From 0cf42046494634dd3ae340f3bcb267c802fa12ec Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Tue, 18 Aug 2020 00:08:45 +0000 Subject: [PATCH 1/3] Merged PR 12343: Fix paths for nuget package release Fix paths for nuget package release --- .../azureDevOps/templates/release-ReleaseToNuGet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml b/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml index dd8404f5dce..422603dd930 100644 --- a/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml +++ b/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml @@ -8,20 +8,20 @@ steps: - pwsh: | #Exclude all global tool packages. Their names start with 'PowerShell.' - Copy-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/*.nupkg" -Destination "$(Pipeline.Workspace)/release" -Exclude "PowerShell.*.nupkg" -Force + Copy-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/*.nupkg" -Destination "$(Pipeline.Workspace)/release" -Exclude "PowerShell.*.nupkg" -Force -Verbose $releaseVersion = Get-Content "$ENV:PIPELINE_WORKSPACE/releasePipeline/metadata/release.json" | ConvertFrom-Json | Select-Object -ExpandProperty 'ReleaseVersion' $globalToolPath = "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/PowerShell.$releaseVersion.nupkg" ### -WhatIf to make sure we do not release global tool. Remove -WhatIf when the PowerShell name reservation is done. Copy-Item $globalToolPath -Destination "$(Pipeline.Workspace)/release" -WhatIf - Get-ChildItem "$(Pipeline.Workspace)" + Get-ChildItem "$(Pipeline.Workspace)/release" -recurse displayName: Download and capture nupkgs - task: NuGetCommand@2 displayName: 'NuGet push' inputs: command: push - packagesToPush: '$(Agent.ReleaseDirectory)/*.nupkg' + packagesToPush: '$(Pipeline.Workspace)/release/*.nupkg' nuGetFeedType: external publishFeedCredentials: PowerShellNuGetOrgPush From f495cacff3bc97ec13d31003755802e6f491fcec Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Tue, 18 Aug 2020 00:17:30 +0000 Subject: [PATCH 2/3] Merged PR 12344: Fix typo in package name for pwsh.deps.json upload task Fix typo in package name for pwsh.deps.json upload task --- .../azureDevOps/templates/release-UpdateDepsJson.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml index 8c2b94dae12..0b483a1c9d9 100644 --- a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml +++ b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml @@ -25,7 +25,7 @@ jobs: displayName: Determine container name - pwsh: | - $zipFile = (Get-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/PowerShell*-winx64.zip") + $zipFile = (Get-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/PowerShell*-win-x64.zip") Expand-Archive -Path $zipFile -Destination "$ENV:PIPELINE_WORKSPACE/expanded" $pwshDepsFile = Get-Item "$ENV:PIPELINE_WORKSPACE/expanded/pwsh.deps.json" From e0738c1ebcc0b382be3dcc7240d952f3abaf4580 Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Tue, 18 Aug 2020 00:33:57 +0000 Subject: [PATCH 3/3] Merged PR 12345: Fix blobprefix and nuget package path Fix blobprefix and nuget package path --- .../azureDevOps/templates/release-ReleaseToNuGet.yml | 1 + .../azureDevOps/templates/release-UpdateDepsJson.yml | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml b/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml index 422603dd930..a77b0203b4f 100644 --- a/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml +++ b/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml @@ -8,6 +8,7 @@ steps: - pwsh: | #Exclude all global tool packages. Their names start with 'PowerShell.' + $null = New-Item -ItemType Directory -Path "$(Pipeline.Workspace)/release" Copy-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/*.nupkg" -Destination "$(Pipeline.Workspace)/release" -Exclude "PowerShell.*.nupkg" -Force -Verbose $releaseVersion = Get-Content "$ENV:PIPELINE_WORKSPACE/releasePipeline/metadata/release.json" | ConvertFrom-Json | Select-Object -ExpandProperty 'ReleaseVersion' diff --git a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml index 0b483a1c9d9..0d2f0df315e 100644 --- a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml +++ b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml @@ -20,7 +20,8 @@ jobs: throw "Unexpected fileName: $fileName" } - $vstsCommand = "vso[task.setvariable variable=ContainerName]$fileName" + $vstsCommand = "vso[task.setvariable variable=BlobPrefix]$fileName" + Write-Verbose -Verbose $vstsCommand Write-Host "##$vstsCommand" displayName: Determine container name @@ -30,6 +31,7 @@ jobs: $pwshDepsFile = Get-Item "$ENV:PIPELINE_WORKSPACE/expanded/pwsh.deps.json" $vstsCommand = "vso[task.setvariable variable=FileToUpload]$pwshDepsFile" + Write-Verbose -Verbose $vstsCommand Write-Host "##$vstsCommand" displayName: Determine file to upload @@ -41,3 +43,4 @@ jobs: Destination: AzureBlob storage: '$(StorageAccount)' ContainerName: ps-deps-json + blobPrefix: '$(BlobPrefix)'