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

Update dependencies from https://github.com/dotnet/arcade build 20201230.2 (#3939)

[master] Update dependencies from dotnet/arcade
上级 3c8af9a4
......@@ -99,25 +99,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20623.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7e0f9bc02f83d0a561d9edb963d856334f048f0d</Sha>
<Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20623.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7e0f9bc02f83d0a561d9edb963d856334f048f0d</Sha>
<Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20623.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7e0f9bc02f83d0a561d9edb963d856334f048f0d</Sha>
<Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20623.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7e0f9bc02f83d0a561d9edb963d856334f048f0d</Sha>
<Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20623.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20630.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7e0f9bc02f83d0a561d9edb963d856334f048f0d</Sha>
<Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
......@@ -43,9 +43,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.20623.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.20623.1</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.20623.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.20630.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.20630.2</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.20630.2</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup>
......
......@@ -273,7 +273,9 @@ function GetDotNetInstallScript {
if command -v curl > /dev/null; then
# first, try directly, if this fails we will retry with verbose logging
curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
echo "curl failed; will now retry with verbose logging."
echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation"
echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443
echo "Will now retry the same URL with verbose logging."
with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || {
local exit_code=$?
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
......
......@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20623.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20623.1"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20630.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20630.2"
},
"sdk": {
"version": "5.0.100"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册