diff options
| author | Andy Gocke <angocke@microsoft.com> | 2022-10-27 23:53:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-27 23:53:43 +0300 |
| commit | 997d750124b1325918e059c12df2f370f7da0de8 (patch) | |
| tree | 377622f83ffac90e2c3e8809f6d8496fb67ce577 | |
| parent | de816cec0f86acfb30682e1609a0b7567afd3dc0 (diff) | |
Upgrade MSBuild ref and downgrade global.json (#3089)
The official build has an old version of MSBuild so we can't use
a new version of MSBuild. However, we do need a higher version of MSBuild
as our ref for the tasks, so this also upgrades the version of MSBuild.
The two changes are technically separate, even though they both involve
MSBuild.
| -rw-r--r-- | eng/Versions.props | 3 | ||||
| -rw-r--r-- | global.json | 2 | ||||
| -rw-r--r-- | src/ILLink.Tasks/ILLink.Tasks.csproj | 2 | ||||
| -rw-r--r-- | test/ILLink.Tasks.Tests/ILLink.Tasks.Tests.csproj | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/eng/Versions.props b/eng/Versions.props index 2cb7d4bec..9f662bd9f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,8 +16,7 @@ <MicrosoftNETCoreILAsmVersion>$(MicrosoftNETSdkILPackageVersion)</MicrosoftNETCoreILAsmVersion> <!-- SRM version should match the SDK version at https://github.com/dotnet/sdk/blob/master/eng/Versions.props --> <SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion> - <MicrosoftBuildFrameworkVersion>17.0.0-preview-21267-01</MicrosoftBuildFrameworkVersion> - <MicrosoftBuildUtilitiesCoreVersion>17.0.0-preview-21267-01</MicrosoftBuildUtilitiesCoreVersion> + <MicrosoftBuildFrameworkVersion>17.0.0</MicrosoftBuildFrameworkVersion> <MicrosoftDotNetApiCompatVersion>6.0.0-beta.22517.1</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21271.1</MicrosoftDotNetCodeAnalysisVersion> <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion> diff --git a/global.json b/global.json index 04e64d495..f922921e7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.402" + "dotnet": "6.0.110" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22517.1", diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj index 7501ecb47..18c64e319 100644 --- a/src/ILLink.Tasks/ILLink.Tasks.csproj +++ b/src/ILLink.Tasks/ILLink.Tasks.csproj @@ -50,7 +50,7 @@ prevent them from being published with the tasks dll, because these are already a part of the SDK. --> <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" PrivateAssets="All" ExcludeAssets="Runtime" /> - <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" PrivateAssets="All" ExcludeAssets="Runtime" /> + <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildFrameworkVersion)" PrivateAssets="All" ExcludeAssets="Runtime" /> <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" Condition=" '$(TargetFramework)' == 'net472' " PrivateAssets="All" Publish="True" /> <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.2" /> diff --git a/test/ILLink.Tasks.Tests/ILLink.Tasks.Tests.csproj b/test/ILLink.Tasks.Tests/ILLink.Tasks.Tests.csproj index 21a8efc47..486d60397 100644 --- a/test/ILLink.Tasks.Tests/ILLink.Tasks.Tests.csproj +++ b/test/ILLink.Tasks.Tests/ILLink.Tasks.Tests.csproj @@ -6,7 +6,7 @@ <ItemGroup> <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" /> - <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" /> + <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildFrameworkVersion)" /> </ItemGroup> <ItemGroup> |