diff options
| author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2022-11-12 04:15:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-12 04:15:29 +0300 |
| commit | 6d8f7fcda49ffe3a368cb4e49626444305cc85cd (patch) | |
| tree | 179212bae19060dd9f0a474df75d44678681705f | |
| parent | 7d933e60912db84407cb079bf3e06f0355de47a2 (diff) | |
Update dependencies from https://github.com/dotnet/arcade build 20221108.7 (#315)dotnet/release/6.0
[dotnet/release/6.0] 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 01f622c460ce..38afa049e4a3 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="6.0.0-beta.22558.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22558.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha> + <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22558.2"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22558.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha> + <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22558.2"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22558.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha> + <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index dbf98a569b1e..876f05fb188f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,6 +6,6 @@ <PreReleaseVersionIteration>1</PreReleaseVersionIteration> </PropertyGroup> <PropertyGroup> - <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22558.2</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22558.7</MicrosoftDotNetBuildTasksPackagingVersion> </PropertyGroup> </Project> diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e7d4..b09ea669f9c0 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 ;; amd64|x86_64) @@ -61,7 +61,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/global.json b/global.json index d07019819f65..051f92ce5da5 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "6.0.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.7", "Microsoft.Build.Traversal": "2.0.2" } } |