Merge branch 'release/v7.5' into release/v7.5_package_references-03de3e7d4

Author: jshigetomi

.github/workflows/linux-ci.yml

@@ -64,7 +64,7 @@ jobs:
 
   ci_build:
     name: Build PowerShell
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: changes
     if: ${{ needs.changes.outputs.source == 'true' }}
     steps:
@@ -81,7 +81,7 @@ jobs:
       - ci_build
       - changes
     if: ${{ needs.changes.outputs.source == 'true' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: checkout
         uses: actions/[email protected]
@@ -98,7 +98,7 @@ jobs:
       - ci_build
       - changes
     if: ${{ needs.changes.outputs.source == 'true' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: checkout
         uses: actions/[email protected]
@@ -115,7 +115,7 @@ jobs:
       - ci_build
       - changes
     if: ${{ needs.changes.outputs.source == 'true' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: checkout
         uses: actions/[email protected]
@@ -132,7 +132,7 @@ jobs:
       - ci_build
       - changes
     if: ${{ needs.changes.outputs.source == 'true' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: checkout
         uses: actions/[email protected]

.pipelines/PowerShell-Release-Official.yml

@@ -17,8 +17,8 @@ parameters: # parameters are shown up in ADO UI in a build queue time
     displayName: Skip Signing
     type: string
     default: 'NO'
-  - name: SkipPMCPublish
-    displayName: Skip PMC Publish
+  - name: SkipPublish
+    displayName: Skip Publishing to GitHub and Nuget
     type: boolean
     default: false
   - name: SkipPSInfraInstallers
@@ -281,19 +281,21 @@ extends:
             Update and merge the changelog for the release.
             This step is required for creating GitHub draft release.
 
-    - stage: PublishGitHubRelease
-      displayName: Publish GitHub Release
-      dependsOn:
+    - stage: PublishGitHubReleaseAndNuget
+      displayName: Publish GitHub and Nuget Release
+      dependsOn: 
         - setReleaseTagAndUploadTools
         - UpdateChangeLog
       variables:
         ob_release_environment: Production
       jobs:
-      - template: /.pipelines/templates/release-githubtasks.yml@self
+      - template: /.pipelines/templates/release-githubNuget.yml@self
+        parameters:
+          skipPublish: ${{ parameters.SkipPublish }}
 
     - stage: PushGitTagAndMakeDraftPublic
       displayName: Push Git Tag and Make Draft Public
-      dependsOn: PublishGitHubRelease
+      dependsOn: PublishGitHubReleaseAndNuget
       jobs:
       - template: /.pipelines/templates/approvalJob.yml@self
         parameters:
@@ -320,18 +322,6 @@ extends:
         parameters:
           SkipPSInfraInstallers: ${{ parameters.SkipPSInfraInstallers }}
 
-    - stage: PublishNuGet
-      displayName: Publish NuGet
-      dependsOn:
-        - setReleaseTagAndUploadTools
-        - PushGitTagAndMakeDraftPublic
-      variables:
-        ob_release_environment: Production
-      jobs:
-      - template: /.pipelines/templates/release-publish-nuget.yml@self
-        parameters:
-          skipPublish: true
-
     - stage: PublishPMC
       displayName: Publish PMC
       dependsOn: PushGitTagAndMakeDraftPublic
@@ -423,8 +413,7 @@ extends:
 
     - stage: ChangesToMaster
       displayName: Ensure changes are in GH master
-      dependsOn:
-        - PublishNuGet
+      dependsOn: 
         - PublishPMC
       jobs:
       - template: /.pipelines/templates/approvalJob.yml@self
@@ -434,17 +423,6 @@ extends:
           instructions: |
             Make sure that changes README.md and metadata.json are merged into master on GitHub.
 
-    - stage: ReleaseSnap
-      displayName: Release Snap
-      dependsOn: ChangesToMaster
-      jobs:
-      - template: /.pipelines/templates/approvalJob.yml@self
-        parameters:
-          displayName: Publish Snap
-          jobName: PublishSnapJob
-          instructions: |
-            Publish Snap
-
     - stage: ReleaseToMU
       displayName: Release to MU
       dependsOn: PushGitTagAndMakeDraftPublic # This only needs the blob to be available
@@ -460,7 +438,6 @@ extends:
       dependsOn:
         - ReleaseToMU
         - ReleaseSymbols
-        - ReleaseSnap
       jobs:
       - template: /.pipelines/templates/approvalJob.yml@self
         parameters:

.pipelines/templates/release-githubtasks.yml renamed to .pipelines/templates/release-githubNuget.yml

@@ -1,3 +1,7 @@
+parameters:
+  - name: skipPublish
+    type: boolean
+
 jobs:
 - job: GithubReleaseDraft
   displayName: Create GitHub Release Draft
@@ -58,6 +62,7 @@ jobs:
     displayName: List all files in the workspace
 
   - task: PowerShell@2
+    condition: and(ne('${{ parameters.skipPublish }}', 'false'), succeeded())
     inputs:
       targetType: inline
       pwsh: true
@@ -86,3 +91,56 @@ jobs:
 
         Publish-ReleaseDraft -Tag '$(ReleaseTag)' -Name '$(ReleaseTag) Release of PowerShell' -Description $clContent -User PowerShell -Repository PowerShell  -PackageFolder "$(Pipeline.Workspace)/GitHubPackages" -Token $(GitHubReleasePat)
     displayName: Publish Release Draft
+
+- job: NuGetPublish
+  displayName: Publish to NuGet
+  condition: succeeded()
+  pool:
+    type: release
+    os: windows
+  templateContext:
+    inputs:
+      - input: pipelineArtifact
+        artifactName: drop_setReleaseTagAndUploadTools_SetTagAndTools
+      - input: pipelineArtifact
+        pipeline: PSPackagesOfficial
+        artifactName: drop_upload_upload_packages
+  variables:
+  - template: ./variable/release-shared.yml@self
+    parameters:
+      VERSION: $[ stageDependencies.setReleaseTagAndUploadTools.SetTagAndTools.outputs['OutputVersion.Version'] ]
+
+  steps:
+  - template: release-install-pwsh.yml
+
+  - pwsh: |
+      Write-Verbose -Verbose "Version: $(Version)"
+      Get-ChildItem Env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+    displayName: 'Capture Environment Variables'
+
+  - pwsh: |
+      #Exclude all global tool packages. Their names start with 'PowerShell.'
+      $null = New-Item -ItemType Directory -Path "$(Pipeline.Workspace)/release"
+      Copy-Item "$(Pipeline.Workspace)/NuGetPackages/*.nupkg" -Destination "$(Pipeline.Workspace)/release" -Exclude "PowerShell.*.nupkg" -Force -Verbose
+
+      $releaseVersion = '$(Version)'
+      $globalToolPath = "$(Pipeline.Workspace)/NuGetPackages/PowerShell.$releaseVersion.nupkg"
+
+      if ($releaseVersion -notlike '*-*') {
+          # Copy the global tool package for stable releases
+          Copy-Item $globalToolPath -Destination "$(Pipeline.Workspace)/release"
+      }
+
+      Write-Verbose -Verbose "The .nupkgs below will be pushed:"
+      Get-ChildItem "$(Pipeline.Workspace)/release" -recurse
+    displayName: Download and capture nupkgs
+    condition: and(ne('${{ parameters.skipPublish }}', 'false'), succeeded())
+
+  - task: NuGetCommand@2
+    displayName: 'NuGet push'
+    condition: and(ne('${{ parameters.skipPublish }}', 'false'), succeeded())
+    inputs:
+      command: push
+      packagesToPush: '$(Pipeline.Workspace)/release/*.nupkg'
+      nuGetFeedType: external
+      publishFeedCredentials: PowerShellNuGetOrgPush

.pipelines/templates/release-publish-nuget.yml

@@ -87,7 +87,16 @@ jobs:
         Get-Content $nugetPath
 
         # Add workaround to unblock xUnit testing see issue: https://github.com/dotnet/sdk/issues/26462
-        $dotnetPath = if ($IsWindows) { "$env:LocalAppData\Microsoft\dotnet" } else { "$env:HOME/.dotnet" }
+
+        $possibleDotnetLocation = "$env:ProgramFiles\dotnet"
+        
+        $dotnetPath = if ($IsWindows) { 
+          if (Test-Path $possibleDotnetLocation) { $possibleDotnetLocation } else { "$env:LocalAppData\Microsoft\dotnet" }
+        }
+        else {
+          "$env:HOME/.dotnet" 
+        }
+
         $env:DOTNET_ROOT = $dotnetPath
 
         dotnet --info