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

Update dependencies from https://github.com/dotnet/arcade build 20191023.3 (#2108)

- Microsoft.DotNet.ApiCompat - 5.0.0-beta.19523.3
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19523.3
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.19523.3
- Microsoft.DotNet.GenAPI - 5.0.0-beta.19523.3
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19523.3
上级 86c905bc
......@@ -63,13 +63,13 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>4ace84dbf94128b4825c76cdd09b46dba7473478</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19522.8">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19523.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b809e63d8ef475faaf6fecbe8bf77180f8e3550c</Sha>
<Sha>894bd005267af53f7d39ac988881e61193e67ae1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19522.8">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.19523.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b809e63d8ef475faaf6fecbe8bf77180f8e3550c</Sha>
<Sha>894bd005267af53f7d39ac988881e61193e67ae1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
......@@ -95,17 +95,17 @@
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>b415b57a15b0c6ba77e63df901823bb46b8aafda</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19522.8">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19523.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b809e63d8ef475faaf6fecbe8bf77180f8e3550c</Sha>
<Sha>894bd005267af53f7d39ac988881e61193e67ae1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19522.8">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19523.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b809e63d8ef475faaf6fecbe8bf77180f8e3550c</Sha>
<Sha>894bd005267af53f7d39ac988881e61193e67ae1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19522.8">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19523.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b809e63d8ef475faaf6fecbe8bf77180f8e3550c</Sha>
<Sha>894bd005267af53f7d39ac988881e61193e67ae1</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
......
......@@ -40,9 +40,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.19522.8</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.19522.8</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.19522.8</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.19523.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.19523.3</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.19523.3</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup>
......
......@@ -47,8 +47,38 @@ while [[ $# > 0 ]]; do
shift
done
# Use uname to determine what the CPU is.
cpuname=$(uname -p)
# Some Linux platforms report unknown for platform, but the arch for machine.
if [[ "$cpuname" == "unknown" ]]; then
cpuname=$(uname -m)
fi
case $cpuname in
aarch64)
buildarch=arm64
;;
amd64|x86_64)
buildarch=x64
;;
armv7l)
buildarch=arm
;;
i686)
buildarch=x86
;;
*)
echo "Unknown CPU $cpuname detected, treating it as x64"
buildarch=x64
;;
esac
. "$scriptroot/tools.sh"
dotnetRoot="$repo_root/.dotnet"
if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
dotnetRoot="$dotnetRoot/$architecture"
fi
InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
local exit_code=$?
echo "dotnet-install.sh failed (exit code '$exit_code')." >&2
......
......@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19522.8",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19522.8"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19523.3",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19523.3"
},
"native-tools": {
"strawberry-perl": "5.28.1.1-1",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册