Skip to content

Commit

Permalink
Merge pull request dotnet#26252 from dotnet/darc-main-29683687-c5a0-4…
Browse files Browse the repository at this point in the history
…b95-8cd6-77d44361f337

[main] Update dependencies from dotnet/msbuild
  • Loading branch information
v-wuzhai committed Jun 27, 2022
2 parents 823bbb2 + 6a2de94 commit 876937b
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 @@ -62,13 +62,13 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>988f570dc4ddd79a166ca8cbc184b2938ed2fefc</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.3.0-preview-22323-15">
<Dependency Name="Microsoft.Build" Version="17.3.0-preview-22324-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>b99b39a350392d9d4a438b5251cc2b06d708db5a</Sha>
<Sha>cd5f87420c9170af906f64075b45b44a038ba0d5</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Localization" Version="17.3.0-preview-22323-15">
<Dependency Name="Microsoft.Build.Localization" Version="17.3.0-preview-22324-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>b99b39a350392d9d4a438b5251cc2b06d708db5a</Sha>
<Sha>cd5f87420c9170af906f64075b45b44a038ba0d5</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22274.4">
<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 @@ -103,15 +103,15 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
<MicrosoftBuildPackageVersion>17.3.0-preview-22323-15</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>17.3.0-preview-22324-06</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.3.0-preview-22323-15</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildLocalizationPackageVersion>17.3.0-preview-22324-06</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
Expand Down

0 comments on commit 876937b

Please sign in to comment.