Skip to content

Commit

Permalink
Merge pull request #7470 from dotnet/darc-release/7.0.4xx-a6c7109e-ef…
Browse files Browse the repository at this point in the history
…f6-46a7-9c5c-048d203b9197

[release/7.0.4xx] Update dependencies from dotnet/arcade
  • Loading branch information
v-wuzhai authored Jan 18, 2024
2 parents b9b92eb + f810088 commit 67c6c16
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
</Dependency>
</ProductDependencies>
<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>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
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
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"dotnet": "7.0.115"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24061.2"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4"
}
}

0 comments on commit 67c6c16

Please sign in to comment.