Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20211…
Browse files Browse the repository at this point in the history
…220.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21125.5 -> To Version 7.0.0-beta.21620.2
  • Loading branch information
dotnet-maestro[bot] committed Dec 21, 2021
1 parent 75f0363 commit 1505aa9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21617.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21620.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>78659a1d4831ce9d62ea817fe13e4e2e70a52961</Sha>
<Sha>2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21617.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21620.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>78659a1d4831ce9d62ea817fe13e4e2e70a52961</Sha>
<Sha>2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
3 changes: 3 additions & 0 deletions eng/common/dotnet-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ case $cpuname in
aarch64)
buildarch=arm64
;;
loongarch64)
buildarch=loongarch64
;;
amd64|x86_64)
buildarch=x64
;;
Expand Down
3 changes: 2 additions & 1 deletion eng/common/native/CommonLibrary.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"rollForward": "major"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21617.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21617.4"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21620.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21620.2"
}
}

0 comments on commit 1505aa9

Please sign in to comment.