未验证 提交 5e818734 编写于 作者: D dotnet-maestro[bot] 提交者: GitHub

Update dependencies from https://github.com/dotnet/arcade build 20211220.2 (#5858)

[main] Update dependencies from dotnet/arcade
上级 a205e94c
......@@ -75,25 +75,25 @@
</Dependency>
</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.CodeAnalysis" Version="7.0.0-beta.21617.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" 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>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.21617.4">
<Dependency Name="Microsoft.DotNet.ApiCompat" 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.GenAPI" Version="7.0.0-beta.21617.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21620.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>78659a1d4831ce9d62ea817fe13e4e2e70a52961</Sha>
<Sha>2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
......@@ -37,9 +37,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.21617.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.21617.4</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.21617.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.21620.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.21620.2</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.21620.2</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
......
......@@ -55,6 +55,9 @@ case $cpuname in
aarch64)
buildarch=arm64
;;
loongarch64)
buildarch=loongarch64
;;
amd64|x86_64)
buildarch=x64
;;
......
......@@ -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"
......
......@@ -12,8 +12,8 @@
}
},
"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"
},
"sdk": {
"version": "6.0.100"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册