From 3ebd16481b77d0357acf82130e6186f59eab7c58 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Mon, 4 Oct 2021 20:41:51 +0000
Subject: [PATCH] Resolve source-build patch conflicts

---
 ...1-Rename-DeploymentReleasesVersion-Versions.props-entr.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch b/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch
index 167c5ce21..1a64f486f 100644
--- a/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch
+++ b/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch
@@ -19,7 +19,7 @@ index 0a7442c7c4..741b654ec4 100644
 @@ -36,7 +36,7 @@
      <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
      <SystemTextJsonVersion>5.0.2</SystemTextJsonVersion>
-     <SystemReflectionMetadataLoadContextVersion>6.0.0-rtm.21501.9</SystemReflectionMetadataLoadContextVersion>
+     <SystemReflectionMetadataLoadContextVersion>6.0.0-rtm.21504.6</SystemReflectionMetadataLoadContextVersion>
 -    <DeploymentReleasesVersion>1.0.0-preview1.1.21112.1</DeploymentReleasesVersion>
 +    <MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview1.1.21112.1</MicrosoftDeploymentDotNetReleasesVersion>
      <SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>