From 6451e8e409ef808dd2f6ad74e329ae6ec593afae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Dec 2021 13:38:22 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20211220.2 (#1246) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/dotnet-install.sh | 3 +++ eng/common/native/CommonLibrary.psm1 | 3 ++- global.json | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c596016..04477b35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 78659a1d4831ce9d62ea817fe13e4e2e70a52961 + 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 - + https://github.com/dotnet/arcade - 78659a1d4831ce9d62ea817fe13e4e2e70a52961 + 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 - + https://github.com/dotnet/arcade - 78659a1d4831ce9d62ea817fe13e4e2e70a52961 + 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 - + https://github.com/dotnet/arcade - 78659a1d4831ce9d62ea817fe13e4e2e70a52961 + 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 - + https://github.com/dotnet/arcade - 78659a1d4831ce9d62ea817fe13e4e2e70a52961 + 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 https://github.com/dotnet/arcade-services diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66..5c94e986 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -55,6 +55,9 @@ case $cpuname in aarch64) buildarch=arm64 ;; + loongarch64) + buildarch=loongarch64 + ;; amd64|x86_64) buildarch=x64 ;; diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1 index adf707c8..ca38268c 100644 --- a/eng/common/native/CommonLibrary.psm1 +++ b/eng/common/native/CommonLibrary.psm1 @@ -276,7 +276,8 @@ function Get-MachineArchitecture { } if (($ProcessorArchitecture -Eq "AMD64") -Or ($ProcessorArchitecture -Eq "IA64") -Or - ($ProcessorArchitecture -Eq "ARM64")) { + ($ProcessorArchitecture -Eq "ARM64") -Or + ($ProcessorArchitecture -Eq "LOONGARCH64")) { return "x64" } return "x86" diff --git a/global.json b/global.json index 72cba32b..1afa2efa 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21617.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21620.2" } }