From 8340546b3805cf86fdf2955f5dca8a2e8997d906 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 14 Jun 2021 22:44:24 +0200 Subject: [PATCH] Revert "[main] Update dependencies from mono/linker dotnet/runtime dotnet/arcade dnceng/internal/dotnet-optimization dotnet/xharness dotnet/hotreload-utils (#54060)" (#54177) This reverts commit 4c0d2f01112a814a8d62494b138859e64a701570. --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 124 +++++++++++------------ eng/Versions.props | 52 +++++----- 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 | 10 +- 14 files changed, 161 insertions(+), 163 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 02e0543e98b..b7d301671f9 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21314.1", + "version": "1.0.0-prerelease.21307.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e73128fec0..aa14dcbaaf0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a https://github.com/microsoft/vstest @@ -146,73 +146,73 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711 https://github.com/mono/linker caeaf2a3fb3f636805fdd4881df4f9a539fff8f6 - + https://github.com/dotnet/xharness - d6f8a4ad30908fb210390380eae97264e4fbe8ce + 2751a33949055a45fd79e2ae126f127daf1aee44 - + https://github.com/dotnet/xharness - d6f8a4ad30908fb210390380eae97264e4fbe8ce + 2751a33949055a45fd79e2ae126f127daf1aee44 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f + 6d1aebccb1ae6c3562bb0cceba8464f78b4e1afd - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f + 6d1aebccb1ae6c3562bb0cceba8464f78b4e1afd - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f + 6d1aebccb1ae6c3562bb0cceba8464f78b4e1afd - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f + 6d1aebccb1ae6c3562bb0cceba8464f78b4e1afd https://github.com/dotnet/emsdk defa37b05c734e025292c5747664e970cd2ac444 - + https://github.com/dotnet/hotreload-utils - 25b814e010cd4796cedfbcce72a274c26928f496 + 04541efa21e114256a1ca9ca4a14685fd9f7e48e diff --git a/eng/Versions.props b/eng/Versions.props index 7c4e7f2107e..693c68ecb1b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,28 +49,28 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 2.5.1-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 + 6.0.0-beta.21304.1 + 6.0.0-beta.21304.1 + 6.0.0-beta.21304.1 + 6.0.0-beta.21304.1 + 6.0.0-beta.21304.1 + 6.0.0-beta.21304.1 + 2.5.1-beta.21304.1 + 6.0.0-beta.21304.1 + 6.0.0-beta.21304.1 + 6.0.0-beta.21304.1 + 6.0.0-beta.21304.1 + 6.0.0-beta.21304.1 + 6.0.0-beta.21304.1 5.9.0-preview.2 6.0.0-alpha.1.20612.4 - 6.0.0-preview.6.21314.1 - 6.0.0-preview.6.21314.1 + 6.0.0-preview.6.21307.1 + 6.0.0-preview.6.21307.1 3.1.0 - 6.0.0-preview.6.21314.1 + 6.0.0-preview.6.21307.1 1.2.0-beta.304 4.3.0 @@ -100,14 +100,14 @@ 4.3.1 4.7.0 4.7.0 - 6.0.0-preview.6.21314.1 - 6.0.0-preview.6.21314.1 + 6.0.0-preview.6.21307.1 + 6.0.0-preview.6.21307.1 4.3.0 4.5.4 4.5.0 1.1.1 4.3.0 - 6.0.0-preview.6.21314.1 + 6.0.0-preview.6.21307.1 6.0.0-beta.21307.1 6.0.0-beta.21307.1 @@ -119,10 +119,10 @@ 6.0.0-beta.21307.1 6.0.0-beta.21307.1 - 1.0.0-prerelease.21313.4 - 1.0.0-prerelease.21313.4 - 1.0.0-prerelease.21313.4 - 1.0.0-prerelease.21313.4 + 1.0.0-prerelease.21308.4 + 1.0.0-prerelease.21308.4 + 1.0.0-prerelease.21308.4 + 1.0.0-prerelease.21308.4 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 @@ -146,9 +146,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21314.1 - 1.0.0-prerelease.21314.1 - 1.0.1-alpha.0.21311.1 + 1.0.0-prerelease.21307.1 + 1.0.0-prerelease.21307.1 + 1.0.1-alpha.0.21307.1 2.4.1 2.4.2 1.3.0 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e7d..d6efeb44340 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 92b77347d99..418c09930cf 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 = Join-Path $RepoRoot "NuGet.config" + $nugetConfigPath = "$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 = Join-Path $RepoRoot "dotnet" + $dotnetTempDir = "$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 9378223ba09..e2233e78122 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 b1bca63ab1d..65f1d75f3d3 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.10.0-preview2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.8.0-preview3" -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 2881a56083c..81b729f74a4 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 - $global:LASTEXITCODE = 0 + $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 3ac1d92b370..1fe9271193c 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 -$global:LASTEXITCODE = 0 +$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 3d9c87aba6a..fe95ab35aa5 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 -$global:LASTEXITCODE = 0 +$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 e8bc77d2ebb..2acdd5256dd 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -18,9 +18,6 @@ parameters: LclSource: lclFilesInRepo LclPackageId: '' RepoType: gitHub - GitHubOrg: dotnet - MirrorRepo: '' - MirrorBranch: main condition: '' jobs: @@ -69,11 +66,6 @@ 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 5619c7aaee1..2d8a74f7d9e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -193,42 +193,38 @@ 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" - Retry({ - Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript - }) + 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." + } + + } } return $installScript @@ -312,8 +308,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.10.0-preview2&view=overview - $defaultXCopyMSBuildVersion = '16.10.0-preview2' + # 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' if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr } @@ -407,13 +403,9 @@ 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 - Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath - }) - + 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 } @@ -450,9 +442,27 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir Write-Host 'Downloading vswhere' - Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe - }) + $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." + } + } } if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } @@ -488,7 +498,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 @@ -545,7 +555,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 @@ -702,10 +712,7 @@ function MSBuild-Core() { } foreach ($arg in $args) { - if ($null -ne $arg -and $arg.Trim() -ne "") { - if ($arg.EndsWith('\')) { - $arg = $arg + "\" - } + if ($arg -ne $null -and $arg.Trim() -ne "") { $cmdArgs += " `"$arg`"" } } @@ -777,7 +784,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 05ca99c6b28..5fad1846e5a 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -485,14 +485,13 @@ _script_dir=`dirname "$_ResolvePath"` eng_root=`cd -P "$_script_dir/.." && pwd` repo_root=`cd -P "$_script_dir/../.." && pwd` -repo_root="${repo_root}/" -artifacts_dir="${repo_root}artifacts" +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 @@ -505,7 +504,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 df8f7ead637..2c9110deb81 100644 --- a/global.json +++ b/global.json @@ -12,13 +12,13 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21311.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21304.1", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21311.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21311.3", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21311.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21304.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21304.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21304.1", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21314.1" + "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21307.1" } } -- GitLab