Skip to content

Commit 9778568

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20200206.12 (#2518)
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20106.12 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20106.12 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20106.12 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20106.12 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20106.12
1 parent e7c94dd commit 9778568

File tree

7 files changed

+84
-36
lines changed

7 files changed

+84
-36
lines changed

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
<Uri>https://github.com/dotnet/core-setup</Uri>
6464
<Sha>4ace84dbf94128b4825c76cdd09b46dba7473478</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20105.2">
66+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20106.12">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
68+
<Sha>50f7059d3a7a83ae1919516755b9ca92c67805e8</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20105.2">
70+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20106.12">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
72+
<Sha>50f7059d3a7a83ae1919516755b9ca92c67805e8</Sha>
7373
</Dependency>
7474
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
7575
<Uri>https://github.com/dotnet/corefx</Uri>
@@ -95,17 +95,17 @@
9595
<Uri>https://github.com/dotnet/coreclr</Uri>
9696
<Sha>b415b57a15b0c6ba77e63df901823bb46b8aafda</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20105.2">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20106.12">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
100+
<Sha>50f7059d3a7a83ae1919516755b9ca92c67805e8</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20105.2">
102+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20106.12">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
104+
<Sha>50f7059d3a7a83ae1919516755b9ca92c67805e8</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20105.2">
106+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20106.12">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>b65df96ccb820fd5f7ea226aeba310485f395130</Sha>
108+
<Sha>50f7059d3a7a83ae1919516755b9ca92c67805e8</Sha>
109109
</Dependency>
110110
<Dependency Name="System.Resources.Extensions" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
111111
<Uri>https://github.com/dotnet/corefx</Uri>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
</PropertyGroup>
4242
<!-- Packages that come from https://github.com/dotnet/arcade -->
4343
<PropertyGroup>
44-
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20105.2</MicrosoftDotNetApiCompatVersion>
45-
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20105.2</MicrosoftDotNetCodeAnalysisPackageVersion>
46-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20105.2</MicrosoftDotNetGenAPIVersion>
44+
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20106.12</MicrosoftDotNetApiCompatVersion>
45+
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20106.12</MicrosoftDotNetCodeAnalysisPackageVersion>
46+
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20106.12</MicrosoftDotNetGenAPIVersion>
4747
</PropertyGroup>
4848
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
4949
<PropertyGroup>

eng/common/templates/post-build/channels/generic-internal-channel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ stages:
4646
buildId: $(AzDOBuildId)
4747
downloadType: 'specific'
4848
itemPattern: |
49-
PDBArtifacts/**
49+
PdbArtifacts/**
5050
BlobArtifacts/**
5151
downloadPath: '$(Build.ArtifactStagingDirectory)'
5252

eng/common/templates/post-build/channels/generic-public-channel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ stages:
4646
buildId: $(AzDOBuildId)
4747
downloadType: 'specific'
4848
itemPattern: |
49-
PDBArtifacts/**
49+
PdbArtifacts/**
5050
BlobArtifacts/**
5151
downloadPath: '$(Build.ArtifactStagingDirectory)'
5252

eng/common/tools.ps1

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,12 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
155155
# The following code block is protecting against concurrent access so that this function can
156156
# be called in parallel.
157157
if ($createSdkLocationFile) {
158-
do {
158+
do {
159159
$sdkCacheFileTemp = Join-Path $ToolsetDir $([System.IO.Path]::GetRandomFileName())
160-
}
160+
}
161161
until (!(Test-Path $sdkCacheFileTemp))
162162
Set-Content -Path $sdkCacheFileTemp -Value $dotnetRoot
163-
163+
164164
try {
165165
Rename-Item -Force -Path $sdkCacheFileTemp 'sdk.txt'
166166
} catch {
@@ -188,7 +188,33 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
188188
if (!(Test-Path $installScript)) {
189189
Create-Directory $dotnetRoot
190190
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
191-
Invoke-WebRequest "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" -OutFile $installScript
191+
192+
$maxRetries = 5
193+
$retries = 1
194+
195+
$uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1"
196+
197+
while($true) {
198+
try {
199+
Write-Host "GET $uri"
200+
Invoke-WebRequest $uri -OutFile $installScript
201+
break
202+
}
203+
catch {
204+
Write-Host "Failed to download '$uri'"
205+
Write-Error $_.Exception.Message -ErrorAction Continue
206+
}
207+
208+
if (++$retries -le $maxRetries) {
209+
$delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
210+
Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
211+
Start-Sleep -Seconds $delayInSeconds
212+
}
213+
else {
214+
throw "Unable to download file in $maxRetries attempts."
215+
}
216+
217+
}
192218
}
193219

194220
return $installScript
@@ -198,12 +224,12 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc
198224
InstallDotNet $dotnetRoot $version $architecture
199225
}
200226

201-
function InstallDotNet([string] $dotnetRoot,
202-
[string] $version,
203-
[string] $architecture = '',
204-
[string] $runtime = '',
205-
[bool] $skipNonVersionedFiles = $false,
206-
[string] $runtimeSourceFeed = '',
227+
function InstallDotNet([string] $dotnetRoot,
228+
[string] $version,
229+
[string] $architecture = '',
230+
[string] $runtime = '',
231+
[bool] $skipNonVersionedFiles = $false,
232+
[string] $runtimeSourceFeed = '',
207233
[string] $runtimeSourceFeedKey = '') {
208234

209235
$installScript = GetDotNetInstallScript $dotnetRoot
@@ -298,7 +324,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
298324
$vsMajorVersion = $vsMinVersion.Major
299325
$xcopyMSBuildVersion = "$vsMajorVersion.$($vsMinVersion.Minor).0-alpha"
300326
}
301-
327+
302328
$vsInstallDir = $null
303329
if ($xcopyMSBuildVersion.Trim() -ine "none") {
304330
$vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install

eng/common/tools.sh

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fi
4141
# Configures warning treatment in msbuild.
4242
warn_as_error=${warn_as_error:-true}
4343

44-
# True to attempt using .NET Core already that meets requirements specified in global.json
44+
# True to attempt using .NET Core already that meets requirements specified in global.json
4545
# installed on the machine instead of downloading one.
4646
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
4747

@@ -172,7 +172,7 @@ function InstallDotNetSdk {
172172
function InstallDotNet {
173173
local root=$1
174174
local version=$2
175-
175+
176176
GetDotNetInstallScript "$root"
177177
local install_script=$_GetDotNetInstallScript
178178

@@ -218,6 +218,28 @@ function InstallDotNet {
218218
}
219219
}
220220

221+
function with_retries {
222+
local maxRetries=5
223+
local retries=1
224+
echo "Trying to run '$@' for maximum of $maxRetries attempts."
225+
while [[ $((retries++)) -le $maxRetries ]]; do
226+
"$@"
227+
228+
if [[ $? == 0 ]]; then
229+
echo "Ran '$@' successfully."
230+
return 0
231+
fi
232+
233+
timeout=$((2**$retries-1))
234+
echo "Failed to execute '$@'. Waiting $timeout seconds before next attempt ($retries out of $maxRetries)." 1>&2
235+
sleep $timeout
236+
done
237+
238+
echo "Failed to execute '$@' for $maxRetries times." 1>&2
239+
240+
return 1
241+
}
242+
221243
function GetDotNetInstallScript {
222244
local root=$1
223245
local install_script="$root/dotnet-install.sh"
@@ -230,13 +252,13 @@ function GetDotNetInstallScript {
230252

231253
# Use curl if available, otherwise use wget
232254
if command -v curl > /dev/null; then
233-
curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
255+
with_retries curl "$install_script_url" -isSLv --retry 10 --create-dirs -o "$install_script" || {
234256
local exit_code=$?
235257
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
236258
ExitWithExitCode $exit_code
237259
}
238-
else
239-
wget -q -O "$install_script" "$install_script_url" || {
260+
else
261+
with_retries wget -v -O "$install_script" "$install_script_url" || {
240262
local exit_code=$?
241263
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
242264
ExitWithExitCode $exit_code
@@ -251,11 +273,11 @@ function InitializeBuildTool {
251273
if [[ -n "${_InitializeBuildTool:-}" ]]; then
252274
return
253275
fi
254-
276+
255277
InitializeDotNetCli $restore
256278

257279
# return values
258-
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
280+
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
259281
_InitializeBuildToolCommand="msbuild"
260282
_InitializeBuildToolFramework="netcoreapp2.1"
261283
}
@@ -319,7 +341,7 @@ function InitializeToolset {
319341
if [[ "$binary_log" == true ]]; then
320342
bl="/bl:$log_dir/ToolsetRestore.binlog"
321343
fi
322-
344+
323345
echo '<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' > "$proj"
324346
MSBuild-Core "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file"
325347

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20105.2",
16-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20105.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20106.12",
16+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20106.12"
1717
},
1818
"native-tools": {
1919
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)