|
| 1 | +From cfa1c6a72f1e98418b7abcfcd0a818a62fedf512 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Viktor Hofer < [email protected]> |
| 3 | +Date: Mon, 24 Jun 2024 19:57:06 +0200 |
| 4 | +Subject: [PATCH] Add dependencies for System libraries |
| 5 | + |
| 6 | +Fixes https://github.com/dotnet/source-build/issues/4477 |
| 7 | + |
| 8 | +Source-build lifts the MSBuild package versions to the N-1 |
| 9 | +(previously produced assets) but fsharp pins the |
| 10 | +System.Reflection.Metadata (and similar System libs) version |
| 11 | +which is a transitive dependency to 8.0.0. That results in a |
| 12 | +package downgrade error. Define a dependency for |
| 13 | +System.Reflection.Metadata (and other System libs) so that |
| 14 | +source-build can lift that version as well. |
| 15 | + |
| 16 | +Backport PR: https://github.com/dotnet/fsharp/pull/17344 |
| 17 | + |
| 18 | +--- |
| 19 | + eng/Version.Details.xml | 12 ++++++++++++ |
| 20 | + eng/Versions.props | 2 -- |
| 21 | + 2 files changed, 12 insertions(+), 2 deletions(-) |
| 22 | + |
| 23 | +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml |
| 24 | +index dea57c3b5..1bc5f3bf0 100644 |
| 25 | +--- a/eng/Version.Details.xml |
| 26 | ++++ b/eng/Version.Details.xml |
| 27 | +@@ -28,6 +28,18 @@ |
| 28 | + <Uri>https://github.com/dotnet/msbuild</Uri> |
| 29 | + <Sha>2d02daa886f279e2ee749cad03db4b1b75bb9adb</Sha> |
| 30 | + </Dependency> |
| 31 | ++ <Dependency Name="System.Reflection.Metadata" Version="8.0.0"> |
| 32 | ++ <Uri>https://github.com/dotnet/runtime</Uri> |
| 33 | ++ <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha> |
| 34 | ++ </Dependency> |
| 35 | ++ <Dependency Name="System.Collections.Immutable" Version="8.0.0"> |
| 36 | ++ <Uri>https://github.com/dotnet/runtime</Uri> |
| 37 | ++ <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha> |
| 38 | ++ </Dependency> |
| 39 | ++ <Dependency Name="System.Threading.Tasks.Dataflow" Version="8.0.0"> |
| 40 | ++ <Uri>https://github.com/dotnet/runtime</Uri> |
| 41 | ++ <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha> |
| 42 | ++ </Dependency> |
| 43 | + </ProductDependencies> |
| 44 | + <ToolsetDependencies> |
| 45 | + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24311.3"> |
| 46 | +diff --git a/eng/Versions.props b/eng/Versions.props |
| 47 | +index 9a1da2fc0..4a8517632 100644 |
| 48 | +--- a/eng/Versions.props |
| 49 | ++++ b/eng/Versions.props |
| 50 | +@@ -91,7 +91,6 @@ |
| 51 | + <SystemThreadingTasksDataflow>$(SystemPackageVersionVersion)</SystemThreadingTasksDataflow> |
| 52 | + <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion> |
| 53 | + <MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion> |
| 54 | +- <!-- --> |
| 55 | + <!-- Versions for package groups --> |
| 56 | + <RoslynVersion>4.11.0-2.24264.2</RoslynVersion> |
| 57 | + <VisualStudioEditorPackagesVersion>17.10.191</VisualStudioEditorPackagesVersion> |
| 58 | +@@ -99,7 +98,6 @@ |
| 59 | + <VisualStudioProjectSystemPackagesVersion>17.10.526-pre-g1b474069f5</VisualStudioProjectSystemPackagesVersion> |
| 60 | + <MicrosoftVisualStudioThreadingPackagesVersion>17.10.41</MicrosoftVisualStudioThreadingPackagesVersion> |
| 61 | + <MicrosoftBuildVersion>17.11.0-preview-24178-03</MicrosoftBuildVersion> |
| 62 | +- <!-- --> |
| 63 | + <!-- Roslyn packages --> |
| 64 | + <MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion> |
| 65 | + <MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion> |
0 commit comments