Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MSBuild on .NET 7: Downgrade compile-time references (#28079) #28090

Merged
merged 1 commit into from
Sep 21, 2022
Merged

MSBuild on .NET 7: Downgrade compile-time references (#28079) #28090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b23dc07bd7363fcd986a17230c2734bc656e71a7</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22466-03">
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22469-04">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>48ab5664b8734afdf4aedba5f72a0663435eef16</Sha>
<Sha>cc3db358d34ad4cd1ec0c67e17582d7ca2a15040</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.4.0-preview-22466-03">
<Dependency Name="Microsoft.Build.Localization" Version="17.4.0-preview-22469-04">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>48ab5664b8734afdf4aedba5f72a0663435eef16</Sha>
<Sha>cc3db358d34ad4cd1ec0c67e17582d7ca2a15040</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.5-beta.22470.2">
<Uri>https://github.com/dotnet/fsharp</Uri>
Expand Down
9 changes: 5 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,16 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
<MicrosoftBuildPackageVersion>17.4.0-preview-22466-03</MicrosoftBuildPackageVersion>
<!-- .NET Framework-targeted tasks will need to run in an MSBuild that is older than the very latest,
<MicrosoftBuildPackageVersion>17.4.0-preview-22469-04</MicrosoftBuildPackageVersion>
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
so target one that matches the version in minimumMSBuildVersion.

This avoids the need to juggle references to packages that have been updated in newer MSBuild. -->
<MicrosoftBuildPackageVersion Condition=" '$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))' == '.NETFramework' and exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion')">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion')">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
<MicrosoftBuildLocalizationPackageVersion>17.4.0-preview-22466-03</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildLocalizationPackageVersion>17.4.0-preview-22469-04</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Layout/tool_msbuild/tool_msbuild.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildRuntimePackageVersion)" />
<PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildCurrentPackageVersion)" />
<PackageReference Include="Microsoft.Build.Localization" Version="$(MicrosoftBuildLocalizationPackageVersion)" />
<PackageReference Include="System.Resources.Extensions" Version="$(SystemResourcesExtensionsPackageVersion)" />
</ItemGroup>
Expand Down