From ca46cb816676241d8552005f4c21844b5717e3f4 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Mon, 13 Nov 2023 15:48:10 -0800 Subject: [PATCH 1/3] Update channels.json --- tools/buildHelper/channels.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/buildHelper/channels.json b/tools/buildHelper/channels.json index c23778e5b..7052601fc 100644 --- a/tools/buildHelper/channels.json +++ b/tools/buildHelper/channels.json @@ -1,7 +1,7 @@ [ { "name": "stable", - "path": "release/7-3", + "path": "release/7-4", "pwshInstallVersion": "7", "packageTag": "" }, @@ -14,7 +14,7 @@ }, { "name": "lts", - "path": "release/7-2", + "path": "release/7-4", "tagPrefix": "lts", "pwshInstallVersion": "7-lts", "packageTag": "-lts" From a7d4bc6b4f24b3dc70b92722154f3babb6eacab5 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 15 Nov 2023 12:51:53 -0800 Subject: [PATCH 2/3] Use UriBuilder to build Uri so that we always have a ? --- .vsts-ci/releasePhase.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.vsts-ci/releasePhase.yml b/.vsts-ci/releasePhase.yml index e282c8b11..9e6afd5b8 100644 --- a/.vsts-ci/releasePhase.yml +++ b/.vsts-ci/releasePhase.yml @@ -104,7 +104,6 @@ jobs: displayName: 'docker login $(dockerHost)' condition: and( succeededOrFailed(), ne(variables['Channel'],'')) - - pwsh: | if($env:ACR -eq 'yes') { @@ -138,7 +137,9 @@ jobs: $containerName = $containerName.Replace('.', '-') $context = New-AzStorageContext -StorageAccountName $(StorageAccount) $querystring = New-AzStorageContainerSASToken -Context $context -Name $containerName -Permission r -ExpiryTime ((get-date).AddMinutes(180)) -Protocol HttpsOnly - $url = "https://$(StorageAccount).blob.core.windows.net/$querystring" + $uriBuilder = [System.UriBuilder]::new("https://$(StorageAccount).blob.core.windows.net") + $uriBuilder.Query = $querystring.ToString() + $url = $uriBuilder.ToString() Write-Host "##vso[task.setvariable variable=SasUrl;]$url" displayName: 'Set SasUrl variable' condition: and( succeededOrFailed(), ne(variables['Channel'],'')) @@ -185,7 +186,7 @@ jobs: displayName: 'docker logout' condition: and( always(), ne(variables['Channel'],'')) - - pwsh: | + - pwsh: | if($env:ACR -eq 'yes') { Write-Host 'Using ACR, will need to az logout' From ef85a57829ca7202132bd5ef8eb7a7eee1e168e2 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 15 Nov 2023 14:32:29 -0800 Subject: [PATCH 3/3] Change LTS back to 7.2 --- tools/buildHelper/channels.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/buildHelper/channels.json b/tools/buildHelper/channels.json index 7052601fc..6f611d981 100644 --- a/tools/buildHelper/channels.json +++ b/tools/buildHelper/channels.json @@ -14,7 +14,7 @@ }, { "name": "lts", - "path": "release/7-4", + "path": "release/7-2", "tagPrefix": "lts", "pwshInstallVersion": "7-lts", "packageTag": "-lts"