Resolve source-build patch conflicts
This commit is contained in:
parent
6b92690374
commit
b36ba0e039
2 changed files with 1 additions and 27 deletions
src/SourceBuild/tarball/patches
|
@ -1,26 +0,0 @@
|
||||||
From 046e225f600b1bdb37d6e05985db77ff894802fe Mon Sep 17 00:00:00 2001
|
|
||||||
From: MichaelSimons <msimons@microsoft.com>
|
|
||||||
Date: Tue, 14 Sep 2021 17:01:16 +0000
|
|
||||||
Subject: [PATCH] Pin System.Reflection.Metadata version for crossgen
|
|
||||||
|
|
||||||
Resolution to the root cause of https://github.com/dotnet/runtime/issues/58800
|
|
||||||
---
|
|
||||||
.../ILCompiler.TypeSystem.ReadyToRun.csproj | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj b/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj
|
|
||||||
index 82452cfa3e9..23cbbd5ad9f 100644
|
|
||||||
--- a/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj
|
|
||||||
+++ b/src/coreclr/tools/aot/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj
|
|
||||||
@@ -30,7 +30,7 @@
|
|
||||||
<Version>4.3.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="System.Reflection.Metadata">
|
|
||||||
- <Version>$(SystemReflectionMetadataVersion)</Version>
|
|
||||||
+ <Version>5.0.0</Version>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Condition = "'$(EnableDiaSymReaderUse)' == 'true'" Include="Microsoft.DiaSymReader">
|
|
||||||
<Version>1.3.0</Version>
|
|
||||||
--
|
|
||||||
2.29.2
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ index 0a7442c7c4..741b654ec4 100644
|
||||||
@@ -36,7 +36,7 @@
|
@@ -36,7 +36,7 @@
|
||||||
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
|
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
|
||||||
<SystemTextJsonVersion>5.0.2</SystemTextJsonVersion>
|
<SystemTextJsonVersion>5.0.2</SystemTextJsonVersion>
|
||||||
<SystemReflectionMetadataLoadContextVersion>6.0.0-rtm.21479.7</SystemReflectionMetadataLoadContextVersion>
|
<SystemReflectionMetadataLoadContextVersion>6.0.0-rtm.21501.9</SystemReflectionMetadataLoadContextVersion>
|
||||||
- <DeploymentReleasesVersion>1.0.0-preview1.1.21112.1</DeploymentReleasesVersion>
|
- <DeploymentReleasesVersion>1.0.0-preview1.1.21112.1</DeploymentReleasesVersion>
|
||||||
+ <MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview1.1.21112.1</MicrosoftDeploymentDotNetReleasesVersion>
|
+ <MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview1.1.21112.1</MicrosoftDeploymentDotNetReleasesVersion>
|
||||||
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
|
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
|
||||||
|
|
Loading…
Add table
Reference in a new issue