From 226ce5ad81bfad17c5f8363c43990e436a7c0d43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 May 2021 12:20:21 +0000 Subject: [PATCH 1/8] Update dependencies from https://github.com/dotnet/arcade build 20210506.1 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21254.3 -> To Version 6.0.0-beta.21256.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/build.ps1 | 2 ++ eng/common/cross/build-android-rootfs.sh | 1 - eng/common/cross/build-rootfs.sh | 4 ---- eng/common/msbuild.ps1 | 1 + eng/common/tools.ps1 | 19 ++++++++++++++++--- global.json | 8 ++++---- 8 files changed, 36 insertions(+), 25 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1a329343c1..b601deea617 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -95,25 +95,25 @@ - + https://github.com/dotnet/arcade - 0cfaf935894a4c98ff7445c903f1b4c32990b127 + 01c1af9f5ead4962e390cfbec92396de34118492 - + https://github.com/dotnet/arcade - 0cfaf935894a4c98ff7445c903f1b4c32990b127 + 01c1af9f5ead4962e390cfbec92396de34118492 - + https://github.com/dotnet/arcade - 0cfaf935894a4c98ff7445c903f1b4c32990b127 + 01c1af9f5ead4962e390cfbec92396de34118492 - + https://github.com/dotnet/arcade - 0cfaf935894a4c98ff7445c903f1b4c32990b127 + 01c1af9f5ead4962e390cfbec92396de34118492 - + https://github.com/dotnet/arcade - 0cfaf935894a4c98ff7445c903f1b4c32990b127 + 01c1af9f5ead4962e390cfbec92396de34118492 diff --git a/eng/Versions.props b/eng/Versions.props index 47f0fdeb44d..5e2ce6e44fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,9 +42,9 @@ - 6.0.0-beta.21254.3 - 6.0.0-beta.21254.3 - 6.0.0-beta.21254.3 + 6.0.0-beta.21256.1 + 6.0.0-beta.21256.1 + 6.0.0-beta.21256.1 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 94a91c0817e..8943da242f6 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -25,6 +25,7 @@ Param( [switch] $prepareMachine, [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', + [switch] $excludePrereleaseVS, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -65,6 +66,7 @@ function Print-Usage() { Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build" Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." + Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh index c29c8267e7a..42516bbeebc 100755 --- a/eng/common/cross/build-android-rootfs.sh +++ b/eng/common/cross/build-android-rootfs.sh @@ -106,7 +106,6 @@ __AndroidPackages+=" libandroid-glob" __AndroidPackages+=" liblzma" __AndroidPackages+=" krb5" __AndroidPackages+=" openssl" -__AndroidPackages+=" openldap" for path in $(wget -qO- http://termux.net/dists/stable/main/binary-$__AndroidArch/Packages |\ grep -A15 "Package: \(${__AndroidPackages// /\\|}\)" | grep -v "static\|tool" | grep Filename); do diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index df0dfa5781c..591d8666a84 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -55,13 +55,11 @@ __UbuntuPackages+=" libcurl4-openssl-dev" __UbuntuPackages+=" libkrb5-dev" __UbuntuPackages+=" libssl-dev" __UbuntuPackages+=" zlib1g-dev" -__UbuntuPackages+=" libldap2-dev" __AlpinePackages+=" curl-dev" __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__AlpinePackages+=" openldap-dev" __FreeBSDBase="12.1-RELEASE" __FreeBSDPkg="1.12.0" @@ -70,13 +68,11 @@ __FreeBSDPackages+=" icu" __FreeBSDPackages+=" libinotify" __FreeBSDPackages+=" lttng-ust" __FreeBSDPackages+=" krb5" -__FreeBSDPackages+=" libslapi-2.4" __IllumosPackages="icu-64.2nb2" __IllumosPackages+=" mit-krb5-1.16.2nb4" __IllumosPackages+=" openssl-1.1.1e" __IllumosPackages+=" zlib-1.2.11" -__IllumosPackages+=" openldap-client-2.4.49" # ML.NET dependencies __UbuntuPackages+=" libomp5" diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1 index c6401230002..eea19cd8452 100644 --- a/eng/common/msbuild.ps1 +++ b/eng/common/msbuild.ps1 @@ -5,6 +5,7 @@ Param( [bool] $nodeReuse = $true, [switch] $ci, [switch] $prepareMachine, + [switch] $excludePrereleaseVS, [Parameter(ValueFromRemainingArguments=$true)][String[]]$extraArgs ) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index d52467eea11..2d8a74f7d9e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -48,6 +48,9 @@ # True to use global NuGet cache instead of restoring packages to repository-local directory. [bool]$useGlobalNuGetCache = if (Test-Path variable:useGlobalNuGetCache) { $useGlobalNuGetCache } else { !$ci } +# True to exclude prerelease versions Visual Studio during build +[bool]$excludePrereleaseVS = if (Test-Path variable:excludePrereleaseVS) { $excludePrereleaseVS } else { $false } + # An array of names of processes to stop on script exit if prepareMachine is true. $processesToStopOnExit = if (Test-Path variable:processesToStopOnExit) { $processesToStopOnExit } else { @('msbuild', 'dotnet', 'vbcscompiler') } @@ -463,7 +466,11 @@ function LocateVisualStudio([object]$vsRequirements = $null){ } if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } - $args = @('-latest', '-prerelease', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') + $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') + + if (!$excludePrereleaseVS) { + $args += '-prerelease' + } if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' @@ -489,7 +496,13 @@ function LocateVisualStudio([object]$vsRequirements = $null){ function InitializeBuildTool() { if (Test-Path variable:global:_BuildTool) { - return $global:_BuildTool + # If the requested msbuild parameters do not match, clear the cached variables. + if($global:_BuildTool.Contains('ExcludePrereleaseVS') -and $global:_BuildTool.ExcludePrereleaseVS -ne $excludePrereleaseVS) { + Remove-Item variable:global:_BuildTool + Remove-Item variable:global:_MSBuildExe + } else { + return $global:_BuildTool + } } if (-not $msbuildEngine) { @@ -517,7 +530,7 @@ function InitializeBuildTool() { ExitWithExitCode 1 } - $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472" } + $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472"; ExcludePrereleaseVS = $excludePrereleaseVS } } else { Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unexpected value of -msbuildEngine: '$msbuildEngine'." ExitWithExitCode 1 diff --git a/global.json b/global.json index fb645c0911a..a4a8ce64920 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-preview.1.21103.13", + "dotnet": "6.0.100-preview.3.21202.5", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21254.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21254.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21256.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21256.1" }, "sdk": { - "version": "6.0.100-preview.1.21103.13" + "version": "6.0.100-preview.3.21202.5" }, "native-tools": { "strawberry-perl": "5.28.1.1-1", From 4421ca90f9bd2d916a72c1e006ecd76af1703935 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 May 2021 12:20:33 +0000 Subject: [PATCH 2/8] Update dependencies from https://github.com/dotnet/arcade build 20210506.13 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21254.3 -> To Version 6.0.0-beta.21256.13 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/post-build/symbols-validation.ps1 | 13 +++++++++++-- global.json | 4 ++-- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b601deea617..924ff019b81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -95,25 +95,25 @@ - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + f9ce6058792211e652243db3b07fa511cf83486b - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + f9ce6058792211e652243db3b07fa511cf83486b - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + f9ce6058792211e652243db3b07fa511cf83486b - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + f9ce6058792211e652243db3b07fa511cf83486b - + https://github.com/dotnet/arcade - 01c1af9f5ead4962e390cfbec92396de34118492 + f9ce6058792211e652243db3b07fa511cf83486b diff --git a/eng/Versions.props b/eng/Versions.props index 5e2ce6e44fe..29bab26b5b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,9 +42,9 @@ - 6.0.0-beta.21256.1 - 6.0.0-beta.21256.1 - 6.0.0-beta.21256.1 + 6.0.0-beta.21256.13 + 6.0.0-beta.21256.13 + 6.0.0-beta.21256.13 diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index 788321d773d..f26f6de81f0 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -114,6 +114,7 @@ $CountMissingSymbols = { $totalRetries = 0 while ($totalRetries -lt $using:MaxRetry) { + # Save the output and get diagnostic output $output = & $dotnetSymbolExe --symbols --modules $WindowsPdbVerificationParam $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String @@ -144,8 +145,16 @@ $CountMissingSymbols = { return $null } - $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--microsoft-symbol-server' $SymbolsPath $WindowsPdbVerificationParam - $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--internal-server' $SymbolsPath $WindowsPdbVerificationParam + $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault ` + -FullPath $FileName ` + -TargetServerParam '--microsoft-symbol-server' ` + -SymbolsPath $SymbolsPath ` + -WindowsPdbVerificationParam $WindowsPdbVerificationParam + $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault ` + -FullPath $FileName ` + -TargetServerParam '--internal-server' ` + -SymbolsPath $SymbolsPath ` + -WindowsPdbVerificationParam $WindowsPdbVerificationParam Write-Host -NoNewLine "`t Checking file " $FileName "... " diff --git a/global.json b/global.json index a4a8ce64920..68a7d7ec3f1 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21256.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21256.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21256.13", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21256.13" }, "sdk": { "version": "6.0.100-preview.3.21202.5" From 1343f41768901bdff604b4658dd61c5cbae5d231 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 May 2021 12:20:31 +0000 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/arcade build 20210507.5 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21254.3 -> To Version 6.0.0-beta.21257.5 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 924ff019b81..6f6589be72f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -95,25 +95,25 @@ - + https://github.com/dotnet/arcade - f9ce6058792211e652243db3b07fa511cf83486b + 5faea1b7965644d1f1c666a7130f6f614abe76c0 - + https://github.com/dotnet/arcade - f9ce6058792211e652243db3b07fa511cf83486b + 5faea1b7965644d1f1c666a7130f6f614abe76c0 - + https://github.com/dotnet/arcade - f9ce6058792211e652243db3b07fa511cf83486b + 5faea1b7965644d1f1c666a7130f6f614abe76c0 - + https://github.com/dotnet/arcade - f9ce6058792211e652243db3b07fa511cf83486b + 5faea1b7965644d1f1c666a7130f6f614abe76c0 - + https://github.com/dotnet/arcade - f9ce6058792211e652243db3b07fa511cf83486b + 5faea1b7965644d1f1c666a7130f6f614abe76c0 diff --git a/eng/Versions.props b/eng/Versions.props index 29bab26b5b1..196e6ab3bed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,9 +42,9 @@ - 6.0.0-beta.21256.13 - 6.0.0-beta.21256.13 - 6.0.0-beta.21256.13 + 6.0.0-beta.21257.5 + 6.0.0-beta.21257.5 + 6.0.0-beta.21257.5 diff --git a/global.json b/global.json index 68a7d7ec3f1..4fb22feee7e 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21256.13", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21256.13" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21257.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21257.5" }, "sdk": { "version": "6.0.100-preview.3.21202.5" From 97e1886b305f8bde3ab61907c7ed51dbdf254b92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 May 2021 12:19:30 +0000 Subject: [PATCH 4/8] Update dependencies from https://github.com/dotnet/arcade build 20210510.1 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21254.3 -> To Version 6.0.0-beta.21260.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f6589be72f..67f77987de9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -95,25 +95,25 @@ - + https://github.com/dotnet/arcade - 5faea1b7965644d1f1c666a7130f6f614abe76c0 + 44324e2d3563921f60b1522fccf3fef45dcfe636 - + https://github.com/dotnet/arcade - 5faea1b7965644d1f1c666a7130f6f614abe76c0 + 44324e2d3563921f60b1522fccf3fef45dcfe636 - + https://github.com/dotnet/arcade - 5faea1b7965644d1f1c666a7130f6f614abe76c0 + 44324e2d3563921f60b1522fccf3fef45dcfe636 - + https://github.com/dotnet/arcade - 5faea1b7965644d1f1c666a7130f6f614abe76c0 + 44324e2d3563921f60b1522fccf3fef45dcfe636 - + https://github.com/dotnet/arcade - 5faea1b7965644d1f1c666a7130f6f614abe76c0 + 44324e2d3563921f60b1522fccf3fef45dcfe636 diff --git a/eng/Versions.props b/eng/Versions.props index 196e6ab3bed..afcc116da37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,9 +42,9 @@ - 6.0.0-beta.21257.5 - 6.0.0-beta.21257.5 - 6.0.0-beta.21257.5 + 6.0.0-beta.21260.1 + 6.0.0-beta.21260.1 + 6.0.0-beta.21260.1 diff --git a/global.json b/global.json index 4fb22feee7e..f7a076a5dbd 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21257.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21257.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21260.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21260.1" }, "sdk": { "version": "6.0.100-preview.3.21202.5" From b83998bd59d9c56796638f8369faa9c40d3fa171 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 May 2021 12:18:44 +0000 Subject: [PATCH 5/8] Update dependencies from https://github.com/dotnet/arcade build 20210511.6 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21254.3 -> To Version 6.0.0-beta.21261.6 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67f77987de9..f3530fc5d2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -95,25 +95,25 @@ - + https://github.com/dotnet/arcade - 44324e2d3563921f60b1522fccf3fef45dcfe636 + c5c6ef92686f208055e884bad45d32966f0b1f95 - + https://github.com/dotnet/arcade - 44324e2d3563921f60b1522fccf3fef45dcfe636 + c5c6ef92686f208055e884bad45d32966f0b1f95 - + https://github.com/dotnet/arcade - 44324e2d3563921f60b1522fccf3fef45dcfe636 + c5c6ef92686f208055e884bad45d32966f0b1f95 - + https://github.com/dotnet/arcade - 44324e2d3563921f60b1522fccf3fef45dcfe636 + c5c6ef92686f208055e884bad45d32966f0b1f95 - + https://github.com/dotnet/arcade - 44324e2d3563921f60b1522fccf3fef45dcfe636 + c5c6ef92686f208055e884bad45d32966f0b1f95 diff --git a/eng/Versions.props b/eng/Versions.props index afcc116da37..f19bef92174 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,9 +42,9 @@ - 6.0.0-beta.21260.1 - 6.0.0-beta.21260.1 - 6.0.0-beta.21260.1 + 6.0.0-beta.21261.6 + 6.0.0-beta.21261.6 + 6.0.0-beta.21261.6 diff --git a/global.json b/global.json index f7a076a5dbd..46d29b0b8d7 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21260.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21260.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21261.6", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21261.6" }, "sdk": { "version": "6.0.100-preview.3.21202.5" From 5c29dc8729c2f0e9b6e82ba4c1dcc134199fa5fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 May 2021 12:20:48 +0000 Subject: [PATCH 6/8] Update dependencies from https://github.com/dotnet/arcade build 20210513.1 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21254.3 -> To Version 6.0.0-beta.21263.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3530fc5d2d..885927b01cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -95,25 +95,25 @@ - + https://github.com/dotnet/arcade - c5c6ef92686f208055e884bad45d32966f0b1f95 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - c5c6ef92686f208055e884bad45d32966f0b1f95 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - c5c6ef92686f208055e884bad45d32966f0b1f95 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - c5c6ef92686f208055e884bad45d32966f0b1f95 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - c5c6ef92686f208055e884bad45d32966f0b1f95 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 diff --git a/eng/Versions.props b/eng/Versions.props index f19bef92174..14824390258 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,9 +42,9 @@ - 6.0.0-beta.21261.6 - 6.0.0-beta.21261.6 - 6.0.0-beta.21261.6 + 6.0.0-beta.21263.1 + 6.0.0-beta.21263.1 + 6.0.0-beta.21263.1 diff --git a/global.json b/global.json index 46d29b0b8d7..ca60ce52b2e 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21261.6", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21261.6" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21263.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21263.1" }, "sdk": { "version": "6.0.100-preview.3.21202.5" From 96f400ca5459b57da2bee6b67c537d3c7c9bb935 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 May 2021 12:21:07 +0000 Subject: [PATCH 7/8] Update dependencies from https://github.com/dotnet/arcade build 20210513.5 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21254.3 -> To Version 6.0.0-beta.21263.5 --- eng/Version.Details.xml | 20 ++--- eng/Versions.props | 6 +- .../post-build/sourcelink-validation.ps1 | 78 ++++++++++++------- eng/common/post-build/symbols-validation.ps1 | 21 ++--- global.json | 4 +- 5 files changed, 79 insertions(+), 50 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 885927b01cc..a0a164c7d36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -95,25 +95,25 @@ - + https://github.com/dotnet/arcade - 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 + e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 - + https://github.com/dotnet/arcade - 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 + e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 - + https://github.com/dotnet/arcade - 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 + e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 - + https://github.com/dotnet/arcade - 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 + e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 - + https://github.com/dotnet/arcade - 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 + e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 diff --git a/eng/Versions.props b/eng/Versions.props index 14824390258..24c2821b6c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,9 +42,9 @@ - 6.0.0-beta.21263.1 - 6.0.0-beta.21263.1 - 6.0.0-beta.21263.1 + 6.0.0-beta.21263.5 + 6.0.0-beta.21263.5 + 6.0.0-beta.21263.5 diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 8c554729b61..85c89861719 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -16,6 +16,8 @@ $global:RepoFiles = @{} # Maximum number of jobs to run in parallel $MaxParallelJobs = 16 +$MaxRetries = 5 + # Wait time between check for system load $SecondsBetweenLoadChecks = 10 @@ -29,7 +31,10 @@ $ValidatePackage = { # Ensure input file exist if (!(Test-Path $PackagePath)) { Write-Host "Input file does not exist: $PackagePath" - return 1 + return [pscustomobject]@{ + result = 1 + packagePath = $PackagePath + } } # Extensions for which we'll look for SourceLink information @@ -59,7 +64,10 @@ $ValidatePackage = { # We ignore resource DLLs if ($FileName.EndsWith('.resources.dll')) { - return + return [pscustomobject]@{ + result = 0 + packagePath = $PackagePath + } } [System.IO.Compression.ZipFileExtensions]::ExtractToFile($_, $TargetFile, $true) @@ -91,36 +99,49 @@ $ValidatePackage = { $Status = 200 $Cache = $using:RepoFiles - if ( !($Cache.ContainsKey($FilePath)) ) { - try { - $Uri = $Link -as [System.URI] - - # Only GitHub links are valid - if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) { - $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode + $totalRetries = 0 + + while ($totalRetries -lt $using:MaxRetries) { + if ( !($Cache.ContainsKey($FilePath)) ) { + try { + $Uri = $Link -as [System.URI] + + # Only GitHub links are valid + if ($Uri.AbsoluteURI -ne $null -and ($Uri.Host -match 'github' -or $Uri.Host -match 'githubusercontent')) { + $Status = (Invoke-WebRequest -Uri $Link -UseBasicParsing -Method HEAD -TimeoutSec 5).StatusCode + } + else { + # If it's not a github link, we want to break out of the loop and not retry. + $Status = 0 + $totalRetries = $using:MaxRetries + } } - else { + catch { + Write-Host $_ $Status = 0 } } - catch { - write-host $_ - $Status = 0 - } - } - if ($Status -ne 200) { - if ($NumFailedLinks -eq 0) { - if ($FailedFiles.Value -eq 0) { - Write-Host + if ($Status -ne 200) { + $totalRetries++ + + if ($totalRetries -ge $using:MaxRetries) { + if ($NumFailedLinks -eq 0) { + if ($FailedFiles.Value -eq 0) { + Write-Host + } + + Write-Host "`tFile $RealPath has broken links:" + } + + Write-Host "`t`tFailed to retrieve $Link" + + $NumFailedLinks++ } - - Write-Host "`tFile $RealPath has broken links:" } - - Write-Host "`t`tFailed to retrieve $Link" - - $NumFailedLinks++ + else { + break + } } } } @@ -136,7 +157,7 @@ $ValidatePackage = { } } catch { - + Write-Host $_ } finally { $zip.Dispose() @@ -220,6 +241,7 @@ function ValidateSourceLinkLinks { # Process each NuGet package in parallel Get-ChildItem "$InputPath\*.symbols.nupkg" | ForEach-Object { + Write-Host "Starting $($_.FullName)" Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName | Out-Null $NumJobs = @(Get-Job -State 'Running').Count @@ -267,6 +289,10 @@ function InstallSourcelinkCli { try { InstallSourcelinkCli + foreach ($Job in @(Get-Job)) { + Remove-Job -Id $Job.Id + } + ValidateSourceLinkLinks } catch { diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index f26f6de81f0..a5af041ba77 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -133,27 +133,27 @@ $CountMissingSymbols = { elseif (Test-Path $SymbolPath) { return 'Module' } - elseif ($output.Contains("503 Service Unavailable")) { - # If we got a 503 error, we should retry. + else + { $totalRetries++ } - else { - return $null - } } return $null } + $FileGuid = New-Guid + $ExpandedSymbolsPath = Join-Path -Path $SymbolsPath -ChildPath $FileGuid + $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault ` -FullPath $FileName ` -TargetServerParam '--microsoft-symbol-server' ` - -SymbolsPath $SymbolsPath ` + -SymbolsPath "$ExpandedSymbolsPath-msdl" ` -WindowsPdbVerificationParam $WindowsPdbVerificationParam $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault ` -FullPath $FileName ` -TargetServerParam '--internal-server' ` - -SymbolsPath $SymbolsPath ` + -SymbolsPath "$ExpandedSymbolsPath-symweb" ` -WindowsPdbVerificationParam $WindowsPdbVerificationParam Write-Host -NoNewLine "`t Checking file " $FileName "... " @@ -217,6 +217,7 @@ function CheckSymbolsAvailable { Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue } + $TotalPackages = 0 $TotalFailures = 0 $DupedSymbols = 0 @@ -239,6 +240,8 @@ function CheckSymbolsAvailable { return } + $TotalPackages++ + Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList @($FullName,$WindowsPdbVerificationParam) | Out-Null $NumJobs = @(Get-Job -State 'Running').Count @@ -264,11 +267,11 @@ function CheckSymbolsAvailable { if ($TotalFailures -gt 0 -or $DupedSymbols -gt 0) { if ($TotalFailures -gt 0) { - Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures packages" + Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures/$TotalPackages packages" } if ($DupedSymbols -gt 0) { - Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$DupedSymbols packages had duplicated symbol files" + Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$DupedSymbols/$TotalPackages packages had duplicated symbol files and could not be extracted" } ExitWithExitCode 1 diff --git a/global.json b/global.json index ca60ce52b2e..0028229b095 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21263.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21263.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21263.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21263.5" }, "sdk": { "version": "6.0.100-preview.3.21202.5" From 9eeb31d3f465f31a36c225eb49b772aa01b4f3e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 May 2021 12:20:54 +0000 Subject: [PATCH 8/8] Update dependencies from https://github.com/dotnet/arcade build 20210514.2 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21254.3 -> To Version 6.0.0-beta.21264.2 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0a164c7d36..892ee680c28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -95,25 +95,25 @@ - + https://github.com/dotnet/arcade - e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 + 42de78a825b575a1ddeb73020a01fb8cd9311d09 - + https://github.com/dotnet/arcade - e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 + 42de78a825b575a1ddeb73020a01fb8cd9311d09 - + https://github.com/dotnet/arcade - e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 + 42de78a825b575a1ddeb73020a01fb8cd9311d09 - + https://github.com/dotnet/arcade - e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 + 42de78a825b575a1ddeb73020a01fb8cd9311d09 - + https://github.com/dotnet/arcade - e8d0df4f35cfa23174fe7204ef958cf5d1b8e797 + 42de78a825b575a1ddeb73020a01fb8cd9311d09 diff --git a/eng/Versions.props b/eng/Versions.props index 24c2821b6c7..77ccdc7220c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,9 +42,9 @@ - 6.0.0-beta.21263.5 - 6.0.0-beta.21263.5 - 6.0.0-beta.21263.5 + 6.0.0-beta.21264.2 + 6.0.0-beta.21264.2 + 6.0.0-beta.21264.2 diff --git a/global.json b/global.json index 0028229b095..fb483341d5c 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21263.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21263.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2" }, "sdk": { "version": "6.0.100-preview.3.21202.5"