Skip to content

Commit

Permalink
Merge pull request #27921 from dotnet/darc-release/7.0.1xx-rc2-9b3fc6…
Browse files Browse the repository at this point in the history
…e0-08ac-48a6-882b-dfad1f58a7cb

[release/7.0.1xx-rc2] Update dependencies from dotnet/msbuild
  • Loading branch information
marcpopMSFT authored Sep 15, 2022
2 parents 13a8527 + f5f4583 commit d0f4686
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c623d96fe33cc360bd9981c9e6f6a646d7881d9e</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22464-02">
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22465-02">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>3d01db7c23495c327f010b6392961082839041a6</Sha>
<Sha>02b334e3afaa105221d0adb49a7b224407c5334c</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.4.0-preview-22464-02">
<Dependency Name="Microsoft.Build.Localization" Version="17.4.0-preview-22465-02">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>3d01db7c23495c327f010b6392961082839041a6</Sha>
<Sha>02b334e3afaa105221d0adb49a7b224407c5334c</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.5-beta.22464.7">
<Uri>https://github.com/dotnet/fsharp</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
<MicrosoftBuildPackageVersion>17.4.0-preview-22464-02</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>17.4.0-preview-22465-02</MicrosoftBuildPackageVersion>
<!-- .NET Framework-targeted tasks 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>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
<MicrosoftBuildLocalizationPackageVersion>17.4.0-preview-22464-02</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildLocalizationPackageVersion>17.4.0-preview-22465-02</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
Expand Down

0 comments on commit d0f4686

Please sign in to comment.