From b4d0211d114bec9cdf029c5daca9a5c080ab0785 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Jun 2021 12:13:35 +0000 Subject: [PATCH 01/22] Update dependencies from https://github.com/dotnet/arcade build 20210604.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21304.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1550d473a9f8a..97f6509729ed5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 78da7776965b428ff31da8f1ff2cb073506212b7 + 85a65ea1fca1d0867f699fed44d191358270bf6a https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 78da7776965b428ff31da8f1ff2cb073506212b7 + 85a65ea1fca1d0867f699fed44d191358270bf6a diff --git a/global.json b/global.json index bae01b1ae194e..7c699b5e8ece4 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21303.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21303.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21304.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21304.1" } } From 9a06c7f0da59750e8cc7f03734da8c3ba0481378 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Jun 2021 12:13:11 +0000 Subject: [PATCH 02/22] Update dependencies from https://github.com/dotnet/arcade build 20210611.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21311.3 --- eng/Version.Details.xml | 8 +- eng/common/dotnet-install.sh | 2 +- eng/common/internal-feed-operations.ps1 | 6 +- eng/common/internal-feed-operations.sh | 2 +- eng/common/sdk-task.ps1 | 4 +- eng/common/sdl/execute-all-sdl-tools.ps1 | 2 +- eng/common/sdl/init-sdl.ps1 | 2 +- eng/common/sdl/run-sdl.ps1 | 2 +- eng/common/templates/job/onelocbuild.yml | 8 ++ eng/common/tools.ps1 | 99 +++++++++++------------- eng/common/tools.sh | 9 ++- global.json | 8 +- 12 files changed, 77 insertions(+), 75 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97f6509729ed5..e1188dd940334 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 85a65ea1fca1d0867f699fed44d191358270bf6a + 4a2b475948d498b89fedef7cf890883f49bc1ea3 https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 85a65ea1fca1d0867f699fed44d191358270bf6a + 4a2b475948d498b89fedef7cf890883f49bc1ea3 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index d6efeb44340ba..fdfeea66e7d43 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -70,7 +70,7 @@ case $cpuname in ;; esac -dotnetRoot="$repo_root/.dotnet" +dotnetRoot="${repo_root}.dotnet" if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then dotnetRoot="$dotnetRoot/$architecture" fi diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 418c09930cf16..92b77347d9904 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -45,11 +45,11 @@ function SetupCredProvider { # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable # feeds successfully - $nugetConfigPath = "$RepoRoot\NuGet.config" + $nugetConfigPath = Join-Path $RepoRoot "NuGet.config" if (-Not (Test-Path -Path $nugetConfigPath)) { Write-PipelineTelemetryError -Category 'Build' -Message 'NuGet.config file not found in repo root!' - ExitWithExitCode 1 + ExitWithExitCode 1 } $endpoints = New-Object System.Collections.ArrayList @@ -85,7 +85,7 @@ function SetupCredProvider { #Workaround for https://github.com/microsoft/msbuild/issues/4430 function InstallDotNetSdkAndRestoreArcade { - $dotnetTempDir = "$RepoRoot\dotnet" + $dotnetTempDir = Join-Path $RepoRoot "dotnet" $dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) $dotnet = "$dotnetTempDir\dotnet.exe" $restoreProjPath = "$PSScriptRoot\restore.proj" diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh index e2233e781220f..9378223ba0955 100755 --- a/eng/common/internal-feed-operations.sh +++ b/eng/common/internal-feed-operations.sh @@ -39,7 +39,7 @@ function SetupCredProvider { # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable # feeds successfully - local nugetConfigPath="$repo_root/NuGet.config" + local nugetConfigPath="{$repo_root}NuGet.config" if [ ! "$nugetConfigPath" ]; then Write-PipelineTelemetryError -category 'Build' "NuGet.config file not found in repo's root!" diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 65f1d75f3d322..b1bca63ab1d82 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -34,7 +34,7 @@ function Print-Usage() { function Build([string]$target) { $logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" } $log = Join-Path $LogDir "$task$logSuffix.binlog" - $outputPath = Join-Path $ToolsetDir "$task\\" + $outputPath = Join-Path $ToolsetDir "$task\" MSBuild $taskProject ` /bl:$log ` @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.8.0-preview3" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.10.0-preview2" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 81b729f74a4d4..2881a56083cf5 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -32,7 +32,7 @@ try { $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true - $LASTEXITCODE = 0 + $global:LASTEXITCODE = 0 # `tools.ps1` checks $ci to perform some actions. Since the SDL # scripts don't necessarily execute in the same agent that run the diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index 1fe9271193cc6..3ac1d92b37006 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -10,7 +10,7 @@ Param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true -$LASTEXITCODE = 0 +$global:LASTEXITCODE = 0 # `tools.ps1` checks $ci to perform some actions. Since the SDL # scripts don't necessarily execute in the same agent that run the diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 index fe95ab35aa5d1..3d9c87aba6acf 100644 --- a/eng/common/sdl/run-sdl.ps1 +++ b/eng/common/sdl/run-sdl.ps1 @@ -13,7 +13,7 @@ Param( $ErrorActionPreference = 'Stop' Set-StrictMode -Version 2.0 $disableConfigureToolsetImport = $true -$LASTEXITCODE = 0 +$global:LASTEXITCODE = 0 try { # `tools.ps1` checks $ci to perform some actions. Since the SDL diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 2acdd5256dd83..e8bc77d2ebbe3 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -18,6 +18,9 @@ parameters: LclSource: lclFilesInRepo LclPackageId: '' RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main condition: '' jobs: @@ -66,6 +69,11 @@ jobs: ${{ if eq(parameters.RepoType, 'gitHub') }}: repoType: ${{ parameters.RepoType }} gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ if ne(parameters.MirrorRepo, '') }}: + isMirrorRepoSelected: true + gitHubOrganization: ${{ parameters.GitHubOrg }} + mirrorRepo: ${{ parameters.MirrorRepo }} + mirrorBranch: ${{ parameters.MirrorBranch }} condition: ${{ parameters.condition }} - task: PublishBuildArtifacts@1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 2d8a74f7d9e89..5619c7aaee1d7 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -193,38 +193,42 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { return $global:_DotNetInstallDir = $dotnetRoot } +function Retry($downloadBlock, $maxRetries = 5) { + $retries = 1 + + while($true) { + try { + & $downloadBlock + break + } + catch { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_ + } + + if (++$retries -le $maxRetries) { + $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff + Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)." + Start-Sleep -Seconds $delayInSeconds + } + else { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts." + break + } + + } +} + function GetDotNetInstallScript([string] $dotnetRoot) { $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1' if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - - $maxRetries = 5 - $retries = 1 - $uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" - while($true) { - try { - Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript - break - } - catch { - Write-Host "Failed to download '$uri'" - Write-Error $_.Exception.Message -ErrorAction Continue - } - - if (++$retries -le $maxRetries) { - $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff - Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)." - Start-Sleep -Seconds $delayInSeconds - } - else { - throw "Unable to download file in $maxRetries attempts." - } - - } + Retry({ + Write-Host "GET $uri" + Invoke-WebRequest $uri -OutFile $installScript + }) } return $installScript @@ -308,8 +312,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.8.0-preview3&view=overview - $defaultXCopyMSBuildVersion = '16.8.0-preview3' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.10.0-preview2&view=overview + $defaultXCopyMSBuildVersion = '16.10.0-preview2' if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr } @@ -403,9 +407,13 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { } Create-Directory $packageDir + Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Retry({ + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + }) + Unzip $packagePath $packageDir } @@ -442,27 +450,9 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir Write-Host 'Downloading vswhere' - $maxRetries = 5 - $retries = 1 - - while($true) { - try { - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe - break - } - catch{ - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_ - } - - if (++$retries -le $maxRetries) { - $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff - Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)." - Start-Sleep -Seconds $delayInSeconds - } - else { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts." - } - } + Retry({ + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + }) } if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } @@ -498,7 +488,7 @@ function InitializeBuildTool() { if (Test-Path variable:global:_BuildTool) { # If the requested msbuild parameters do not match, clear the cached variables. if($global:_BuildTool.Contains('ExcludePrereleaseVS') -and $global:_BuildTool.ExcludePrereleaseVS -ne $excludePrereleaseVS) { - Remove-Item variable:global:_BuildTool + Remove-Item variable:global:_BuildTool Remove-Item variable:global:_MSBuildExe } else { return $global:_BuildTool @@ -555,7 +545,7 @@ function GetDefaultMSBuildEngine() { function GetNuGetPackageCachePath() { if ($env:NUGET_PACKAGES -eq $null) { - # Use local cache on CI to ensure deterministic build. + # Use local cache on CI to ensure deterministic build. # Avoid using the http cache as workaround for https://github.com/NuGet/Home/issues/3116 # use global cache in dev builds to avoid cost of downloading packages. # For directory normalization, see also: https://github.com/NuGet/Home/issues/7968 @@ -712,7 +702,10 @@ function MSBuild-Core() { } foreach ($arg in $args) { - if ($arg -ne $null -and $arg.Trim() -ne "") { + if ($null -ne $arg -and $arg.Trim() -ne "") { + if ($arg.EndsWith('\')) { + $arg = $arg + "\" + } $cmdArgs += " `"$arg`"" } } @@ -784,7 +777,7 @@ function Get-Darc($version) { . $PSScriptRoot\pipeline-logging-functions.ps1 -$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot '..\..') +$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot '..\..\') $EngRoot = Resolve-Path (Join-Path $PSScriptRoot '..') $ArtifactsDir = Join-Path $RepoRoot 'artifacts' $ToolsetDir = Join-Path $ArtifactsDir 'toolset' diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 5fad1846e5a53..05ca99c6b2813 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -485,13 +485,14 @@ _script_dir=`dirname "$_ResolvePath"` eng_root=`cd -P "$_script_dir/.." && pwd` repo_root=`cd -P "$_script_dir/../.." && pwd` -artifacts_dir="$repo_root/artifacts" +repo_root="${repo_root}/" +artifacts_dir="${repo_root}artifacts" toolset_dir="$artifacts_dir/toolset" -tools_dir="$repo_root/.tools" +tools_dir="${repo_root}.tools" log_dir="$artifacts_dir/log/$configuration" temp_dir="$artifacts_dir/tmp/$configuration" -global_json_file="$repo_root/global.json" +global_json_file="${repo_root}global.json" # determine if global.json contains a "runtimes" entry global_json_has_runtimes=false if command -v jq &> /dev/null; then @@ -504,7 +505,7 @@ fi # HOME may not be defined in some scenarios, but it is required by NuGet if [[ -z $HOME ]]; then - export HOME="$repo_root/artifacts/.home/" + export HOME="${repo_root}artifacts/.home/" mkdir -p "$HOME" fi diff --git a/global.json b/global.json index 7c699b5e8ece4..229e0743ac344 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "6.0.100-preview.3.21202.5", + "version": "6.0.100-preview.4.21255.9", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.3.21202.5", + "dotnet": "6.0.100-preview.4.21255.9", "vs": { "version": "16.8" }, "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21304.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21304.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21311.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21311.3" } } From f2752115e17052863ec3286093b6d2cc59872831 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Jun 2021 12:07:49 +0000 Subject: [PATCH 03/22] Update dependencies from https://github.com/dotnet/arcade build 20210614.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21314.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1188dd940334..b009f25a36418 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 diff --git a/global.json b/global.json index 229e0743ac344..eabb29167d17e 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21311.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21311.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21314.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21314.1" } } From 38efc45b6bfd20aa38c7f0b1bac29b020d0bc5ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jun 2021 12:15:21 +0000 Subject: [PATCH 04/22] Update dependencies from https://github.com/dotnet/arcade build 20210616.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21316.3 --- eng/Version.Details.xml | 8 ++++---- eng/common/templates/job/source-index-stage1.yml | 6 +++++- global.json | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b009f25a36418..28a30e00d4301 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index a649d2b5990c0..b58d42364b9e7 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,15 +1,19 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20210421.1 + sourceIndexPackageVersion: 1.0.1-20210614.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog pool: vmImage: vs2017-win2016 + condition: '' + dependsOn: '' jobs: - job: SourceIndexStage1 + dependsOn: ${{ parameters.dependsOn }} + condition: ${{ parameters.condition }} variables: - name: SourceIndexPackageVersion value: ${{ parameters.sourceIndexPackageVersion }} diff --git a/global.json b/global.json index eabb29167d17e..5a9370e04b119 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21314.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21314.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21316.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21316.3" } } From ca103c4bc8b6fb5546ed2deb4f89deac8955d1da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Jun 2021 12:14:37 +0000 Subject: [PATCH 05/22] Update dependencies from https://github.com/dotnet/arcade build 20210617.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21317.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28a30e00d4301..c612704abaaf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b diff --git a/global.json b/global.json index 5a9370e04b119..21e649aef1c90 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21316.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21316.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21317.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21317.1" } } From b5db981f1fc90f982a7f5a5eba53223fd936d183 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Jun 2021 12:14:50 +0000 Subject: [PATCH 06/22] Update dependencies from https://github.com/dotnet/arcade build 20210618.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21318.2 --- eng/Version.Details.xml | 8 ++++---- eng/common/generate-locproject.ps1 | 13 ++++++++++--- global.json | 4 ++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c612704abaaf7..6302159523cf0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index de348a2e225c0..25e97ac00772d 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -25,8 +25,15 @@ Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to # Template files $jsonFiles = @() -$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern -$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern +$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern +$jsonTemplateFiles | ForEach-Object { + $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json + + $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json" + $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru +} + +$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern $xlfFiles = @() @@ -44,7 +51,7 @@ $langXlfFiles | ForEach-Object { $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru } -$locFiles = $jsonFiles + $xlfFiles +$locFiles = $jsonFiles + $jsonWinformsTemplateFiles + $xlfFiles $locJson = @{ Projects = @( diff --git a/global.json b/global.json index 21e649aef1c90..9c9f8a6b2148f 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21317.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21317.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21318.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21318.2" } } From ed5bc46f851d4603aca4ebfacd14777d0aea3d2b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 20 Jun 2021 12:13:09 +0000 Subject: [PATCH 07/22] Update dependencies from https://github.com/dotnet/arcade build 20210619.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21319.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6302159523cf0..08979ec38cf8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 diff --git a/global.json b/global.json index 9c9f8a6b2148f..1fe1faff4e3fb 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21318.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21318.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21319.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21319.2" } } From 6ec36c6ffdd83a184c522adab94f1a36537535c9 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 21 Jun 2021 14:52:33 -0700 Subject: [PATCH 08/22] Leave SDK on .NET 6 Preview 3 --- eng/Versions.props | 2 +- global.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a703120f5e1a7..28527ea4280e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -92,7 +92,7 @@ 1.1.0-beta2-20115-01 16.9.0-beta1.21055.5 1.5.0 - 6.0.0-beta.21260.1 + 6.0.0-beta.21319.2 5.0.0 5.0.0 3.13.8 diff --git a/global.json b/global.json index 1fe1faff4e3fb..0738f3f8e0813 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.4.21255.9", + "version": "6.0.100-preview.3.21202.5", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.4.21255.9", + "dotnet": "6.0.100-preview.3.21202.5", "vs": { "version": "16.8" }, @@ -15,4 +15,4 @@ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21319.2", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21319.2" } -} +} \ No newline at end of file From 0b172c4abd6021585383aea87fda8e7a5037b7b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Jun 2021 12:12:55 +0000 Subject: [PATCH 09/22] Update dependencies from https://github.com/dotnet/arcade build 20210621.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21321.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08979ec38cf8a..ee88ebe16de03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 diff --git a/global.json b/global.json index 0738f3f8e0813..51e4ad97cae99 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "6.0.100-preview.3.21202.5", + "version": "6.0.100-preview.4.21255.9", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.3.21202.5", + "dotnet": "6.0.100-preview.4.21255.9", "vs": { "version": "16.8" }, "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21319.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21319.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21321.1" } -} \ No newline at end of file +} From 73e296d4163605bdba478588b9361ff35b79bfb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Jun 2021 12:14:29 +0000 Subject: [PATCH 10/22] Update dependencies from https://github.com/dotnet/arcade build 20210621.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21321.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee88ebe16de03..48bf4915dce22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 28a6403ee97077256fcdc60f599f0ad9e38e3cfa https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 36b148348ee8312f6369c0c56b0d0fe07deec603 + 28a6403ee97077256fcdc60f599f0ad9e38e3cfa diff --git a/global.json b/global.json index 51e4ad97cae99..a95d3189afce6 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21321.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21321.2" } } From 7fa7f8ca6a9ae83f1f7e60abe3f94e05bee1268e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Jun 2021 12:14:55 +0000 Subject: [PATCH 11/22] Update dependencies from https://github.com/dotnet/arcade build 20210623.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21323.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48bf4915dce22..e3d7cbeb409ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 28a6403ee97077256fcdc60f599f0ad9e38e3cfa + 1685a12f35cfb396f9352d63736eb675673b0e20 https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 28a6403ee97077256fcdc60f599f0ad9e38e3cfa + 1685a12f35cfb396f9352d63736eb675673b0e20 diff --git a/global.json b/global.json index a95d3189afce6..f2b63c0b741ef 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21321.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21323.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21323.1" } } From 9b7e608e74efa33dc9f90f70aa3ff206cf9d857c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Jun 2021 12:13:26 +0000 Subject: [PATCH 12/22] Update dependencies from https://github.com/dotnet/arcade build 20210624.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21324.3 --- eng/Version.Details.xml | 8 ++++---- eng/common/tools.ps1 | 11 ++++++++++- global.json | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3d7cbeb409ed..f340208bc5c75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 1685a12f35cfb396f9352d63736eb675673b0e20 + a68ec1edf328e737b31a09cb49e1929c28e91d0c https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 1685a12f35cfb396f9352d63736eb675673b0e20 + a68ec1edf328e737b31a09cb49e1929c28e91d0c diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5619c7aaee1d7..7942ffaf4cb3c 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -378,7 +378,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } - return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe" + + $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin" + $local:Prefer64bit = if ($vsRequirements.Prefer64bit) { $vsRequirements.Prefer64bit } else { $false } + if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) { + $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe" + } else { + $global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe" + } + + return $global:_MSBuildExe } function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) { diff --git a/global.json b/global.json index f2b63c0b741ef..f66016cbfb268 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21323.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21323.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21324.3" } } From 59554facf0222d4b1af1a3257651e7bf612dfd08 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 28 Jun 2021 10:01:46 -0700 Subject: [PATCH 13/22] Leave SDK on NET 6 Preview 3 --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index f66016cbfb268..a278a685840ba 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "6.0.100-preview.4.21255.9", + "version": "6.0.100-preview.3.21202.5", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.4.21255.9", + "dotnet": "6.0.100-preview.3.21202.5", "vs": { "version": "16.8" }, From 87644e9c183dad7d76b71b4c7f3162615c7e5d7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Jun 2021 12:16:15 +0000 Subject: [PATCH 14/22] Update dependencies from https://github.com/dotnet/arcade build 20210628.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21328.2 --- eng/Version.Details.xml | 8 ++++---- eng/common/tools.ps1 | 2 +- global.json | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f340208bc5c75..920109b16de45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7942ffaf4cb3c..4b25520324931 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -380,7 +380,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin" - $local:Prefer64bit = if ($vsRequirements.Prefer64bit) { $vsRequirements.Prefer64bit } else { $false } + $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false } if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) { $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe" } else { diff --git a/global.json b/global.json index a278a685840ba..3fc127e8de481 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "6.0.100-preview.3.21202.5", + "version": "6.0.100-preview.4.21255.9", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.3.21202.5", + "dotnet": "6.0.100-preview.4.21255.9", "vs": { "version": "16.8" }, "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21324.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21328.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21328.2" } } From 9cc3e25a7276982b0e767aa2a5423c7623177747 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Jun 2021 12:13:42 +0000 Subject: [PATCH 15/22] Update dependencies from https://github.com/dotnet/arcade build 20210629.8 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21329.8 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 920109b16de45..cdf7264f6fea0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 685c1a4fa207d81e881a402a32ffa1c0fb191b42 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 685c1a4fa207d81e881a402a32ffa1c0fb191b42 + 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 diff --git a/global.json b/global.json index 3fc127e8de481..eec23915e18bc 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21328.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21328.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21329.8", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21329.8" } } From 27f6eb7f42a45683926502511b1743c87b8f8067 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Jul 2021 12:13:44 +0000 Subject: [PATCH 16/22] Update dependencies from https://github.com/dotnet/arcade build 20210630.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21330.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cdf7264f6fea0..22c3526564232 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 + 26345756f99087811b1fe4d02ff213eb172ec506 https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2 + 26345756f99087811b1fe4d02ff213eb172ec506 diff --git a/global.json b/global.json index eec23915e18bc..2dfd8aab3395c 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21329.8", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21329.8" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21330.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21330.2" } } From 6aed397490e6d628396b8d9c31994b0658e63a6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Jul 2021 12:13:32 +0000 Subject: [PATCH 17/22] Update dependencies from https://github.com/dotnet/arcade build 20210701.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21351.2 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22c3526564232..f85ff8778e91f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 7f52af24016a4b749a2c1f219105c0f5a7100028 https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 7f52af24016a4b749a2c1f219105c0f5a7100028 diff --git a/global.json b/global.json index 2dfd8aab3395c..065066869ab84 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21330.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21330.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21351.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21351.2" } } From 132ef557a75ace094c68a638ae482ca863ae96e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Jul 2021 12:14:27 +0000 Subject: [PATCH 18/22] Update dependencies from https://github.com/dotnet/arcade build 20210705.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21355.2 --- eng/Version.Details.xml | 8 ++++---- eng/common/SetupNugetSources.ps1 | 6 ++++++ eng/common/SetupNugetSources.sh | 24 ++++++++++++++++++++++++ global.json | 4 ++-- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f85ff8778e91f..f130f8b3fea02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 7f52af24016a4b749a2c1f219105c0f5a7100028 + 615fbd8c498067deae160a696701eaf33155da56 https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 7f52af24016a4b749a2c1f219105c0f5a7100028 + 615fbd8c498067deae160a696701eaf33155da56 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index a0b5fc37f4388..18823840b1127 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -158,4 +158,10 @@ if ($dotnet5Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } +$dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']") +if ($dotnet6Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password +} + $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 2734601c13c4b..ad3fb74fd2cc8 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -129,6 +129,30 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet5-internal-transport') fi +# Ensure dotnet6-internal and dotnet6-internal-transport are in the packageSources if the public dotnet6 feeds are present +grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet6-internal') + + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet6-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet6-internal-transport') +fi + # I want things split line by line PrevIFS=$IFS IFS=$'\n' diff --git a/global.json b/global.json index 065066869ab84..0343c8168b937 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21351.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21351.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21355.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21355.2" } } From b944126c43f74fda6f7fbbd32f888d7ccdf45d36 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jul 2021 12:14:51 +0000 Subject: [PATCH 19/22] Update dependencies from https://github.com/dotnet/arcade build 20210707.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21357.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f130f8b3fea02..3b871fba148cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 615fbd8c498067deae160a696701eaf33155da56 + 286d98094b830b8dad769542b2669cb1b75f7097 https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 615fbd8c498067deae160a696701eaf33155da56 + 286d98094b830b8dad769542b2669cb1b75f7097 diff --git a/global.json b/global.json index 0343c8168b937..55e890fb42777 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21355.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21355.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21357.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21357.3" } } From 7da7f29b1d71ee8781c5ffc04a0cf443eb4d75b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jul 2021 12:13:45 +0000 Subject: [PATCH 20/22] Update dependencies from https://github.com/dotnet/arcade build 20210709.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21303.2 -> To Version 6.0.0-beta.21359.3 --- eng/Version.Details.xml | 8 ++++---- eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 4 ++-- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b871fba148cd..367509fabd579 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 https://github.com/dotnet/roslyn 5b972bceb846f5d15f991a479e285067a75103e4 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 4b25520324931..2df0909937d10 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -42,7 +42,7 @@ [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dot.net/v1/dotnet-install.ps1 +# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' } # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -223,7 +223,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" + $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 05ca99c6b2813..828119be411b3 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true} use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dot.net/v1/dotnet-install.sh +# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -262,7 +262,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dot.net/$dotnetInstallScriptVersion/dotnet-install.sh" + local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index 55e890fb42777..87027da233fbc 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21357.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21357.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21359.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21359.3" } } From a3953ce96b26888482db6f3a5d9bbb4256b0006c Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Tue, 13 Jul 2021 17:16:10 -0700 Subject: [PATCH 21/22] Build on dev16.10 or higher. --- azure-pipelines-official.yml | 2 +- global.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index 35bb7e5b7e90f..dfe040f9bfaab 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -81,7 +81,7 @@ stages: timeoutInMinutes: 360 pool: name: NetCoreInternal-Pool - queue: BuildPool.Server.Amd64.VS2017 + queue: BuildPool.Server.Amd64.VS2019 steps: - powershell: Write-Host "##vso[task.setvariable variable=SourceBranchName]$('$(Build.SourceBranch)'.Substring('refs/heads/'.Length))" diff --git a/global.json b/global.json index 87027da233fbc..0da51abf5be9b 100644 --- a/global.json +++ b/global.json @@ -7,12 +7,12 @@ "tools": { "dotnet": "6.0.100-preview.4.21255.9", "vs": { - "version": "16.8" + "version": "16.10" }, - "xcopy-msbuild": "16.8.0-preview2.1" + "xcopy-msbuild": "16.10.0-preview2" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21359.3", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21359.3" } -} +} \ No newline at end of file From a7611bb0ed8fef8928d2fc916479304601fa7629 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 14 Jul 2021 17:21:30 -0700 Subject: [PATCH 22/22] Run Correctness tests on VS2019 image --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c3d4926f3c653..2c6a312e7c8f0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -155,7 +155,7 @@ jobs: - job: Correctness_Determinism pool: name: NetCorePublic-Pool - queue: BuildPool.Windows.10.Amd64.VS2017.Open + queue: BuildPool.Windows.10.Amd64.VS2019.Open timeoutInMinutes: 90 steps: - template: eng/pipelines/checkout-windows-task.yml @@ -171,7 +171,7 @@ jobs: - job: Correctness_Build pool: name: NetCorePublic-Pool - queue: BuildPool.Windows.10.Amd64.VS2017.Open + queue: BuildPool.Windows.10.Amd64.VS2019.Open timeoutInMinutes: 90 steps: - template: eng/pipelines/checkout-windows-task.yml