Skip to content

W
wpf

dotNET Platform / wpf
12 个月 前同步成功

通知 1
Star 1
Fork 0
W
wpf

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 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
隐藏空白更改
内联 并排
Showing with 20 addition and 16 deletion
eng/Version.Details.xml
浏览文件 @ 5e818734
...@@ -75,25 +75,25 @@ ...@@ -75,25 +75,25 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <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> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>78659a1d4831ce9d62ea817fe13e4e2e70a52961</Sha> <Sha>2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4</Sha>
</Dependency> </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> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>78659a1d4831ce9d62ea817fe13e4e2e70a52961</Sha> <Sha>2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4</Sha>
</Dependency> </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> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>78659a1d4831ce9d62ea817fe13e4e2e70a52961</Sha> <Sha>2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4</Sha>
</Dependency> </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> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>78659a1d4831ce9d62ea817fe13e4e2e70a52961</Sha> <Sha>2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4</Sha>
</Dependency> </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> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>78659a1d4831ce9d62ea817fe13e4e2e70a52961</Sha> <Sha>2af5dda2d48417982a6b90bf28e8b9a9b57f5ad4</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>
eng/Versions.props
浏览文件 @ 5e818734
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade --> <!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup> <PropertyGroup>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.21617.4</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetApiCompatVersion>7.0.0-beta.21620.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.21617.4</MicrosoftDotNetCodeAnalysisPackageVersion> <MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.21620.2</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.21617.4</MicrosoftDotNetGenAPIVersion> <MicrosoftDotNetGenAPIVersion>7.0.0-beta.21620.2</MicrosoftDotNetGenAPIVersion>
</PropertyGroup> </PropertyGroup>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 --> <!-- 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 --> <!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
......
eng/common/dotnet-install.sh
浏览文件 @ 5e818734
...@@ -55,6 +55,9 @@ case $cpuname in ...@@ -55,6 +55,9 @@ case $cpuname in
aarch64) aarch64)
buildarch=arm64 buildarch=arm64
;; ;;
loongarch64)
buildarch=loongarch64
;;
amd64|x86_64) amd64|x86_64)
buildarch=x64 buildarch=x64
;; ;;
......
eng/common/native/CommonLibrary.psm1
浏览文件 @ 5e818734
...@@ -276,7 +276,8 @@ function Get-MachineArchitecture { ...@@ -276,7 +276,8 @@ function Get-MachineArchitecture {
} }
if (($ProcessorArchitecture -Eq "AMD64") -Or if (($ProcessorArchitecture -Eq "AMD64") -Or
($ProcessorArchitecture -Eq "IA64") -Or ($ProcessorArchitecture -Eq "IA64") -Or
($ProcessorArchitecture -Eq "ARM64")) { ($ProcessorArchitecture -Eq "ARM64") -Or
($ProcessorArchitecture -Eq "LOONGARCH64")) {
return "x64" return "x64"
} }
return "x86" return "x86"
......
global.json
浏览文件 @ 5e818734
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.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.21617.4" "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21620.2"
}, },
"sdk": { "sdk": {
"version": "6.0.100" "version": "6.0.100"
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或