PowerShell · TravisEz13 · Oct 12, 2021 · Oct 1, 2021 · Oct 1, 2021 · Oct 1, 2021
@@ -1,20 +1,40 @@
 parameters:
-  pool: 'Hosted VS2017'
-  jobName: 'win_packaging'
-  architecture: 'x64'
-  channel: 'preview'
-  parentJobs: []
+  - name: pool
+    default: 'Hosted VS2017'
+  - name: jobName
+    default: 'win_packaging'
+  - name: architecture
+    default: 'x64'
+  - name: channel
+    default: 'preview'
 
 jobs:
 - job: ${{ parameters.jobName }}_${{ parameters.channel }}_${{ parameters.architecture }}
-  dependsOn:
-      ${{ parameters.parentJobs }}
+
+  variables:
+    - name: repoFolder
+      value: PowerShell
+    - name: repoPath
+      value: $(Agent.BuildDirectory)\$(repoFolder)
+    - name: complianceRepoFolder
+      value: compliance
+    - name: complianceRepoPath
+      value: $(Agent.BuildDirectory)\$(complianceRepoFolder)
+
   pool:
     name: ${{ parameters.pool }}
 
   displayName: Windows Packaging - ${{ parameters.architecture }} - ${{ parameters.channel }}
 
   steps:
+  - checkout: self
+    clean: true
+    path: $(repoFolder)
+
+  - checkout: ComplianceRepo
+    clean: true
+    path: $(complianceRepoFolder)
+
   - powershell: |
       Get-ChildItem -Path env:
     displayName: Capture environment
@@ -27,9 +47,24 @@ jobs:
       Invoke-CIInstall -SkipUser
     displayName: Bootstrap
     condition: succeeded()
+    workingDirectory: $(repoPath)
+
+  - pwsh: |
+      Import-Module .\tools\ci.psm1
+      New-CodeCoverageAndTestPackage
+      Invoke-CIFinish -Runtime win7-${{ parameters.architecture }} -channel ${{ parameters.channel }} -Stage Build
+    displayName: Build
+    workingDirectory: $(repoPath)
+
+  - template: Sbom.yml@ComplianceRepo
+    parameters:
+      BuildDropPath: '$(System.ArtifactsDirectory)/mainBuild'
+      Build_Repository_Uri: $(build.repository.uri)
+      displayName: SBOM
 
   - pwsh: |
       Import-Module .\tools\ci.psm1
       New-CodeCoverageAndTestPackage
-      Invoke-CIFinish -Runtime win7-${{ parameters.architecture }} -channel ${{ parameters.channel }}
-    displayName: Build and Test Package
+      Invoke-CIFinish -Runtime win7-${{ parameters.architecture }} -channel ${{ parameters.channel }} -Stage Package
+    displayName: Package and Test
+    workingDirectory: $(repoPath)
@@ -67,10 +67,17 @@ variables:
   - name: __SuppressAnsiEscapeSequences
     value: 1
   - group: fakeNugetKey
+  - name: SBOMGenerator_Formats
+    value: spdx:2.2
 
 resources:
-- repo: self
-  clean: true
+  repositories:
+    - repository: ComplianceRepo
+      type: github
+      endpoint: PowerShell
+      name: PowerShell/compliance
+      ref: master
+
 stages:
 - stage: PackagingWin
   displayName: Packaging for Windows

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
@@ -3057,6 +3057,16 @@
       <Component Id="cmp2EB55EB6B44F4CF186F0BAFD6B33BCD6">
         <File Id="filC629C6EFCF314F9BB78C56E0876C08EB" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.45113.dll" />
       </Component>
+      <Directory Name="_manifest" Id="dir81094D6B916B4BC8B1BA0E1DADB93A02">
+        <Directory Name="spdx_2.2" Id="dirA36413FB3A534FDF8657D62728080E9F">
+          <Component Id="cmp408A3AF905EB47ADA35FBC5A6B1465A0">
+            <File Id="fil2146848B6ACB45FCA8E9C8FEE3BECDD8" KeyPath="yes" Source="$(var.ProductSourcePath)\_manifest\spdx_2.2\manifest.spdx.json" />
+          </Component>
+        </Directory>
+      </Directory>
+      <Component Id="cmpA6276F9EAB41411AAAEC496E67A3DBAE">
+        <File Id="filC840646CDE814D33B16DA3A5BBDDC88D" KeyPath="yes" Source="$(var.ProductSourcePath)\psoptions.json" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -4042,6 +4052,8 @@
       <ComponentRef Id="cmpA75DEF5617C54DA1937CB37D5824BF79" />
       <ComponentRef Id="cmp957498053E01454DA1E21E6D7317DCD6" />
       <ComponentRef Id="cmp2EB55EB6B44F4CF186F0BAFD6B33BCD6" />
+      <ComponentRef Id="cmp408A3AF905EB47ADA35FBC5A6B1465A0" />
+      <ComponentRef Id="cmpA6276F9EAB41411AAAEC496E67A3DBAE" />
     </ComponentGroup>
   </Fragment>
 </Wix>
@@ -321,7 +321,8 @@ function Start-PSBuild {
         [string]$ReleaseTag,
         [switch]$Detailed,
         [switch]$InteractiveAuth,
-        [switch]$SkipRoslynAnalyzers
+        [switch]$SkipRoslynAnalyzers,
+        [string]$PSOptionsPath
     )
 
     if ($ReleaseTag -and $ReleaseTag -notmatch "^v\d+\.\d+\.\d+(-(preview|rc)(\.\d{1,2})?)?$") {
@@ -668,6 +669,15 @@ Fix steps:
     if ($CI) {
         Restore-PSPester -Destination (Join-Path $publishPath "Modules")
     }
+
+    if ($PSOptionsPath) {
+        $resolvedPSOptionsPath = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($PSOptionsPath)
+        $parent = Split-Path -Path $resolvedPSOptionsPath
+        if (!(Test-Path $parent)) {
+            $null = New-Item -ItemType Directory -Path $parent
+        }
+        Save-PSOptions -PSOptionsPath $PSOptionsPath -Options $Options
+    }
 }
 
 function Restore-PSPackage

@@ -1,11 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-if($PSVersionTable.PSEdition -ne 'Desktop')
-{
-    throw 'Must be run from Windows PowerShell'
-}
-
 function New-LocalUser
 {
   <#

@@ -442,111 +442,156 @@ function Invoke-CIFinish
 {
     param(
         [string] $Runtime = 'win7-x64',
-        [string] $Channel = 'preview'
+        [string] $Channel = 'preview',
+        [Validateset('Build','Package')]
+        [string[]] $Stage = ('Build','Package')
     )
 
-    if($PSEdition -eq 'Core' -and ($IsLinux -or $IsMacOS))
-    {
+    if ($PSEdition -eq 'Core' -and ($IsLinux -or $IsMacOS) -and $Stage -contains 'Build') {
         return New-LinuxPackage
     }
 
+    $artifacts = New-Object System.Collections.ArrayList
     try {
-
-        if($Channel -eq 'preview')
-        {
-            $releaseTag = Get-ReleaseTag
-
-            $previewVersion = $releaseTag.Split('-')
-            $previewPrefix = $previewVersion[0]
-            $previewLabel = $previewVersion[1].replace('.','')
-
-            if(Test-DailyBuild)
-            {
-                $previewLabel= "daily{0}" -f $previewLabel
+        $buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/mainBuild"
+
+        if ($Stage -contains "Build") {
+            if ($Channel -eq 'preview') {
+                $releaseTag = Get-ReleaseTag
+
+                $previewVersion = $releaseTag.Split('-')
+                $previewPrefix = $previewVersion[0]
+                $previewLabel = $previewVersion[1].replace('.','')
+
+                if(Test-DailyBuild)
+                {
+                    $previewLabel= "daily{0}" -f $previewLabel
+                }
+
+                $prereleaseIteration = (get-date).Day
+                $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration"
+                # Build clean before backing to remove files from testing
+                Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime -output $buildFolder -PSOptionsPath "${buildFolder}/psoptions.json"
+                $options = Get-PSOptions
+                # Remove symbol files.
+                $filter = Join-Path -Path (Split-Path $options.Output) -ChildPath '*.pdb'
+                Write-Verbose "Removing symbol files from $filter" -Verbose
+                Remove-Item $filter -Force -Recurse
+            }
+            else {
+                $releaseTag = Get-ReleaseTag
+                $releaseTagParts = $releaseTag.split('.')
+                $preReleaseVersion = $releaseTagParts[0]+ ".9.9"
+                Write-Verbose "newPSReleaseTag: $preReleaseVersion" -Verbose
+                Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime -output $buildFolder -PSOptionsPath "${buildFolder}/psoptions.json"
+                $options = Get-PSOptions
+                # Remove symbol files.
+                $filter = Join-Path -Path (Split-Path $options.Output) -ChildPath '*.pdb'
+                Write-Verbose "Removing symbol files from $filter" -Verbose
+                Remove-Item $filter -Force -Recurse
             }
 
-            $prereleaseIteration = (get-date).Day
-            $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration"
-            # Build clean before backing to remove files from testing
-            Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime
-        }
-        else {
-            $releaseTag = Get-ReleaseTag
-            $releaseTagParts = $releaseTag.split('.')
-            $preReleaseVersion = $releaseTagParts[0]+ ".9.9"
-            Write-Verbose "newPSReleaseTag: $preReleaseVersion" -Verbose
-            Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime
+            # Set a variable, both in the current process and in AzDevOps for the packaging stage to get the release tag
+            $env:CI_FINISH_RELASETAG=$preReleaseVersion
+            $vstsCommandString = "vso[task.setvariable variable=CI_FINISH_RELASETAG]$preReleaseVersion"
+            Write-Verbose -Message "$vstsCommandString" -Verbose
+            Write-Host -Object "##$vstsCommandString"
+
+            $armBuildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/releaseArm32"
+
+            # produce win-arm and win-arm64 packages if it is a daily build
+            Start-PSBuild -Restore -Runtime win-arm -PSModuleRestore -Configuration 'Release' -ReleaseTag $releaseTag -output $armBuildFolder -PSOptionsPath "${armBuildFolder}-meta/psoptions.json" -Crossgen
+            $options = Get-PSOptions
+            # Remove symbol files.
+            $filter = Join-Path -Path (Split-Path $options.Output) -ChildPath '*.pdb'
+            Write-Verbose "Removing symbol files from $filter" -Verbose
+            Remove-Item $filter -Force -Recurse
+
+            $armBuildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/releaseArm64"
+            Start-PSBuild -Restore -Runtime win-arm64 -PSModuleRestore -Configuration 'Release' -ReleaseTag $releaseTag -output $armBuildFolder -PSOptionsPath "${armBuildFolder}-meta/psoptions.json" -Crossgen
+            $options = Get-PSOptions
+            # Remove symbol files.
+            $filter = Join-Path -Path (Split-Path $options.Output) -ChildPath '*.pdb'
+            Write-Verbose "Removing symbol files from $filter" -Verbose
+            Remove-Item $filter -Force -Recurse
         }
 
-        # Build packages	            $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration"
-        $packages = Start-PSPackage -Type msi,nupkg,zip,zip-pdb -ReleaseTag $preReleaseVersion -SkipReleaseChecks -WindowsRuntime $Runtime
-
-        $artifacts = New-Object System.Collections.ArrayList
-        foreach ($package in $packages) {
-            if (Test-Path $package -ErrorAction Ignore)
-            {
-                Write-Log "Package found: $package"
-            }
-            else
-            {
-                Write-Warning -Message "Package NOT found: $package"
-            }
 
-            if($package -is [string])
-            {
-                $null = $artifacts.Add($package)
+        if ($Stage -contains "Package") {
+            Restore-PSOptions -PSOptionsPath "${buildFolder}-meta/psoptions.json"
+            $preReleaseVersion = $env:CI_FINISH_RELASETAG
+
+            # Build packages	            $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration"
+            $packages = Start-PSPackage -Type msi, nupkg, zip, zip-pdb -ReleaseTag $preReleaseVersion -SkipReleaseChecks -WindowsRuntime $Runtime
+
+            foreach ($package in $packages) {
+                if (Test-Path $package -ErrorAction Ignore)
+                {
+                    Write-Log "Package found: $package"
+                }
+                else
+                {
+                    Write-Warning -Message "Package NOT found: $package"
+                }
+
+                if($package -is [string])
+                {
+                    $null = $artifacts.Add($package)
+                }
+                elseif($package -is [pscustomobject] -and $package.psobject.Properties['msi'])
+                {
+                    $null = $artifacts.Add($package.msi)
+                    $null = $artifacts.Add($package.wixpdb)
+                }
             }
-            elseif($package -is [pscustomobject] -and $package.psobject.Properties['msi'])
-            {
-                $null = $artifacts.Add($package.msi)
-                $null = $artifacts.Add($package.wixpdb)
-            }
-        }
 
-        # the packaging tests find the MSI package using env:PSMsiX64Path
-        $env:PSMsiX64Path = $artifacts | Where-Object { $_.EndsWith(".msi")}
-        $architechture = $Runtime.Split('-')[1]
-        $exePath = New-ExePackage -ProductVersion ($preReleaseVersion -replace '^v') -ProductTargetArchitecture $architechture -MsiLocationPath $env:PSMsiX64Path
-        Write-Verbose "exe Path: $exePath" -Verbose
-        $artifacts.Add($exePath)
-        $env:PSExePath = $exePath
-        $env:PSMsiChannel = $Channel
-        $env:PSMsiRuntime = $Runtime
+            # the packaging tests find the MSI package using env:PSMsiX64Path
+            $env:PSMsiX64Path = $artifacts | Where-Object { $_.EndsWith(".msi")}
+            $architechture = $Runtime.Split('-')[1]
+            $exePath = New-ExePackage -ProductVersion ($preReleaseVersion -replace '^v') -ProductTargetArchitecture $architechture -MsiLocationPath $env:PSMsiX64Path
+            Write-Verbose "exe Path: $exePath" -Verbose
+            $artifacts.Add($exePath)
+            $env:PSExePath = $exePath
+            $env:PSMsiChannel = $Channel
+            $env:PSMsiRuntime = $Runtime
 
-        # Install the latest Pester and import it
-        $maximumPesterVersion = '4.99'
-        Install-Module Pester -Force -SkipPublisherCheck -MaximumVersion $maximumPesterVersion
-        Import-Module Pester -Force -MaximumVersion $maximumPesterVersion
+            # Install the latest Pester and import it
+            $maximumPesterVersion = '4.99'
+            Install-Module Pester -Force -SkipPublisherCheck -MaximumVersion $maximumPesterVersion
+            Import-Module Pester -Force -MaximumVersion $maximumPesterVersion
 
-        $testResultPath = Join-Path -Path $env:TEMP -ChildPath "win-package-$channel-$runtime.xml"
+            $testResultPath = Join-Path -Path $env:TEMP -ChildPath "win-package-$channel-$runtime.xml"
 
-        # start the packaging tests and get the results
-        $packagingTestResult = Invoke-Pester -Script (Join-Path $repoRoot '.\test\packaging\windows\') -PassThru -OutputFormat NUnitXml -OutputFile $testResultPath
+            # start the packaging tests and get the results
+            $packagingTestResult = Invoke-Pester -Script (Join-Path $repoRoot '.\test\packaging\windows\') -PassThru -OutputFormat NUnitXml -OutputFile $testResultPath
 
-        Publish-TestResults -Title "win-package-$channel-$runtime" -Path $testResultPath
+            Publish-TestResults -Title "win-package-$channel-$runtime" -Path $testResultPath
 
-        # fail the CI job if the tests failed, or nothing passed
-        if(-not $packagingTestResult -is [pscustomobject] -or $packagingTestResult.FailedCount -ne 0 -or $packagingTestResult.PassedCount -eq 0)
-        {
-            throw "Packaging tests failed ($($packagingTestResult.FailedCount) failed/$($packagingTestResult.PassedCount) passed)"
-        }
+            # fail the CI job if the tests failed, or nothing passed
+            if(-not $packagingTestResult -is [pscustomobject] -or $packagingTestResult.FailedCount -ne 0 -or $packagingTestResult.PassedCount -eq 0)
+            {
+                throw "Packaging tests failed ($($packagingTestResult.FailedCount) failed/$($packagingTestResult.PassedCount) passed)"
+            }
 
-        # only publish assembly nuget packages if it is a daily build and tests passed
-        if(Test-DailyBuild)
-        {
-            $nugetArtifacts = Get-ChildItem $PSScriptRoot\packaging\nugetOutput -ErrorAction SilentlyContinue -Filter *.nupkg | Select-Object -ExpandProperty FullName
-            if($nugetArtifacts)
+            # only publish assembly nuget packages if it is a daily build and tests passed
+            if(Test-DailyBuild)
             {
-                $artifacts.AddRange(@($nugetArtifacts))
+                $nugetArtifacts = Get-ChildItem $PSScriptRoot\packaging\nugetOutput -ErrorAction SilentlyContinue -Filter *.nupkg | Select-Object -ExpandProperty FullName
+                if($nugetArtifacts)
+                {
+                    $artifacts.AddRange(@($nugetArtifacts))
+                }
             }
         }
 
         # produce win-arm and win-arm64 packages if it is a daily build
-        Start-PSBuild -Restore -Runtime win-arm -PSModuleRestore -Configuration 'Release' -ReleaseTag $releaseTag
+        $armBuildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/releaseArm32"
+        Restore-PSOptions -PSOptionsPath "${armBuildFolder}-meta/psoptions.json"
         $arm32Package = Start-PSPackage -Type zip -WindowsRuntime win-arm -ReleaseTag $releaseTag -SkipReleaseChecks
         $artifacts.Add($arm32Package)
 
-        Start-PSBuild -Restore -Runtime win-arm64 -PSModuleRestore -Configuration 'Release' -ReleaseTag $releaseTag
+        $armBuildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/releaseArm64"
+        Restore-PSOptions -PSOptionsPath "${armBuildFolder}-meta/psoptions.json"
         $arm64Package = Start-PSPackage -Type zip -WindowsRuntime win-arm64 -ReleaseTag $releaseTag -SkipReleaseChecks
         $artifacts.Add($arm64Package)
     }