mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2021-12-21 14:21:59 +00:00 committed by GitHub
parent 135e075984
commit d56e6e80f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -172,19 +172,19 @@
</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>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21617.4"> <Dependency Name="Microsoft.DotNet.CMake.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>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21617.4"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" 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.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.21616.2"> <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.21616.2">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
View file

@ -26,7 +26,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21617.4</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21620.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->

3
eng/common/dotnet-install.sh vendored
View file

@ -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
;; ;;

3
eng/common/native/CommonLibrary.psm1
View file

@ -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"

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4" "cmake": "3.16.4"
}, },
"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.CMake.Sdk": "7.0.0-beta.21617.4" "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21620.2"
} }
} }