diff options
| author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2022-04-18 16:51:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-18 16:51:40 +0300 |
| commit | 4a19781d1b1d85eee1e218875206d64d23497ec3 (patch) | |
| tree | 11af5c6a3efb0706d11c9864d82e26d0e6cb1ef3 | |
| parent | 6f32b19258abc17deb66dfc65bc7743206e6cd7d (diff) | |
Update dependencies from https://github.com/dotnet/arcade build 20220415.2 (#194)
[release/11.x] Update dependencies from dotnet/arcade
| -rw-r--r-- | eng/Version.Details.xml | 12 | ||||
| -rw-r--r-- | eng/Versions.props | 2 | ||||
| -rwxr-xr-x | eng/common/dotnet-install.sh | 4 | ||||
| -rw-r--r-- | global.json | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e46ad9d744e8..5b231647a0f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ <ProductDependencies> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22206.10"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22215.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>549523c3fc8929da1a3073d1a97f298e0d1dc342</Sha> + <Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22206.10"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22215.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>549523c3fc8929da1a3073d1a97f298e0d1dc342</Sha> + <Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22206.10"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22215.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>549523c3fc8929da1a3073d1a97f298e0d1dc342</Sha> + <Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index 7303e4152eca..e96fa8136c70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,6 +6,6 @@ <PreReleaseVersionIteration>1</PreReleaseVersionIteration> </PropertyGroup> <PropertyGroup> - <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22206.10</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22215.2</MicrosoftDotNetBuildTasksPackagingVersion> </PropertyGroup> </Project> diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 5c94e98632a0..abd045a3247f 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; loongarch64) @@ -64,7 +64,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/global.json b/global.json index 599bc6d59f9c..ef431faa90e6 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "7.0.100-preview.2.22153.17" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22206.10", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22206.10", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22215.2", "Microsoft.Build.Traversal": "2.0.2" } } |