Resolve source-build patch conflicts
This commit is contained in:
parent
26079651b0
commit
3ebd16481b
1 changed files with 1 additions and 1 deletions
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue