Skip to content

Commit

Permalink
Merge commit '75795d5a443e96fcd736d58de021ec3f5bfbf3c5'
Browse files Browse the repository at this point in the history
  • Loading branch information
Mirroring committed Sep 13, 2024
2 parents 1d8350d + 75795d5 commit c9e4442
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24459.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24459.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24459.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24459.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24459.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24413.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.24413.1</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24413.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24459.5</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.24459.5</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24459.5</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24413.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24413.1"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24459.5",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24459.5"
},
"sdk": {
"version": "6.0.133"
Expand Down

0 comments on commit c9e4442

Please sign in to comment.