diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a8fe633290e14c..d3032263df25eb 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21613.2", + "version": "1.0.0-prerelease.21621.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f1b989d5f6029..2822e40110492e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - d483c01eb69a904062475e49d6b20b8bbbefe64b + d9371f17932fbf828f1d1e2f21a99b64ba40eba5 https://github.com/dotnet/msquic @@ -18,125 +18,125 @@ - + 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 - 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 - 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 - 78659a1d4831ce9d62ea817fe13e4e2e70a52961 + 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 - + https://github.com/dotnet/arcade - 78659a1d4831ce9d62ea817fe13e4e2e70a52961 + 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 - + https://github.com/dotnet/arcade - 78659a1d4831ce9d62ea817fe13e4e2e70a52961 + 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b https://github.com/dotnet/llvm-project @@ -206,17 +206,17 @@ https://github.com/dotnet/linker 853385633a7aeb84d9bd81885b3b221fc3075038 - + https://github.com/dotnet/xharness - d5affc0d0361de14aa1ccbf5cad268d5873e3113 + bd9a0b3a2b718b0e5a0e9ff5754cd25a48b98aa3 - + https://github.com/dotnet/xharness - d5affc0d0361de14aa1ccbf5cad268d5873e3113 + bd9a0b3a2b718b0e5a0e9ff5754cd25a48b98aa3 - + https://github.com/dotnet/arcade - 78659a1d4831ce9d62ea817fe13e4e2e70a52961 + 2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -234,13 +234,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 91d6b3c1f51888d166701510189505f35714665c - + https://github.com/dotnet/hotreload-utils - 4782fa39c0fb1651890b6b03aef11f7129884eae + f0d838421286fed81005fd4ddf6562555b641b3b - + https://github.com/dotnet/runtime-assets - 658e482c4af9a16cbe9ea0fae4c6e4281f1521b6 + f6e023ee68f858cd020a13dc9dfc13ba6a82b64b https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 595bff91734275..89240db56297a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21617.4 - 7.0.0-beta.21617.4 - 7.0.0-beta.21617.4 - 7.0.0-beta.21617.4 - 7.0.0-beta.21617.4 - 7.0.0-beta.21617.4 - 2.5.1-beta.21617.4 - 7.0.0-beta.21617.4 - 7.0.0-beta.21617.4 - 7.0.0-beta.21617.4 - 7.0.0-beta.21617.4 - 7.0.0-beta.21617.4 - 7.0.0-beta.21617.4 - 7.0.0-beta.21617.4 - 7.0.0-beta.21617.4 + 7.0.0-beta.21620.2 + 7.0.0-beta.21620.2 + 7.0.0-beta.21620.2 + 7.0.0-beta.21620.2 + 7.0.0-beta.21620.2 + 7.0.0-beta.21620.2 + 2.5.1-beta.21620.2 + 7.0.0-beta.21620.2 + 7.0.0-beta.21620.2 + 7.0.0-beta.21620.2 + 7.0.0-beta.21620.2 + 7.0.0-beta.21620.2 + 7.0.0-beta.21620.2 + 7.0.0-beta.21620.2 + 7.0.0-beta.21620.2 6.0.0-preview.1.102 @@ -118,18 +118,18 @@ 4.5.0 7.0.0-alpha.1.21620.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 - 7.0.0-beta.21603.1 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 + 7.0.0-beta.21620.3 1.0.0-prerelease.21577.2 1.0.0-prerelease.21577.2 @@ -152,9 +152,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21613.2 - 1.0.0-prerelease.21613.2 - 1.0.2-alpha.0.21613.2 + 1.0.0-prerelease.21621.1 + 1.0.0-prerelease.21621.1 + 1.0.2-alpha.0.21620.2 2.4.2-pre.9 2.4.2 1.3.0 @@ -170,7 +170,7 @@ 7.0.100-1.21616.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-alpha.1.21613.1 + 7.0.0-alpha.1.21620.1 7.0.0-alpha.1.21529.3 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e7d43f..5c94e98632a0a7 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 adf707c8fe7008..ca38268c44d832 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 45588433346c66..f19412eb0fdd03 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21617.4", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21617.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21617.4", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21617.4", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21620.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21620.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21620.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21620.2", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21620.1"