Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20240…
Browse files Browse the repository at this point in the history
…115.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk
 From Version 7.0.0-beta.24061.2 -> To Version 7.0.0-beta.24065.4
  • Loading branch information
dotnet-maestro[bot] committed Jan 22, 2024
1 parent 9383fd5 commit d1c0e38
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24061.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24065.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d6372b3e4dcd568d7412ab1e60003fa1083aaa5f</Sha>
<Sha>feda715e3fb6d511eaa39071bb9d77351cf4d943</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24061.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24065.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d6372b3e4dcd568d7412ab1e60003fa1083aaa5f</Sha>
<Sha>feda715e3fb6d511eaa39071bb9d77351cf4d943</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24061.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24065.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d6372b3e4dcd568d7412ab1e60003fa1083aaa5f</Sha>
<Sha>feda715e3fb6d511eaa39071bb9d77351cf4d943</Sha>
</Dependency>
</ToolsetDependencies>
<!-- ProductDependencies -->
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- Disabling the check for End of live TFMs since we still target netcoreapp 2.1 -->
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
<MicrosoftDotNetGenAPIPackageVersion>7.0.0-beta.24061.2</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>7.0.0-beta.24065.4</MicrosoftDotNetGenAPIPackageVersion>
<!-- dotnet/corefx dependencies -->
<SystemDrawingCommonPackageVersion>6.0.0</SystemDrawingCommonPackageVersion>
<SystemIOPortsPackageVersion>5.0.1</SystemIOPortsPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/native/init-compiler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
# Set default versions
if [[ -z "$majorVersion" ]]; then
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi

for version in "${versions[@]}"; do
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"rollForward": "major"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24061.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24061.2",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24065.4",
"Microsoft.Build.Traversal": "3.1.6"
}
}

0 comments on commit d1c0e38

Please sign in to comment.