|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Nikola Milosavljevic <nikolam@microsoft.com> |
| 3 | +Date: Tue, 23 Apr 2024 01:55:17 +0000 |
| 4 | +Subject: [PATCH] Update MSBuild dependencies |
| 5 | + |
| 6 | +Backport: https://github.com/dotnet/runtime/issues/101395 |
| 7 | +--- |
| 8 | + eng/Version.Details.xml | 12 ++++++++++++ |
| 9 | + eng/Versions.props | 6 +++--- |
| 10 | + src/tasks/AotCompilerTask/MonoAOTCompiler.csproj | 1 - |
| 11 | + src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 3 --- |
| 12 | + 4 files changed, 15 insertions(+), 7 deletions(-) |
| 13 | + |
| 14 | +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml |
| 15 | +index fe35dc0997e..b90337395f6 100644 |
| 16 | +--- a/eng/Version.Details.xml |
| 17 | ++++ b/eng/Version.Details.xml |
| 18 | +@@ -414,6 +414,18 @@ |
| 19 | + <Uri>https://github.com/dotnet/msbuild</Uri> |
| 20 | + <Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha> |
| 21 | + </Dependency> |
| 22 | ++ <Dependency Name="Microsoft.Build.Framework" Version="17.8.3"> |
| 23 | ++ <Uri>https://github.com/dotnet/msbuild</Uri> |
| 24 | ++ <Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha> |
| 25 | ++ </Dependency> |
| 26 | ++ <Dependency Name="Microsoft.Build.Tasks.Core" Version="17.8.3"> |
| 27 | ++ <Uri>https://github.com/dotnet/msbuild</Uri> |
| 28 | ++ <Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha> |
| 29 | ++ </Dependency> |
| 30 | ++ <Dependency Name="Microsoft.Build.Utilities.Core" Version="17.8.3"> |
| 31 | ++ <Uri>https://github.com/dotnet/msbuild</Uri> |
| 32 | ++ <Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha> |
| 33 | ++ </Dependency> |
| 34 | + <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06"> |
| 35 | + <Uri>https://github.com/dotnet/msbuild</Uri> |
| 36 | + <Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha> |
| 37 | +diff --git a/eng/Versions.props b/eng/Versions.props |
| 38 | +index f012e409095..bf16c6ee71f 100644 |
| 39 | +--- a/eng/Versions.props |
| 40 | ++++ b/eng/Versions.props |
| 41 | +@@ -173,9 +173,9 @@ |
| 42 | + <MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion> |
| 43 | + <DNNEVersion>2.0.5</DNNEVersion> |
| 44 | + <MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion> |
| 45 | +- <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion> |
| 46 | +- <MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion> |
| 47 | +- <MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildUtilitiesCoreVersion> |
| 48 | ++ <MicrosoftBuildTasksCoreVersion>17.8.3</MicrosoftBuildTasksCoreVersion> |
| 49 | ++ <MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion> |
| 50 | ++ <MicrosoftBuildUtilitiesCoreVersion>17.8.3</MicrosoftBuildUtilitiesCoreVersion> |
| 51 | + <NugetProjectModelVersion>6.2.4</NugetProjectModelVersion> |
| 52 | + <NugetPackagingVersion>6.2.4</NugetPackagingVersion> |
| 53 | + <DotnetSosVersion>7.0.412701</DotnetSosVersion> |
| 54 | +diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj |
| 55 | +index e76730b5aec..88ae0fb136c 100644 |
| 56 | +--- a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj |
| 57 | ++++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj |
| 58 | +@@ -14,7 +14,6 @@ |
| 59 | + <ItemGroup> |
| 60 | + <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" /> |
| 61 | + <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" /> |
| 62 | +- <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" /> |
| 63 | + </ItemGroup> |
| 64 | + <ItemGroup> |
| 65 | + <Compile Include="MonoAOTCompiler.cs" /> |
| 66 | +diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj |
| 67 | +index 34a51095986..d8c95954dd8 100644 |
| 68 | +--- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj |
| 69 | ++++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj |
| 70 | +@@ -24,9 +24,6 @@ |
| 71 | + |
| 72 | + <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" /> |
| 73 | + <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" /> |
| 74 | +- <!-- FIXME: is this the correct version of SRM to use when building for .NET Framework? --> |
| 75 | +- <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" /> |
| 76 | +- <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" /> |
| 77 | + </ItemGroup> |
| 78 | + |
| 79 | + <ItemGroup> |
0 commit comments