From 7b780a81dac13992d6223a0ac84e1a9bd2e825f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Nov 2021 13:09:26 +0000 Subject: [PATCH 01/30] Update dependencies from https://github.com/dotnet/icu build 20211115.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-alpha.1.21558.1 -> To Version 7.0.0-alpha.1.21565.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9365e67fda4b5..4e0d7550a9cd0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 18e6b6f8ac75c6ceff0be934d863df94be035bf1 + 65a1c6dbbc036610145cf5dfc67027c0efe9e79d https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index cc22e9b5edd28..e6cfe9758445c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,7 +172,7 @@ 7.0.100-1.21562.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-alpha.1.21558.1 + 7.0.0-alpha.1.21565.1 7.0.0-alpha.1.21529.3 From 792e334fd8ac77ab41c0d53b53c3b81e8bbb3f08 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Nov 2021 13:15:22 +0000 Subject: [PATCH 02/30] Update dependencies from https://github.com/dotnet/xharness build 20211116.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21561.1 -> To Version 1.0.0-prerelease.21566.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 3ab3433285362..a7616ada01d7f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21561.1", + "version": "1.0.0-prerelease.21566.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e0d7550a9cd0..73c8b035539f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,13 +202,13 @@ https://github.com/dotnet/linker f2dd65f51f6096f25e00e0d1e4c6af0e85d41865 - + https://github.com/dotnet/xharness - 42da0d206c22393c081abc4b6a48a181e17bb372 + 8ec2a7dcda3a9db6ab0805690893c475598bb8f6 - + https://github.com/dotnet/xharness - 42da0d206c22393c081abc4b6a48a181e17bb372 + 8ec2a7dcda3a9db6ab0805690893c475598bb8f6 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index e6cfe9758445c..5af867dd53422 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,8 +154,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21561.1 - 1.0.0-prerelease.21561.1 + 1.0.0-prerelease.21566.1 + 1.0.0-prerelease.21566.1 1.0.2-alpha.0.21558.2 2.4.2-pre.9 2.4.2 From d7178877c3755510ab643e3313148264a737cd52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Nov 2021 13:22:33 +0000 Subject: [PATCH 03/30] Update dependencies from https://github.com/dotnet/hotreload-utils build 20211115.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.2-alpha.0.21558.2 -> To Version 1.0.2-alpha.0.21565.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73c8b035539f8..1e9416204207f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,9 +230,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 3c8cfc49b13ac020b70585ee49b2e4a1c99a7793 - + https://github.com/dotnet/hotreload-utils - a445d89f31358546e8d6d60a04a75643abd7de64 + bd05ac9d3005735e3e4f444adc656be2db982577 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 5af867dd53422..13eb36945b0cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,7 +156,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21566.1 1.0.0-prerelease.21566.1 - 1.0.2-alpha.0.21558.2 + 1.0.2-alpha.0.21565.2 2.4.2-pre.9 2.4.2 1.3.0 From e5a070b57d26d628387ccbabd51bc1f826a0df7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Nov 2021 13:23:56 +0000 Subject: [PATCH 04/30] Update dependencies from https://github.com/dotnet/llvm-project build 20211115.1 runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 11.1.0-alpha.1.21558.1 -> To Version 11.1.0-alpha.1.21565.1 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e9416204207f..684a4b4c7c75f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -134,37 +134,37 @@ https://github.com/dotnet/runtime-assets 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/llvm-project - 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 + 2059b611a9a58c0bcb25ece23c65acce83503a37 - + https://github.com/dotnet/llvm-project - 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 + 2059b611a9a58c0bcb25ece23c65acce83503a37 - + https://github.com/dotnet/llvm-project - 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 + 2059b611a9a58c0bcb25ece23c65acce83503a37 - + https://github.com/dotnet/llvm-project - 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 + 2059b611a9a58c0bcb25ece23c65acce83503a37 - + https://github.com/dotnet/llvm-project - 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 + 2059b611a9a58c0bcb25ece23c65acce83503a37 - + https://github.com/dotnet/llvm-project - 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 + 2059b611a9a58c0bcb25ece23c65acce83503a37 - + https://github.com/dotnet/llvm-project - 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 + 2059b611a9a58c0bcb25ece23c65acce83503a37 - + https://github.com/dotnet/llvm-project - 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 + 2059b611a9a58c0bcb25ece23c65acce83503a37 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 13eb36945b0cf..ca47987db5a3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,14 +176,14 @@ 7.0.0-alpha.1.21529.3 - 11.1.0-alpha.1.21558.1 - 11.1.0-alpha.1.21558.1 - 11.1.0-alpha.1.21558.1 - 11.1.0-alpha.1.21558.1 - 11.1.0-alpha.1.21558.1 - 11.1.0-alpha.1.21558.1 - 11.1.0-alpha.1.21558.1 - 11.1.0-alpha.1.21558.1 + 11.1.0-alpha.1.21565.1 + 11.1.0-alpha.1.21565.1 + 11.1.0-alpha.1.21565.1 + 11.1.0-alpha.1.21565.1 + 11.1.0-alpha.1.21565.1 + 11.1.0-alpha.1.21565.1 + 11.1.0-alpha.1.21565.1 + 11.1.0-alpha.1.21565.1 7.0.0-alpha.1.21560.2 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) From 7b8f19be4790e9c9e885a787c094931836b18b35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Nov 2021 13:11:50 +0000 Subject: [PATCH 05/30] Update dependencies from https://github.com/dotnet/arcade build 20211116.10 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 7.0.0-beta.21559.3 -> To Version 7.0.0-beta.21566.10 --- eng/Version.Details.xml | 76 ++++++++++++------------ eng/Versions.props | 30 +++++----- eng/common/sdl/execute-all-sdl-tools.ps1 | 2 +- eng/common/tools.ps1 | 57 +++++++++++------- eng/common/tools.sh | 62 ++++++++++--------- global.json | 8 +-- 6 files changed, 127 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 684a4b4c7c75f..4d804bfddf419 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf https://github.com/microsoft/vstest @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness 8ec2a7dcda3a9db6ab0805690893c475598bb8f6 - + https://github.com/dotnet/arcade - fecf65bedcee9036b8ba9d8d7feef5413f294914 + 53cc1bc2e555aa7aea95884575d22e21d63708cf https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index ca47987db5a3f..1f9de0d35b17b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,21 +57,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21559.3 - 7.0.0-beta.21559.3 - 7.0.0-beta.21559.3 - 7.0.0-beta.21559.3 - 7.0.0-beta.21559.3 - 7.0.0-beta.21559.3 - 2.5.1-beta.21559.3 - 7.0.0-beta.21559.3 - 7.0.0-beta.21559.3 - 7.0.0-beta.21559.3 - 7.0.0-beta.21559.3 - 7.0.0-beta.21559.3 - 7.0.0-beta.21559.3 - 7.0.0-beta.21559.3 - 7.0.0-beta.21559.3 + 7.0.0-beta.21566.10 + 7.0.0-beta.21566.10 + 7.0.0-beta.21566.10 + 7.0.0-beta.21566.10 + 7.0.0-beta.21566.10 + 7.0.0-beta.21566.10 + 2.5.1-beta.21566.10 + 7.0.0-beta.21566.10 + 7.0.0-beta.21566.10 + 7.0.0-beta.21566.10 + 7.0.0-beta.21566.10 + 7.0.0-beta.21566.10 + 7.0.0-beta.21566.10 + 7.0.0-beta.21566.10 + 7.0.0-beta.21566.10 6.0.0-preview.1.102 diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 1157151f4862a..e5bef8ebd3a3b 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -124,7 +124,7 @@ try { Exec-BlockVerbosely { & $(Join-Path $PSScriptRoot 'run-sdl.ps1') ` -GuardianCliLocation $guardianCliLocation ` - -WorkingDirectory $workingDirectory ` + -WorkingDirectory $SourceDirectory ` -UpdateBaseline $UpdateBaseline ` -GdnFolder $gdnFolder } diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 44484289943ed..90b1f9fdcdb19 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -301,31 +301,44 @@ function InstallDotNet([string] $dotnetRoot, if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } if ($noPath) { $installParameters.NoPath = $True } - try { - & $installScript @installParameters - } - catch { - if ($runtimeSourceFeed -or $runtimeSourceFeedKey) { - Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'" - if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + $variations = @() + $variations += @($installParameters) - if ($runtimeSourceFeedKey) { - $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) - $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) - $installParameters.FeedCredential = $decodedString - } + $dotnetBuilds = $installParameters.Clone() + $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $variations += @($dotnetBuilds) - try { - & $installScript @installParameters - } - catch { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'." - ExitWithExitCode 1 - } + if ($runtimeSourceFeed) { + $runtimeSource = $installParameters.Clone() + $runtimeSource.AzureFeed = $runtimeSourceFeed + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $runtimeSource.FeedCredential = $decodedString + } + $variations += @($runtimeSource) + } + + $installSuccess = $false + foreach ($variation in $variations) { + if ($variation | Get-Member AzureFeed) { + $location = $variation.AzureFeed } else { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location." - ExitWithExitCode 1 + $location = "public location"; + } + Write-Host "Attempting to install dotnet from $location." + try { + & $installScript @variation + $installSuccess = $true + break } + catch { + Write-Host "Failed to install dotnet from $location." + } + } + if (-not $installSuccess) { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations." + ExitWithExitCode 1 } } @@ -887,7 +900,7 @@ function Try-LogClientIpAddress() Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes" try { - $result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing + $result = Invoke-WebRequest -Uri "http://co1r5a.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing $lines = $result.Content.Split([Environment]::NewLine) $socketIp = $lines | Select-String -Pattern "^Socket IP:.*" Write-Host $socketIp diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6a4871ef72b7a..dd7030ff5385e 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -188,28 +188,29 @@ function InstallDotNet { GetDotNetInstallScript "$root" local install_script=$_GetDotNetInstallScript - local archArg='' + local installParameters=(--version $version --install-dir "$root") + if [[ -n "${3:-}" ]] && [ "$3" != 'unset' ]; then - archArg="--architecture $3" + installParameters+=(--architecture $3) fi - local runtimeArg='' if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then - runtimeArg="--runtime $4" + installParameters+=(--runtime $4) fi - local skipNonVersionedFilesArg="" if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then - skipNonVersionedFilesArg="--skip-non-versioned-files" + installParameters+=(--skip-non-versioned-files) fi - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { - local exit_code=$? - echo "Failed to install dotnet SDK from public location (exit code '$exit_code')." - local runtimeSourceFeed='' - if [[ -n "${6:-}" ]]; then - runtimeSourceFeed="--azure-feed $6" - fi + local variations=() # list of variable names with parameter arrays in them + + local public_location=("${installParameters[@]}") + variations+=(public_location) + + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + variations+=(dotnetbuilds) - local runtimeSourceFeedKey='' + if [[ -n "${6:-}" ]]; then + variations+=(private_feed) + local private_feed=("${installParameters[@]}" --azure-feed $6) if [[ -n "${7:-}" ]]; then # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' # '-d'. To work around this, do a simple detection and switch the parameter @@ -219,22 +220,27 @@ function InstallDotNet { decodeArg="-d" fi decodedFeedKey=`echo $7 | base64 $decodeArg` - runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + private_feed+=(--feed-credential $decodedFeedKey) fi + fi - if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { - local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." - ExitWithExitCode $exit_code - } - else - if [[ $exit_code != 0 ]]; then - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." - fi - ExitWithExitCode $exit_code + local installSuccess=0 + for variationName in "${variations[@]}"; do + local name="$variationName[@]" + local variation=("${!name}") + echo "Attempting to install dotnet from $variationName." + bash "$install_script" "${variation[@]}" && installSuccess=1 + if [[ "$installSuccess" -eq 1 ]]; then + break fi - } + + echo "Failed to install dotnet from $variationName." + done + + if [[ "$installSuccess" -eq 0 ]]; then + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations." + ExitWithExitCode 1 + fi } function with_retries { @@ -402,7 +408,7 @@ function StopProcesses { function TryLogClientIpAddress () { echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' if command -v curl > /dev/null; then - curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true + curl -s 'http://co1r5a.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true fi } diff --git a/global.json b/global.json index a2a8b24903117..de9645449c46f 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21559.3", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21559.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21559.3", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21559.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21566.10", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21566.10", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21566.10", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21566.10", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21562.1" From 48ba17ce90afb27c0e7e58f9507fb685cb61b9b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Nov 2021 13:14:26 +0000 Subject: [PATCH 06/30] Update dependencies from https://github.com/dotnet/xharness build 20211116.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21561.1 -> To Version 1.0.0-prerelease.21566.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a7616ada01d7f..e78fdbb261ea4 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21566.1", + "version": "1.0.0-prerelease.21566.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d804bfddf419..6df40ab95dc9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,13 +202,13 @@ https://github.com/dotnet/linker f2dd65f51f6096f25e00e0d1e4c6af0e85d41865 - + https://github.com/dotnet/xharness - 8ec2a7dcda3a9db6ab0805690893c475598bb8f6 + 42ee9ef50448af46e205ae0ec96f344e3f8dd72d - + https://github.com/dotnet/xharness - 8ec2a7dcda3a9db6ab0805690893c475598bb8f6 + 42ee9ef50448af46e205ae0ec96f344e3f8dd72d https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 1f9de0d35b17b..82cf7cee75bb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,8 +154,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21566.1 - 1.0.0-prerelease.21566.1 + 1.0.0-prerelease.21566.2 + 1.0.0-prerelease.21566.2 1.0.2-alpha.0.21565.2 2.4.2-pre.9 2.4.2 From 42778274105ee0e589beece6535815b7a4018e6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Nov 2021 13:21:46 +0000 Subject: [PATCH 07/30] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20211117.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.21554.2 -> To Version 7.0.0-preview1.21567.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6df40ab95dc9c..d7ae9674eb2e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,9 +238,9 @@ https://github.com/dotnet/runtime-assets 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/roslyn-analyzers - 380759dbc374f0fa2e2b714b0bf317231a06c2dd + 09f855d8fd01ef5b46029686478aeef7e5b365f2 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 82cf7cee75bb2..9788d5af956b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 3.3.2 4.0.0-4.final 4.0.0-4.final - 7.0.0-preview1.21554.2 + 7.0.0-preview1.21567.2 4.0.0-5.21453.15 From e7184dd829a4b5b009ad114e217466a4be51582c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Nov 2021 09:19:31 +0000 Subject: [PATCH 08/30] Update dependencies from https://github.com/dotnet/xharness build 20211119.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21561.1 -> To Version 1.0.0-prerelease.21569.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index e78fdbb261ea4..7757dc3aa84ac 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21566.2", + "version": "1.0.0-prerelease.21569.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7ae9674eb2e4..c27795a305802 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,13 +202,13 @@ https://github.com/dotnet/linker f2dd65f51f6096f25e00e0d1e4c6af0e85d41865 - + https://github.com/dotnet/xharness - 42ee9ef50448af46e205ae0ec96f344e3f8dd72d + 43851eed389ee54b4b8b17078f0f8df4f7cf38e4 - + https://github.com/dotnet/xharness - 42ee9ef50448af46e205ae0ec96f344e3f8dd72d + 43851eed389ee54b4b8b17078f0f8df4f7cf38e4 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 9788d5af956b4..bf17a39449674 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,8 +154,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21566.2 - 1.0.0-prerelease.21566.2 + 1.0.0-prerelease.21569.1 + 1.0.0-prerelease.21569.1 1.0.2-alpha.0.21565.2 2.4.2-pre.9 2.4.2 From 56e0c85f34c0143e2db830d969e7461f14e3af50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Nov 2021 13:12:01 +0000 Subject: [PATCH 09/30] Update dependencies from https://github.com/dotnet/arcade build 20211118.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 7.0.0-beta.21559.3 -> To Version 7.0.0-beta.21568.2 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 8 ++--- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c27795a305802..be8e34dcc2ef7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f https://github.com/microsoft/vstest @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness 43851eed389ee54b4b8b17078f0f8df4f7cf38e4 - + https://github.com/dotnet/arcade - 53cc1bc2e555aa7aea95884575d22e21d63708cf + 7097001cd87357ebc6fb82f3c7a801efeed70e3f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index bf17a39449674..27c178213ebc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,21 +57,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21566.10 - 7.0.0-beta.21566.10 - 7.0.0-beta.21566.10 - 7.0.0-beta.21566.10 - 7.0.0-beta.21566.10 - 7.0.0-beta.21566.10 - 2.5.1-beta.21566.10 - 7.0.0-beta.21566.10 - 7.0.0-beta.21566.10 - 7.0.0-beta.21566.10 - 7.0.0-beta.21566.10 - 7.0.0-beta.21566.10 - 7.0.0-beta.21566.10 - 7.0.0-beta.21566.10 - 7.0.0-beta.21566.10 + 7.0.0-beta.21568.2 + 7.0.0-beta.21568.2 + 7.0.0-beta.21568.2 + 7.0.0-beta.21568.2 + 7.0.0-beta.21568.2 + 7.0.0-beta.21568.2 + 2.5.1-beta.21568.2 + 7.0.0-beta.21568.2 + 7.0.0-beta.21568.2 + 7.0.0-beta.21568.2 + 7.0.0-beta.21568.2 + 7.0.0-beta.21568.2 + 7.0.0-beta.21568.2 + 7.0.0-beta.21568.2 + 7.0.0-beta.21568.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index de9645449c46f..a978860d7e1f5 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21566.10", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21566.10", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21566.10", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21566.10", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21568.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21568.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21568.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21568.2", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21562.1" From 74252a261ac6cbefae8276681b2977666ab1da4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Nov 2021 13:10:43 +0000 Subject: [PATCH 10/30] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20211119.2 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21563.1 -> To Version 1.0.0-prerelease.21569.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be8e34dcc2ef7..e5847285ae1e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,21 +214,21 @@ https://github.com/dotnet/arcade 7097001cd87357ebc6fb82f3c7a801efeed70e3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 3c8cfc49b13ac020b70585ee49b2e4a1c99a7793 + 214f7cfae5d9cd628d38c68bea034801d7864779 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 3c8cfc49b13ac020b70585ee49b2e4a1c99a7793 + 214f7cfae5d9cd628d38c68bea034801d7864779 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 3c8cfc49b13ac020b70585ee49b2e4a1c99a7793 + 214f7cfae5d9cd628d38c68bea034801d7864779 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 3c8cfc49b13ac020b70585ee49b2e4a1c99a7793 + 214f7cfae5d9cd628d38c68bea034801d7864779 https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index 27c178213ebc9..7e0a300d7be03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,10 +133,10 @@ 7.0.0-beta.21552.1 7.0.0-beta.21552.1 - 1.0.0-prerelease.21563.1 - 1.0.0-prerelease.21563.1 - 1.0.0-prerelease.21563.1 - 1.0.0-prerelease.21563.1 + 1.0.0-prerelease.21569.2 + 1.0.0-prerelease.21569.2 + 1.0.0-prerelease.21569.2 + 1.0.0-prerelease.21569.2 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 241ba6e1997e3aa65293400f1b53684795adfb6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Nov 2021 13:11:53 +0000 Subject: [PATCH 11/30] Update dependencies from https://github.com/dotnet/arcade build 20211119.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 7.0.0-beta.21559.3 -> To Version 7.0.0-beta.21569.2 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- eng/common/darc-init.sh | 2 +- global.json | 8 ++--- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5847285ae1e7..f1c90d398dcc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa https://github.com/microsoft/vstest @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness 43851eed389ee54b4b8b17078f0f8df4f7cf38e4 - + https://github.com/dotnet/arcade - 7097001cd87357ebc6fb82f3c7a801efeed70e3f + 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 7e0a300d7be03..55d8cfdeb3df9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,21 +57,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21568.2 - 7.0.0-beta.21568.2 - 7.0.0-beta.21568.2 - 7.0.0-beta.21568.2 - 7.0.0-beta.21568.2 - 7.0.0-beta.21568.2 - 2.5.1-beta.21568.2 - 7.0.0-beta.21568.2 - 7.0.0-beta.21568.2 - 7.0.0-beta.21568.2 - 7.0.0-beta.21568.2 - 7.0.0-beta.21568.2 - 7.0.0-beta.21568.2 - 7.0.0-beta.21568.2 - 7.0.0-beta.21568.2 + 7.0.0-beta.21569.2 + 7.0.0-beta.21569.2 + 7.0.0-beta.21569.2 + 7.0.0-beta.21569.2 + 7.0.0-beta.21569.2 + 7.0.0-beta.21569.2 + 2.5.1-beta.21569.2 + 7.0.0-beta.21569.2 + 7.0.0-beta.21569.2 + 7.0.0-beta.21569.2 + 7.0.0-beta.21569.2 + 7.0.0-beta.21569.2 + 7.0.0-beta.21569.2 + 7.0.0-beta.21569.2 + 7.0.0-beta.21569.2 6.0.0-preview.1.102 diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 39abdbecdcf11..84c1d0cc2e75a 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -53,7 +53,7 @@ fi function InstallDarcCli { local darc_cli_package_name="microsoft.dotnet.darc" - InitializeDotNetCli + InitializeDotNetCli true local dotnet_root=$_InitializeDotNetCli if [ -z "$toolpath" ]; then diff --git a/global.json b/global.json index a978860d7e1f5..dc091a4ca4d9c 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21568.2", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21568.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21568.2", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21568.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21569.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21569.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21569.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21569.2", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21562.1" From 151c72a1db6930ea2c451381282e4a909e196844 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Nov 2021 13:13:33 +0000 Subject: [PATCH 12/30] Update dependencies from https://github.com/dotnet/xharness build 20211119.5 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21561.1 -> To Version 1.0.0-prerelease.21569.5 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 7757dc3aa84ac..0961dbd1d26ee 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21569.1", + "version": "1.0.0-prerelease.21569.5", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1c90d398dcc4..9ab31d6746ce2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,13 +202,13 @@ https://github.com/dotnet/linker f2dd65f51f6096f25e00e0d1e4c6af0e85d41865 - + https://github.com/dotnet/xharness - 43851eed389ee54b4b8b17078f0f8df4f7cf38e4 + a584ca98ef56413e7aa3e3f214137068df3859c9 - + https://github.com/dotnet/xharness - 43851eed389ee54b4b8b17078f0f8df4f7cf38e4 + a584ca98ef56413e7aa3e3f214137068df3859c9 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 55d8cfdeb3df9..af0410134f288 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,8 +154,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21569.1 - 1.0.0-prerelease.21569.1 + 1.0.0-prerelease.21569.5 + 1.0.0-prerelease.21569.5 1.0.2-alpha.0.21565.2 2.4.2-pre.9 2.4.2 From 80329c7892b55485fd4a5a8374c3b23de7094a61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 21 Nov 2021 13:21:42 +0000 Subject: [PATCH 13/30] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20211120.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.21554.2 -> To Version 7.0.0-preview1.21570.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ab31d6746ce2..3fa5e465360b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,9 +238,9 @@ https://github.com/dotnet/runtime-assets 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/roslyn-analyzers - 09f855d8fd01ef5b46029686478aeef7e5b365f2 + 8d27b16932558a3929f635cbaaad66e27f0b4ff9 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index af0410134f288..4d782d0350c71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 3.3.2 4.0.0-4.final 4.0.0-4.final - 7.0.0-preview1.21567.2 + 7.0.0-preview1.21570.2 4.0.0-5.21453.15 From baf665b0a9a734f16e903223a9525455ce369602 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Nov 2021 13:11:49 +0000 Subject: [PATCH 14/30] Update dependencies from https://github.com/dotnet/xharness build 20211122.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21561.1 -> To Version 1.0.0-prerelease.21572.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0961dbd1d26ee..6f669656d8572 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21569.5", + "version": "1.0.0-prerelease.21572.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3fa5e465360b9..3f0d54d282051 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,13 +202,13 @@ https://github.com/dotnet/linker f2dd65f51f6096f25e00e0d1e4c6af0e85d41865 - + https://github.com/dotnet/xharness - a584ca98ef56413e7aa3e3f214137068df3859c9 + ce11017eeda6622405543e33259a1ec7f75c14ba - + https://github.com/dotnet/xharness - a584ca98ef56413e7aa3e3f214137068df3859c9 + ce11017eeda6622405543e33259a1ec7f75c14ba https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 691cba475bd44..5d32a81a5b541 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,8 +154,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21569.5 - 1.0.0-prerelease.21569.5 + 1.0.0-prerelease.21572.1 + 1.0.0-prerelease.21572.1 1.0.2-alpha.0.21565.2 2.4.2-pre.9 2.4.2 From fc4df90ab19781ea4d9c12c6d5141a70bc396bf1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Nov 2021 13:20:43 +0000 Subject: [PATCH 15/30] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20211121.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.21554.2 -> To Version 7.0.0-preview1.21571.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f0d54d282051..56e8a0084e7b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,9 +238,9 @@ https://github.com/dotnet/runtime-assets 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/roslyn-analyzers - 8d27b16932558a3929f635cbaaad66e27f0b4ff9 + a4ffd4f27aa2847deecad09d87b8bd4c8c301a0c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5d32a81a5b541..d33bfa59b2c47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 3.3.2 4.0.0-4.final 4.0.0-4.final - 7.0.0-preview1.21570.2 + 7.0.0-preview1.21571.1 4.0.0-5.21453.15 From a3a7afc6cc8ef82e44a1bbf3485c963f96f4fb58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Nov 2021 15:10:50 +0000 Subject: [PATCH 16/30] Update dependencies from https://github.com/dotnet/xharness build 20211122.4 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21561.1 -> To Version 1.0.0-prerelease.21572.4 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 6f669656d8572..18f4e3da0e9c3 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21572.1", + "version": "1.0.0-prerelease.21572.4", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56e8a0084e7b2..82627fd07e969 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,13 +202,13 @@ https://github.com/dotnet/linker f2dd65f51f6096f25e00e0d1e4c6af0e85d41865 - + https://github.com/dotnet/xharness - ce11017eeda6622405543e33259a1ec7f75c14ba + 7aa4d338b58a2b21974933802bd731a64c36c1d8 - + https://github.com/dotnet/xharness - ce11017eeda6622405543e33259a1ec7f75c14ba + 7aa4d338b58a2b21974933802bd731a64c36c1d8 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index d33bfa59b2c47..01a391c283222 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,8 +154,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21572.1 - 1.0.0-prerelease.21572.1 + 1.0.0-prerelease.21572.4 + 1.0.0-prerelease.21572.4 1.0.2-alpha.0.21565.2 2.4.2-pre.9 2.4.2 From 9b9822c6547f4401c24d7dceb5bc1ea23ee22c32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Nov 2021 13:11:09 +0000 Subject: [PATCH 17/30] Update dependencies from https://github.com/dotnet/xharness build 20211123.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21572.4 -> To Version 1.0.0-prerelease.21573.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 18f4e3da0e9c3..0a89ec4701304 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21572.4", + "version": "1.0.0-prerelease.21573.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82627fd07e969..46a721d50e79d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,13 +202,13 @@ https://github.com/dotnet/linker f2dd65f51f6096f25e00e0d1e4c6af0e85d41865 - + https://github.com/dotnet/xharness - 7aa4d338b58a2b21974933802bd731a64c36c1d8 + 3ea1f36d9a82e31729a941cfde5fc2dda9e29f6a - + https://github.com/dotnet/xharness - 7aa4d338b58a2b21974933802bd731a64c36c1d8 + 3ea1f36d9a82e31729a941cfde5fc2dda9e29f6a https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 01a391c283222..6956e7eb66f7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,8 +154,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21572.4 - 1.0.0-prerelease.21572.4 + 1.0.0-prerelease.21573.1 + 1.0.0-prerelease.21573.1 1.0.2-alpha.0.21565.2 2.4.2-pre.9 2.4.2 From 14073a4fcdc5feb1ed5d4aadb262365bb302a06a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Nov 2021 13:19:57 +0000 Subject: [PATCH 18/30] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20211122.6 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.21554.2 -> To Version 7.0.0-preview1.21572.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46a721d50e79d..15ab9551f9c56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,9 +238,9 @@ https://github.com/dotnet/runtime-assets 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/roslyn-analyzers - a4ffd4f27aa2847deecad09d87b8bd4c8c301a0c + ffd024eb265e97e639a2879d869cf82b5b958992 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6956e7eb66f7e..ff18c489b2241 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 3.3.2 4.0.0-4.final 4.0.0-4.final - 7.0.0-preview1.21571.1 + 7.0.0-preview1.21572.6 4.0.0-5.21453.15 From 9740b9e6dde1005e6309c4d2cb8a7b7901ea477a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Nov 2021 13:11:58 +0000 Subject: [PATCH 19/30] Update dependencies from https://github.com/dotnet/arcade build 20211123.3 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 7.0.0-beta.21559.3 -> To Version 7.0.0-beta.21573.3 --- eng/Version.Details.xml | 76 +++++++++++++++--------------- eng/Versions.props | 30 ++++++------ eng/common/build.sh | 4 -- eng/common/native/init-compiler.sh | 2 +- eng/common/sdk-task.ps1 | 3 -- eng/common/templates/job/job.yml | 1 + eng/common/tools.ps1 | 21 --------- eng/common/tools.sh | 7 --- global.json | 12 ++--- 9 files changed, 61 insertions(+), 95 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15ab9551f9c56..c3c122e3747d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 https://github.com/microsoft/vstest @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness 3ea1f36d9a82e31729a941cfde5fc2dda9e29f6a - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index ff18c489b2241..d90e552692157 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,21 +57,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21569.2 - 7.0.0-beta.21569.2 - 7.0.0-beta.21569.2 - 7.0.0-beta.21569.2 - 7.0.0-beta.21569.2 - 7.0.0-beta.21569.2 - 2.5.1-beta.21569.2 - 7.0.0-beta.21569.2 - 7.0.0-beta.21569.2 - 7.0.0-beta.21569.2 - 7.0.0-beta.21569.2 - 7.0.0-beta.21569.2 - 7.0.0-beta.21569.2 - 7.0.0-beta.21569.2 - 7.0.0-beta.21569.2 + 7.0.0-beta.21573.3 + 7.0.0-beta.21573.3 + 7.0.0-beta.21573.3 + 7.0.0-beta.21573.3 + 7.0.0-beta.21573.3 + 7.0.0-beta.21573.3 + 2.5.1-beta.21573.3 + 7.0.0-beta.21573.3 + 7.0.0-beta.21573.3 + 7.0.0-beta.21573.3 + 7.0.0-beta.21573.3 + 7.0.0-beta.21573.3 + 7.0.0-beta.21573.3 + 7.0.0-beta.21573.3 + 7.0.0-beta.21573.3 6.0.0-preview.1.102 diff --git a/eng/common/build.sh b/eng/common/build.sh index bc07a1c684824..55b298f16ccd1 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -187,10 +187,6 @@ function InitializeCustomToolset { } function Build { - - if [[ "$ci" == true ]]; then - TryLogClientIpAddress - fi InitializeToolset InitializeCustomToolset diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 8c944f30b2864..03a996062a796 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -112,7 +112,7 @@ if [[ -z "$CC" ]]; then fi if [[ "$compiler" == "clang" ]]; then - if command -v "lld$desired_version" > /dev/null; then + if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then # Only lld version >= 9 can be considered stable if [[ "$majorVersion" -ge 9 ]]; then LDFLAGS="-fuse-ld=lld" diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 7ab9baac5c8d9..b1bca63ab1d82 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -83,9 +83,6 @@ try { } if ($restore) { - if ($ci) { - Try-LogClientIpAddress - } Build 'Restore' } diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 37dceb1bab0a9..7678b94ce740c 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -114,6 +114,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - task: NuGetAuthenticate@0 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 90b1f9fdcdb19..f1e1cb53953bc 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Disable telemetry on CI. if ($ci) { $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 - - # In case of network error, try to log the current IP for reference - Try-LogClientIpAddress } # Source Build uses DotNetCoreSdkDir variable @@ -895,24 +892,6 @@ if (!$disableConfigureToolsetImport) { } } -function Try-LogClientIpAddress() -{ - Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes" - try - { - $result = Invoke-WebRequest -Uri "http://co1r5a.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing - $lines = $result.Content.Split([Environment]::NewLine) - $socketIp = $lines | Select-String -Pattern "^Socket IP:.*" - Write-Host $socketIp - $clientIp = $lines | Select-String -Pattern "^Client IP:.*" - Write-Host $clientIp - } - catch - { - Write-Host "Unable to get this machine's effective IP address for logging: $_" - } -} - # # If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic. # diff --git a/eng/common/tools.sh b/eng/common/tools.sh index dd7030ff5385e..e555c34269f6e 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -405,13 +405,6 @@ function StopProcesses { return 0 } -function TryLogClientIpAddress () { - echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' - if command -v curl > /dev/null; then - curl -s 'http://co1r5a.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true - fi -} - function MSBuild { local args=$@ if [[ "$pipelines_log" == true ]]; then diff --git a/global.json b/global.json index dc091a4ca4d9c..78c3cdab33c77 100644 --- a/global.json +++ b/global.json @@ -1,21 +1,21 @@ { "sdk": { - "version": "6.0.100-rc.2.21505.57", + "version": "6.0.100", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-rc.2.21505.57" + "dotnet": "6.0.100" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21569.2", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21569.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21569.2", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21569.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21573.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21573.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21573.3", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21573.3", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21562.1" From 657e5f9a06302ad97cb4354ca4189333885d2209 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Nov 2021 13:13:40 +0000 Subject: [PATCH 20/30] Update dependencies from https://github.com/dotnet/xharness build 20211123.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21572.4 -> To Version 1.0.0-prerelease.21573.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0a89ec4701304..65004575cab58 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21573.1", + "version": "1.0.0-prerelease.21573.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3c122e3747d6..8c3a4d2bb5e28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,13 +202,13 @@ https://github.com/dotnet/linker f2dd65f51f6096f25e00e0d1e4c6af0e85d41865 - + https://github.com/dotnet/xharness - 3ea1f36d9a82e31729a941cfde5fc2dda9e29f6a + 87fe1fc7c38eda983b0318208f03af2b28773e95 - + https://github.com/dotnet/xharness - 3ea1f36d9a82e31729a941cfde5fc2dda9e29f6a + 87fe1fc7c38eda983b0318208f03af2b28773e95 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index d90e552692157..06b2885f551bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,8 +154,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21573.1 - 1.0.0-prerelease.21573.1 + 1.0.0-prerelease.21573.2 + 1.0.0-prerelease.21573.2 1.0.2-alpha.0.21565.2 2.4.2-pre.9 2.4.2 From ac7bf34df138fad3c8c956a29f4ee63089ba0e0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Nov 2021 13:14:37 +0000 Subject: [PATCH 21/30] Update dependencies from https://github.com/dotnet/runtime-assets build 20211123.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.21552.1 -> To Version 7.0.0-beta.21573.1 --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c3a4d2bb5e28..46e4aa0873190 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,45 +94,45 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 84788d11ca8c96c61a9cf7847c46bc012cef2b8b + bec318add4bd14cbf98cd38da1cb013f69713807 - + https://github.com/dotnet/runtime-assets - 84788d11ca8c96c61a9cf7847c46bc012cef2b8b + bec318add4bd14cbf98cd38da1cb013f69713807 - + https://github.com/dotnet/runtime-assets - 84788d11ca8c96c61a9cf7847c46bc012cef2b8b + bec318add4bd14cbf98cd38da1cb013f69713807 - + https://github.com/dotnet/runtime-assets - 84788d11ca8c96c61a9cf7847c46bc012cef2b8b + bec318add4bd14cbf98cd38da1cb013f69713807 - + https://github.com/dotnet/runtime-assets - 84788d11ca8c96c61a9cf7847c46bc012cef2b8b + bec318add4bd14cbf98cd38da1cb013f69713807 - + https://github.com/dotnet/runtime-assets - 84788d11ca8c96c61a9cf7847c46bc012cef2b8b + bec318add4bd14cbf98cd38da1cb013f69713807 - + https://github.com/dotnet/runtime-assets - 84788d11ca8c96c61a9cf7847c46bc012cef2b8b + bec318add4bd14cbf98cd38da1cb013f69713807 - + https://github.com/dotnet/runtime-assets - 84788d11ca8c96c61a9cf7847c46bc012cef2b8b + bec318add4bd14cbf98cd38da1cb013f69713807 - + https://github.com/dotnet/runtime-assets - 84788d11ca8c96c61a9cf7847c46bc012cef2b8b + bec318add4bd14cbf98cd38da1cb013f69713807 - + https://github.com/dotnet/runtime-assets - 84788d11ca8c96c61a9cf7847c46bc012cef2b8b + bec318add4bd14cbf98cd38da1cb013f69713807 https://github.com/dotnet/llvm-project @@ -234,9 +234,9 @@ https://github.com/dotnet/hotreload-utils bd05ac9d3005735e3e4f444adc656be2db982577 - + https://github.com/dotnet/runtime-assets - 84788d11ca8c96c61a9cf7847c46bc012cef2b8b + bec318add4bd14cbf98cd38da1cb013f69713807 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 06b2885f551bc..dc12789a4c6c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,17 +121,17 @@ 4.5.0 7.0.0-alpha.1.21562.1 - 7.0.0-beta.21552.1 - 7.0.0-beta.21552.1 - 7.0.0-beta.21552.1 - 7.0.0-beta.21552.1 - 7.0.0-beta.21552.1 - 7.0.0-beta.21552.1 - 7.0.0-beta.21552.1 - 7.0.0-beta.21552.1 - 7.0.0-beta.21552.1 - 7.0.0-beta.21552.1 - 7.0.0-beta.21552.1 + 7.0.0-beta.21573.1 + 7.0.0-beta.21573.1 + 7.0.0-beta.21573.1 + 7.0.0-beta.21573.1 + 7.0.0-beta.21573.1 + 7.0.0-beta.21573.1 + 7.0.0-beta.21573.1 + 7.0.0-beta.21573.1 + 7.0.0-beta.21573.1 + 7.0.0-beta.21573.1 + 7.0.0-beta.21573.1 1.0.0-prerelease.21569.2 1.0.0-prerelease.21569.2 From 6f5eec53212abc1fe275c3b892c7751be976a3c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Nov 2021 13:31:22 +0000 Subject: [PATCH 22/30] Update dependencies from https://github.com/dotnet/hotreload-utils build 20211123.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.2-alpha.0.21558.2 -> To Version 1.0.2-alpha.0.21573.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46e4aa0873190..679e0a6615c07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,9 +230,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 214f7cfae5d9cd628d38c68bea034801d7864779 - + https://github.com/dotnet/hotreload-utils - bd05ac9d3005735e3e4f444adc656be2db982577 + e2263c29f17acf64ac29dbb262dd72d120a4405e https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index dc12789a4c6c0..17b4c3ff33dcc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,7 +156,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21573.2 1.0.0-prerelease.21573.2 - 1.0.2-alpha.0.21565.2 + 1.0.2-alpha.0.21573.1 2.4.2-pre.9 2.4.2 1.3.0 From a069f1f3a8d8190628deb76e9bebfe3d1531b58e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Nov 2021 11:40:31 +0000 Subject: [PATCH 23/30] Update dependencies from https://github.com/dotnet/arcade build 20211124.3 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 7.0.0-beta.21559.3 -> To Version 7.0.0-beta.21574.3 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 8 ++--- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 679e0a6615c07..19b9e7b0af8de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb https://github.com/microsoft/vstest @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness 87fe1fc7c38eda983b0318208f03af2b28773e95 - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 17b4c3ff33dcc..e4eabfba4795c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,21 +57,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21573.3 - 7.0.0-beta.21573.3 - 7.0.0-beta.21573.3 - 7.0.0-beta.21573.3 - 7.0.0-beta.21573.3 - 7.0.0-beta.21573.3 - 2.5.1-beta.21573.3 - 7.0.0-beta.21573.3 - 7.0.0-beta.21573.3 - 7.0.0-beta.21573.3 - 7.0.0-beta.21573.3 - 7.0.0-beta.21573.3 - 7.0.0-beta.21573.3 - 7.0.0-beta.21573.3 - 7.0.0-beta.21573.3 + 7.0.0-beta.21574.3 + 7.0.0-beta.21574.3 + 7.0.0-beta.21574.3 + 7.0.0-beta.21574.3 + 7.0.0-beta.21574.3 + 7.0.0-beta.21574.3 + 2.5.1-beta.21574.3 + 7.0.0-beta.21574.3 + 7.0.0-beta.21574.3 + 7.0.0-beta.21574.3 + 7.0.0-beta.21574.3 + 7.0.0-beta.21574.3 + 7.0.0-beta.21574.3 + 7.0.0-beta.21574.3 + 7.0.0-beta.21574.3 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 78c3cdab33c77..e36807b392242 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21573.3", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21573.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21573.3", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21573.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21574.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21574.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21574.3", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21574.3", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21562.1" From 227872dc29fcd7bcb1451d23047ea4cece587861 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Nov 2021 13:10:58 +0000 Subject: [PATCH 24/30] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20211124.1 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21563.1 -> To Version 1.0.0-prerelease.21574.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19b9e7b0af8de..59d739d653d3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,21 +214,21 @@ https://github.com/dotnet/arcade 11fb2931671a47924e29b92e5fe06043fb3c6bbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 214f7cfae5d9cd628d38c68bea034801d7864779 + a869a09cb4bbf06502137c1044e6af7ccb3a8bd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 214f7cfae5d9cd628d38c68bea034801d7864779 + a869a09cb4bbf06502137c1044e6af7ccb3a8bd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 214f7cfae5d9cd628d38c68bea034801d7864779 + a869a09cb4bbf06502137c1044e6af7ccb3a8bd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 214f7cfae5d9cd628d38c68bea034801d7864779 + a869a09cb4bbf06502137c1044e6af7ccb3a8bd5 https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index e4eabfba4795c..19ff8998120f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,10 +133,10 @@ 7.0.0-beta.21573.1 7.0.0-beta.21573.1 - 1.0.0-prerelease.21569.2 - 1.0.0-prerelease.21569.2 - 1.0.0-prerelease.21569.2 - 1.0.0-prerelease.21569.2 + 1.0.0-prerelease.21574.1 + 1.0.0-prerelease.21574.1 + 1.0.0-prerelease.21574.1 + 1.0.0-prerelease.21574.1 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From d9e414ccd5ce1604d5ba4f3d6174b2a31c4e6f9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Nov 2021 13:12:43 +0000 Subject: [PATCH 25/30] Update dependencies from https://github.com/dotnet/xharness build 20211124.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21572.4 -> To Version 1.0.0-prerelease.21574.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 65004575cab58..47a592e89f287 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21573.2", + "version": "1.0.0-prerelease.21574.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59d739d653d3d..6995e0a3ac0ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,13 +202,13 @@ https://github.com/dotnet/linker f2dd65f51f6096f25e00e0d1e4c6af0e85d41865 - + https://github.com/dotnet/xharness - 87fe1fc7c38eda983b0318208f03af2b28773e95 + d4888e60f3c979e2b94863a8a16653ce584702e9 - + https://github.com/dotnet/xharness - 87fe1fc7c38eda983b0318208f03af2b28773e95 + d4888e60f3c979e2b94863a8a16653ce584702e9 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 19ff8998120f7..8bf52a2550097 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,8 +154,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21573.2 - 1.0.0-prerelease.21573.2 + 1.0.0-prerelease.21574.2 + 1.0.0-prerelease.21574.2 1.0.2-alpha.0.21573.1 2.4.2-pre.9 2.4.2 From 7cf3df227b66603c23b592e626cb4fafbb8e6dce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Nov 2021 13:29:52 +0000 Subject: [PATCH 26/30] Update dependencies from https://github.com/dotnet/hotreload-utils build 20211124.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.2-alpha.0.21558.2 -> To Version 1.0.2-alpha.0.21574.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6995e0a3ac0ab..6bb54a23e10db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,9 +230,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization a869a09cb4bbf06502137c1044e6af7ccb3a8bd5 - + https://github.com/dotnet/hotreload-utils - e2263c29f17acf64ac29dbb262dd72d120a4405e + 652a6ae580fdbfd58b7622a17b5b75ec15ac36c8 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 8bf52a2550097..4bcfe7e6512b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,7 +156,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21574.2 1.0.0-prerelease.21574.2 - 1.0.2-alpha.0.21573.1 + 1.0.2-alpha.0.21574.2 2.4.2-pre.9 2.4.2 1.3.0 From 39a1d22a20dc849a30d76daaa26bc9db59d81f9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Nov 2021 13:11:58 +0000 Subject: [PATCH 27/30] Update dependencies from https://github.com/dotnet/arcade build 20211126.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 7.0.0-beta.21559.3 -> To Version 7.0.0-beta.21576.2 --- eng/Version.Details.xml | 76 +++++++++++++++--------------- eng/Versions.props | 30 ++++++------ eng/common/native/init-compiler.sh | 10 ++-- global.json | 8 ++-- 4 files changed, 61 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bb54a23e10db..f2381b83fc816 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea https://github.com/microsoft/vstest @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness d4888e60f3c979e2b94863a8a16653ce584702e9 - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 4bcfe7e6512b4..3e4cd4d95b3d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,21 +57,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21574.3 - 7.0.0-beta.21574.3 - 7.0.0-beta.21574.3 - 7.0.0-beta.21574.3 - 7.0.0-beta.21574.3 - 7.0.0-beta.21574.3 - 2.5.1-beta.21574.3 - 7.0.0-beta.21574.3 - 7.0.0-beta.21574.3 - 7.0.0-beta.21574.3 - 7.0.0-beta.21574.3 - 7.0.0-beta.21574.3 - 7.0.0-beta.21574.3 - 7.0.0-beta.21574.3 - 7.0.0-beta.21574.3 + 7.0.0-beta.21576.2 + 7.0.0-beta.21576.2 + 7.0.0-beta.21576.2 + 7.0.0-beta.21576.2 + 7.0.0-beta.21576.2 + 7.0.0-beta.21576.2 + 2.5.1-beta.21576.2 + 7.0.0-beta.21576.2 + 7.0.0-beta.21576.2 + 7.0.0-beta.21576.2 + 7.0.0-beta.21576.2 + 7.0.0-beta.21576.2 + 7.0.0-beta.21576.2 + 7.0.0-beta.21576.2 + 7.0.0-beta.21576.2 6.0.0-preview.1.102 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 03a996062a796..fd1d080e20435 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -111,12 +111,10 @@ if [[ -z "$CC" ]]; then exit 1 fi -if [[ "$compiler" == "clang" ]]; then - if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then - # Only lld version >= 9 can be considered stable - if [[ "$majorVersion" -ge 9 ]]; then - LDFLAGS="-fuse-ld=lld" - fi +# Only lld version >= 9 can be considered stable +if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then + if "$CC" -fuse-ld=lld -Wl,--version 2>/dev/null; then + LDFLAGS="-fuse-ld=lld" fi fi diff --git a/global.json b/global.json index e36807b392242..e3f5d4c251f62 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21574.3", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21574.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21574.3", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21574.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21576.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21576.2", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21562.1" From 283c9df18935da592f6d69160dd9508e7430d919 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Nov 2021 13:14:12 +0000 Subject: [PATCH 28/30] Update dependencies from https://github.com/dotnet/xharness build 20211126.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21572.4 -> To Version 1.0.0-prerelease.21576.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 47a592e89f287..1646c9e406a69 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21574.2", + "version": "1.0.0-prerelease.21576.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2381b83fc816..996cd82d9cddf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,13 +202,13 @@ https://github.com/dotnet/linker f2dd65f51f6096f25e00e0d1e4c6af0e85d41865 - + https://github.com/dotnet/xharness - d4888e60f3c979e2b94863a8a16653ce584702e9 + 2863beb74c1abad7ddfe9ef7afea6fc2605e8a03 - + https://github.com/dotnet/xharness - d4888e60f3c979e2b94863a8a16653ce584702e9 + 2863beb74c1abad7ddfe9ef7afea6fc2605e8a03 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 3e4cd4d95b3d6..0313c1adb2da1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,8 +154,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21574.2 - 1.0.0-prerelease.21574.2 + 1.0.0-prerelease.21576.1 + 1.0.0-prerelease.21576.1 1.0.2-alpha.0.21574.2 2.4.2-pre.9 2.4.2 From 261af71cf9025d8270192e0eb0efac301adcf245 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Nov 2021 13:20:16 +0000 Subject: [PATCH 29/30] Update dependencies from https://github.com/dotnet/runtime-assets build 20211125.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.21552.1 -> To Version 7.0.0-beta.21575.1 --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 996cd82d9cddf..4f73409b06499 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,45 +94,45 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - bec318add4bd14cbf98cd38da1cb013f69713807 + 043b7a65a4319c412b1fe03b8a770be67aeedfc4 - + https://github.com/dotnet/runtime-assets - bec318add4bd14cbf98cd38da1cb013f69713807 + 043b7a65a4319c412b1fe03b8a770be67aeedfc4 - + https://github.com/dotnet/runtime-assets - bec318add4bd14cbf98cd38da1cb013f69713807 + 043b7a65a4319c412b1fe03b8a770be67aeedfc4 - + https://github.com/dotnet/runtime-assets - bec318add4bd14cbf98cd38da1cb013f69713807 + 043b7a65a4319c412b1fe03b8a770be67aeedfc4 - + https://github.com/dotnet/runtime-assets - bec318add4bd14cbf98cd38da1cb013f69713807 + 043b7a65a4319c412b1fe03b8a770be67aeedfc4 - + https://github.com/dotnet/runtime-assets - bec318add4bd14cbf98cd38da1cb013f69713807 + 043b7a65a4319c412b1fe03b8a770be67aeedfc4 - + https://github.com/dotnet/runtime-assets - bec318add4bd14cbf98cd38da1cb013f69713807 + 043b7a65a4319c412b1fe03b8a770be67aeedfc4 - + https://github.com/dotnet/runtime-assets - bec318add4bd14cbf98cd38da1cb013f69713807 + 043b7a65a4319c412b1fe03b8a770be67aeedfc4 - + https://github.com/dotnet/runtime-assets - bec318add4bd14cbf98cd38da1cb013f69713807 + 043b7a65a4319c412b1fe03b8a770be67aeedfc4 - + https://github.com/dotnet/runtime-assets - bec318add4bd14cbf98cd38da1cb013f69713807 + 043b7a65a4319c412b1fe03b8a770be67aeedfc4 https://github.com/dotnet/llvm-project @@ -234,9 +234,9 @@ https://github.com/dotnet/hotreload-utils 652a6ae580fdbfd58b7622a17b5b75ec15ac36c8 - + https://github.com/dotnet/runtime-assets - bec318add4bd14cbf98cd38da1cb013f69713807 + 043b7a65a4319c412b1fe03b8a770be67aeedfc4 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 0313c1adb2da1..6893cc51990a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,17 +121,17 @@ 4.5.0 7.0.0-alpha.1.21562.1 - 7.0.0-beta.21573.1 - 7.0.0-beta.21573.1 - 7.0.0-beta.21573.1 - 7.0.0-beta.21573.1 - 7.0.0-beta.21573.1 - 7.0.0-beta.21573.1 - 7.0.0-beta.21573.1 - 7.0.0-beta.21573.1 - 7.0.0-beta.21573.1 - 7.0.0-beta.21573.1 - 7.0.0-beta.21573.1 + 7.0.0-beta.21575.1 + 7.0.0-beta.21575.1 + 7.0.0-beta.21575.1 + 7.0.0-beta.21575.1 + 7.0.0-beta.21575.1 + 7.0.0-beta.21575.1 + 7.0.0-beta.21575.1 + 7.0.0-beta.21575.1 + 7.0.0-beta.21575.1 + 7.0.0-beta.21575.1 + 7.0.0-beta.21575.1 1.0.0-prerelease.21574.1 1.0.0-prerelease.21574.1 From 3a795eff1aef90df0d2085a902d9f1cfd46012e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 26 Nov 2021 20:31:43 +0100 Subject: [PATCH 30/30] Update arcade --- eng/Version.Details.xml | 76 +++++++++++++++--------------- eng/Versions.props | 30 ++++++------ eng/common/native/init-compiler.sh | 3 +- global.json | 8 ++-- 4 files changed, 59 insertions(+), 58 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f73409b06499..2e43c4f270d24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 https://github.com/microsoft/vstest @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness 2863beb74c1abad7ddfe9ef7afea6fc2605e8a03 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 6893cc51990a8..f6259e4fe5f46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,21 +57,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21576.2 - 7.0.0-beta.21576.2 - 7.0.0-beta.21576.2 - 7.0.0-beta.21576.2 - 7.0.0-beta.21576.2 - 7.0.0-beta.21576.2 - 2.5.1-beta.21576.2 - 7.0.0-beta.21576.2 - 7.0.0-beta.21576.2 - 7.0.0-beta.21576.2 - 7.0.0-beta.21576.2 - 7.0.0-beta.21576.2 - 7.0.0-beta.21576.2 - 7.0.0-beta.21576.2 - 7.0.0-beta.21576.2 + 7.0.0-beta.21576.4 + 7.0.0-beta.21576.4 + 7.0.0-beta.21576.4 + 7.0.0-beta.21576.4 + 7.0.0-beta.21576.4 + 7.0.0-beta.21576.4 + 2.5.1-beta.21576.4 + 7.0.0-beta.21576.4 + 7.0.0-beta.21576.4 + 7.0.0-beta.21576.4 + 7.0.0-beta.21576.4 + 7.0.0-beta.21576.4 + 7.0.0-beta.21576.4 + 7.0.0-beta.21576.4 + 7.0.0-beta.21576.4 6.0.0-preview.1.102 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index fd1d080e20435..e361e03fabdd2 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -2,6 +2,7 @@ # # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables # +# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! if [[ "$#" -lt 3 ]]; then echo "Usage..." @@ -113,7 +114,7 @@ fi # Only lld version >= 9 can be considered stable if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then - if "$CC" -fuse-ld=lld -Wl,--version 2>/dev/null; then + if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then LDFLAGS="-fuse-ld=lld" fi fi diff --git a/global.json b/global.json index e3f5d4c251f62..4bb3c2487cdec 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21576.2", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.2", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21576.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21576.4", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.4", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21576.4", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21562.1"