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
…503.1 (#33681)

[main] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] committed May 7, 2024
1 parent c349de9 commit 703b40c
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24229.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24253.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<Sha>020255bcf7d0b8beed7de05338d97396982ae527</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<SystemTextJsonVersion>9.0.0-preview.4.24229.1</SystemTextJsonVersion>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24253.1</MicrosoftDotNetBuildTasksTemplatingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<MicrosoftBuildFrameworkVersion>17.9.5</MicrosoftBuildFrameworkVersion>
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 @@ -64,7 +64,7 @@ if [ -z "$CLR_CC" ]; then
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="18 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="13 12 11 10 9 8 7 6 5 4.9"; fi
elif [ "$compiler" = "gcc" ]; then versions="14 13 12 11 10 9 8 7 6 5 4.9"; fi

for version in $versions; do
_major="${version%%.*}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ steps:
${{ if parameters.args.artifactName }}:
artifactName: ${{ parameters.args.artifactName }}
${{ if parameters.args.properties }}:
properties: ${{ properties.args.properties }}
properties: ${{ parameters.args.properties }}
2 changes: 1 addition & 1 deletion eng/common/templates/steps/publish-pipeline-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ steps:
${{ if parameters.args.parallelCount }}:
parallelCount: ${{ parameters.args.parallelCount }}
${{ if parameters.args.properties }}:
properties: ${{ properties.args.properties }}
properties: ${{ parameters.args.properties }}
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dotnet": "9.0.100-preview.3.24204.13"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24229.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24229.1"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24253.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24253.1"
}
}

0 comments on commit 703b40c

Please sign in to comment.