Update Dotnetmetadata.json to take RC2 build from .NET

.github/prquantifier.yaml

@@ -1,11 +0,0 @@
-# https://github.com/microsoft/PullRequestQuantifier/blob/main/docs/prquantifier-yaml.md
-Excluded:
-# defaults
-- '*.csproj'
-- prquantifier.yaml
-- package-lock.json
-- '*.md'
-- '*.sln'
-# autogenerated files
-- cgmanifest.json
-- assets/wix/files.wxs

.github/workflows/GHWorkflowHelper/GHWorkflowHelper.psm1

@@ -1,27 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-function Set-GWVariable {
-    param(
-        [Parameter(Mandatory = $true)]
-        [string]$Name,
-        [Parameter(Mandatory = $true)]
-        [string]$Value
-    )
-
-    Write-Verbose "Setting CI variable $Name to $Value" -Verbose
-
-    if ($env:GITHUB_ENV) {
-        "$Name=$Value" | Out-File $env:GITHUB_ENV -Append
-    }
-}
-
-function Get-GWTempPath {
-    $temp = [System.IO.Path]::GetTempPath()
-    if ($env:RUNNER_TEMP) {
-        $temp = $env:RUNNER_TEMP
-    }
-
-    Write-Verbose "Get CI Temp path: $temp" -Verbose
-    return $temp
-}

.github/workflows/daily.yml

@@ -30,16 +30,18 @@ jobs:
           git fetch --prune --unshallow --tags
       - name: Execute Update .NET script
         run: |
-          Import-Module ./.github/workflows/GHWorkflowHelper
           $currentVersion = (Get-Content .\global.json | ConvertFrom-Json).sdk.version
-          Set-GWVariable -Name OLD_VERSION -Value $currentVersion
+          Write-Verbose "OLD_VERSION=$currentVersion" -Verbose
+          "OLD_VERSION=$currentVersion" | Out-File $env:GITHUB_ENV -Append
 
           ./tools/UpdateDotnetRuntime.ps1 -UpdateMSIPackaging -UseInternalFeed
           $newVersion = (Get-Content .\global.json | ConvertFrom-Json).sdk.version
-          Set-GWVariable -Name NEW_VERSION -Value $newVersion
+          Write-Verbose "NEW_VERSION=$newVersion" -Verbose
+          "NEW_VERSION=$newVersion" | Out-File $env:GITHUB_ENV -Append
 
           if ($currentVersion -ne $newVersion) {
-            Set-GWVariable -Name CREATE_PR -Value 'true'
+            Write-Verbose "CREATE_PR=true" -Verbose
+            "CREATE_PR=true" | Out-File $env:GITHUB_ENV -Append
           }
       - name: Microsoft Teams Notifier
         uses: skitionek/notify-microsoft-teams@master
@@ -56,43 +58,5 @@ jobs:
           title: "Update .NET SDK version from `${{ env.OLD_VERSION }}` to `${{ env.NEW_VERSION }}`"
           base: master
           branch: dotnet_update
-  update-tpn:
-    name: Update Notices File
-    timeout-minutes: 15
-    runs-on: windows-latest
-    if: github.repository == 'PowerShell/PowerShell'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Update Notices file
-        run: |
-          Invoke-WebRequest -Uri https://aka.ms/pwsh-daily-tpn -OutFile ./ThirdPartyNotices.txt
-      - name: Capture Git Status
-        run: |
-          git status --short
-      - name: Check if we need to create a PR
-        run: |
-          $ErrorActionPreference = 'continue'
-          git diff --quiet ThirdPartyNotices.txt
-          $exitCode = $LASTEXITCODE
-          Write-Verbose -Message "Exit code: $exitCode" -Verbose
-          if ($LASTEXITCODE -ne 0) {
-            Import-Module ./.github/workflows/GHWorkflowHelper
-            Set-GWVariable -Name CREATE_PR -Value 'true'
-          } else {
-            Write-Verbose "No difference found.  Not creating a PR." -Verbose
-          }
-          exit 0
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
-        id: cprtpn
-        if: env.CREATE_PR == 'true'
-        with:
-          commit-message: "Update to the latest notice file"
-          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          title: "Update to the latest notice file"
-          reviewers: travisez13
-          base: master
-          draft: false
-          branch: update-cgmanifest
+
+

.github/workflows/update-cgmanifest.yml

@@ -1,57 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT license.
-
-name: Update cgmanifest
-on:
-    workflow_dispatch:
-    pull_request:
-      branches:
-      - master
-
-defaults:
-  run:
-    shell: pwsh
-
-env:
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  POWERSHELL_TELEMETRY_OPTOUT: 1
-  CGMANIFEST_PATH: ''
-  NUGET_PACKAGES: ${{ github.workspace }}\.nuget\packages
-
-jobs:
-  update-cgmanifest:
-    name: Update cgmanifest
-    timeout-minutes: 15
-    runs-on: windows-latest
-    if: github.repository == 'PowerShell/PowerShell'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Cache DotNet
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~\AppData\Local\Microsoft\dotnet
-            ${{ github.workspace }}\.nuget\packages
-          key: ${{ runner.os }}-${{ hashFiles('**\DotnetRuntimeMetadata.json') }}-${{ hashFiles('**\nuget.config') }}
-      - name: Sync tags
-        run: |
-          git fetch --prune --unshallow --tags
-      - name: Install Ships provider to deal with project.assets.json
-        run: |
-          Install-Module -Name dotnet.project.assets -force
-      - name: Bootstrap
-        run: |
-          Import-Module ./build.psm1
-          Start-PSBootStrap
-      - name: Verify cgmanifest is up to date
-        run: |
-          Import-Module ./build.psm1
-          Find-Dotnet
-          ./tools/findMissingNotices.ps1
-      - name: Upload cgmanifest
-        uses: actions/upload-artifact@v2
-        if: always() && env.CGMANIFEST_PATH != ''
-        with:
-          name: cgmanifest
-          path: ${{ env.CGMANIFEST_PATH }}

.spelling

@@ -15,7 +15,6 @@
 about_
 about_debuggers
 about_jobs
-about_Telemetry
 acl
 adamdriscoll
 add-localgroupmember
@@ -1270,7 +1269,7 @@ package.json
 jcotton42
 RPMs
 PSDesiredStateConfiguration
- - CHANGELOG/7.2.md
+ - CHANGELOG/preview.md
 Gimly
 jborean93
 mkswd
@@ -1384,32 +1383,12 @@ lselden
 SethFalco
 CodeQL
 slowy07
-rc.2.21505.57
-ThirdPartyNotices.txt
-cgmanifest.json
-buildinfo
-tar.gz
-psoptions.json
-manifest.spdx.json
-vPack
-kondratyev-nv
-v7.2.0
-cgmanifest.json
-pwsh.exe
-6.0.100-rtm.21527.11
-6.0.100-rc.2.21505.57
-ThirdPartyNotices.txt
-rtm.21527.11
  - CHANGELOG/7.0.md
 codesign
 release-BuildJson
 yml
 centos-7
 PSDesiredStateConfiguration
-NoLanguage
-createdump
-vPack
-PkgES
  - test/perf/benchmarks/README.md
 benchmarked
 BenchmarkDotNet

.vsts-ci/linux.yml

@@ -11,9 +11,9 @@ trigger:
     include:
     - '*'
     exclude:
-    - .vsts-ci/misc-analysis.yml
-    - .github/ISSUE_TEMPLATE/*
-    - .dependabot/config.yml
+    - /.vsts-ci/misc-analysis.yml
+    - /.github/ISSUE_TEMPLATE/*
+    - /.dependabot/config.yml
     - test/perf/*
 pr:
   branches:
@@ -30,14 +30,10 @@ pr:
     - .vsts-ci/misc-analysis.yml
     - .vsts-ci/windows.yml
     - .vsts-ci/windows/*
-    - cgmanifest.json
-    - LICENSE.txt
     - test/common/markdown/*
     - test/perf/*
     - tools/releaseBuild/*
     - tools/releaseBuild/azureDevOps/templates/*
-    - README.md
-    - .spelling
 
 variables:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1

.vsts-ci/mac.yml

@@ -11,10 +11,10 @@ trigger:
     include:
     - '*'
     exclude:
-    - tools/releaseBuild/**/*
-    - .vsts-ci/misc-analysis.yml
-    - .github/ISSUE_TEMPLATE/*
-    - .dependabot/config.yml
+    - /tools/releaseBuild/**/*
+    - /.vsts-ci/misc-analysis.yml
+    - /.github/ISSUE_TEMPLATE/*
+    - /.dependabot/config.yml
     - test/perf/*
 pr:
   branches:
@@ -29,17 +29,13 @@ pr:
     - .dependabot/config.yml
     - .github/ISSUE_TEMPLATE/*
     - .vsts-ci/misc-analysis.yml
-    - .vsts-ci/windows.yml
-    - .vsts-ci/windows/*
-    - cgmanifest.json
-    - LICENSE.txt
+    - /.vsts-ci/windows.yml
+    - /.vsts-ci/windows/*
     - test/common/markdown/*
     - test/perf/*
     - tools/packaging/*
     - tools/releaseBuild/*
     - tools/releaseBuild/azureDevOps/templates/*
-    - README.md
-    - .spelling
 
 variables:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -101,6 +97,10 @@ stages:
       vmImage: macOS-latest
     steps:
     - pwsh: |
+        # Remove old .NET SDKs
+        if (Test-Path -Path $HOME/.dotnet) {
+            Remove-Item $HOME/.dotnet -Recurse -Force
+        }
         Import-Module .\tools\ci.psm1
         New-CodeCoverageAndTestPackage
       displayName: CodeCoverage and Test Package

.vsts-ci/misc-analysis.yml

@@ -27,41 +27,83 @@ variables:
   - name: repoFolder
     value: PowerShell
 
-stages:
-- stage: Compliance
-  jobs:
-  - job: CI_Compliance
-    displayName: CI Compliance
+jobs:
+- job: CI_Compliance
+  displayName: CI Compliance
 
-    pool:
-      vmImage: windows-latest
+  pool:
+    vmImage: windows-latest
 
-    variables:
-      - name: repoPath
-        value: $(Agent.BuildDirectory)\$(repoFolder)
+  variables:
+    - name: repoPath
+      value: $(Agent.BuildDirectory)\$(repoFolder)
 
-    steps:
-    - checkout: self
-      clean: true
-      path: $(repoFolder)
+  steps:
+  - checkout: self
+    clean: true
+    path: $(repoFolder)
 
-    - checkout: ComplianceRepo
+  - checkout: ComplianceRepo
 
-    - template: ci-compliance.yml@ComplianceRepo
-- stage: markdown_spelling_lint
-  displayName: Markdown Spelling and Lint
-  dependsOn: []
-  jobs:
-  - template: ./misc-analysis/mdSpell.yml
-- stage: markdown_link
-  displayName: Markdown Link
-  dependsOn: []
-  jobs:
-  - template: ./misc-analysis/generateMarkdownMatrix.yml
+  - template: ci-compliance.yml@ComplianceRepo
+
+- job: Linux_CI
+  displayName: Markdown and Common Tests
+
+  pool:
+    vmImage: ubuntu-20.04
+
+  variables:
+    - name: repoPath
+      value: $(Agent.BuildDirectory)/$(repoFolder)
+
+  steps:
+  - checkout: self
+    clean: true
+    path: $(repoFolder)
+
+  - checkout: ComplianceRepo
+
+  - powershell: |
+      Get-ChildItem -Path env:
+    displayName: Capture Environment
+    condition: succeededOrFailed()
+
+  - powershell: |
+      Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
+    displayName: Install Pester
+    condition: succeededOrFailed()
+
+  - bash: |
+      curl -o- --progress-bar -L https://yarnpkg.com/install.sh | bash
+    displayName: Bootstrap Yarn
+    condition: succeededOrFailed()
+
+  - bash: |
+      sudo yarn global add markdown-spellcheck@0.11.0
+    displayName: Install mdspell
+    condition: succeededOrFailed()
+
+  - bash: |
+      mdspell '**/*.md' '!**/Pester/**/*.md' '!**/dotnet-tools/**/*.md' --ignore-numbers --ignore-acronyms --report --en-us;
+    displayName: Test Spelling in Markdown
+    condition: succeededOrFailed()
+    workingDirectory: '$(repoPath)'
+
+  - ${{ if not(contains(variables['SYSTEM.COLLECTIONURI'],'mscodehub')) }}:
+    - pwsh: |
+        Import-module ./build.psm1
+        $path = Join-Path -Path $pwd -ChildPath './commonTestResults.xml'
+        $results = invoke-pester -Script ./test/common -OutputFile $path -OutputFormat NUnitXml -PassThru
+        Write-Host "##vso[results.publish type=NUnit;mergeResults=true;runTitle=Common Tests;publishRunAttachments=true;resultFiles=$path;]"
+        if($results.TotalCount -eq 0 -or $results.FailedCount -gt 0)
+        {
+          throw "Markdown tests failed"
+        }
+      displayName: Run Common Tests
+      condition: succeededOrFailed()
+      workingDirectory: '$(repoPath)'
+
+  - template: dailyBuildCompliance.yml@ComplianceRepo
     parameters:
-      jobName: generateMatrix
-      taskName: matrixTask
-  - template: ./misc-analysis/markdown.yml
-    parameters:
-      matrix: $[ dependencies.generateMatrix.outputs['matrixTask.matrix'] ]
-      dependsOn: generateMatrix
+      sourceScanPath: '$(repoPath)'

.vsts-ci/misc-analysis/generateMarkdownMatrix.yml

@@ -1,46 +0,0 @@
-parameters:
-  - name: jobName
-  - name: taskName
-
-jobs:
-- job: ${{ parameters.jobName }}
-  displayName: Generate Markdown Matrix
-
-  pool:
-    vmImage: ubuntu-20.04
-
-  variables:
-    - name: repoPath
-      value: $(Agent.BuildDirectory)/$(repoFolder)
-
-  steps:
-  - checkout: self
-    clean: true
-    path: $(repoFolder)
-
-  - powershell: |
-      $matrix = @{}
-      $matrix += @{
-        'root' = @{
-          markdown_folder = "$(repoPath)"
-          markdown_recurse = $false
-        }
-      }
-      Get-ChildItem -path '$(repoPath)' -Directory | Foreach-Object {
-        $folder = $_
-        $matrix += @{
-          $_.Name = @{
-            markdown_folder = $_.fullName
-            markdown_recurse = $true
-          }
-        }
-      }
-
-      $matrixJson = $matrix | ConvertTo-Json -Compress
-      $variableName = "matrix"
-      $command = "vso[task.setvariable variable=$variableName;isoutput=true]$($matrixJson)"
-      Write-Verbose "sending command: '$command'"
-      Write-Host "##$command"
-    displayName: Create Matrix
-    condition: succeededOrFailed()
-    name: ${{ parameters.taskName }}

.vsts-ci/misc-analysis/markdown.yml

@@ -1,63 +0,0 @@
-parameters:
-  - name: matrix
-  - name: dependsOn
-
-jobs:
-- job: markdown
-  strategy:
-    matrix: ${{ parameters.matrix }}
-    maxParallel: 5
-
-  displayName: Markdown Link Verification
-
-  dependsOn: ${{ parameters.dependsOn }}
-
-  pool:
-    vmImage: ubuntu-20.04
-
-  variables:
-    - name: repoPath
-      value: $(Agent.BuildDirectory)/$(repoFolder)
-    - name: YARN_CACHE_FOLDER
-      value: $(Pipeline.Workspace)/.yarn
-    - name: YARN_GLOBAL_CACHE_FOLDER
-      value: $(Pipeline.Workspace)/.yarn-global
-
-  steps:
-  - checkout: self
-    clean: true
-    path: $(repoFolder)
-
-  - checkout: ComplianceRepo
-
-  - task: Cache@2
-    inputs:
-      key: '"markdown-link-check" | "$(Agent.OS)" | $(repoPath)/test/common/markdown-link/markdown-link.tests.ps1'
-      path: $(YARN_GLOBAL_CACHE_FOLDER)
-    displayName: Cache Yarn packages
-
-  - powershell: |
-      Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
-    displayName: Install Pester
-
-  - bash: |
-      curl -o- --progress-bar -L https://yarnpkg.com/install.sh | bash
-    displayName: Bootstrap Yarn
-
-  - bash: |
-      yarn config  set global-folder "$(YARN_GLOBAL_CACHE_FOLDER)"
-    displayName: Set Yarn global cache folder
-
-  - ${{ if not(contains(variables['SYSTEM.COLLECTIONURI'],'mscodehub')) }}:
-    - pwsh: |
-        Import-module ./build.psm1
-        $path = Join-Path -Path $pwd -ChildPath './commonTestResults.xml'
-        $results = invoke-pester -Script ./test/common/markdown-link -OutputFile $path -OutputFormat NUnitXml -PassThru
-        Write-Host "##vso[results.publish type=NUnit;mergeResults=true;runTitle=Markdown Link;publishRunAttachments=true;resultFiles=$path;]"
-        if($results.TotalCount -eq 0 -or $results.FailedCount -gt 0)
-        {
-          throw "Markdown tests failed"
-        }
-      displayName: Run Markdown Link Tests
-      condition: succeededOrFailed()
-      workingDirectory: '$(repoPath)'

.vsts-ci/misc-analysis/mdSpell.yml

@@ -1,56 +0,0 @@
-jobs:
-- job: markdown
-  displayName: Markdown Spelling
-
-  pool:
-    vmImage: ubuntu-20.04
-
-  variables:
-    - name: repoPath
-      value: $(Agent.BuildDirectory)/$(repoFolder)
-
-  steps:
-  - checkout: self
-    clean: true
-    path: $(repoFolder)
-
-  - checkout: ComplianceRepo
-
-  - powershell: |
-      Get-ChildItem -Path env:
-    displayName: Capture Environment
-    condition: succeededOrFailed()
-
-  - bash: |
-      curl -o- --progress-bar -L https://yarnpkg.com/install.sh | bash
-    displayName: Bootstrap Yarn
-    condition: succeededOrFailed()
-
-  - bash: |
-      sudo yarn global add markdown-spellcheck@0.11.0
-    displayName: Install mdspell
-    condition: succeededOrFailed()
-
-  - bash: |
-      mdspell '**/*.md' '!**/Pester/**/*.md' '!**/dotnet-tools/**/*.md' --ignore-numbers --ignore-acronyms --report --en-us;
-    displayName: Test Spelling in Markdown
-    condition: succeededOrFailed()
-    workingDirectory: '$(repoPath)'
-
-  - ${{ if not(contains(variables['SYSTEM.COLLECTIONURI'],'mscodehub')) }}:
-    - pwsh: |
-        Import-module ./build.psm1
-        $path = Join-Path -Path $pwd -ChildPath './commonTestResults.xml'
-        $results = invoke-pester -Script ./test/common/markdown-lint -OutputFile $path -OutputFormat NUnitXml -PassThru
-        Write-Host "##vso[results.publish type=NUnit;mergeResults=true;runTitle=Markdown Lint;publishRunAttachments=true;resultFiles=$path;]"
-        if($results.TotalCount -eq 0 -or $results.FailedCount -gt 0)
-        {
-          throw "Markdown tests failed"
-        }
-      displayName: Run Markdown Lint Tests
-      condition: succeededOrFailed()
-      workingDirectory: '$(repoPath)'
-
-  - template: dailyBuildCompliance.yml@ComplianceRepo
-    parameters:
-      sourceScanPath: '$(repoPath)'

.vsts-ci/sshremoting-tests.yml

@@ -34,8 +34,6 @@ resources:
   clean: true
 jobs:
 - job: SSHRemotingTests
-  pool:
-    vmImage: ubuntu-20.04
   container: mcr.microsoft.com/powershell/test-deps:ubuntu-18.04
   displayName: SSH Remoting Tests
 

.vsts-ci/templates/ci-build.yml

@@ -11,31 +11,38 @@ jobs:
   displayName: ${{ parameters.displayName }}
 
   steps:
-  - pwsh: |
+  - powershell: |
       Get-ChildItem -Path env:
     displayName: Capture Environment
     condition: succeededOrFailed()
 
-  - pwsh:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
+  - powershell:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
     displayName: Set Build Name for Non-PR
     condition: ne(variables['Build.Reason'], 'PullRequest')
 
   - ${{ if ne(variables['AzDevOpsFeed'], '') }}:
     - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
 
+  - pwsh: |
+      if (Test-Path -Path $HOME/.dotnet) {
+          Remove-Item $HOME/.dotnet -Recurse -Force
+      }
+    displayName: Remove Old .NET SDKs
+    condition: succeededOrFailed()
+
   - pwsh: |
       Import-Module .\tools\ci.psm1
       Invoke-CIInstall -SkipUser
     displayName: Bootstrap
     condition: succeeded()
 
-  - pwsh: |
+  - powershell: |
       Import-Module .\tools\ci.psm1
       Invoke-CIBuild
     displayName: Build
     condition: succeeded()
 
-  - pwsh: |
+  - powershell: |
       Import-Module .\tools\ci.psm1
       Restore-PSOptions
       Invoke-CIxUnit -SkipFailing

.vsts-ci/templates/nix-test.yml

@@ -33,6 +33,13 @@ jobs:
     displayName: 'Capture Artifacts Directory'
     continueOnError: true
 
+  - pwsh: |
+      if (Test-Path -Path $HOME/.dotnet) {
+          Remove-Item $HOME/.dotnet -Recurse -Force
+      }
+    displayName: Remove Old .NET SDKs
+    condition: succeededOrFailed()
+
   - pwsh: |
       Import-Module .\tools\ci.psm1
       Invoke-CIInstall -SkipUser

.vsts-ci/windows.yml

@@ -11,9 +11,9 @@ trigger:
     include:
     - '*'
     exclude:
-    - .vsts-ci/misc-analysis.yml
-    - .github/ISSUE_TEMPLATE/*
-    - .dependabot/config.yml
+    - /.vsts-ci/misc-analysis.yml
+    - /.github/ISSUE_TEMPLATE/*
+    - /.dependabot/config.yml
     - test/perf/*
 pr:
   branches:
@@ -28,15 +28,11 @@ pr:
     - .dependabot/config.yml
     - .github/ISSUE_TEMPLATE/*
     - .vsts-ci/misc-analysis.yml
-    - cgmanifest.json
-    - LICENSE.txt
     - test/common/markdown/*
     - test/perf/*
     - tools/packaging/*
     - tools/releaseBuild/*
     - tools/releaseBuild/azureDevOps/templates/*
-    - README.md
-    - .spelling
 
 variables:
   GIT_CONFIG_PARAMETERS: "'core.autocrlf=false'"

.vsts-ci/windows/templates/windows-packaging.yml

@@ -1,53 +1,25 @@
 parameters:
-  - name: pool
-    default: 'Hosted VS2017'
-  - name: jobName
-    default: 'win_packaging'
-  - name: runtimePrefix
-    default: 'win7'
-  - name: architecture
-    default: 'x64'
-  - name: channel
-    default: 'preview'
+  pool: 'Hosted VS2017'
+  jobName: 'win_packaging'
+  architecture: 'x64'
+  channel: 'preview'
+  parentJobs: []
 
 jobs:
 - job: ${{ parameters.jobName }}_${{ parameters.channel }}_${{ parameters.architecture }}
-
-  variables:
-    - name: repoFolder
-      value: PowerShell
-    - name: repoPath
-      value: $(Agent.BuildDirectory)\$(repoFolder)
-    - name: complianceRepoFolder
-      value: compliance
-    - name: complianceRepoPath
-      value: $(Agent.BuildDirectory)\$(complianceRepoFolder)
-
+  dependsOn:
+      ${{ parameters.parentJobs }}
   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
     condition: succeededOrFailed()
 
-  - pwsh: |
-      $PSVersionTable
-    displayName: Capture PowerShell Version Table
-    condition: succeededOrFailed()
-
-
   - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
 
   - pwsh: |
@@ -55,24 +27,9 @@ jobs:
       Invoke-CIInstall -SkipUser
     displayName: Bootstrap
     condition: succeeded()
-    workingDirectory: $(repoPath)
 
   - pwsh: |
       Import-Module .\tools\ci.psm1
       New-CodeCoverageAndTestPackage
-      Invoke-CIFinish -Runtime ${{ parameters.runtimePrefix }}-${{ 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 ${{ parameters.runtimePrefix }}-${{ parameters.architecture }} -channel ${{ parameters.channel }} -Stage Package
-    displayName: Package and Test
-    workingDirectory: $(repoPath)
+      Invoke-CIFinish -Runtime win7-${{ parameters.architecture }} -channel ${{ parameters.channel }}
+    displayName: Build and Test Package

.vsts-ci/windows/windows-packaging.yml

@@ -67,17 +67,10 @@ variables:
   - name: __SuppressAnsiEscapeSequences
     value: 1
   - group: fakeNugetKey
-  - name: SBOMGenerator_Formats
-    value: spdx:2.2
 
 resources:
-  repositories:
-    - repository: ComplianceRepo
-      type: github
-      endpoint: PowerShell
-      name: PowerShell/compliance
-      ref: master
-
+- repo: self
+  clean: true
 stages:
 - stage: PackagingWin
   displayName: Packaging for Windows
@@ -93,13 +86,3 @@ stages:
     parameters:
       channel: preview
       architecture: x86
-  - template: templates/windows-packaging.yml
-    parameters:
-      channel: preview
-      architecture: arm
-      runtimePrefix: win
-  - template: templates/windows-packaging.yml
-    parameters:
-      channel: preview
-      architecture: arm64
-      runtimePrefix: win

Analyzers.props

@@ -1,7 +1,7 @@
 <Project>
   <ItemGroup>
     <PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rtm.21504.2" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
   </ItemGroup>
 </Project>

CHANGELOG/7.0.md

@@ -1,45 +1,5 @@
 # 7.0 Changelog
 
-## [7.0.8] - 2021-10-14
-
-### Engine Updates and Fixes
-
-- Handle error from unauthorized access when removing `AppLocker` test files (#15881)
-- Handle error when the telemetry mutex cannot be created (#15574) (Thanks @gukoff!)
-- Configure `ApplicationInsights` to not send cloud role name (Internal 17099)
-- Disallow `Add-Type` in NoLanguage mode on a locked down machine (Internal 17521)
-
-### Tools
-
-- Add `.stylecop` to `filetypexml` and format it (#16025)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-<p>Bump .NET SDK to 3.1.414</p>
-</summary>
-
-<ul>
-<li>Update the nuget.config file used for building NuGet packages (Internal 17547)</li>
-<li>Sign the .NET <code>createdump</code> executable (#16229)</li>
-<li>Upgrade <code>set-value</code> package for markdown test (#16196)</li>
-<li>Move vPack build to 1ES Pool (#16169)</li>
-<li>Update to .NET SDK 3.1.414 (Internal 17532)</li>
-<li>Fix the macOS build by updating the pool image name (#16010)</li>
-<li>Move from PkgES hosted agents to 1ES hosted agents (#16023)</li>
-<li>Use Alpine 3.12 for building PowerShell for Alpine Linux (#16008)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Fix example nuget.config (#14349)
-
-[7.0.8]: https://github.com/PowerShell/PowerShell/compare/v7.0.7...v7.0.8
-
 ## [7.0.7] - 2021-08-12
 
 ### Build and Packaging Improvements

CHANGELOG/7.1.md

@@ -1,45 +1,5 @@
 # 7.1 Changelog
 
-## [7.1.5] - 2021-10-14
-
-### Engine Updates and Fixes
-
-- Handle error from unauthorized access when removing `AppLocker` test files (#15881)
-- Test more thoroughly whether a command is `Out-Default` for transcription scenarios (#15653)
-- Handle error when the telemetry mutex cannot be created (#15574) (Thanks @gukoff!)
-- Configure `ApplicationInsights` to not send cloud role name (Internal 17100)
-- Disallow `Add-Type` in NoLanguage mode on a locked down machine (Internal 17522)
-
-### Tools
-
-- Add `.stylecop` to `filetypexml` and format it (#16025)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-<p>Bump .NET SDK to 5.0.402</p>
-</summary>
-
-<ul>
-<li>Upgrade <code>set-value</code> package for markdown test (#16196)</li>
-<li>Sign the .NET <code>createdump</code> executable (#16229)</li>
-<li>Move vPack build to 1ES Pool (#16169)</li>
-<li>Update to .NET SDK 5.0.402 (Internal 17537)</li>
-<li>Move from PkgES hosted agents to 1ES hosted agents (#16023)</li>
-<li>Fix the macOS build by updating the pool image name (#16010)</li>
-<li>Use Alpine 3.12 for building PowerShell for Alpine Linux (#16008)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Fix example nuget.config (#14349)
-
-[7.1.5]: https://github.com/PowerShell/PowerShell/compare/v7.1.4...v7.1.5
-
 ## [7.1.4] - 2021-08-12
 
 ### Build and Packaging Improvements

DotnetRuntimeMetadata.json

@@ -1,15 +1,13 @@
 {
   "sdk": {
-    "channel": "6.0.1xx",
+    "channel": "6.0.1xx-rc2",
     "quality": "signed",
     "qualityFallback": "daily",
-    "packageVersionPattern": "6.0.0",
+    "packageVersionPattern": "6.0.0-rc.2",
     "sdkImageVersion": "6.0.100",
-    "nextChannel": "6.0.1xx",
-    "azureFeed": "",
-    "sdkImageOverride": ""
+    "nextChannel": "6.0.1xx-rc2"
   },
   "internalfeed" : {
-    "url": ""
+    "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21458.32-shipping/nuget/v2"
   }
 }

PowerShell.Common.props

@@ -138,7 +138,6 @@
     <TargetFramework>net6.0</TargetFramework>
     <LangVersion>10.0</LangVersion>
     <PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
-    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

README.md

@@ -30,19 +30,19 @@ You can download and install a PowerShell package for any of the following platf
 | -------------------------------------------| ------------------------| ------------------------| ----------------------| ------------------------------|
 | [Windows (x64)][corefx-win]                | [.msi][lts-windows-64]  | [.msi][rl-windows-64]   | [.msi][pv-windows-64] | [Instructions][in-windows]    |
 | [Windows (x86)][corefx-win]                | [.msi][lts-windows-86]  | [.msi][rl-windows-86]   | [.msi][pv-windows-86] | [Instructions][in-windows]    |
-| [Ubuntu 20.04][corefx-linux]               | [.deb][lts-deb]         | [.deb][rl-ubuntu20]     | [.deb][pv-deb]        | [Instructions][in-ubuntu20]   |
-| [Ubuntu 18.04][corefx-linux]               | [.deb][lts-deb]         | [.deb][rl-ubuntu18]     | [.deb][pv-deb]        | [Instructions][in-ubuntu18]   |
-| [Ubuntu 16.04][corefx-linux]               | [.deb][lts-deb]         | [.deb][rl-ubuntu16]     | [.deb][pv-deb]        | [Instructions][in-ubuntu16]   |
-| [Debian 9][corefx-linux]                   | [.deb][lts-deb]         | [.deb][rl-debian9]      | [.deb][pv-deb]        | [Instructions][in-deb9]       |
-| [Debian 10][corefx-linux]                  | [.deb][lts-deb]         | [.deb][rl-debian10]     | [.deb][pv-deb]        | [Instructions][in-deb9]       |
-| [Debian 11][corefx-linux]                  | [.deb][lts-deb]         | [.deb][rl-debian11]     | [.deb][pv-deb]        |                               |
-| [CentOS 7][corefx-linux]                   | [.rpm][lts-rh]          | [.rpm][rl-centos]       | [.rpm][pv-rpm]        | [Instructions][in-centos]     |
-| [CentOS 8][corefx-linux]                   | [.rpm][lts-rh]          | [.rpm][rl-centos8]      | [.rpm][pv-rpm]        |                               |
-| [Red Hat Enterprise Linux 7][corefx-linux] | [.rpm][lts-rh]          | [.rpm][rl-centos]       | [.rpm][pv-rpm]        | [Instructions][in-rhel7]      |
-| [openSUSE 42.3][corefx-linux]              | [.rpm][lts-rh]          | [.rpm][rl-centos]       | [.rpm][pv-rpm]        | [Instructions][in-opensuse]   |
-| [Fedora 30][corefx-linux]                  | [.rpm][lts-rh]          | [.rpm][rl-centos]       | [.rpm][pv-rpm]        | [Instructions][in-fedora]     |
+| [Ubuntu 20.04][corefx-linux]               |                         | [.deb][rl-ubuntu20]     | [.deb][pv-deb]        | [Instructions][in-ubuntu20]   |
+| [Ubuntu 18.04][corefx-linux]               | [.deb][lts-ubuntu18]    | [.deb][rl-ubuntu18]     | [.deb][pv-deb]        | [Instructions][in-ubuntu18]   |
+| [Ubuntu 16.04][corefx-linux]               | [.deb][lts-ubuntu16]    | [.deb][rl-ubuntu16]     | [.deb][pv-deb]        | [Instructions][in-ubuntu16]   |
+| [Debian 9][corefx-linux]                   | [.deb][lts-debian9]     | [.deb][rl-debian9]      | [.deb][pv-deb]        | [Instructions][in-deb9]       |
+| [Debian 10][corefx-linux]                  | [.deb][lts-debian10]    | [.deb][rl-debian10]     | [.deb][pv-deb]        | [Instructions][in-deb9]       |
+| [Debian 11][corefx-linux]                  |                         | [.deb][rl-debian11]     | [.deb][pv-deb]        |                               |
+| [CentOS 7][corefx-linux]                   | [.rpm][lts-centos]      | [.rpm][rl-centos]       | [.rpm][pv-rpm]        | [Instructions][in-centos]     |
+| [CentOS 8][corefx-linux]                   | [.rpm][lts-centos8]     | [.rpm][rl-centos8]      | [.rpm][pv-rpm]        |                               |
+| [Red Hat Enterprise Linux 7][corefx-linux] | [.rpm][lts-centos]      | [.rpm][rl-centos]       | [.rpm][pv-rpm]        | [Instructions][in-rhel7]      |
+| [openSUSE 42.3][corefx-linux]              | [.rpm][lts-centos]      | [.rpm][rl-centos]       | [.rpm][pv-rpm]        | [Instructions][in-opensuse]   |
+| [Fedora 30][corefx-linux]                  | [.rpm][lts-centos]      | [.rpm][rl-centos]       | [.rpm][pv-rpm]        | [Instructions][in-fedora]     |
 | [macOS 10.13+ (x64)][corefx-macos]         | [.pkg][lts-macos]       | [.pkg][rl-macos]        | [.pkg][pv-macos]      | [Instructions][in-macos]      |
-| [macOS 10.13+ (arm64)][corefx-macos]       | [.pkg][lts-macos-arm64] | [.pkg][rl-macos-arm64]  | [.pkg][pv-macos-arm64]| [Instructions][in-macos]      |
+| [macOS 10.13+ (arm64)][corefx-macos]       |                         |                         | [.pkg][pv-macos-arm64]| [Instructions][in-macos]      |
 | Docker                                     |                         |                         |                       | [Instructions][in-docker]     |
 
 You can download and install a PowerShell package for any of the following platforms, **which are supported by the community.**
@@ -59,54 +59,55 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 | ---------------| --------------------------------------------------- | ------------------------------------------------| -----------------------------------------------|
 | Windows        | [32-bit][rl-winx86-zip]/[64-bit][rl-winx64-zip]     | [32-bit][pv-winx86-zip]/[64-bit][pv-winx64-zip] | [Instructions][in-windows-zip]                 |
 | macOS (x64)    | [64-bit][rl-macos-tar]                              | [64-bit][pv-macos-tar]                          | [Instructions][in-tar-macos]                   |
-| macOS (arm64)  | [64-bit][rl-macos-tar-arm64]                        | [64-bit][pv-macos-tar-arm64]                    | [Instructions][in-tar-macos]                   |
+| macOS (arm64)  |                                                     | [64-bit][pv-macos-tar-arm64]                    | [Instructions][in-tar-macos]                   |
 | Linux          | [64-bit][rl-linux-tar]                              | [64-bit][pv-linux-tar]                          | [Instructions][in-tar-linux]                   |
 | Windows (Arm)  | [64-bit][rl-winarm64] (preview)                     | [64-bit][pv-winarm64]                           | [Instructions][in-arm]                         |
 | Raspbian (Arm) | [32-bit][rl-arm32]/[64-bit][rl-arm64]               | [32-bit][pv-arm32]/[64-bit][pv-arm64]           | [Instructions][in-raspbian]                    |
 
-[lts-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x86.msi
-[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x64.msi
-[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-lts_7.2.0-1.deb_amd64.deb
-[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-lts-7.2.0-1.rh.x86_64.rpm
-[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-lts-7.2.0-osx-x64.pkg
-[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-lts-7.2.0-osx-arm64.pkg
+[lts-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/PowerShell-7.0.7-win-x86.msi
+[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/PowerShell-7.0.7-win-x64.msi
+[lts-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts_7.0.7-1.ubuntu.18.04_amd64.deb
+[lts-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts_7.0.7-1.ubuntu.16.04_amd64.deb
+[lts-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts_7.0.7-1.debian.9_amd64.deb
+[lts-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts_7.0.7-1.debian.10_amd64.deb
+[lts-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts-7.0.7-1.rhel.7.x86_64.rpm
+[lts-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts-7.0.7-1.centos.8.x86_64.rpm
+[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts-7.0.7-osx-x64.pkg
 
-[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x64.msi
-[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x86.msi
-[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell_7.2.0-1.deb_amd64.deb
-[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell_7.2.0-1.deb_amd64.deb
-[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell_7.2.0-1.deb_amd64.deb
-[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell_7.2.0-1.deb_amd64.deb
-[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell_7.2.0-1.deb_amd64.deb
-[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell_7.2.0-1.deb_amd64.deb
-[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-1.rh.x86_64.rpm
-[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-1.rh.x86_64.rpm
-[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-osx-x64.pkg
-[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-osx-arm64.pkg
-[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-arm64.zip
-[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x86.zip
-[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x64.zip
-[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-osx-x64.tar.gz
-[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-osx-arm64.tar.gz
-[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-linux-x64.tar.gz
-[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-linux-arm32.tar.gz
-[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-linux-arm64.tar.gz
+[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/PowerShell-7.1.4-win-x64.msi
+[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/PowerShell-7.1.4-win-x86.msi
+[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell_7.1.4-1.ubuntu.20.04_amd64.deb
+[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell_7.1.4-1.ubuntu.18.04_amd64.deb
+[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell_7.1.4-1.ubuntu.16.04_amd64.deb
+[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell_7.1.4-1.debian.9_amd64.deb
+[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell_7.1.4-1.debian.10_amd64.deb
+[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell_7.1.4-1.debian.11_amd64.deb
+[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-1.rhel.7.x86_64.rpm
+[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-1.centos.8.x86_64.rpm
+[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-osx-x64.pkg
+[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/PowerShell-7.1.4-win-arm64.zip
+[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/PowerShell-7.1.4-win-x86.zip
+[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/PowerShell-7.1.4-win-x64.zip
+[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-osx-x64.tar.gz
+[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-linux-x64.tar.gz
+[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-linux-arm32.tar.gz
+[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-linux-arm64.tar.gz
 [rl-snap]: https://snapcraft.io/powershell
 
-[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/PowerShell-7.2.0-rc.1-win-x64.msi
-[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/PowerShell-7.2.0-rc.1-win-x86.msi
-[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-preview_7.2.0-rc.1-1.deb_amd64.deb
-[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-preview-7.2.0_rc.1-1.rh.x86_64.rpm
-[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-osx-x64.pkg
-[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-osx-arm64.pkg
-[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/PowerShell-7.2.0-rc.1-win-arm64.zip
-[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/PowerShell-7.2.0-rc.1-win-x86.zip
-[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/PowerShell-7.2.0-rc.1-win-x64.zip
-[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-osx-x64.tar.gz
-[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-osx-arm64.tar.gz
-[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-linux-x64.tar.gz
-[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-linux-arm32.tar.gz
-[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-linux-arm64.tar.gz
+[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/PowerShell-7.2.0-preview.10-win-x64.msi
+[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/PowerShell-7.2.0-preview.10-win-x86.msi
+[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/powershell-preview_7.2.0-preview.10-1.deb_amd64.deb
+[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/powershell-preview-7.2.0_preview.10-1.rh.x86_64.rpm
+[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/powershell-7.2.0-preview.10-osx-x64.pkg
+[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/powershell-7.2.0-preview.10-osx-arm64.pkg
+[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/PowerShell-7.2.0-preview.10-win-arm64.zip
+[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/PowerShell-7.2.0-preview.10-win-x86.zip
+[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/PowerShell-7.2.0-preview.10-win-x64.zip
+[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/powershell-7.2.0-preview.10-osx-x64.tar.gz
+[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/powershell-7.2.0-preview.10-osx-arm64.tar.gz
+[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/powershell-7.2.0-preview.10-linux-x64.tar.gz
+[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/powershell-7.2.0-preview.10-linux-arm32.tar.gz
+[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/powershell-7.2.0-preview.10-linux-arm64.tar.gz
 [pv-snap]: https://snapcraft.io/powershell-preview
 
 [in-windows]: https://docs.microsoft.com/powershell/scripting/install/installing-powershell-core-on-windows
@@ -239,8 +240,9 @@ License: By requesting and using the Container OS Image for Windows containers,
 
 ### Telemetry
 
-Please visit our [about_Telemetry](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/about/about_telemetry)
-topic to read details about telemetry gathered by PowerShell.
+By default, PowerShell collects the OS description and the version of PowerShell (equivalent to `$PSVersionTable.OS` and `$PSVersionTable.GitCommitId`) using [Application Insights](https://azure.microsoft.com/services/application-insights/).
+To opt-out of sending telemetry, create an environment variable called `POWERSHELL_TELEMETRY_OPTOUT` set to a value of `1` before starting PowerShell from the installed location.
+The telemetry we collect falls under the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement/).
 
 ## Governance
 

assets/additionalAttributions.txt

@@ -1,42 +1,46 @@
+## Used to generate a new TPN
+## Copy this into the additional attributions fields
+## Copy everything below here, but do not include this line
 
--------------------------------------------------------------------
+---------------------------------------------
+File:  PSReadLine
+---------------------------------------------
 
--------------------------------------------------------------------
+https://github.com/lzybkr/PSReadLine
 
-Additional  -
+Copyright (c) 2013, Jason Shirk
 
--------------------------------------------------
-Microsoft.PowerShell.Archive
--------------------------------------------------
+All rights reserved.
 
-Copyright (c) 2016 Microsoft Corporation.
+BSD License
 
-The MIT License (MIT)
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+----------------------------------------------
+File:  Hashtables from ConvertFrom-json
+----------------------------------------------
 
--------------------------------------------------
-Microsoft.Management.Infrastructure.Runtime.Unix
-Microsoft.Management.Infrastructure
--------------------------------------------------
+https://stackoverflow.com/questions/22002748/hashtables-from-convertfrom-json-have-different-type-from-powershells-built-in-h
 
-Copyright (c) Microsoft Corporation
+Copyright (c) 2015 Dave Wyatt.  All rights reserved.
 
 All rights reserved.
 
@@ -48,6 +52,33 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+-------------------------------------------------
+PackageManagement
+-------------------------------------------------
+
+Copyright (c) Microsoft Corporation
+All rights reserved.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the Software), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 --------------------------------------------------------
 •	NuGet.Common
 •	NuGet.Configuration
@@ -77,116 +108,3 @@ Unless required by applicable law or agreed to in writing, software distributed
 under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
-
--------------------------------------------------
-PackageManagement
--------------------------------------------------
-
-Copyright (c) Microsoft Corporation
-All rights reserved.
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the Software), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--------------------------------------------------
-PowerShellGet
--------------------------------------------------
-
-Copyright (c) Microsoft Corporation
-
-All rights reserved.
-
-The MIT License (MIT)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----------------------------------------------
-File:  PSReadLine
----------------------------------------------
-
-https://github.com/PowerShell/PSReadLine
-
-Copyright (c) 2013, Jason Shirk
-
-All rights reserved.
-
-BSD License
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--------------------------------------------------
-ThreadJob
--------------------------------------------------
-
-Copyright (c) 2018 Paul Higinbotham
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

assets/wix/Product.wxs

@@ -361,7 +361,7 @@
         <Text><![CDATA[<a href="https://aka.ms/PowerShell-Microsoft-Update-FAQ">See the Microsoft Update FAQ</a>]]></Text>
       </Control>
       <Control Id="PrivacyLink" Type="Hyperlink" X="20" Y="210" Width="290" Height="17">
-        <Text><![CDATA[<a href="https://aka.ms/PowerShell-Microsoft-Update-Privacy-Statement">Read the Microsoft Update Privacy Statement</a>]]></Text>
+        <Text><![CDATA[<a href="https://aka.ms/PowerShell-Microsoft-Update-Privacy-Statement">Read the Microsoft Update Priacy Statement</a>]]></Text>
       </Control>
       <!-- divider and bottom buttons -->
       <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" TabSkip="yes"/>

assets/wix/files.wxs

@@ -1987,12 +1987,6 @@
         <Component Id="cmp57D197B18F1F4A6AAB704B28CF61B535">
           <File Id="fil71B3802CB88348AC888B9902212CADA2" KeyPath="yes" Source="$(var.ProductSourcePath)\cs\Microsoft.VisualBasic.Forms.resources.dll" />
         </Component>
-        <Component Id="cmp690BAC3241424F59B5D30DE0E846D03E">
-          <File Id="filDBDCB9BFFF9F425B8CF7F7A5F05D42B1" KeyPath="yes" Source="$(var.ProductSourcePath)\cs\System.Private.ServiceModel.resources.dll" />
-        </Component>
-        <Component Id="cmp5B67AE2852E04C26970FD2016CA76E07">
-          <File Id="fil42D10EBCB41B426BAFBF26BB053A9E84" KeyPath="yes" Source="$(var.ProductSourcePath)\cs\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dirEA0127D6607E68B508B9DB9CE315A2CE" Name="de">
         <Component Id="cmpF2941A91B17EEA22CD6DAB34693D9AC0">
@@ -2052,12 +2046,6 @@
         <Component Id="cmpB40EE0CC916B4928987F62F5909AE709">
           <File Id="filA21E2DDEAEAE4E0D94346C5671D9D29F" KeyPath="yes" Source="$(var.ProductSourcePath)\de\System.Windows.Forms.Primitives.resources.dll" />
         </Component>
-        <Component Id="cmpB43ED7BA30C844E2B5C38F7B747EEFDC">
-          <File Id="filE106C77258F047E8A384E1E75B7EF6B8" KeyPath="yes" Source="$(var.ProductSourcePath)\de\System.Private.ServiceModel.resources.dll" />
-        </Component>
-        <Component Id="cmp777DF202EF2542F2ACFCCF0481E8D6EE">
-          <File Id="filFCCE95BFDDD540E1AA243049872EF5D0" KeyPath="yes" Source="$(var.ProductSourcePath)\de\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir5B65D7353FBDCD17AB60A674B3FDF93B" Name="es">
         <Component Id="cmpBEB5F3CF75675537751F0D0B32125BF1">
@@ -2117,12 +2105,6 @@
         <Component Id="cmpB944176DE7924A268269903DC0B5D510">
           <File Id="filBA47C41DFB3849228624C99949FB61FC" KeyPath="yes" Source="$(var.ProductSourcePath)\es\System.Windows.Forms.Primitives.resources.dll" />
         </Component>
-        <Component Id="cmpCC4A42AA70EE4418926986F5A4B8D3FA">
-          <File Id="fil186134FCB6984F1484A8308DF4F2B917" KeyPath="yes" Source="$(var.ProductSourcePath)\es\System.Private.ServiceModel.resources.dll" />
-        </Component>
-        <Component Id="cmpF96C036EAE3B436DB096888697193FAF">
-          <File Id="fil761ECB84FAFA4674AB5712669532C569" KeyPath="yes" Source="$(var.ProductSourcePath)\es\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir23063512FA8C884E1B4F08FDF0A44516" Name="fr">
         <Component Id="cmp1DEB513A065956086898BCDACC5887B6">
@@ -2182,12 +2164,6 @@
         <Component Id="cmp7B5948A1A366409F99B871F0E772B945">
           <File Id="filCCA6A5EE7ED9459C93A8C05B0A93880F" KeyPath="yes" Source="$(var.ProductSourcePath)\fr\System.Windows.Forms.Primitives.resources.dll" />
         </Component>
-        <Component Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5">
-          <File Id="fil93C038D9EED945F5A984CF3C98EDB72B" KeyPath="yes" Source="$(var.ProductSourcePath)\fr\System.Private.ServiceModel.resources.dll" />
-        </Component>
-        <Component Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4">
-          <File Id="fil70A83BE26FCF4905B220521A6B75198D" KeyPath="yes" Source="$(var.ProductSourcePath)\fr\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir42B03840AE19D1498CC524F2B6C0389D" Name="it">
         <Component Id="cmp3EC91B8BF4282E77113321E5D1ED27B2">
@@ -2247,12 +2223,6 @@
         <Component Id="cmp28349C4ACD6D42D3967853E0A1D7DC4E">
           <File Id="filDF0828378FCA4CAC8F7DA90DC4F802CC" KeyPath="yes" Source="$(var.ProductSourcePath)\it\Microsoft.VisualBasic.Forms.resources.dll" />
         </Component>
-        <Component Id="cmp166B17F72C954B0087DF991E560B399A">
-          <File Id="fil528F0FBF10C246568FCE1F5B10E541D1" KeyPath="yes" Source="$(var.ProductSourcePath)\it\System.Private.ServiceModel.resources.dll" />
-        </Component>
-        <Component Id="cmp0173AE0CBFA44C269D93361F6C98F99B">
-          <File Id="fil3767F5D3C1264EC596A9F335355521C6" KeyPath="yes" Source="$(var.ProductSourcePath)\it\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir086D21BE309BE4C7081FC60E3524890F" Name="ja">
         <Component Id="cmp867E4E51FE7BC09AAD5D59FD76716FBC">
@@ -2312,12 +2282,6 @@
         <Component Id="cmp26335B5D1FE94E87A6B6EBD56A22C2B9">
           <File Id="filD585A7E89ACF4E4CB9DB8EAD4ACB7092" KeyPath="yes" Source="$(var.ProductSourcePath)\ja\System.Windows.Forms.Primitives.resources.dll" />
         </Component>
-        <Component Id="cmp529A2B5343FD466884FAF627E37C648D">
-          <File Id="fil265B2A6A67EF4C6E8C17BDC3AAD8F729" KeyPath="yes" Source="$(var.ProductSourcePath)\ja\System.Private.ServiceModel.resources.dll" />
-        </Component>
-        <Component Id="cmp5492F78ACB1A4391BBED371FDFC06B9E">
-          <File Id="fil54F7909E28E54B0687222DFD1D95009D" KeyPath="yes" Source="$(var.ProductSourcePath)\ja\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir43D6CAD5F3ED1060009918D06D84FB18" Name="ko">
         <Component Id="cmpAA026CCA623F0E8FB5BAE9F201C5B89D">
@@ -2377,12 +2341,6 @@
         <Component Id="cmpF4093A1E8AB94B43AB0F852EB647CE7F">
           <File Id="filCE28F42A54C24F5DA508904E60E23BBD" KeyPath="yes" Source="$(var.ProductSourcePath)\ko\System.Windows.Forms.Primitives.resources.dll" />
         </Component>
-        <Component Id="cmp4EE1633EE4864CE5B9015BF76BD31D14">
-          <File Id="fil688FE14A80204086A48DE1BDC6591EB0" KeyPath="yes" Source="$(var.ProductSourcePath)\ko\System.Private.ServiceModel.resources.dll" />
-        </Component>
-        <Component Id="cmp3B07F4E4B6034F3284288C18F4638CA7">
-          <File Id="filA52AFEA335CA41D98DB28358CE344EB5" KeyPath="yes" Source="$(var.ProductSourcePath)\ko\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dirE8201C74A7184D11233BAD63C6DB37BD" Name="pl">
         <Component Id="cmpA656A18FE14D3C8EB02C31AE474054E3">
@@ -2442,12 +2400,6 @@
         <Component Id="cmp705598FEC8EA43D7A9B239787BA5DB09">
           <File Id="filD8ECB20D015F4477ABD58505B48D02D1" KeyPath="yes" Source="$(var.ProductSourcePath)\pl\System.Windows.Forms.Primitives.resources.dll" />
         </Component>
-        <Component Id="cmpC8C68DB0DEE44CF49D98532D2C26395E">
-          <File Id="fil1959B05E9F214DCFA6670F1892EE2E7D" KeyPath="yes" Source="$(var.ProductSourcePath)\pl\System.Private.ServiceModel.resources.dll" />
-        </Component>
-        <Component Id="cmpA8A66545C44F428BB552B55EEE353BB0">
-          <File Id="filC0107BEFC31E4F9AB5037537B82D92EF" KeyPath="yes" Source="$(var.ProductSourcePath)\pl\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir47ED939BFA870848E0764E862CD6B4D7" Name="pt-BR">
         <Component Id="cmp3D20E940BDBF41630242C63011A80CE5">
@@ -2507,12 +2459,6 @@
         <Component Id="cmpFAA0CCBA17FE4E8FAE5FE4B5F679DF52">
           <File Id="fil6A42B845F64A4B2490AFFA079E0FB086" KeyPath="yes" Source="$(var.ProductSourcePath)\pt-BR\System.Windows.Forms.Primitives.resources.dll" />
         </Component>
-        <Component Id="cmpF3C18F07C6A148638CBC858EB02E3A6D">
-          <File Id="filE6672552F1EE45D3AC3021E02DB093CB" KeyPath="yes" Source="$(var.ProductSourcePath)\pt-BR\System.Private.ServiceModel.resources.dll" />
-        </Component>
-        <Component Id="cmp0C4751F9D5C14419A45F234152D21DA9">
-          <File Id="filF6E3EF23DEEF4D3BB3CA9C9D084FB607" KeyPath="yes" Source="$(var.ProductSourcePath)\pt-BR\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir37B8DFAE26D5F8E9948851F7D19F9E20" Name="ru">
         <Component Id="cmpFDCD51BD80926ABECCE27D0D66A47C8F">
@@ -2572,12 +2518,6 @@
         <Component Id="cmpA6FA5B27C61E482D8BBC5F1806D3B223">
           <File Id="filD4732A3ABFD342B890F75CCB5DE1CAE8" KeyPath="yes" Source="$(var.ProductSourcePath)\ru\System.Windows.Forms.Primitives.resources.dll" />
         </Component>
-        <Component Id="cmpBD958F4B8F9146499DE2CA6321C65F96">
-          <File Id="fil6A1EB9311FE546F69F28948794DC43BF" KeyPath="yes" Source="$(var.ProductSourcePath)\ru\System.Private.ServiceModel.resources.dll" />
-        </Component>
-        <Component Id="cmp6ADB50DF9F2D4BCA9E682AA6D1C7C03B">
-          <File Id="fil7FECA5AED84D4C84968358F2C065BBEC" KeyPath="yes" Source="$(var.ProductSourcePath)\ru\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dirA7E9CC01273A7FED89FC8D3A368E00CC" Name="tr">
         <Component Id="cmp286FCD0B19BF06446A7274672A2491CA">
@@ -2637,12 +2577,6 @@
         <Component Id="cmp10773057C33543FA93222022DEC0847D">
           <File Id="filD2D3E621E5C54C5EBF044078C9073C2B" KeyPath="yes" Source="$(var.ProductSourcePath)\tr\Microsoft.VisualBasic.Forms.resources.dll" />
         </Component>
-        <Component Id="cmp2B8239B905B146A69CD5D55A353AC131">
-          <File Id="fil618AA430D1794A45A1D2BAA2451BECB2" KeyPath="yes" Source="$(var.ProductSourcePath)\tr\System.Private.ServiceModel.resources.dll" />
-        </Component>
-        <Component Id="cmp9FCFAEB797D9475C873E21B4B5A89E28">
-          <File Id="filC4BDA69F669843EAAD7B6D8714CB1420" KeyPath="yes" Source="$(var.ProductSourcePath)\tr\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir47E993970F74AA9F393D23500827D12C" Name="zh-Hans">
         <Component Id="cmp34C4A21743AC68583599BF2B139F39F2">
@@ -2702,12 +2636,6 @@
         <Component Id="cmp33364765C98D4BE09BD26DC1E6B95B86">
           <File Id="filB57C4C58936D4A7587CEA358B1AF57C2" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hans\Microsoft.VisualBasic.Forms.resources.dll" />
         </Component>
-        <Component Id="cmp582595AE8291444E837793472E0A259C">
-          <File Id="fil7044506B31FA4130B2E375147032298D" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hans\System.Private.ServiceModel.resources.dll" />
-        </Component>
-        <Component Id="cmpF24D3B9F29F84B4D9C47577B7926FC2E">
-          <File Id="fil0AF0C0F933404EABBC94B10ED8740042" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hans\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dirB1FFB91EED6FD71EA866548CEA3A5298" Name="zh-Hant">
         <Component Id="cmpBC28FE8B65954B00AECA9C534639596D">
@@ -2767,12 +2695,6 @@
         <Component Id="cmpB9B22A80E70F414B8778B852E29D6492">
           <File Id="fil46C0F341CAB64BD390BEA73E1FE0F552" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hant\Microsoft.VisualBasic.Forms.resources.dll" />
         </Component>
-        <Component Id="cmp91C27D1766E84B8BB0F0C70888F03C2E">
-          <File Id="filC888727CE05A4A9FA0DB66EE0F15097C" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hant\System.Private.ServiceModel.resources.dll" />
-        </Component>
-        <Component Id="cmpD55F08F6CF51498E9E8551067BA57040">
-          <File Id="fil46C47F01171F45A898A7AD6A14ACE432" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hant\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Name="Schemas" Id="dir1DB5B24CC3494785974A51F28F128069">
         <Directory Name="PSMaml" Id="dirAC38B2C7629B42DC836E01F976A10EC9">
@@ -3132,27 +3054,8 @@
       <Component Id="cmp957498053E01454DA1E21E6D7317DCD6">
         <File Id="fil2AA6F0D8A51D4BB89F33F2B73AB12391" KeyPath="yes" Source="$(var.ProductSourcePath)\msquic.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>
-      <Component Id="cmp3CF3F69A352F4438B8F2F73EBBD12996">
-        <File Id="filB8F63979F96B4007BA9C0CE6BD3531D0" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Extensions.ObjectPool.dll" />
-      </Component>
-      <Component Id="cmp09155DA101E1424B98832A789E93E835">
-        <File Id="fil7D748565EBF5423A84CFC6D25D21F43C" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Bcl.AsyncInterfaces.dll" />
-      </Component>
-      <Component Id="cmp22840874A8C84AA796496634FBEBF09C">
-        <File Id="fil2067B616D1FA4B30932A0240ABE06089" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
-      </Component>
-      <Component Id="cmpFB17CABA17334B2BBA1ED6CBF757B310">
-        <File Id="fil1621E0132D2C49B89068166196075157" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.52210.dll" />
+      <Component Id="cmp2EB55EB6B44F4CF186F0BAFD6B33BCD6">
+        <File Id="filC629C6EFCF314F9BB78C56E0876C08EB" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.45113.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4138,38 +4041,7 @@
       <ComponentRef Id="cmp708913639F7A46E784CC0FA862A1A2CE" />
       <ComponentRef Id="cmpA75DEF5617C54DA1937CB37D5824BF79" />
       <ComponentRef Id="cmp957498053E01454DA1E21E6D7317DCD6" />
-      <ComponentRef Id="cmp408A3AF905EB47ADA35FBC5A6B1465A0" />
-      <ComponentRef Id="cmpA6276F9EAB41411AAAEC496E67A3DBAE" />
-      <ComponentRef Id="cmp91C27D1766E84B8BB0F0C70888F03C2E" />
-      <ComponentRef Id="cmpCC4A42AA70EE4418926986F5A4B8D3FA" />
-      <ComponentRef Id="cmp690BAC3241424F59B5D30DE0E846D03E" />
-      <ComponentRef Id="cmp3CF3F69A352F4438B8F2F73EBBD12996" />
-      <ComponentRef Id="cmp09155DA101E1424B98832A789E93E835" />
-      <ComponentRef Id="cmpC8C68DB0DEE44CF49D98532D2C26395E" />
-      <ComponentRef Id="cmpB43ED7BA30C844E2B5C38F7B747EEFDC" />
-      <ComponentRef Id="cmpF3C18F07C6A148638CBC858EB02E3A6D" />
-      <ComponentRef Id="cmp582595AE8291444E837793472E0A259C" />
-      <ComponentRef Id="cmp2B8239B905B146A69CD5D55A353AC131" />
-      <ComponentRef Id="cmpBD958F4B8F9146499DE2CA6321C65F96" />
-      <ComponentRef Id="cmp166B17F72C954B0087DF991E560B399A" />
-      <ComponentRef Id="cmp529A2B5343FD466884FAF627E37C648D" />
-      <ComponentRef Id="cmp4EE1633EE4864CE5B9015BF76BD31D14" />
-      <ComponentRef Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5" />
-      <ComponentRef Id="cmp5B67AE2852E04C26970FD2016CA76E07" />
-      <ComponentRef Id="cmp6ADB50DF9F2D4BCA9E682AA6D1C7C03B" />
-      <ComponentRef Id="cmpA8A66545C44F428BB552B55EEE353BB0" />
-      <ComponentRef Id="cmp5492F78ACB1A4391BBED371FDFC06B9E" />
-      <ComponentRef Id="cmp22840874A8C84AA796496634FBEBF09C" />
-      <ComponentRef Id="cmp0173AE0CBFA44C269D93361F6C98F99B" />
-      <ComponentRef Id="cmpFB17CABA17334B2BBA1ED6CBF757B310" />
-      <ComponentRef Id="cmpD55F08F6CF51498E9E8551067BA57040" />
-      <ComponentRef Id="cmp777DF202EF2542F2ACFCCF0481E8D6EE" />
-      <ComponentRef Id="cmpF24D3B9F29F84B4D9C47577B7926FC2E" />
-      <ComponentRef Id="cmp3B07F4E4B6034F3284288C18F4638CA7" />
-      <ComponentRef Id="cmp9FCFAEB797D9475C873E21B4B5A89E28" />
-      <ComponentRef Id="cmp0C4751F9D5C14419A45F234152D21DA9" />
-      <ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
-      <ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
+      <ComponentRef Id="cmp2EB55EB6B44F4CF186F0BAFD6B33BCD6" />
     </ComponentGroup>
   </Fragment>
 </Wix>

build.psm1

@@ -6,8 +6,6 @@ param(
     [parameter(Mandatory = $false)][switch]$SkipLinuxDistroCheck = $false
 )
 
-. "$PSScriptRoot\tools\buildCommon\startNativeExecution.ps1"
-
 Set-StrictMode -Version 3.0
 
 # On Unix paths is separated by colon
@@ -18,8 +16,6 @@ $script:Options = $null
 $dotnetMetadata = Get-Content $PSScriptRoot/DotnetRuntimeMetadata.json | ConvertFrom-Json
 $dotnetCLIChannel = $dotnetMetadata.Sdk.Channel
 $dotnetCLIQuality = $dotnetMetadata.Sdk.Quality
-$dotnetAzureFeed = $dotnetMetadata.Sdk.azureFeed
-$dotnetSDKVersionOveride = $dotnetMetadata.Sdk.sdkImageOverride
 $dotnetCLIRequiredVersion = $(Get-Content $PSScriptRoot/global.json | ConvertFrom-Json).Sdk.Version
 
 # Track if tags have been sync'ed
@@ -318,13 +314,14 @@ function Start-PSBuild {
         [ValidateSet('Debug', 'Release', 'CodeCoverage', '')] # We might need "Checked" as well
         [string]$Configuration,
 
+        [switch]$CrossGen,
+
         [ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d{1,2})?)?$")]
         [ValidateNotNullOrEmpty()]
         [string]$ReleaseTag,
         [switch]$Detailed,
         [switch]$InteractiveAuth,
-        [switch]$SkipRoslynAnalyzers,
-        [string]$PSOptionsPath
+        [switch]$SkipRoslynAnalyzers
     )
 
     if ($ReleaseTag -and $ReleaseTag -notmatch "^v\d+\.\d+\.\d+(-(preview|rc)(\.\d{1,2})?)?$") {
@@ -345,6 +342,10 @@ function Start-PSBuild {
     }
 
     if ($ForMinimalSize) {
+        if ($CrossGen) {
+            throw "Build for the minimal size requires the minimal disk footprint, so `CrossGen` is not allowed"
+        }
+
         if ($Runtime -and "linux-x64", "win7-x64", "osx-x64" -notcontains $Runtime) {
             throw "Build for the minimal size is enabled only for following runtimes: 'linux-x64', 'win7-x64', 'osx-x64'"
         }
@@ -390,8 +391,7 @@ function Start-PSBuild {
     }
 
     # Verify if the dotnet in-use is the required version
-    $dotnetCLIInstalledVersion = Get-LatestInstalledSDK
-
+    $dotnetCLIInstalledVersion = Start-NativeExecution -sb { dotnet --version } -IgnoreExitcode
     If ($dotnetCLIInstalledVersion -ne $dotnetCLIRequiredVersion) {
         Write-Warning @"
 The currently installed .NET Command Line Tools is not the required version.
@@ -413,6 +413,7 @@ Fix steps:
 
     # set output options
     $OptionsArguments = @{
+        CrossGen=$CrossGen
         Output=$Output
         Runtime=$Runtime
         Configuration=$Configuration
@@ -439,10 +440,6 @@ Fix steps:
     # Add --self-contained due to "warning NETSDK1179: One of '--self-contained' or '--no-self-contained' options are required when '--runtime' is used."
     if ($Options.Runtime -like 'fxdependent*') {
         $Arguments += "--no-self-contained"
-        # The UseAppHost = false property avoids creating ".exe" for the fxdependent packages.
-        # The ".exe" is not a cross-platform executable, but specific to the platform that it was built on.
-        # We do not need to ship that.
-        $Arguments += "/property:UseAppHost=false"
     }
     else {
         $Arguments += "--self-contained"
@@ -527,6 +524,12 @@ Fix steps:
             Write-Log -message "Run dotnet $Arguments from $PWD"
             Start-NativeExecution { dotnet $Arguments }
             Write-Log -message "PowerShell output: $($Options.Output)"
+
+            if ($CrossGen) {
+                # fxdependent package cannot be CrossGen'ed
+                Start-CrossGen -PublishPath $publishPath -Runtime $script:Options.Runtime
+                Write-Log -message "pwsh.exe with ngen binaries is available at: $($Options.Output)"
+            }
         } else {
             $globalToolSrcFolder = Resolve-Path (Join-Path $Options.Top "../Microsoft.PowerShell.GlobalTool.Shim") | Select-Object -ExpandProperty Path
 
@@ -665,15 +668,6 @@ 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
@@ -829,6 +823,8 @@ function New-PSOptions {
                      "win7-x86")]
         [string]$Runtime,
 
+        [switch]$CrossGen,
+
         # Accept a path to the output directory
         # If not null or empty, name of the executable will be appended to
         # this path, otherwise, to the default path, and then the full path
@@ -934,6 +930,7 @@ function New-PSOptions {
                 -RootInfo ([PSCustomObject]$RootInfo) `
                 -Top $Top `
                 -Runtime $Runtime `
+                -Crossgen $Crossgen.IsPresent `
                 -Configuration $Configuration `
                 -PSModuleRestore $PSModuleRestore.IsPresent `
                 -Framework $Framework `
@@ -1751,13 +1748,6 @@ function Install-Dotnet {
         [string]$FeedCredential
     )
 
-    Write-Verbose -Verbose "In install-dotnet"
-
-    # This is needed workaround for RTM pre-release build as the SDK version is always 6.0.100 after installation for every pre-release
-    if ($dotnetCLIRequiredVersion -like '6.0.100-rtm.*') {
-        $dotnetCLIRequiredVersion = '6.0.100'
-    }
-
     # This allows sudo install to be optional; needed when running in containers / as root
     # Note that when it is null, Invoke-Expression (but not &) must be used to interpolate properly
     $sudo = if (!$NoSudo) { "sudo" }
@@ -1785,12 +1775,10 @@ function Install-Dotnet {
             Write-Warning "This script only removes prior versions of dotnet for Ubuntu and OS X"
         }
 
-        Write-Verbose -Verbose "Invoking install script"
-
         # Install new dotnet 1.1.0 preview packages
         $installScript = "dotnet-install.sh"
-
-        Write-Verbose -Message "downloading install script from $installObtainUrl/$installScript ..." -Verbose
+        Start-NativeExecution {
+            Write-Verbose -Message "downloading install script from $installObtainUrl/$installScript ..." -Verbose
             & $wget $installObtainUrl/$installScript
 
             if ((Get-ChildItem "./$installScript").Length -eq 0) {
@@ -1809,16 +1797,9 @@ function Install-Dotnet {
             }
 
             if ($AzureFeed) {
-                $bashArgs += @('-AzureFeed', $AzureFeed)
+                $bashArgs += @('-AzureFeed', $AzureFeed, '-FeedCredential', $FeedCredential)
             }
 
-            if ($FeedCredential) {
-                $bashArgs += @('-FeedCredential', $FeedCredential)
-            }
-
-            $bashArgs | Out-String | Write-Verbose -Verbose
-
-        Start-NativeExecution {
             bash @bashArgs
         }
     } elseif ($environment.IsWindows) {
@@ -1841,44 +1822,35 @@ function Install-Dotnet {
             }
 
             if ($AzureFeed) {
-                $installArgs += @{AzureFeed = $AzureFeed}
+                $installArgs += @{
+                    AzureFeed       = $AzureFeed
+                    $FeedCredential = $FeedCredential
+                }
             }
 
-            if ($FeedCredential) {
-                $installArgs += @{FeedCredential = $FeedCredential}
-            }
-
-            $installArgs | Out-String | Write-Verbose -Verbose
-
             & ./$installScript @installArgs
         }
         else {
             # dotnet-install.ps1 uses APIs that are not supported in .NET Core, so we run it with Windows PowerShell
             $fullPSPath = Join-Path -Path $env:windir -ChildPath "System32\WindowsPowerShell\v1.0\powershell.exe"
             $fullDotnetInstallPath = Join-Path -Path $PWD.Path -ChildPath $installScript
-
-            if ($Version) {
-                $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version, '-Quality', $Quality)
-            }
-            elseif ($Channel) {
-                $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Channel', $Channel, '-Quality', $Quality)
-            }
-
-            if ($InstallDir) {
-                $psArgs += @('-InstallDir', $InstallDir)
-            }
-
-            if ($AzureFeed) {
-                $psArgs += @('-AzureFeed', $AzureFeed)
-            }
-
-            if ($FeedCredential) {
-                $psArgs += @('-FeedCredential', $FeedCredential)
-            }
-
-            $psArgs | Out-String | Write-Verbose -Verbose
-
             Start-NativeExecution {
+
+                if ($Version) {
+                    $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version, '-Quality', $Quality)
+                }
+                elseif ($Channel) {
+                    $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Channel', $Channel, '-Quality', $Quality)
+                }
+
+                if ($InstallDir) {
+                    $psArgs += @('-InstallDir', $InstallDir)
+                }
+
+                if ($AzureFeed) {
+                    $psArgs += @('-AzureFeed', $AzureFeed, '-FeedCredential', $FeedCredential)
+                }
+
                 & $fullPSPath @psArgs
             }
         }
@@ -1912,10 +1884,6 @@ function Start-PSBootstrap {
 
     Push-Location $PSScriptRoot/tools
 
-    if ($dotnetSDKVersionOveride) {
-        $Version = $dotnetSDKVersionOveride
-    }
-
     try {
         if ($environment.IsLinux -or $environment.IsMacOS) {
             # This allows sudo install to be optional; needed when running in containers / as root
@@ -2013,9 +1981,6 @@ function Start-PSBootstrap {
                 # Build tools
                 $Deps += "cmake"
 
-                # wget for downloading dotnet
-                $Deps += "wget"
-
                 # .NET Core required runtime libraries
                 $Deps += "openssl"
 
@@ -2023,7 +1988,7 @@ function Start-PSBootstrap {
                 # ignore exitcode, because they may be already installed
                 Start-NativeExecution ([ScriptBlock]::Create("$PackageManager install $Deps")) -IgnoreExitcode
             } elseif ($environment.IsLinux -and $environment.IsAlpine) {
-                $Deps += 'libunwind', 'libcurl', 'bash', 'cmake', 'clang', 'build-base', 'git', 'curl', 'wget'
+                $Deps += 'libunwind', 'libcurl', 'bash', 'cmake', 'clang', 'build-base', 'git', 'curl'
 
                 Start-NativeExecution {
                     Invoke-Expression "apk add $Deps"
@@ -2048,18 +2013,14 @@ function Start-PSBootstrap {
             }
         }
 
-        Write-Verbose -Verbose "Calling Find-Dotnet from Start-PSBootstrap"
-
         # Try to locate dotnet-SDK before installing it
         Find-Dotnet
 
-        Write-Verbose -Verbose "Back from calling Find-Dotnet from Start-PSBootstrap"
-
         # Install dotnet-SDK
         $dotNetExists = precheck 'dotnet' $null
         $dotNetVersion = [string]::Empty
         if($dotNetExists) {
-            $dotNetVersion = Get-LatestInstalledSDK
+            $dotNetVersion = Start-NativeExecution -sb { dotnet --version } -IgnoreExitcode
         }
 
         if(!$dotNetExists -or $dotNetVersion -ne $dotnetCLIRequiredVersion -or $Force.IsPresent) {
@@ -2074,12 +2035,6 @@ function Start-PSBootstrap {
             }
 
             $DotnetArguments = @{ Channel=$Channel; Version=$Version; NoSudo=$NoSudo }
-
-            if ($dotnetAzureFeed) {
-                $null = $DotnetArguments.Add("AzureFeed", $dotnetAzureFeed)
-                $null = $DotnetArguments.Add("FeedCredential", $null)
-            }
-
             Install-Dotnet @DotnetArguments
         }
         else {
@@ -2101,12 +2056,6 @@ function Start-PSBootstrap {
     }
 }
 
-function Get-LatestInstalledSDK {
-    Start-NativeExecution -sb {
-        dotnet --list-sdks | Select-String -Pattern '\d*.\d*.\d*(-\w*\.\d*)?' | ForEach-Object { [System.Management.Automation.SemanticVersion]::new($_.matches.value) } | Sort-Object -Descending | Select-Object -First 1
-    } -IgnoreExitcode 2> $null
-}
-
 function Start-DevPowerShell {
     [CmdletBinding(DefaultParameterSetName='ConfigurationParamSet')]
     param(
@@ -2239,29 +2188,17 @@ function Start-ResGen
 }
 
 function Find-Dotnet() {
-    Write-Verbose -Verbose "In Find-DotNet"
-
     $originalPath = $env:PATH
     $dotnetPath = if ($environment.IsWindows) { "$env:LocalAppData\Microsoft\dotnet" } else { "$env:HOME/.dotnet" }
 
-    $chosenDotNetVersion = if($dotnetSDKVersionOveride) {
-        $dotnetSDKVersionOveride
-    }
-    else {
-        $dotnetCLIRequiredVersion
-    }
-
     # If there dotnet is already in the PATH, check to see if that version of dotnet can find the required SDK
     # This is "typically" the globally installed dotnet
     if (precheck dotnet) {
         # Must run from within repo to ensure global.json can specify the required SDK version
         Push-Location $PSScriptRoot
-        $dotnetCLIInstalledVersion = Get-LatestInstalledSDK
+        $dotnetCLIInstalledVersion = Start-NativeExecution -sb { dotnet --version } -IgnoreExitcode 2> $null
         Pop-Location
-
-        Write-Verbose -Verbose "dotnetCLIInstalledVersion = $dotnetCLIInstalledVersion`nchosenDotNetVersion = $chosenDotNetVersion"
-
-        if ($dotnetCLIInstalledVersion -ne $chosenDotNetVersion) {
+        if ($dotnetCLIInstalledVersion -ne $dotnetCLIRequiredVersion) {
             Write-Warning "The 'dotnet' in the current path can't find SDK version ${dotnetCLIRequiredVersion}, prepending $dotnetPath to PATH."
             # Globally installed dotnet doesn't have the required SDK version, prepend the user local dotnet location
             $env:PATH = $dotnetPath + [IO.Path]::PathSeparator + $env:PATH
@@ -2359,6 +2296,258 @@ function script:precheck([string]$command, [string]$missedMessage) {
     }
 }
 
+# this function wraps native command Execution
+# for more information, read https://mnaoumov.wordpress.com/2015/01/11/execution-of-external-commands-in-powershell-done-right/
+function script:Start-NativeExecution
+{
+    param(
+        [scriptblock]$sb,
+        [switch]$IgnoreExitcode,
+        [switch]$VerboseOutputOnError
+    )
+    $backupEAP = $ErrorActionPreference
+    $ErrorActionPreference = "Continue"
+    try {
+        if($VerboseOutputOnError.IsPresent)
+        {
+            $output = & $sb 2>&1
+        }
+        else
+        {
+            & $sb
+        }
+
+        # note, if $sb doesn't have a native invocation, $LASTEXITCODE will
+        # point to the obsolete value
+        if ($LASTEXITCODE -ne 0 -and -not $IgnoreExitcode) {
+            if($VerboseOutputOnError.IsPresent -and $output)
+            {
+                $output | Out-String | Write-Verbose -Verbose
+            }
+
+            # Get caller location for easier debugging
+            $caller = Get-PSCallStack -ErrorAction SilentlyContinue
+            if($caller)
+            {
+                $callerLocationParts = $caller[1].Location -split ":\s*line\s*"
+                $callerFile = $callerLocationParts[0]
+                $callerLine = $callerLocationParts[1]
+
+                $errorMessage = "Execution of {$sb} by ${callerFile}: line $callerLine failed with exit code $LASTEXITCODE"
+                throw $errorMessage
+            }
+            throw "Execution of {$sb} failed with exit code $LASTEXITCODE"
+        }
+    } finally {
+        $ErrorActionPreference = $backupEAP
+    }
+}
+
+function Start-CrossGen {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory= $true)]
+        [ValidateNotNullOrEmpty()]
+        [String]
+        $PublishPath,
+
+        [Parameter(Mandatory=$true)]
+        [ValidateSet("alpine-x64",
+                     "linux-arm",
+                     "linux-arm64",
+                     "linux-x64",
+                     "osx-arm64",
+                     "osx-x64",
+                     "win-arm",
+                     "win-arm64",
+                     "win7-x64",
+                     "win7-x86")]
+        [string]
+        $Runtime
+    )
+
+    function New-CrossGenAssembly {
+        param (
+            [Parameter(Mandatory = $true)]
+            [ValidateNotNullOrEmpty()]
+            [String[]]
+            $AssemblyPath,
+
+            [Parameter(Mandatory = $true)]
+            [ValidateNotNullOrEmpty()]
+            [String]
+            $CrossgenPath,
+
+            [Parameter(Mandatory = $true)]
+            [ValidateSet("alpine-x64",
+                "linux-arm",
+                "linux-arm64",
+                "linux-x64",
+                "osx-arm64",
+                "osx-x64",
+                "win-arm",
+                "win-arm64",
+                "win7-x64",
+                "win7-x86")]
+            [string]
+            $Runtime
+        )
+
+        $platformAssembliesPath = Split-Path $AssemblyPath[0] -Parent
+
+        $targetOS, $targetArch = $Runtime -split '-'
+
+        # Special cases where OS / Arch does not conform with runtime names
+        switch ($Runtime) {
+            'alpine-x64' {
+                $targetOS = 'linux'
+                $targetArch = 'x64'
+             }
+            'win-arm' {
+                $targetOS = 'windows'
+                $targetArch = 'arm'
+            }
+            'win-arm64' {
+                $targetOS = 'windows'
+                $targetArch = 'arm64'
+            }
+            'win7-x64' {
+                $targetOS = 'windows'
+                $targetArch = 'x64'
+            }
+            'win7-x86' {
+                $targetOS = 'windows'
+                $targetArch = 'x86'
+            }
+        }
+
+        $generatePdb = $targetos -eq 'windows'
+
+        # The path to folder must end with directory separator
+        $dirSep = [System.IO.Path]::DirectorySeparatorChar
+        $platformAssembliesPath = if (-not $platformAssembliesPath.EndsWith($dirSep)) { $platformAssembliesPath + $dirSep }
+
+        Start-NativeExecution {
+            $crossgen2Params = @(
+                "-r"
+                $platformAssembliesPath
+                "--out-near-input"
+                "--single-file-compilation"
+                "-O"
+                "--targetos"
+                $targetOS
+                "--targetarch"
+                $targetArch
+            )
+
+            if ($generatePdb) {
+                $crossgen2Params += "--pdb"
+            }
+
+            $crossgen2Params += $AssemblyPath
+
+            & $CrossgenPath $crossgen2Params
+        }
+    }
+
+    if (-not (Test-Path $PublishPath)) {
+        throw "Path '$PublishPath' does not exist."
+    }
+
+    # Get the path to crossgen
+    $crossGenExe = if ($environment.IsWindows) { "crossgen2.exe" } else { "crossgen2" }
+
+    # The crossgen tool is only published for these particular runtimes
+    $crossGenRuntime = if ($environment.IsWindows) {
+        # for windows the tool architecture is the host machine architecture, so it is always x64.
+        # we can cross compile for x86, arm and arm64
+        "win-x64"
+    } else {
+        $Runtime
+    }
+
+    if (-not $crossGenRuntime) {
+        throw "crossgen is not available for this platform"
+    }
+
+    $dotnetRuntimeVersion = $script:Options.Framework -replace 'net'
+
+    # Get the CrossGen.exe for the correct runtime with the latest version
+    $crossGenPath = Get-ChildItem $script:Environment.nugetPackagesRoot $crossGenExe -Recurse | `
+                        Where-Object { $_.FullName -match $crossGenRuntime } | `
+                        Where-Object { $_.FullName -match $dotnetRuntimeVersion } | `
+                        Where-Object { (Split-Path $_.FullName -Parent).EndsWith('tools') } | `
+                        Sort-Object -Property FullName -Descending | `
+                        Select-Object -First 1 | `
+                        ForEach-Object { $_.FullName }
+    if (-not $crossGenPath) {
+        throw "Unable to find latest version of crossgen2.exe. 'Please run Start-PSBuild -Clean' first, and then try again."
+    }
+    Write-Verbose "Matched CrossGen2.exe: $crossGenPath" -Verbose
+
+    # Common assemblies used by Add-Type or assemblies with high JIT and no pdbs to crossgen
+    $commonAssembliesForAddType = @(
+        "Microsoft.CodeAnalysis.CSharp.dll"
+        "Microsoft.CodeAnalysis.dll"
+        "System.Linq.Expressions.dll"
+        "Microsoft.CSharp.dll"
+        "System.Runtime.Extensions.dll"
+        "System.Linq.dll"
+        "System.Collections.Concurrent.dll"
+        "System.Collections.dll"
+        "Newtonsoft.Json.dll"
+        "System.IO.FileSystem.dll"
+        "System.Diagnostics.Process.dll"
+        "System.Threading.Tasks.Parallel.dll"
+        "System.Security.AccessControl.dll"
+        "System.Text.Encoding.CodePages.dll"
+        "System.Private.Uri.dll"
+        "System.Threading.dll"
+        "System.Security.Principal.Windows.dll"
+        "System.Console.dll"
+        "Microsoft.Win32.Registry.dll"
+        "System.IO.Pipes.dll"
+        "System.Diagnostics.FileVersionInfo.dll"
+        "System.Collections.Specialized.dll"
+        "Microsoft.ApplicationInsights.dll"
+    )
+
+    $fullAssemblyList = $commonAssembliesForAddType
+
+    $assemblyFullPaths = @()
+    $assemblyFullPaths += foreach ($assemblyName in $fullAssemblyList) {
+        Join-Path $PublishPath $assemblyName
+    }
+
+    New-CrossGenAssembly -CrossgenPath $crossGenPath -AssemblyPath $assemblyFullPaths -Runtime $Runtime
+
+    #
+    # With the latest dotnet.exe, the default load context is only able to load TPAs, and TPA
+    # only contains IL assembly names. In order to make the default load context able to load
+    # the NI PS assemblies, we need to replace the IL PS assemblies with the corresponding NI
+    # PS assemblies, but with the same IL assembly names.
+    #
+    Write-Verbose "PowerShell Ngen assemblies have been generated. Deploying ..." -Verbose
+    foreach ($assemblyName in $fullAssemblyList) {
+
+        # Remove the IL assembly and its symbols.
+        $assemblyPath = Join-Path $PublishPath $assemblyName
+        $symbolsPath = [System.IO.Path]::ChangeExtension($assemblyPath, ".pdb")
+
+        Remove-Item $assemblyPath -Force -ErrorAction Stop
+
+        # Rename the corresponding ni.dll assembly to be the same as the IL assembly
+        $niAssemblyPath = [System.IO.Path]::ChangeExtension($assemblyPath, "ni.dll")
+        Rename-Item $niAssemblyPath $assemblyPath -Force -ErrorAction Stop
+
+        # No symbols are available for Microsoft.CodeAnalysis.CSharp.dll, Microsoft.CodeAnalysis.dll,
+        # Microsoft.CodeAnalysis.VisualBasic.dll, and Microsoft.CSharp.dll.
+        if ($commonAssembliesForAddType -notcontains $assemblyName) {
+            Remove-Item $symbolsPath -Force -ErrorAction Stop
+        }
+    }
+}
+
 # Cleans the PowerShell repo - everything but the root folder
 function Clear-PSRepo
 {
@@ -2881,6 +3070,7 @@ function Restore-PSOptions {
                     -RootInfo $options.RootInfo `
                     -Top $options.Top `
                     -Runtime $options.Runtime `
+                    -Crossgen $options.Crossgen `
                     -Configuration $options.Configuration `
                     -PSModuleRestore $options.PSModuleRestore `
                     -Framework $options.Framework `
@@ -2904,6 +3094,10 @@ function New-PSOptionsObject
         [String]
         $Runtime,
 
+        [Parameter(Mandatory)]
+        [Bool]
+        $CrossGen,
+
         [Parameter(Mandatory)]
         [String]
         $Configuration,
@@ -2932,6 +3126,7 @@ function New-PSOptionsObject
         Framework = $Framework
         Runtime = $Runtime
         Output = $Output
+        CrossGen = $CrossGen
         PSModuleRestore = $PSModuleRestore
         ForMinimalSize = $ForMinimalSize
     }

docker/tests/README.md

@@ -0,0 +1,25 @@
+# Docker tests
+
+## Windows and Linux containers
+
+The tests must be run separately on the Windows and Linux docker daemons. You can use the Linux docker daemon on Windows, but that will only test Linux containers not Windows Containers.
+
+## To building and basic behavior of the containers
+
+```PowerShell
+Invoke-Pester
+```
+
+Note: be sure to do this using both the Windows and Linux docker daemon.
+
+## To test the productions containers
+
+```PowerShell
+Invoke-Pester -Tag Behavior
+```
+
+## To test only building the containers
+
+```PowerShell
+Invoke-Pester -Tag Build
+```

docker/tests/Templates/centos7/Dockerfile

@@ -0,0 +1,23 @@
+FROM centos:7
+
+ARG PACKAGENAME
+ARG PACKAGELOCATION
+ARG PREVIEWSUFFIX=
+ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
+ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
+
+# Install dependencies
+RUN yum install -y \
+        curl \
+        glibc-locale-source \
+        git
+
+# Setup the locale
+ENV LANG en_US.UTF-8
+ENV LC_ALL $LANG
+RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
+
+RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME \
+    && yum install -y $PACKAGENAME
+RUN $TESTDOWNLOADCOMMAND
+RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"

docker/tests/Templates/debian.9/Dockerfile

@@ -0,0 +1,29 @@
+FROM debian:stretch
+
+ARG PACKAGENAME
+ARG PACKAGELOCATION
+ARG PREVIEWSUFFIX=
+ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
+ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
+
+# Install dependencies
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        apt-utils \
+        ca-certificates \
+        curl \
+        apt-transport-https \
+        locales \
+        git \
+    && apt-get clean
+
+# Setup the locale
+ENV LANG en_US.UTF-8
+ENV LC_ALL $LANG
+RUN locale-gen $LANG && update-locale
+
+RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
+RUN dpkg -i $PACKAGENAME || :
+RUN apt-get install -y -f --no-install-recommends
+RUN $TESTDOWNLOADCOMMAND
+RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"

docker/tests/Templates/fedora28/Dockerfile

@@ -0,0 +1,26 @@
+FROM fedora:28
+
+ARG PACKAGENAME
+ARG PACKAGELOCATION
+ARG PREVIEWSUFFIX=
+ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
+ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
+
+# Install dependencies
+RUN dnf install -y \
+        curl \
+        glibc-locale-source \
+        git \
+        compat-openssl10 \
+    && dnf upgrade-minimal -y --security \
+    && dnf clean all
+
+# Setup the locale
+ENV LANG en_US.UTF-8
+ENV LC_ALL $LANG
+RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
+
+RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
+RUN dnf install -y $PACKAGENAME
+RUN $TESTDOWNLOADCOMMAND
+RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"

docker/tests/Templates/fxdependent-centos7/Dockerfile

@@ -0,0 +1,31 @@
+FROM centos:7
+
+ARG PACKAGENAME
+ARG PACKAGELOCATION
+ARG PREVIEWSUFFIX=
+ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
+ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
+
+# Install dependencies
+RUN yum install -y \
+        glibc-locale-source \
+        git
+
+# Install dotnet-runtime
+RUN rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm
+RUN yum install -y \
+        dotnet-runtime-2.1
+
+# Setup the locale
+ENV LANG en_US.UTF-8
+ENV LC_ALL $LANG
+RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
+
+# Install PowerShell package
+ADD $PACKAGELOCATION/$PACKAGENAME .
+RUN mkdir -p /opt/microsoft/powershell
+RUN tar zxf $PACKAGENAME -C /opt/microsoft/powershell
+
+# Download and run tests
+RUN $TESTDOWNLOADCOMMAND
+RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"

docker/tests/Templates/fxdependent-debian.9/Dockerfile

@@ -0,0 +1,31 @@
+FROM microsoft/dotnet:2.1.7-runtime-stretch-slim
+
+ARG PACKAGENAME
+ARG PACKAGELOCATION
+ARG PREVIEWSUFFIX=
+ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
+ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
+
+# Install dependencies
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        apt-utils \
+        ca-certificates \
+        apt-transport-https \
+        locales \
+        git \
+    && apt-get clean
+
+# Setup the locale
+ENV LANG en_US.UTF-8
+ENV LC_ALL $LANG
+RUN locale-gen $LANG && update-locale
+
+# Install PowerShell package
+ADD $PACKAGELOCATION/$PACKAGENAME .
+RUN mkdir -p /opt/microsoft/powershell
+RUN tar zxf $PACKAGENAME -C /opt/microsoft/powershell
+
+# Download and run tests
+RUN $TESTDOWNLOADCOMMAND
+RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"

docker/tests/Templates/fxdependent-dotnetsdk-latest/Dockerfile

@@ -0,0 +1,31 @@
+FROM microsoft/dotnet:3.0.100-preview-sdk
+
+ARG PACKAGENAME
+ARG PACKAGELOCATION
+ARG PREVIEWSUFFIX=
+ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
+ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
+
+# Install dependencies
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        apt-utils \
+        ca-certificates \
+        apt-transport-https \
+        locales \
+        git \
+    && apt-get clean
+
+# Setup the locale
+ENV LANG en_US.UTF-8
+ENV LC_ALL $LANG
+RUN locale-gen $LANG && update-locale
+
+# Install PowerShell package
+ADD $PACKAGELOCATION/$PACKAGENAME .
+RUN mkdir -p /opt/microsoft/powershell \
+    && tar zxf $PACKAGENAME -C /opt/microsoft/powershell
+
+# Download and run tests
+RUN $TESTDOWNLOADCOMMAND
+RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"

docker/tests/Templates/fxdependent-fedora28/Dockerfile

@@ -0,0 +1,38 @@
+FROM fedora:28
+
+ARG PACKAGENAME
+ARG PACKAGELOCATION
+ARG PREVIEWSUFFIX=
+ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
+ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
+
+# Install dependencies
+RUN dnf install -y \
+        glibc-locale-source \
+        git \
+        compat-openssl10 \
+    && dnf upgrade-minimal -y --security \
+    && dnf clean all
+
+# Install dotnet-runtime
+RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc
+ADD https://packages.microsoft.com/config/fedora/27/prod.repo .
+RUN mv prod.repo /etc/yum.repos.d/microsoft-prod.repo
+RUN dnf install -y \
+        dotnet-runtime-2.1 \
+    && dnf upgrade-minimal -y --security \
+    && dnf clean all
+
+# Setup the locale
+ENV LANG en_US.UTF-8
+ENV LC_ALL $LANG
+RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
+
+# Install PowerShell package
+ADD $PACKAGELOCATION/$PACKAGENAME .
+RUN mkdir -p /opt/microsoft/powershell \
+    && tar zxf $PACKAGENAME -C /opt/microsoft/powershell
+
+# Download and run tests
+RUN $TESTDOWNLOADCOMMAND
+RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"

docker/tests/Templates/fxdependent-opensuse42.3/Dockerfile

@@ -0,0 +1,41 @@
+FROM opensuse:42.3
+
+ARG PACKAGENAME
+ARG PACKAGELOCATION
+ARG PREVIEWSUFFIX=
+ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
+ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
+
+# Install dependencies
+RUN zypper --non-interactive update --skip-interactive \
+    && zypper --non-interactive install \
+        glibc-locale \
+        glibc-i18ndata \
+        tar \
+        libunwind \
+        libicu \
+        openssl \
+        git
+
+# Install dotnet-runtime
+ADD https://packages.microsoft.com/keys/microsoft.asc .
+RUN rpmkeys --import microsoft.asc
+ADD https://packages.microsoft.com/config/opensuse/42.2/prod.repo .
+RUN mv prod.repo /etc/zypp/repos.d/microsoft-prod.repo
+RUN zypper --non-interactive update --skip-interactive \
+    && zypper --non-interactive install \
+        dotnet-runtime-2.1
+
+# Setup the locale
+ENV LANG en_US.UTF-8
+ENV LC_ALL $LANG
+RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
+
+# Install PowerShell package
+ADD $PACKAGELOCATION/$PACKAGENAME .
+RUN mkdir -p /opt/microsoft/powershell
+RUN tar zxf $PACKAGENAME -C /opt/microsoft/powershell
+
+# Download and run tests
+RUN $TESTDOWNLOADCOMMAND
+RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"

docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile

@@ -0,0 +1,39 @@
+FROM ubuntu:xenial
+
+ARG PACKAGENAME
+ARG PACKAGELOCATION
+ARG PREVIEWSUFFIX=
+ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
+ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
+
+# Install dependencies
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        apt-utils \
+        ca-certificates \
+        apt-transport-https \
+        locales \
+        git \
+    && apt-get clean
+
+# Install dotnet-runtime
+ADD https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb .
+RUN dpkg -i packages-microsoft-prod.deb
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        dotnet-runtime-2.1 \
+    && apt-get clean
+
+# Setup the locale
+ENV LANG en_US.UTF-8
+ENV LC_ALL $LANG
+RUN locale-gen $LANG && update-locale
+
+# Install PowerShell package
+ADD $PACKAGELOCATION/$PACKAGENAME .
+RUN mkdir -p /opt/microsoft/powershell \
+    && tar zxf $PACKAGENAME -C /opt/microsoft/powershell
+
+# Download and run tests
+RUN $TESTDOWNLOADCOMMAND
+RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"

docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile

@@ -0,0 +1,31 @@
+FROM microsoft/dotnet:2.1.7-runtime-bionic
+
+ARG PACKAGENAME
+ARG PACKAGELOCATION
+ARG PREVIEWSUFFIX=
+ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
+ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
+
+# Install dependencies
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        apt-utils \
+        ca-certificates \
+        apt-transport-https \
+        locales \
+        git \
+    && apt-get clean
+
+# Setup the locale
+ENV LANG en_US.UTF-8
+ENV LC_ALL $LANG
+RUN locale-gen $LANG && update-locale
+
+# Install PowerShell package
+ADD $PACKAGELOCATION/$PACKAGENAME .
+RUN mkdir -p /opt/microsoft/powershell \
+    && tar zxf $PACKAGENAME -C /opt/microsoft/powershell
+
+# Download and run tests
+RUN $TESTDOWNLOADCOMMAND
+RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"

docker/tests/Templates/opensuse42.3/Dockerfile

@@ -0,0 +1,39 @@
+FROM opensuse:42.3
+
+ARG PACKAGENAME
+ARG PACKAGELOCATION
+ARG PREVIEWSUFFIX=
+ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
+ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
+
+ARG POWERSHELL_LINKFILE=/usr/bin/pwsh
+
+# Install dependencies
+RUN zypper --non-interactive update --skip-interactive \
+    && zypper --non-interactive install \
+        glibc-locale \
+        glibc-i18ndata \
+        tar \
+        curl \
+        libunwind \
+        libicu \
+        openssl \
+        git
+
+# Setup the locale
+ENV LANG en_US.UTF-8
+ENV LC_ALL $LANG
+RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
+
+RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
+
+# Create the target folder where powershell will be placed
+RUN mkdir -p /opt/microsoft/powershell
+# Expand powershell to the target folder
+RUN tar zxf $PACKAGENAME -C /opt/microsoft/powershell
+
+# Create the symbolic link that points to powershell
+RUN ln -s /opt/microsoft/powershell/pwsh $POWERSHELL_LINKFILE
+
+RUN $TESTDOWNLOADCOMMAND
+RUN pwsh -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"

docker/tests/Templates/ubuntu16.04/Dockerfile

@@ -0,0 +1,29 @@
+FROM ubuntu:xenial
+
+ARG PACKAGENAME
+ARG PACKAGELOCATION
+ARG PREVIEWSUFFIX=
+ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
+ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
+
+# Install dependencies
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        apt-utils \
+        ca-certificates \
+        curl \
+        apt-transport-https \
+        locales \
+        git \
+    && apt-get clean
+
+# Setup the locale
+ENV LANG en_US.UTF-8
+ENV LC_ALL $LANG
+RUN locale-gen $LANG && update-locale
+
+RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
+RUN dpkg -i $PACKAGENAME || :
+RUN apt-get install -y -f --no-install-recommends
+RUN $TESTDOWNLOADCOMMAND
+RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"

docker/tests/Templates/ubuntu18.04/Dockerfile

@@ -0,0 +1,29 @@
+FROM ubuntu:bionic
+
+ARG PACKAGENAME
+ARG PACKAGELOCATION
+ARG PREVIEWSUFFIX=
+ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
+ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
+
+# Install dependencies
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        apt-utils \
+        ca-certificates \
+        curl \
+        apt-transport-https \
+        locales \
+        git \
+    && apt-get clean
+
+# Setup the locale
+ENV LANG en_US.UTF-8
+ENV LC_ALL $LANG
+RUN locale-gen $LANG && update-locale
+
+RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
+RUN dpkg -i $PACKAGENAME || :
+RUN apt-get install -y -f --no-install-recommends
+RUN $TESTDOWNLOADCOMMAND
+RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"

docker/tests/containerTestCommon.psm1

@@ -0,0 +1,370 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+$script:forcePull = $true
+# Get docker Engine OS
+function Get-DockerEngineOs
+{
+    docker info --format '{{ .OperatingSystem }}'
+}
+
+# Call Docker with appropriate result checksfunction Invoke-Docker
+function Invoke-Docker
+{
+    param(
+        [Parameter(Mandatory=$true)]
+        [string[]]
+        $Command,
+        [ValidateSet("error","warning",'ignore')]
+        $FailureAction = 'error',
+
+        [Parameter(Mandatory=$true)]
+        [string[]]
+        $Params,
+
+        [switch]
+        $PassThru,
+        [switch]
+        $SuppressHostOutput
+    )
+
+    $ErrorActionPreference = 'Continue'
+
+    # Log how we are running docker for troubleshooting issues
+    Write-Verbose "Running docker $command $params" -Verbose
+    if($SuppressHostOutput.IsPresent)
+    {
+        $result = docker $command $params 2>&1
+    }
+    else
+    {
+        &'docker' $command $params 2>&1 | Tee-Object -Variable result -ErrorAction SilentlyContinue | Out-String -Stream -ErrorAction SilentlyContinue | Write-Host -ErrorAction SilentlyContinue
+    }
+
+    $dockerExitCode = $LASTEXITCODE
+    if($PassThru.IsPresent)
+    {
+        Write-Verbose "passing through docker result$($result.length)..." -Verbose
+        return $result
+    }
+    elseif($dockerExitCode -ne 0 -and $FailureAction -eq 'error')
+    {
+        Write-Error "docker $command failed with: $result" -ErrorAction Stop
+        return $false
+    }
+    elseif($dockerExitCode -ne 0 -and $FailureAction -eq 'warning')
+    {
+        Write-Warning "docker $command failed with: $result"
+        return $false
+    }
+    elseif($dockerExitCode -ne 0)
+    {
+        return $false
+    }
+
+    return $true
+}
+
+# Return a list of Linux Container Test Cases
+function Get-LinuxContainer
+{
+    foreach($os in 'centos7','ubuntu16.04')
+    {
+        Write-Output @{
+            Name = $os
+            Path = "$PSScriptRoot/../release/$os"
+        }
+    }
+}
+
+# Return a list of Windows Container Test Cases
+function Get-WindowsContainer
+{
+    foreach($os in 'windowsservercore','nanoserver')
+    {
+        Write-Output @{
+            Name = $os
+            Path = "$PSScriptRoot/../release/$os"
+        }
+    }
+}
+
+$script:repoName = 'microsoft/powershell'
+function Get-RepoName
+{
+    return $script:repoName
+}
+
+function Set-RepoName
+{
+    param([string]$RepoName)
+
+    $script:repoName = $RepoName
+    $script:forcePull = $false
+}
+
+function Test-SkipWindows
+{
+    [bool] $canRunWindows = (Get-DockerEngineOs) -like 'Windows*'
+    return ($IsLinux -or $IsMacOS -or !$canRunWindows)
+}
+
+function Test-SkipLinux
+{
+    $os = Get-DockerEngineOs
+
+    switch -wildcard ($os)
+    {
+        '*Linux*' {
+            return $false
+        }
+        '*Mac' {
+            return $false
+        }
+        # Docker for Windows means we are running the linux kernel
+        'Docker for Windows' {
+            return $false
+        }
+        'Windows*' {
+            return $true
+        }
+        default {
+            throw "Unknown docker os '$os'"
+        }
+    }
+}
+
+function Get-TestContext
+{
+    param(
+        [ValidateSet('Linux','Windows','macOS')]
+        [string]$Type
+    )
+
+    $resultFileName = 'results.xml'
+    $logFileName = 'results.log'
+    $containerTestDrive = '/test'
+
+    # Return a windows context if the Context in Windows *AND*
+    # the current system is windows, otherwise Join-path will fail.
+    if($Type -eq 'Windows' -and $IsWindows)
+    {
+        $ContainerTestDrive = 'C:\test'
+    }
+    $resolvedTestDrive = (Resolve-Path "Testdrive:\").providerPath
+
+    return @{
+        ResolvedTestDrive = $resolvedTestDrive
+        ResolvedXmlPath = Join-Path $resolvedTestDrive -ChildPath $resultFileName
+        ResolvedLogPath = Join-Path $resolvedTestDrive -ChildPath $logFileName
+        ContainerTestDrive = $ContainerTestDrive
+        ContainerXmlPath = Join-Path $containerTestDrive -ChildPath $resultFileName
+        ContainerLogPath = Join-Path $containerTestDrive -ChildPath $logFileName
+        Type = $Type
+        ForcePull = $script:forcePull
+    }
+}
+
+function Get-ContainerPowerShellVersion
+{
+    param(
+        [HashTable] $TestContext,
+        [string] $RepoName,
+        [string] $Name
+    )
+
+    $imageTag = "${script:repoName}:${Name}"
+
+    if($TestContext.ForcePull)
+    {
+        $null=Invoke-Docker -Command 'image', 'pull' -Params $imageTag -SuppressHostOutput
+    }
+
+    $runParams = @()
+    $localVolumeName = $testContext.resolvedTestDrive
+    $runParams += '--rm'
+    if($TestContext.Type -ne 'Windows' -and $IsWindows)
+    {
+        # use a container volume on windows because host volumes are not automatic
+        $volumeName = "test-volume-" + (Get-Random -Minimum 100 -Maximum 999)
+
+        # using alpine because it's tiny
+        $null=Invoke-Docker -Command create -Params '-v', '/test', '--name', $volumeName, 'alpine' -SuppressHostOutput
+        $runParams += '--volumes-from'
+        $runParams += $volumeName
+    }
+    else {
+        $runParams += '-v'
+        $runParams += "${localVolumeName}:$($testContext.containerTestDrive)"
+    }
+
+    $runParams += $imageTag
+    $runParams += 'pwsh'
+    $runParams += '-c'
+    $runParams += ('$PSVersionTable.PSVersion.ToString() | out-string | out-file -encoding ascii -FilePath '+$testContext.containerLogPath)
+
+    $null = Invoke-Docker -Command run -Params $runParams -SuppressHostOutput
+    if($TestContext.Type -ne 'Windows' -and $IsWindows)
+    {
+        $null = Invoke-Docker -Command cp -Params "${volumeName}:$($testContext.containerLogPath)", $TestContext.ResolvedLogPath
+        $null = Invoke-Docker -Command container, rm -Params $volumeName, '--force' -SuppressHostOutput
+    }
+    return (Get-Content -Encoding Ascii $testContext.resolvedLogPath)[0]
+}
+
+# Function defines a config mapping for testing Preview packages.
+# The list of supported OS for each release can be found here:
+# https://github.com/PowerShell/PowerShell-Docs/blob/staging/reference/docs-conceptual/PowerShell-Core-Support.md#supported-platforms
+function Get-DefaultPreviewConfigForPackageValidation
+{
+    # format: <DockerfileFolderName>=<PartOfPackageFilename>
+    @{  'centos7'='rhel.7';
+        'debian.9'='debian.9';
+        'fedora28'='rhel.7';
+        'opensuse42.3'='linux-x64.tar.gz';
+        'ubuntu16.04'='ubuntu.16.04';
+        'ubuntu18.04'='ubuntu.18.04';
+        'fxdependent-centos7'='linux-x64-fxdependent.tar.gz';
+        'fxdependent-debian.9'='linux-x64-fxdependent.tar.gz';
+        'fxdependent-fedora28'='linux-x64-fxdependent.tar.gz';
+        'fxdependent-opensuse42.3'='linux-x64-fxdependent.tar.gz';
+        'fxdependent-ubuntu16.04'='linux-x64-fxdependent.tar.gz';
+        'fxdependent-ubuntu18.04'='linux-x64-fxdependent.tar.gz';
+        'fxdependent-dotnetsdk-latest'='linux-x64-fxd-dotnetsdk.tar.gz'
+    }
+}
+
+# Function defines a config mapping for testing Stable packages.
+# The list of supported OS for each release can be found here:
+# https://github.com/PowerShell/PowerShell-Docs/blob/staging/reference/docs-conceptual/PowerShell-Core-Support.md#supported-platforms
+function Get-DefaultStableConfigForPackageValidation
+{
+    # format: <DockerfileFolderName>=<PartOfPackageFilename>
+    @{  'centos7'='rhel.7';
+        'debian.9'='debian.9';
+        'opensuse42.3'='linux-x64.tar.gz';
+        'ubuntu16.04'='ubuntu.16.04';
+        'fxdependent-centos7'='linux-x64-fxdependent.tar.gz';
+        'fxdependent-debian.9'='linux-x64-fxdependent.tar.gz';
+        'fxdependent-opensuse42.3'='linux-x64-fxdependent.tar.gz';
+        'fxdependent-ubuntu16.04'='linux-x64-fxdependent.tar.gz'
+    }
+}
+
+# Returns a list of files in a specified Azure container.
+function Get-PackageNamesOnAzureBlob
+{
+    param(
+        [string]
+        $ContainerUrl,
+
+        # $SAS (shared access signature) param should include beginning '?' and trailing '&'
+        [string]
+        $SAS
+    )
+
+
+    $response = Invoke-RestMethod -Method Get -Uri $($ContainerUrl + $SAS + 'restype=container&comp=list')
+
+    $xmlResponce = [xml]$response.Substring($response.IndexOf('<EnumerationResults')) # remove some bad chars in the beginning that break XML parsing
+    ($xmlResponce.EnumerationResults.Blobs.Blob).Name
+}
+
+# This function is used for basic validation of PS packages during a release;
+# During the process Docker files are filled out and executed with Docker build;
+# During the build PS packages are downloaded onto Docker containers, installed and selected Pester tests from PowerShell Github repo are executed.
+# This function must be run on a Docker host machine in 'Linux containers' mode, such as Windows 10 server with Hyper-V role installed.
+function Test-PSPackage
+{
+    param(
+        [string]
+        [Parameter(Mandatory=$true)]
+        $PSPackageLocation, # e.g. Azure container storage url
+        [string]
+        $SAS,# $SAS (shared access signature) param should include beginning '?' and trailing '&'
+        [Hashtable]
+        $Config, # hashtable that maps packages to dockerfiles; for example see Get-DefaultConfigForPackageValidation
+        [string]
+        $TestList = "/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module",
+        [string]
+        $TestDownloadCommand = "git clone --recursive https://github.com/PowerShell/PowerShell.git",
+        [switch]
+        $Preview = $false
+    )
+
+    $PSPackageLocation = $PSPackageLocation.TrimEnd('/','\') # code below assumes there is no trailing separator in PSPackageLocation url
+    $RootFolder = Join-Path $PSScriptRoot 'Templates'
+
+
+    $packageList = Get-PackageNamesOnAzureBlob -ContainerUrl $PSPackageLocation -SAS $SAS
+    if (!$Config)
+    {
+        if ($Preview)
+        {
+            $Config = Get-DefaultPreviewConfigForPackageValidation
+        }
+        else
+        {
+            $Config = Get-DefaultStableConfigForPackageValidation
+        }
+    }
+
+    # pre-process $Config: verify build directories and packages exist
+    $map = @{}
+    foreach($kp in $Config.GetEnumerator())
+    {
+        $buildDir = Join-Path $RootFolder $kp.Key
+        $packageName = $packageList | Where-Object {$_ -like $('*'+$kp.Value+'*')}
+
+        if (-not (Test-Path $buildDir))
+        {
+            Write-Error "Directory does Not exist - $buildDir; Check `$Config parameter and '$RootFolder' folder"
+        }
+        elseif (-not ($packageName))
+        {
+            Write-Error "Can not find package that matches filter *$($kp.Value)*; Check `$Config parameter and '$PSPackageLocation'"
+        }
+        else
+        {
+            $map.Add($buildDir, $packageName)
+        }
+    }
+
+    Write-Verbose "Using configuration:" -Verbose
+    Write-Verbose ($map | Format-List | Out-String) -Verbose
+
+    $results = @{}
+    $returnValue = $true
+
+    # run builds sequentially, but don't block for errors so that configs after failed one can run
+    foreach($kp in $map.GetEnumerator())
+    {
+        $dockerDirPath = $kp.Key
+        $packageFileName = $kp.Value
+
+        $buildArgs = @()
+
+        $buildArgs += "--build-arg","PACKAGENAME=$packageFileName"
+        $buildArgs += "--build-arg","PACKAGELOCATION=$PSPackageLocation"
+        if ($Preview)
+        {
+            $buildArgs += "--build-arg","PREVIEWSUFFIX=-preview"
+        }
+        $buildArgs += "--build-arg","TESTLIST=$TestList"
+        $buildArgs += "--build-arg","TESTDOWNLOADCOMMAND=$TestDownloadCommand"
+        $buildArgs += "--no-cache"
+        $buildArgs += $dockerDirPath
+
+        $dockerResult = Invoke-Docker -Command 'build' -Params $buildArgs -FailureAction warning
+
+        $confName = Split-Path -Leaf $dockerDirPath
+        $results.Add($confName, $dockerResult)
+        if (-not $dockerResult) {$returnValue = $false}
+    }
+
+    # in the end print results for all configurations
+    Write-Verbose "Package validation results:" -Verbose
+    $results
+
+    return $returnValue
+}

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.100"
+    "version": "6.0.100-rc.1.21458.32"
   }
 }

nuget.config

@@ -2,11 +2,12 @@
 <configuration>
   <packageSources>
     <clear />
+    <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v2" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="dotnet-internal" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21430.44-shipping/nuget/v2" />
   </packageSources>
   <disabledPackageSources>
     <clear />
   </disabledPackageSources>
 </configuration>
 
-

src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj

@@ -47,7 +47,7 @@
 
   <ItemGroup>
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.1.21451.13" />
   </ItemGroup>
 
 </Project>

src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
-    <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
+    <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0-preview.2" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-6.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-4.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.1.21451.13" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.1.21451.13" />
     <PackageReference Include="NJsonSchema" Version="10.5.2" />
   </ItemGroup>
 

src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs

@@ -11,7 +11,6 @@ using System.IO;
 using System.Linq;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
-using System.Management.Automation.Security;
 using System.Reflection;
 using System.Runtime.Loader;
 using System.Security;
@@ -550,10 +549,8 @@ namespace Microsoft.PowerShell.Commands
         /// </summary>
         protected override void BeginProcessing()
         {
-            // Prevent code compilation in ConstrainedLanguage mode, or NoLanguage mode under system lock down.
-            if (SessionState.LanguageMode == PSLanguageMode.ConstrainedLanguage ||
-                (SessionState.LanguageMode == PSLanguageMode.NoLanguage && 
-                 SystemPolicy.GetSystemLockdownPolicy() == SystemEnforcementMode.Enforce))
+            // Prevent code compilation in ConstrainedLanguage mode
+            if (SessionState.LanguageMode == PSLanguageMode.ConstrainedLanguage)
             {
                 ThrowTerminatingError(
                     new ErrorRecord(

src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs

@@ -2823,14 +2823,13 @@ function Get-PSImplicitRemotingClientSideParameters
 
             $clientSideParameters = Get-PSImplicitRemotingClientSideParameters $PSBoundParameters ${8}
 
-            $scriptCmd = {{
-                & $script:InvokeCommand `
-                    @clientSideParameters `
-                    -HideComputerName `
-                    -Session (Get-PSImplicitRemotingSession -CommandName '{0}') `
-                    -Arg ('{0}', $PSBoundParameters, $positionalArguments) `
-                    -Script {{ param($name, $boundParams, $unboundParams) & $name @boundParams @unboundParams }} `
-            }}
+            $scriptCmd = {{ & $script:InvokeCommand `
+                            @clientSideParameters `
+                            -HideComputerName `
+                            -Session (Get-PSImplicitRemotingSession -CommandName '{0}') `
+                            -Arg ('{0}', $PSBoundParameters, $positionalArguments) `
+                            -Script {{ param($name, $boundParams, $unboundParams) & $name @boundParams @unboundParams }} `
+                         }}
 
             $steppablePipeline = $scriptCmd.GetSteppablePipeline($myInvocation.CommandOrigin)
             $steppablePipeline.Begin($myInvocation.ExpectingInput, $ExecutionContext)

src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs

@@ -219,7 +219,7 @@ namespace Microsoft.PowerShell.Commands
 
             if (s_inputFieldRegex == null)
             {
-                s_inputFieldRegex = new Regex(@"<input\s+[^>]*(/?>|>.*?</input>)",
+                s_inputFieldRegex = new Regex(@"<input\s+[^>]*(/>|>.*?</input>)",
                     RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
             }
 

src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/HttpVersionCompletionsAttribute.cs

@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.Management.Automation;
-using System.Net;
-using System.Reflection;
-
-namespace Microsoft.PowerShell.Commands
-{
-    /// <summary>
-    /// A completer for HTTP version names.
-    /// </summary>
-    internal sealed class HttpVersionCompletionsAttribute : ArgumentCompletionsAttribute
-    {
-        public static readonly string[] AllowedVersions;
-
-        static HttpVersionCompletionsAttribute()
-        {
-            FieldInfo[] fields = typeof(HttpVersion).GetFields(BindingFlags.Static | BindingFlags.Public);
-
-            var versions = new List<string>(fields.Length - 1);
-
-            for (int i = 0; i < fields.Length; i++)
-            {
-                // skip field Unknown and not Version type
-                if (fields[i].Name == nameof(HttpVersion.Unknown) || fields[i].FieldType != typeof(Version))
-                {
-                    continue;
-                }
-
-                var version = (Version?)fields[i].GetValue(null);
-
-                if (version is not null)
-                {
-                    versions.Add(version.ToString());
-                }
-            }
-
-            AllowedVersions = versions.ToArray();
-        }
-
-        /// <inheritdoc/>
-        public HttpVersionCompletionsAttribute() : base(AllowedVersions)
-        {
-        } 
-    }
-}

src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs

@@ -107,18 +107,6 @@ namespace Microsoft.PowerShell.Commands
 
         #endregion
 
-        #region HTTP Version
-
-        /// <summary>
-        /// Gets or sets the HTTP Version property.
-        /// </summary>
-        [Parameter]
-        [ArgumentToVersionTransformation]
-        [HttpVersionCompletions]
-        public virtual Version HttpVersion { get; set; }
-
-        #endregion
-
         #region Session
         /// <summary>
         /// Gets or sets the Session property.
@@ -1093,11 +1081,6 @@ namespace Microsoft.PowerShell.Commands
             // create the base WebRequest object
             var request = new HttpRequestMessage(httpMethod, requestUri);
 
-            if (HttpVersion is not null)
-            {
-                request.Version = HttpVersion;
-            }
-
             // pull in session data
             if (WebSession.Headers.Count > 0)
             {
@@ -1430,7 +1413,6 @@ namespace Microsoft.PowerShell.Commands
                         string reqVerboseMsg = string.Format(
                             CultureInfo.CurrentCulture,
                             WebCmdletStrings.WebMethodInvocationVerboseMsg,
-                            requestWithoutRange.Version,
                             requestWithoutRange.Method,
                             requestWithoutRange.RequestUri,
                             requestContentLength);
@@ -1523,14 +1505,10 @@ namespace Microsoft.PowerShell.Commands
                                 if (request.Content != null)
                                     requestContentLength = request.Content.Headers.ContentLength.Value;
 
-                                string reqVerboseMsg = string.Format(
-                                    CultureInfo.CurrentCulture,
+                                string reqVerboseMsg = string.Format(CultureInfo.CurrentCulture,
                                     WebCmdletStrings.WebMethodInvocationVerboseMsg,
-                                    request.Version,
                                     request.Method,
-                                    request.RequestUri,
                                     requestContentLength);
-
                                 WriteVerbose(reqVerboseMsg);
 
                                 HttpResponseMessage response = GetResponse(client, request, keepAuthorization);

src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs

@@ -27,13 +27,15 @@ namespace Microsoft.PowerShell.Commands
 
         private int _depth = 2;
 
+        private const int maxDepthAllowed = 100;
+
         private readonly CancellationTokenSource _cancellationSource = new();
 
         /// <summary>
         /// Gets or sets the Depth property.
         /// </summary>
         [Parameter]
-        [ValidateRange(0, 100)]
+        [ValidateRange(0, int.MaxValue)]
         public int Depth
         {
             get { return _depth; }
@@ -97,7 +99,23 @@ namespace Microsoft.PowerShell.Commands
                 _cancellationSource.Dispose();
             }
         }
-        
+
+        /// <summary>
+        /// Prerequisite checks.
+        /// </summary>
+        protected override void BeginProcessing()
+        {
+            if (_depth > maxDepthAllowed)
+            {
+                string errorMessage = StringUtil.Format(WebCmdletStrings.ReachedMaximumDepthAllowed, maxDepthAllowed);
+                ThrowTerminatingError(new ErrorRecord(
+                                new InvalidOperationException(errorMessage),
+                                "ReachedMaximumDepthAllowed",
+                                ErrorCategory.InvalidOperation,
+                                null));
+            }
+        }
+
         private readonly List<object> _inputObjects = new();
 
         /// <summary>

src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx

@@ -129,7 +129,7 @@
   <data name="AuthenticationCredentialNotSupplied" xml:space="preserve">
     <value>The cmdlet cannot run because the following parameter is not specified: Credential. The supplied Authentication type requires a Credential. Specify Credential, then retry.</value>
   </data>
-  <data name="AuthenticationTokenNotSupplied" xml:space="preserve">
+    <data name="AuthenticationTokenNotSupplied" xml:space="preserve">
     <value>The cmdlet cannot run because the following parameter is not specified: Token. The supplied Authentication type requires a Token. Specify Token, then retry.</value>
   </data>
   <data name="AuthenticationTokenConflict" xml:space="preserve">
@@ -237,6 +237,9 @@
   <data name="JsonNetModuleFilesRequired" xml:space="preserve">
     <value>Ensure 'Json.Net.psd1' and 'Newtonsoft.Json.dll' are available in a versioned subdirectory of '{0}'.</value>
   </data>
+  <data name="ReachedMaximumDepthAllowed" xml:space="preserve">
+    <value>The maximum depth allowed for serialization is {0}.</value>
+  </data>
   <data name="JsonDeserializationFailed" xml:space="preserve">
     <value>Conversion from JSON failed with error: {0}</value>
   </data>
@@ -247,7 +250,7 @@
     <value>Following rel link {0}</value>
   </data>
   <data name="WebMethodInvocationVerboseMsg" xml:space="preserve">
-    <value>HTTP/{0} {1} {2} with {3}-byte payload</value>
+    <value>{0} with {1}-byte payload</value>
   </data>
   <data name="WebMethodResumeFailedVerboseMsg" xml:space="preserve">
     <value>The remote server indicated it could not resume downloading. The local file will be overwritten.</value>

src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-rc.1.21451.13" />
   </ItemGroup>
 
 </Project>

src/Microsoft.PowerShell.GlobalTool.Shim/Microsoft.PowerShell.GlobalTool.Shim.csproj

@@ -6,7 +6,6 @@
     <AssemblyName>Microsoft.PowerShell.GlobalTool.Shim</AssemblyName>
     <OutputType>EXE</OutputType>
     <RootNamespace>Microsoft.PowerShell.GlobalTool.Shim</RootNamespace>
-    <UseAppHost>False</UseAppHost>
   </PropertyGroup>
 
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk' " />

src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj

@@ -16,21 +16,21 @@
 
   <ItemGroup>
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
+    <PackageReference Include="System.IO.Packaging" Version="6.0.0-rc.1.21451.13" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rc.1.21451.13" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rc.1.21451.13" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.9.0" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.9.0" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.9.0" />
-    <PackageReference Include="System.Private.ServiceModel" Version="4.9.0" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0-preview1.21220.1" />
+    <PackageReference Include="System.ServiceModel.Http" Version="4.9.0-preview1.21220.1" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.9.0-preview1.21220.1" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0-preview1.21220.1" />
+    <PackageReference Include="System.ServiceModel.Security" Version="4.9.0-preview1.21220.1" />
+    <PackageReference Include="System.Private.ServiceModel" Version="4.9.0-preview1.21220.1" />
     <!-- the source could not be found for the following package(s) -->
     <PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21451.13" />
   </ItemGroup>
 
 </Project>

src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj

@@ -10,7 +10,7 @@
     <ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
     <ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.1.21451.13" />
   </ItemGroup>
 
   <PropertyGroup>

src/System.Management.Automation/CoreCLR/CorePsPlatform.cs

@@ -184,7 +184,7 @@ namespace System.Management.Automation
 #endif
 
         // format files
-        internal static readonly string[] FormatFileNames = new string[]
+        internal static readonly List<string> FormatFileNames = new()
         {
             "Certificate.format.ps1xml",
             "Diagnostics.format.ps1xml",
@@ -1134,6 +1134,10 @@ namespace System.Management.Automation
                 internal static extern int CreateHardLink([MarshalAs(UnmanagedType.LPStr)] string filePath,
                                                           [MarshalAs(UnmanagedType.LPStr)] string target);
 
+                [DllImport(psLib, CharSet = CharSet.Ansi, SetLastError = true)]
+                [return: MarshalAs(UnmanagedType.LPStr)]
+                internal static extern string FollowSymLink([MarshalAs(UnmanagedType.LPStr)] string filePath);
+
                 [DllImport(psLib, CharSet = CharSet.Ansi, SetLastError = true)]
                 [return: MarshalAs(UnmanagedType.LPStr)]
                 internal static extern string GetUserFromPid(int pid);

src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs

@@ -2082,37 +2082,37 @@ namespace System.Management.Automation.Runspaces
                         .AddItemScriptBlock(@"""$($_.FileInfo.Executable)$($_.FileInfo.Executable.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "FileInfo.Executable")
                         .AddItemScriptBlock(@"""$([string]::Join(',',$_.FileInfo.Extension.Keys))""", label: "FileInfo.Extension")
                         .AddItemScriptBlock(@"""$($_.Foreground.Black)$($_.Foreground.Black.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Black")
-                        .AddItemScriptBlock(@"""$($_.Foreground.BrightBlack)$($_.Foreground.BrightBlack.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightBlack")
                         .AddItemScriptBlock(@"""$($_.Foreground.White)$($_.Foreground.White.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.White")
-                        .AddItemScriptBlock(@"""$($_.Foreground.BrightWhite)$($_.Foreground.BrightWhite.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightWhite")
+                        .AddItemScriptBlock(@"""$($_.Foreground.DarkGray)$($_.Foreground.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.DarkGray")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightGray)$($_.Foreground.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightGray")
                         .AddItemScriptBlock(@"""$($_.Foreground.Red)$($_.Foreground.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Red")
-                        .AddItemScriptBlock(@"""$($_.Foreground.BrightRed)$($_.Foreground.BrightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightRed")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightRed)$($_.Foreground.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightRed")
                         .AddItemScriptBlock(@"""$($_.Foreground.Magenta)$($_.Foreground.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Magenta")
-                        .AddItemScriptBlock(@"""$($_.Foreground.BrightMagenta)$($_.Foreground.BrightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightMagenta")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightMagenta)$($_.Foreground.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightMagenta")
                         .AddItemScriptBlock(@"""$($_.Foreground.Blue)$($_.Foreground.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Blue")
-                        .AddItemScriptBlock(@"""$($_.Foreground.BrightBlue)$($_.Foreground.BrightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightBlue")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightBlue)$($_.Foreground.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightBlue")
                         .AddItemScriptBlock(@"""$($_.Foreground.Cyan)$($_.Foreground.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Cyan")
-                        .AddItemScriptBlock(@"""$($_.Foreground.BrightCyan)$($_.Foreground.BrightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightCyan")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightCyan)$($_.Foreground.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightCyan")
                         .AddItemScriptBlock(@"""$($_.Foreground.Green)$($_.Foreground.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Green")
-                        .AddItemScriptBlock(@"""$($_.Foreground.BrightGreen)$($_.Foreground.BrightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightGreen")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightGreen)$($_.Foreground.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightGreen")
                         .AddItemScriptBlock(@"""$($_.Foreground.Yellow)$($_.Foreground.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Yellow")
-                        .AddItemScriptBlock(@"""$($_.Foreground.BrightYellow)$($_.Foreground.BrightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightYellow")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightYellow)$($_.Foreground.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightYellow")
                         .AddItemScriptBlock(@"""$($_.Background.Black)$($_.Background.Black.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Black")
-                        .AddItemScriptBlock(@"""$($_.Background.BrightBlack)$($_.Background.BrightBlack.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightBlack")
                         .AddItemScriptBlock(@"""$($_.Background.White)$($_.Background.White.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.White")
-                        .AddItemScriptBlock(@"""$($_.Background.BrightWhite)$($_.Background.BrightWhite.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightWhite")
+                        .AddItemScriptBlock(@"""$($_.Background.DarkGray)$($_.Background.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.DarkGray")
+                        .AddItemScriptBlock(@"""$($_.Background.LightGray)$($_.Background.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightGray")
                         .AddItemScriptBlock(@"""$($_.Background.Red)$($_.Background.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Red")
-                        .AddItemScriptBlock(@"""$($_.Background.BrightRed)$($_.Background.BrightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightRed")
+                        .AddItemScriptBlock(@"""$($_.Background.LightRed)$($_.Background.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightRed")
                         .AddItemScriptBlock(@"""$($_.Background.Magenta)$($_.Background.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Magenta")
-                        .AddItemScriptBlock(@"""$($_.Background.BrightMagenta)$($_.Background.BrightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightMagenta")
+                        .AddItemScriptBlock(@"""$($_.Background.LightMagenta)$($_.Background.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightMagenta")
                         .AddItemScriptBlock(@"""$($_.Background.Blue)$($_.Background.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Blue")
-                        .AddItemScriptBlock(@"""$($_.Background.BrightBlue)$($_.Background.BrightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightBlue")
+                        .AddItemScriptBlock(@"""$($_.Background.LightBlue)$($_.Background.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightBlue")
                         .AddItemScriptBlock(@"""$($_.Background.Cyan)$($_.Background.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Cyan")
-                        .AddItemScriptBlock(@"""$($_.Background.BrightCyan)$($_.Background.BrightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightCyan")
+                        .AddItemScriptBlock(@"""$($_.Background.LightCyan)$($_.Background.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightCyan")
                         .AddItemScriptBlock(@"""$($_.Background.Green)$($_.Background.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Green")
-                        .AddItemScriptBlock(@"""$($_.Background.BrightGreen)$($_.Background.BrightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightGreen")
+                        .AddItemScriptBlock(@"""$($_.Background.LightGreen)$($_.Background.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightGreen")
                         .AddItemScriptBlock(@"""$($_.Background.Yellow)$($_.Background.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Yellow")
-                        .AddItemScriptBlock(@"""$($_.Background.BrightYellow)$($_.Background.BrightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightYellow")
+                        .AddItemScriptBlock(@"""$($_.Background.LightYellow)$($_.Background.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightYellow")
                         .EndEntry()
                 .EndList());
         }
@@ -2185,46 +2185,46 @@ namespace System.Management.Automation.Runspaces
                 ListControl.Create()
                     .StartEntry()
                         .AddItemScriptBlock(@"""$($_.Black)$($_.Black.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Black")
-                        .AddItemScriptBlock(@"""$($_.BrightBlack)$($_.BrightBlack.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightBlack")
                         .AddItemScriptBlock(@"""$($_.White)$($_.White.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "White")
-                        .AddItemScriptBlock(@"""$($_.BrightWhite)$($_.BrightWhite.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightWhite")
+                        .AddItemScriptBlock(@"""$($_.DarkGray)$($_.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "DarkGray")
+                        .AddItemScriptBlock(@"""$($_.LightGray)$($_.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGray")
                         .AddItemScriptBlock(@"""$($_.Red)$($_.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Red")
-                        .AddItemScriptBlock(@"""$($_.BrightRed)$($_.BrightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightRed")
+                        .AddItemScriptBlock(@"""$($_.LightRed)$($_.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightRed")
                         .AddItemScriptBlock(@"""$($_.Magenta)$($_.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Magenta")
-                        .AddItemScriptBlock(@"""$($_.BrightMagenta)$($_.BrightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightMagenta")
+                        .AddItemScriptBlock(@"""$($_.LightMagenta)$($_.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightMagenta")
                         .AddItemScriptBlock(@"""$($_.Blue)$($_.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Blue")
-                        .AddItemScriptBlock(@"""$($_.BrightBlue)$($_.BrightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightBlue")
+                        .AddItemScriptBlock(@"""$($_.LightBlue)$($_.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightBlue")
                         .AddItemScriptBlock(@"""$($_.Cyan)$($_.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Cyan")
-                        .AddItemScriptBlock(@"""$($_.BrightCyan)$($_.BrightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightCyan")
+                        .AddItemScriptBlock(@"""$($_.LightCyan)$($_.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightCyan")
                         .AddItemScriptBlock(@"""$($_.Green)$($_.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Green")
-                        .AddItemScriptBlock(@"""$($_.BrightGreen)$($_.BrightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightGreen")
+                        .AddItemScriptBlock(@"""$($_.LightGreen)$($_.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGreen")
                         .AddItemScriptBlock(@"""$($_.Yellow)$($_.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Yellow")
-                        .AddItemScriptBlock(@"""$($_.BrightYellow)$($_.BrightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightYellow")
+                        .AddItemScriptBlock(@"""$($_.LightYellow)$($_.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightYellow")
                     .EndEntry()
                 .EndList());
         }
 
         private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Automation_PSStyleBackgroundColor()
         {
-            yield return new FormatViewDefinition("System.Management.Automation.PSStyle+BackgroundColor",
+            yield return new FormatViewDefinition("System.Management.Automation.PSStyle+ForegroundColor",
                 ListControl.Create()
                     .StartEntry()
                         .AddItemScriptBlock(@"""$($_.Black)$($_.Black.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Black")
-                        .AddItemScriptBlock(@"""$($_.BrightBlack)$($_.BrightBlack.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightBlack")
                         .AddItemScriptBlock(@"""$($_.White)$($_.White.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "White")
-                        .AddItemScriptBlock(@"""$($_.BrightWhite)$($_.BrightWhite.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightWhite")
+                        .AddItemScriptBlock(@"""$($_.DarkGray)$($_.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "DarkGray")
+                        .AddItemScriptBlock(@"""$($_.LightGray)$($_.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGray")
                         .AddItemScriptBlock(@"""$($_.Red)$($_.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Red")
-                        .AddItemScriptBlock(@"""$($_.BrightRed)$($_.BrightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightRed")
+                        .AddItemScriptBlock(@"""$($_.LightRed)$($_.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightRed")
                         .AddItemScriptBlock(@"""$($_.Magenta)$($_.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Magenta")
-                        .AddItemScriptBlock(@"""$($_.BrightMagenta)$($_.BrightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightMagenta")
+                        .AddItemScriptBlock(@"""$($_.LightMagenta)$($_.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightMagenta")
                         .AddItemScriptBlock(@"""$($_.Blue)$($_.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Blue")
-                        .AddItemScriptBlock(@"""$($_.BrightBlue)$($_.BrightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightBlue")
+                        .AddItemScriptBlock(@"""$($_.LightBlue)$($_.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightBlue")
                         .AddItemScriptBlock(@"""$($_.Cyan)$($_.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Cyan")
-                        .AddItemScriptBlock(@"""$($_.BrightCyan)$($_.BrightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightCyan")
+                        .AddItemScriptBlock(@"""$($_.LightCyan)$($_.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightCyan")
                         .AddItemScriptBlock(@"""$($_.Green)$($_.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Green")
-                        .AddItemScriptBlock(@"""$($_.BrightGreen)$($_.BrightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightGreen")
+                        .AddItemScriptBlock(@"""$($_.LightGreen)$($_.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGreen")
                         .AddItemScriptBlock(@"""$($_.Yellow)$($_.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Yellow")
-                        .AddItemScriptBlock(@"""$($_.BrightYellow)$($_.BrightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightYellow")
+                        .AddItemScriptBlock(@"""$($_.LightYellow)$($_.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightYellow")
                     .EndEntry()
                 .EndList());
         }

src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs

@@ -35,7 +35,7 @@ namespace System.Management.Automation
         /// <summary>Classic rendering of progress.</summary>
         Classic = 1,
     }
-
+    
     #region PSStyle
     /// <summary>
     /// Contains configuration for how PowerShell renders text.
@@ -52,80 +52,80 @@ namespace System.Management.Automation
             /// </summary>
             public string Black { get; } = "\x1b[30m";
 
-            /// <summary>
-            /// Gets the color red.
-            /// </summary>
-            public string Red { get; } = "\x1b[31m";
-
-            /// <summary>
-            /// Gets the color green.
-            /// </summary>
-            public string Green { get; } = "\x1b[32m";
-
-            /// <summary>
-            /// Gets the color yellow.
-            /// </summary>
-            public string Yellow { get; } = "\x1b[33m";
-
             /// <summary>
             /// Gets the color blue.
             /// </summary>
             public string Blue { get; } = "\x1b[34m";
 
-            /// <summary>
-            /// Gets the color magenta.
-            /// </summary>
-            public string Magenta { get; } = "\x1b[35m";
-
             /// <summary>
             /// Gets the color cyan.
             /// </summary>
             public string Cyan { get; } = "\x1b[36m";
 
+            /// <summary>
+            /// Gets the color dark gray.
+            /// </summary>
+            public string DarkGray { get; } = "\x1b[90m";
+
+            /// <summary>
+            /// Gets the color green.
+            /// </summary>
+            public string Green { get; } = "\x1b[32m";
+
+            /// <summary>
+            /// Gets the color light blue.
+            /// </summary>
+            public string LightBlue { get; } = "\x1b[94m";
+
+            /// <summary>
+            /// Gets the color light cyan.
+            /// </summary>
+            public string LightCyan { get; } = "\x1b[96m";
+
+            /// <summary>
+            /// Gets the color light gray.
+            /// </summary>
+            public string LightGray { get; } = "\x1b[97m";
+
+            /// <summary>
+            /// Gets the color light green.
+            /// </summary>
+            public string LightGreen { get; } = "\x1b[92m";
+
+            /// <summary>
+            /// Gets the color light magenta.
+            /// </summary>
+            public string LightMagenta { get; } = "\x1b[95m";
+
+            /// <summary>
+            /// Gets the color light red.
+            /// </summary>
+            public string LightRed { get; } = "\x1b[91m";
+
+            /// <summary>
+            /// Gets the color light yellow.
+            /// </summary>
+            public string LightYellow { get; } = "\x1b[93m";
+
+            /// <summary>
+            /// Gets the color magenta.
+            /// </summary>
+            public string Magenta { get; } = "\x1b[35m";
+
+            /// <summary>
+            /// Gets the color read.
+            /// </summary>
+            public string Red { get; } = "\x1b[31m";
+
             /// <summary>
             /// Gets the color white.
             /// </summary>
             public string White { get; } = "\x1b[37m";
 
             /// <summary>
-            /// Gets the color bright black.
+            /// Gets the color yellow.
             /// </summary>
-            public string BrightBlack { get; } = "\x1b[90m";
-
-            /// <summary>
-            /// Gets the color bright red.
-            /// </summary>
-            public string BrightRed { get; } = "\x1b[91m";
-
-            /// <summary>
-            /// Gets the color bright green.
-            /// </summary>
-            public string BrightGreen { get; } = "\x1b[92m";
-
-            /// <summary>
-            /// Gets the color bright yellow.
-            /// </summary>
-            public string BrightYellow { get; } = "\x1b[93m";
-
-            /// <summary>
-            /// Gets the color bright blue.
-            /// </summary>
-            public string BrightBlue { get; } = "\x1b[94m";
-
-            /// <summary>
-            /// Gets the color bright magenta.
-            /// </summary>
-            public string BrightMagenta { get; } = "\x1b[95m";
-
-            /// <summary>
-            /// Gets the color bright cyan.
-            /// </summary>
-            public string BrightCyan { get; } = "\x1b[96m";
-
-            /// <summary>
-            /// Gets the color bright white.
-            /// </summary>
-            public string BrightWhite { get; } = "\x1b[97m";
+            public string Yellow { get; } = "\x1b[33m";
 
             /// <summary>
             /// Set as RGB (Red, Green, Blue).
@@ -167,80 +167,80 @@ namespace System.Management.Automation
             /// </summary>
             public string Black { get; } = "\x1b[40m";
 
-            /// <summary>
-            /// Gets the color red.
-            /// </summary>
-            public string Red { get; } = "\x1b[41m";
-
-            /// <summary>
-            /// Gets the color green.
-            /// </summary>
-            public string Green { get; } = "\x1b[42m";
-
-            /// <summary>
-            /// Gets the color yellow.
-            /// </summary>
-            public string Yellow { get; } = "\x1b[43m";
-
             /// <summary>
             /// Gets the color blue.
             /// </summary>
             public string Blue { get; } = "\x1b[44m";
 
-            /// <summary>
-            /// Gets the color magenta.
-            /// </summary>
-            public string Magenta { get; } = "\x1b[45m";
-
             /// <summary>
             /// Gets the color cyan.
             /// </summary>
             public string Cyan { get; } = "\x1b[46m";
 
+            /// <summary>
+            /// Gets the color dark gray.
+            /// </summary>
+            public string DarkGray { get; } = "\x1b[100m";
+
+            /// <summary>
+            /// Gets the color green.
+            /// </summary>
+            public string Green { get; } = "\x1b[42m";
+
+            /// <summary>
+            /// Gets the color light blue.
+            /// </summary>
+            public string LightBlue { get; } = "\x1b[104m";
+
+            /// <summary>
+            /// Gets the color light cyan.
+            /// </summary>
+            public string LightCyan { get; } = "\x1b[106m";
+
+            /// <summary>
+            /// Gets the color light gray.
+            /// </summary>
+            public string LightGray { get; } = "\x1b[107m";
+
+            /// <summary>
+            /// Gets the color light green.
+            /// </summary>
+            public string LightGreen { get; } = "\x1b[102m";
+
+            /// <summary>
+            /// Gets the color light magenta.
+            /// </summary>
+            public string LightMagenta { get; } = "\x1b[105m";
+
+            /// <summary>
+            /// Gets the color light red.
+            /// </summary>
+            public string LightRed { get; } = "\x1b[101m";
+
+            /// <summary>
+            /// Gets the color light yellow.
+            /// </summary>
+            public string LightYellow { get; } = "\x1b[103m";
+
+            /// <summary>
+            /// Gets the color magenta.
+            /// </summary>
+            public string Magenta { get; } = "\x1b[45m";
+
+            /// <summary>
+            /// Gets the color read.
+            /// </summary>
+            public string Red { get; } = "\x1b[41m";
+
             /// <summary>
             /// Gets the color white.
             /// </summary>
             public string White { get; } = "\x1b[47m";
 
             /// <summary>
-            /// Gets the color bright black.
+            /// Gets the color yellow.
             /// </summary>
-            public string BrightBlack { get; } = "\x1b[100m";
-
-            /// <summary>
-            /// Gets the color bright red.
-            /// </summary>
-            public string BrightRed { get; } = "\x1b[101m";
-
-            /// <summary>
-            /// Gets the color bright green.
-            /// </summary>
-            public string BrightGreen { get; } = "\x1b[102m";
-
-            /// <summary>
-            /// Gets the color bright yellow.
-            /// </summary>
-            public string BrightYellow { get; } = "\x1b[103m";
-
-            /// <summary>
-            /// Gets the color bright blue.
-            /// </summary>
-            public string BrightBlue { get; } = "\x1b[104m";
-
-            /// <summary>
-            /// Gets the color bright magenta.
-            /// </summary>
-            public string BrightMagenta { get; } = "\x1b[105m";
-
-            /// <summary>
-            /// Gets the color bright cyan.
-            /// </summary>
-            public string BrightCyan { get; } = "\x1b[106m";
-
-            /// <summary>
-            /// Gets the color bright white.
-            /// </summary>
-            public string BrightWhite { get; } = "\x1b[107m";
+            public string Yellow { get; } = "\x1b[43m";
 
             /// <summary>
             /// The color set as RGB (Red, Green, Blue).
@@ -365,7 +365,7 @@ namespace System.Management.Automation
                 get => _error;
                 set => _error = ValidateNoContent(value);
             }
-
+            
             private string _error = "\x1b[31;1m";
 
             /// <summary>
@@ -397,7 +397,7 @@ namespace System.Management.Automation
             {
                 get => _debug;
                 set => _debug = ValidateNoContent(value);
-            }
+            }   
 
             private string _debug = "\x1b[33;1m";
         }
@@ -467,16 +467,6 @@ namespace System.Management.Automation
                     _extensionDictionary.Add(ValidateExtension(extension), ValidateNoContent(decoration));
                 }
 
-                /// <summary>
-                /// Add new extension and decoration to dictionary without validation.
-                /// </summary>
-                /// <param name="extension">Extension to add.</param>
-                /// <param name="decoration">ANSI string value to add.</param>
-                internal void AddWithoutValidation(string extension, string decoration)
-                {
-                    _extensionDictionary.Add(extension, decoration);
-                }
-
                 /// <summary>
                 /// Remove an extension from dictionary.
                 /// </summary>
@@ -553,19 +543,19 @@ namespace System.Management.Automation
                 Extension = new FileExtensionDictionary();
 
                 // archives
-                Extension.AddWithoutValidation(".zip", "\x1b[31;1m");
-                Extension.AddWithoutValidation(".tgz", "\x1b[31;1m");
-                Extension.AddWithoutValidation(".gz", "\x1b[31;1m");
-                Extension.AddWithoutValidation(".tar", "\x1b[31;1m");
-                Extension.AddWithoutValidation(".nupkg", "\x1b[31;1m");
-                Extension.AddWithoutValidation(".cab", "\x1b[31;1m");
-                Extension.AddWithoutValidation(".7z", "\x1b[31;1m");
+                Extension.Add(".zip", "\x1b[31;1m");
+                Extension.Add(".tgz", "\x1b[31;1m");
+                Extension.Add(".gz", "\x1b[31;1m");
+                Extension.Add(".tar", "\x1b[31;1m");
+                Extension.Add(".nupkg", "\x1b[31;1m");
+                Extension.Add(".cab", "\x1b[31;1m");
+                Extension.Add(".7z", "\x1b[31;1m");
 
                 // powershell
-                Extension.AddWithoutValidation(".ps1", "\x1b[33;1m");
-                Extension.AddWithoutValidation(".psd1", "\x1b[33;1m");
-                Extension.AddWithoutValidation(".psm1", "\x1b[33;1m");
-                Extension.AddWithoutValidation(".ps1xml", "\x1b[33;1m");
+                Extension.Add(".ps1", "\x1b[33;1m");
+                Extension.Add(".psd1", "\x1b[33;1m");
+                Extension.Add(".psm1", "\x1b[33;1m");
+                Extension.Add(".ps1xml", "\x1b[33;1m");
             }
         }
 
@@ -698,7 +688,7 @@ namespace System.Management.Automation
 
         private static string ValidateNoContent(string text)
         {
-            var decorartedString = new ValueStringDecorated(text);
+            var decorartedString = new StringDecorated(text);
             if (decorartedString.ContentLength > 0)
             {
                 throw new ArgumentException(string.Format(PSStyleStrings.TextContainsContent, decorartedString.ToString(OutputRendering.PlainText)));

src/System.Management.Automation/System.Management.Automation.csproj

@@ -14,21 +14,21 @@
     <!-- the following package(s) are from https://github.com/JamesNK/Newtonsoft.Json -->
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <!-- the Application Insights package -->
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.19.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.18.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
-    <PackageReference Include="System.DirectoryServices" Version="6.0.0" />
-    <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
-    <PackageReference Include="System.Management" Version="6.0.0" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0" />
-    <PackageReference Include="System.Security.Permissions" Version="6.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-rc.1.21451.13" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rc.1.21451.13" />
+    <PackageReference Include="System.DirectoryServices" Version="6.0.0-rc.1.21451.13" />
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" />
+    <PackageReference Include="System.Management" Version="6.0.0-rc.1.21451.13" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rc.1.21451.13" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.5.21301.5" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rc.1.21451.13" />
+    <PackageReference Include="System.Security.Permissions" Version="6.0.0-rc.1.21451.13" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21451.13" />
     <!-- the following package(s) are from the powershell org -->
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
-    <PackageReference Include="Microsoft.PowerShell.Native" Version="7.2.0" />
+    <PackageReference Include="Microsoft.PowerShell.Native" Version="7.2.0-preview.2" />
   </ItemGroup>
 
   <PropertyGroup>

src/System.Management.Automation/engine/ArgumentToVersionTransformationAttribute.cs

@@ -1,58 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#nullable enable
-
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace System.Management.Automation
-{
-    /// <summary>
-    /// To make it easier to specify a version, we add some conversions that wouldn't happen otherwise:
-    ///   * A simple integer, i.e. 2;
-    ///   * A string without a dot, i.e. "2".
-    /// </summary>
-    internal class ArgumentToVersionTransformationAttribute : ArgumentTransformationAttribute
-    {
-        /// <inheritdoc/>
-        public override object Transform(EngineIntrinsics engineIntrinsics, object inputData)
-        {
-            object version = PSObject.Base(inputData);
-
-            if (version is string versionStr)
-            {
-                if (TryConvertFromString(versionStr, out var convertedVersion))
-                {
-                    return convertedVersion;
-                }
-
-                if (versionStr.Contains('.'))
-                {
-                    // If the string contains a '.', let the Version constructor handle the conversion.
-                    return inputData;
-                }
-            }
-
-            if (version is double)
-            {
-                // The conversion to int below is wrong, but the usual conversions will turn
-                // the double into a string, so just return the original object.
-                return inputData;
-            }
-
-            if (LanguagePrimitives.TryConvertTo<int>(version, out var majorVersion))
-            {
-                return new Version(majorVersion, 0);
-            }
-
-            return inputData;
-        }
-
-        protected virtual bool TryConvertFromString(string versionString, [NotNullWhen(true)] out Version? version)
-        {
-            version = null;
-            return false;
-        }
-    }
-}

src/System.Management.Automation/engine/CommandBase.cs

@@ -233,13 +233,6 @@ namespace System.Management.Automation.Internal
         {
         }
 
-        /// <summary>
-        /// When overridden in the derived class, performs clean-up after the command execution.
-        /// </summary>
-        internal virtual void DoCleanResource()
-        {
-        }
-
         #endregion Override
 
         /// <summary>

src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs

@@ -1813,14 +1813,9 @@ namespace System.Management.Automation
                     }
                 }
             }
-            if (completionContext.TokenAtCursor.TokenFlags == TokenFlags.MemberName)
-            {
-                result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
-                if (result is not null)
-                {
-                    return result;
-                }
-            }
+
+            result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
+            if (result != null) return result;
 
             if ((tokenAtCursor.TokenFlags & TokenFlags.CommandName) != 0)
             {

src/System.Management.Automation/engine/CommandInfo.cs

@@ -529,7 +529,7 @@ namespace System.Management.Automation
                 processor = scriptCommand != null
                     ? new CommandProcessor(scriptCommand, _context, useLocalScope: true, fromScriptFile: false,
                         sessionState: scriptCommand.ScriptBlock.SessionStateInternal ?? Context.EngineSessionState)
-                    : new CommandProcessor((CmdletInfo)this, _context);
+                    : new CommandProcessor((CmdletInfo)this, _context) { UseLocalScope = true };
 
                 ParameterBinderController.AddArgumentsToCommandProcessor(processor, Arguments);
                 CommandProcessorBase oldCurrentCommandProcessor = Context.CurrentCommandProcessor;

src/System.Management.Automation/engine/CommandMetadata.cs

@@ -875,11 +875,8 @@ process
 
 end
 {{{5}}}
-
-clean
-{{{6}}}
 <#
-{7}
+{6}
 #>
 ",
                 GetDecl(),
@@ -888,7 +885,6 @@ clean
                 GetBeginBlock(),
                 GetProcessBlock(),
                 GetEndBlock(),
-                GetCleanBlock(),
                 CodeGeneration.EscapeBlockCommentContent(helpComment));
 
             return result;
@@ -1067,11 +1063,6 @@ clean
 
         internal string GetProcessBlock()
         {
-            // The reason we wrap scripts in 'try { } catch { throw }' (here and elsewhere) is to turn
-            // an exception that could be thrown from .NET method invocation into a terminating error
-            // that can be propagated up.
-            // By default, an exception thrown from .NET method is not terminating, but when enclosed
-            // in try/catch, it will be turned into a terminating error.
             return @"
     try {
         $steppablePipeline.Process($_)
@@ -1122,16 +1113,6 @@ clean
 ";
         }
 
-        internal string GetCleanBlock()
-        {
-            // Here we don't need to enclose the script in a 'try/catch' like elsewhere, because
-            //  1. the 'Clean' block doesn't propagate up any exception (terminating error);
-            //  2. only one expression in the script, so nothing else needs to be stopped when invoking the method fails.
-            return @"
-    $steppablePipeline.Clean()
-";
-        }
-
         #endregion
 
         #region Helper methods for restricting commands needed by implicit and interactive remoting

src/System.Management.Automation/engine/CommandProcessor.cs

@@ -309,11 +309,13 @@ namespace System.Management.Automation
         internal override void ProcessRecord()
         {
             // Invoke the Command method with the request object
+
             if (!this.RanBeginAlready)
             {
                 RanBeginAlready = true;
                 try
                 {
+                    // NOTICE-2004/06/08-JonN 959638
                     using (commandRuntime.AllowThisCommandToWrite(true))
                     {
                         if (Context._debuggingMode > 0 && Command is not PSScriptCmdlet)
@@ -324,9 +326,12 @@ namespace System.Management.Automation
                         Command.DoBeginProcessing();
                     }
                 }
-                catch (Exception e)
+                // 2004/03/18-JonN This is understood to be
+                // an FXCOP violation, cleared by KCwalina.
+                catch (Exception e)  // Catch-all OK, 3rd party callout.
                 {
-                    // This cmdlet threw an exception, so wrap it and bubble it up.
+                    // This cmdlet threw an exception, so
+                    // wrap it and bubble it up.
                     throw ManageInvocationException(e);
                 }
             }
@@ -361,7 +366,6 @@ namespace System.Management.Automation
 
                     // NOTICE-2004/06/08-JonN 959638
                     using (commandRuntime.AllowThisCommandToWrite(true))
-                    using (ParameterBinderBase.bindingTracer.TraceScope("CALLING ProcessRecord"))
                     {
                         if (CmdletParameterBinderController.ObsoleteParameterWarningList != null &&
                             CmdletParameterBinderController.ObsoleteParameterWarningList.Count > 0)
@@ -396,13 +400,14 @@ namespace System.Management.Automation
                 }
                 catch (LoopFlowException)
                 {
-                    // Don't wrap LoopFlowException, we incorrectly raise a PipelineStoppedException
+                    // Win8:84066 - Don't wrap LoopFlowException, we incorrectly raise a PipelineStoppedException
                     // which gets caught by a script try/catch if we wrap here.
                     throw;
                 }
-                catch (Exception e)
+                // 2004/03/18-JonN This is understood to be
+                // an FXCOP violation, cleared by KCwalina.
+                catch (Exception e) // Catch-all OK, 3rd party callout.
                 {
-                    // Catch-all OK, 3rd party callout.
                     exceptionToThrow = e;
                 }
                 finally

src/System.Management.Automation/engine/CommandProcessorBase.cs

@@ -5,7 +5,8 @@ using System.Collections;
 using System.Collections.ObjectModel;
 using System.Management.Automation.Internal;
 using System.Management.Automation.Language;
-using System.Runtime.InteropServices;
+
+using Dbg = System.Management.Automation.Diagnostics;
 
 namespace System.Management.Automation
 {
@@ -45,7 +46,6 @@ namespace System.Management.Automation
                     string errorTemplate = expAttribute.ExperimentAction == ExperimentAction.Hide
                         ? DiscoveryExceptions.ScriptDisabledWhenFeatureOn
                         : DiscoveryExceptions.ScriptDisabledWhenFeatureOff;
-
                     string errorMsg = StringUtil.Format(errorTemplate, expAttribute.ExperimentName);
                     ErrorRecord errorRecord = new ErrorRecord(
                         new InvalidOperationException(errorMsg),
@@ -54,8 +54,6 @@ namespace System.Management.Automation
                         commandInfo);
                     throw new CmdletInvocationException(errorRecord);
                 }
-
-                HasCleanBlock = scriptCommand.ScriptBlock.HasCleanBlock;
             }
 
             CommandInfo = commandInfo;
@@ -89,11 +87,6 @@ namespace System.Management.Automation
         /// <value></value>
         internal CommandInfo CommandInfo { get; set; }
 
-        /// <summary>
-        /// Gets whether the command has a 'Clean' block defined.
-        /// </summary>
-        internal bool HasCleanBlock { get; }
-
         /// <summary>
         /// This indicates whether this command processor is created from
         /// a script file.
@@ -378,10 +371,13 @@ namespace System.Management.Automation
 
             Context.EngineSessionState = _previousCommandSessionState;
 
-            // Restore the scope but use the same session state instance we
-            // got it from because the command may have changed the execution context
-            // session state...
-            CommandSessionState.CurrentScope = _previousScope;
+            if (_previousScope != null)
+            {
+                // Restore the scope but use the same session state instance we
+                // got it from because the command may have changed the execution context
+                // session state...
+                CommandSessionState.CurrentScope = _previousScope;
+            }
         }
 
         private SessionStateScope _previousScope;
@@ -456,14 +452,16 @@ namespace System.Management.Automation
                     HandleObsoleteCommand(ObsoleteAttribute);
                 }
             }
-            catch (InvalidComObjectException e)
+            catch (Exception)
             {
-                // This type of exception could be thrown from parameter binding.
-                string msg = StringUtil.Format(ParserStrings.InvalidComObjectException, e.Message);
-                var newEx = new RuntimeException(msg, e);
+                if (_useLocalScope)
+                {
+                    // If we had an exception during Prepare, we're done trying to execute the command
+                    // so the scope we created needs to release any resources it hold.s
+                    CommandSessionState.RemoveScope(CommandScope);
+                }
 
-                newEx.SetErrorId("InvalidComObjectException");
-                throw newEx;
+                throw;
             }
             finally
             {
@@ -510,23 +508,26 @@ namespace System.Management.Automation
                     // The RedirectShellErrorOutputPipe flag is used by the V2 hosting API to force the
                     // redirection.
                     //
-                    if (RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe is not null)
+                    if (this.RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe != null)
                     {
-                        _context.ShellFunctionErrorOutputPipe = commandRuntime.ErrorOutputPipe;
+                        _context.ShellFunctionErrorOutputPipe = this.commandRuntime.ErrorOutputPipe;
                     }
 
                     _context.CurrentCommandProcessor = this;
-                    SetCurrentScopeToExecutionScope();
-
                     using (commandRuntime.AllowThisCommandToWrite(true))
-                    using (ParameterBinderBase.bindingTracer.TraceScope("CALLING BeginProcessing"))
                     {
-                        if (Context._debuggingMode > 0 && Command is not PSScriptCmdlet)
+                        using (ParameterBinderBase.bindingTracer.TraceScope(
+                            "CALLING BeginProcessing"))
                         {
-                            Context.Debugger.CheckCommand(Command.MyInvocation);
-                        }
+                            SetCurrentScopeToExecutionScope();
 
-                        Command.DoBeginProcessing();
+                            if (Context._debuggingMode > 0 && Command is not PSScriptCmdlet)
+                            {
+                                Context.Debugger.CheckCommand(this.Command.MyInvocation);
+                            }
+
+                            Command.DoBeginProcessing();
+                        }
                     }
                 }
                 catch (Exception e)
@@ -588,14 +589,20 @@ namespace System.Management.Automation
             try
             {
                 using (commandRuntime.AllowThisCommandToWrite(true))
-                using (ParameterBinderBase.bindingTracer.TraceScope("CALLING EndProcessing"))
                 {
-                    this.Command.DoEndProcessing();
+                    using (ParameterBinderBase.bindingTracer.TraceScope(
+                        "CALLING EndProcessing"))
+                    {
+                        this.Command.DoEndProcessing();
+                    }
                 }
             }
+            // 2004/03/18-JonN This is understood to be
+            // an FXCOP violation, cleared by KCwalina.
             catch (Exception e)
             {
-                // This cmdlet threw an exception, wrap it as needed and bubble it up.
+                // This cmdlet threw an exception, so
+                // wrap it and bubble it up.
                 throw ManageInvocationException(e);
             }
         }
@@ -624,119 +631,44 @@ namespace System.Management.Automation
                 // The RedirectShellErrorOutputPipe flag is used by the V2 hosting API to force the
                 // redirection.
                 //
-                if (RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe is not null)
+                if (this.RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe != null)
                 {
-                    _context.ShellFunctionErrorOutputPipe = commandRuntime.ErrorOutputPipe;
+                    _context.ShellFunctionErrorOutputPipe = this.commandRuntime.ErrorOutputPipe;
                 }
 
                 _context.CurrentCommandProcessor = this;
+
                 SetCurrentScopeToExecutionScope();
                 Complete();
             }
             finally
             {
+                OnRestorePreviousScope();
+
                 _context.ShellFunctionErrorOutputPipe = oldErrorOutputPipe;
                 _context.CurrentCommandProcessor = oldCurrentCommandProcessor;
 
-                RestorePreviousScope();
-            }
-        }
-
-        protected virtual void CleanResource()
-        {
-            try
-            {
-                using (commandRuntime.AllowThisCommandToWrite(permittedToWriteToPipeline: true))
-                using (ParameterBinderBase.bindingTracer.TraceScope("CALLING CleanResource"))
+                // Destroy the local scope at this point if there is one...
+                if (_useLocalScope && CommandScope != null)
                 {
-                    Command.DoCleanResource();
-                }
-            }
-            catch (HaltCommandException)
-            {
-                throw;
-            }
-            catch (FlowControlException)
-            {
-                throw;
-            }
-            catch (Exception e)
-            {
-                // This cmdlet threw an exception, so wrap it and bubble it up.
-                throw ManageInvocationException(e);
-            }
-        }
-
-        internal void DoCleanup()
-        {
-            // The property 'PropagateExceptionsToEnclosingStatementBlock' controls whether a general exception
-            // (an exception thrown from a .NET method invocation, or an expression like '1/0') will be turned
-            // into a terminating error, which will be propagated up and thus stop the rest of the running script.
-            // It is usually used by TryStatement and TrapStatement, which makes the general exception catch-able.
-            //
-            // For the 'Clean' block, we don't want to bubble up the general exception when the command is enclosed
-            // in a TryStatement or has TrapStatement accompanying, because no exception can escape from 'Clean' and
-            // thus it's pointless to bubble up the general exception in this case.
-            //
-            // Therefore we set this property to 'false' here to mask off the previous setting that could be from a
-            // TryStatement or TrapStatement. Example:
-            //   PS:1> function b { end {} clean { 1/0; Write-Host 'clean' } }
-            //   PS:2> b
-            //   RuntimeException: Attempted to divide by zero.
-            //   clean
-            //   ## Note that, outer 'try/trap' doesn't affect the general exception happens in 'Clean' block.
-            //   ## so its behavior is consistent regardless of whether the command is enclosed by 'try/catch' or not.
-            //   PS:3> try { b } catch { 'outer catch' }
-            //   RuntimeException: Attempted to divide by zero.
-            //   clean
-            //
-            // Be noted that, this doesn't affect the TryStatement/TrapStatement within the 'Clean' block. Example:
-            //   ## 'try/trap' within 'Clean' block makes the general exception catch-able.
-            //   PS:3> function a { end {} clean { try { 1/0; Write-Host 'clean' } catch { Write-Host "caught: $_" } } }
-            //   PS:4> a
-            //   caught: Attempted to divide by zero.
-            bool oldExceptionPropagationState = _context.PropagateExceptionsToEnclosingStatementBlock;
-            _context.PropagateExceptionsToEnclosingStatementBlock = false;
-
-            Pipe oldErrorOutputPipe = _context.ShellFunctionErrorOutputPipe;
-            CommandProcessorBase oldCurrentCommandProcessor = _context.CurrentCommandProcessor;
-
-            try
-            {
-                if (RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe is not null)
-                {
-                    _context.ShellFunctionErrorOutputPipe = commandRuntime.ErrorOutputPipe;
+                    CommandSessionState.RemoveScope(CommandScope);
                 }
 
-                _context.CurrentCommandProcessor = this;
-                SetCurrentScopeToExecutionScope();
-                CleanResource();
+                // and the previous scope...
+                if (_previousScope != null)
+                {
+                    // Restore the scope but use the same session state instance we
+                    // got it from because the command may have changed the execution context
+                    // session state...
+                    CommandSessionState.CurrentScope = _previousScope;
+                }
+
+                // Restore the previous session state
+                if (_previousCommandSessionState != null)
+                {
+                    Context.EngineSessionState = _previousCommandSessionState;
+                }
             }
-            finally
-            {
-                _context.PropagateExceptionsToEnclosingStatementBlock = oldExceptionPropagationState;
-                _context.ShellFunctionErrorOutputPipe = oldErrorOutputPipe;
-                _context.CurrentCommandProcessor = oldCurrentCommandProcessor;
-
-                RestorePreviousScope();
-            }
-        }
-
-        internal void ReportCleanupError(Exception exception)
-        {
-            var error = exception is IContainsErrorRecord icer
-                ? icer.ErrorRecord
-                : new ErrorRecord(exception, "Clean.ReportException", ErrorCategory.NotSpecified, targetObject: null);
-
-            PSObject errorWrap = PSObject.AsPSObject(error);
-            errorWrap.WriteStream = WriteStreamType.Error;
-
-            var errorPipe = commandRuntime.ErrorMergeTo == MshCommandRuntime.MergeDataStream.Output
-                ? commandRuntime.OutputPipe
-                : commandRuntime.ErrorOutputPipe;
-
-            errorPipe.Add(errorWrap);
-            _context.QuestionMarkVariableValue = false;
         }
 
         /// <summary>
@@ -845,16 +777,23 @@ namespace System.Management.Automation
                 {
                     do // false loop
                     {
-                        if (e is ProviderInvocationException pie)
+                        ProviderInvocationException pie = e as ProviderInvocationException;
+                        if (pie != null)
                         {
-                            // If a ProviderInvocationException occurred, discard the ProviderInvocationException
-                            // and re-wrap it in CmdletProviderInvocationException.
-                            e = new CmdletProviderInvocationException(pie, Command.MyInvocation);
+                            // If a ProviderInvocationException occurred,
+                            // discard the ProviderInvocationException and
+                            // re-wrap in CmdletProviderInvocationException
+                            e = new CmdletProviderInvocationException(
+                                pie,
+                                Command.MyInvocation);
                             break;
                         }
 
-                        // HaltCommandException will cause the command to stop, but not be reported as an error.
-                        // FlowControlException should not be wrapped.
+                        // 1021203-2005/05/09-JonN
+                        // HaltCommandException will cause the command
+                        // to stop, but not be reported as an error.
+                        // 906445-2005/05/16-JonN
+                        // FlowControlException should not be wrapped
                         if (e is PipelineStoppedException
                             || e is CmdletInvocationException
                             || e is ActionPreferenceStopException
@@ -874,7 +813,9 @@ namespace System.Management.Automation
                         }
 
                         // wrap all other exceptions
-                        e = new CmdletInvocationException(e, Command.MyInvocation);
+                        e = new CmdletInvocationException(
+                                    e,
+                                    Command.MyInvocation);
                     } while (false);
 
                     // commandRuntime.ManageException will always throw PipelineStoppedException
@@ -1002,27 +943,15 @@ namespace System.Management.Automation
         private void Dispose(bool disposing)
         {
             if (_disposed)
-            {
                 return;
-            }
 
             if (disposing)
             {
-                if (UseLocalScope)
-                {
-                    // Clean up the PS drives that are associated with this local scope.
-                    // This operation may be needed at multiple stages depending on whether the 'clean' block is declared:
-                    //  1. when there is a 'clean' block, it needs to be done only after 'clean' block runs, because the scope
-                    //     needs to be preserved until the 'clean' block finish execution.
-                    //  2. when there is no 'clean' block, it needs to be done when
-                    //      (1) there is any exception thrown from 'DoPrepare()', 'DoBegin()', 'DoExecute()', or 'DoComplete';
-                    //      (2) OR, the command runs to the end successfully;
-                    // Doing this cleanup at those multiple stages is cumbersome. Since we will always dispose the command in
-                    // the end, doing this cleanup here will cover all the above cases.
-                    CommandSessionState.RemoveScope(CommandScope);
-                }
-
-                if (Command is IDisposable id)
+                // 2004/03/05-JonN Look into using metadata to check
+                // whether IDisposable is implemented, in order to avoid
+                // this expensive reflection cast.
+                IDisposable id = Command as IDisposable;
+                if (id != null)
                 {
                     id.Dispose();
                 }

src/System.Management.Automation/engine/ExecutionContext.cs

@@ -783,6 +783,11 @@ namespace System.Management.Automation
             return oldPipe;
         }
 
+        internal void RestoreErrorPipe(Pipe pipe)
+        {
+            ShellFunctionErrorOutputPipe = pipe;
+        }
+
         /// <summary>
         /// Reset all of the redirection book keeping variables. This routine should be called when starting to
         /// execute a script.
@@ -835,13 +840,15 @@ namespace System.Management.Automation
         internal void AppendDollarError(object obj)
         {
             ErrorRecord objAsErrorRecord = obj as ErrorRecord;
-            if (objAsErrorRecord is null && obj is not Exception)
+            if (objAsErrorRecord == null && obj is not Exception)
             {
                 Diagnostics.Assert(false, "Object to append was neither an ErrorRecord nor an Exception in ExecutionContext.AppendDollarError");
                 return;
             }
 
-            if (DollarErrorVariable is not ArrayList arraylist)
+            object old = this.DollarErrorVariable;
+            ArrayList arraylist = old as ArrayList;
+            if (arraylist == null)
             {
                 Diagnostics.Assert(false, "$error should be a global constant ArrayList");
                 return;

src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs

@@ -23,8 +23,6 @@ namespace System.Management.Automation
         internal const string EngineSource = "PSEngine";
         internal const string PSNativeCommandArgumentPassingFeatureName = "PSNativeCommandArgumentPassing";
         internal const string PSNativeCommandErrorActionPreferenceFeatureName = "PSNativeCommandErrorActionPreference";
-        internal const string PSRemotingSSHTransportErrorHandling = "PSRemotingSSHTransportErrorHandling";
-        internal const string PSCleanBlockFeatureName = "PSCleanBlock";
 
         #endregion
 
@@ -128,12 +126,6 @@ namespace System.Management.Automation
                 new ExperimentalFeature(
                     name: PSNativeCommandErrorActionPreferenceFeatureName,
                     description: "Native commands with non-zero exit codes issue errors according to $ErrorActionPreference when $PSNativeCommandUseErrorActionPreference is $true"),
-                new ExperimentalFeature(
-                    name: PSRemotingSSHTransportErrorHandling,
-                    description: "Removes the SSH remoting transport stdErr stream message handling as terminating errors, and instead just writes error messages to console."),
-                new ExperimentalFeature(
-                    name: PSCleanBlockFeatureName,
-                    description: "Add support of a 'Clean' block to functions and script cmdlets for easy resource cleanup"),
             };
 
             EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);

src/System.Management.Automation/engine/InitialSessionState.cs

@@ -1434,6 +1434,9 @@ namespace System.Management.Automation.Runspaces
             return iss;
         }
 
+        // Porting note: moved to Platform so we have one list to maintain
+        private static readonly string[] s_PSCoreFormatFileNames = Platform.FormatFileNames.ToArray();
+
         private static void IncludePowerShellCoreFormats(InitialSessionState iss)
         {
             string psHome = Utils.DefaultPowerShellAppBase;
@@ -1443,7 +1446,7 @@ namespace System.Management.Automation.Runspaces
             }
 
             iss.Formats.Clear();
-            foreach (var coreFormat in Platform.FormatFileNames)
+            foreach (var coreFormat in s_PSCoreFormatFileNames)
             {
                 iss.Formats.Add(new SessionStateFormatEntry(Path.Combine(psHome, coreFormat)));
             }

src/System.Management.Automation/engine/InternalCommands.cs

@@ -6,6 +6,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Dynamic;
 using System.Globalization;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
@@ -14,10 +15,8 @@ using System.Management.Automation.PSTasks;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading;
-
 using CommonParamSet = System.Management.Automation.Internal.CommonParameters;
 using Dbg = System.Management.Automation.Diagnostics;
-using NotNullWhen = System.Diagnostics.CodeAnalysis.NotNullWhenAttribute;
 
 namespace Microsoft.PowerShell.Commands
 {
@@ -2648,19 +2647,46 @@ namespace Microsoft.PowerShell.Commands
         private SwitchParameter _off;
 
         /// <summary>
-        /// Handle 'latest', which we interpret to be the current version of PowerShell.
+        /// To make it easier to specify a version, we add some conversions that wouldn't happen otherwise:
+        ///   * A simple integer, i.e. 2
+        ///   * A string without a dot, i.e. "2"
+        ///   * The string 'latest', which we interpret to be the current version of PowerShell.
         /// </summary>
-        private sealed class ArgumentToPSVersionTransformationAttribute : ArgumentToVersionTransformationAttribute
+        private sealed class ArgumentToVersionTransformationAttribute : ArgumentTransformationAttribute
         {
-            protected override bool TryConvertFromString(string versionString, [NotNullWhen(true)] out Version version)
+            public override object Transform(EngineIntrinsics engineIntrinsics, object inputData)
             {
-                if (string.Equals("latest", versionString, StringComparison.OrdinalIgnoreCase))
+                object version = PSObject.Base(inputData);
+
+                string versionStr = version as string;
+                if (versionStr != null)
                 {
-                    version = PSVersionInfo.PSVersion;
-                    return true;
+                    if (versionStr.Equals("latest", StringComparison.OrdinalIgnoreCase))
+                    {
+                        return PSVersionInfo.PSVersion;
+                    }
+
+                    if (versionStr.Contains('.'))
+                    {
+                        // If the string contains a '.', let the Version constructor handle the conversion.
+                        return inputData;
+                    }
                 }
 
-                return base.TryConvertFromString(versionString, out version);
+                if (version is double)
+                {
+                    // The conversion to int below is wrong, but the usual conversions will turn
+                    // the double into a string, so just return the original object.
+                    return inputData;
+                }
+
+                int majorVersion;
+                if (LanguagePrimitives.TryConvertTo<int>(version, out majorVersion))
+                {
+                    return new Version(majorVersion, 0);
+                }
+
+                return inputData;
             }
         }
 
@@ -2685,7 +2711,7 @@ namespace Microsoft.PowerShell.Commands
         /// Gets or sets strict mode in the current scope.
         /// </summary>
         [Parameter(ParameterSetName = "Version", Mandatory = true)]
-        [ArgumentToPSVersionTransformation]
+        [ArgumentToVersionTransformation]
         [ValidateVersion]
         [Alias("v")]
         public Version Version

src/System.Management.Automation/engine/MshCommandRuntime.cs

@@ -928,8 +928,7 @@ namespace System.Management.Automation
         /// </summary>
         internal string PipelineVariable { get; set; }
 
-        private PSVariable _pipelineVarReference;
-        private bool _shouldRemovePipelineVariable;
+        private PSVariable _pipelineVarReference = null;
 
         internal void SetupOutVariable()
         {
@@ -942,8 +941,10 @@ namespace System.Management.Automation
 
             // Handle the creation of OutVariable in the case of Out-Default specially,
             // as it needs to handle much of its OutVariable support itself.
-            if (!OutVariable.StartsWith('+') &&
-                string.Equals("Out-Default", _commandInfo.Name, StringComparison.OrdinalIgnoreCase))
+            if (
+                (!string.IsNullOrEmpty(this.OutVariable)) &&
+                (!(this.OutVariable.StartsWith('+'))) &&
+                string.Equals("Out-Default", _thisCommand.CommandInfo.Name, StringComparison.OrdinalIgnoreCase))
             {
                 if (_state == null)
                     _state = new SessionState(Context.EngineSessionState);
@@ -971,7 +972,7 @@ namespace System.Management.Automation
             // This can't use the common SetupVariable implementation, as this needs to persist for an entire
             // pipeline.
 
-            if (string.IsNullOrEmpty(PipelineVariable))
+            if (string.IsNullOrEmpty(this.PipelineVariable))
             {
                 return;
             }
@@ -982,24 +983,12 @@ namespace System.Management.Automation
                 _state = new SessionState(Context.EngineSessionState);
 
             // Create the pipeline variable
-            _pipelineVarReference = new PSVariable(PipelineVariable);
-            object varToUse = _state.Internal.SetVariable(
-                _pipelineVarReference,
-                force: false,
-                CommandOrigin.Internal);
+            _pipelineVarReference = new PSVariable(this.PipelineVariable);
+            _state.PSVariable.Set(_pipelineVarReference);
 
-            if (ReferenceEquals(_pipelineVarReference, varToUse))
-            {
-                // The returned variable is the exact same instance, which means we set a new variable.
-                // In this case, we will try removing the pipeline variable in the end.
-                _shouldRemovePipelineVariable = true;
-            }
-            else
-            {
-                // A variable with the same name already exists in the same scope and it was returned.
-                // In this case, we update the reference and don't remove the variable in the end.
-                _pipelineVarReference = (PSVariable)varToUse;
-            }
+            // Get the reference again in case we re-used one from the
+            // same scope.
+            _pipelineVarReference = _state.PSVariable.Get(this.PipelineVariable);
 
             if (_thisCommand is not PSScriptCmdlet)
             {
@@ -1007,15 +996,6 @@ namespace System.Management.Automation
             }
         }
 
-        internal void RemovePipelineVariable()
-        {
-            if (_shouldRemovePipelineVariable)
-            {
-                // Remove pipeline variable when a pipeline is being torn down.
-                _state.PSVariable.Remove(PipelineVariable);
-            }
-        }
-
         /// <summary>
         /// Configures the number of objects to buffer before calling the downstream Cmdlet.
         /// </summary>
@@ -2424,6 +2404,7 @@ namespace System.Management.Automation
                 }
 
                 // Log a command health event
+
                 MshLog.LogCommandHealthEvent(
                     Context,
                     e,
@@ -3762,10 +3743,8 @@ namespace System.Management.Automation
         {
             Diagnostics.Assert(_thisCommand is PSScriptCmdlet, "this is only done for script cmdlets");
 
-            if (_outVarList != null && !OutputPipe.IgnoreOutVariableList)
+            if (_outVarList != null)
             {
-                // A null pipe is used when executing the 'Clean' block of a PSScriptCmdlet.
-                // In such a case, we don't capture output to the out variable list.
                 this.OutputPipe.AddVariableList(VariableStreamKind.Output, _outVarList);
             }
 
@@ -3786,13 +3765,26 @@ namespace System.Management.Automation
 
             if (this.PipelineVariable != null)
             {
+                // _state can be null if the current script block is dynamicparam, etc.
+                if (_state != null)
+                {
+                    // Create the pipeline variable
+                    _state.PSVariable.Set(_pipelineVarReference);
+
+                    // Get the reference again in case we re-used one from the
+                    // same scope.
+                    _pipelineVarReference = _state.PSVariable.Get(this.PipelineVariable);
+                }
+
                 this.OutputPipe.SetPipelineVariable(_pipelineVarReference);
             }
         }
 
         internal void RemoveVariableListsInPipe()
         {
-            if (_outVarList != null && !OutputPipe.IgnoreOutVariableList)
+            // Diagnostics.Assert(thisCommand is PSScriptCmdlet, "this is only done for script cmdlets");
+
+            if (_outVarList != null)
             {
                 this.OutputPipe.RemoveVariableList(VariableStreamKind.Output, _outVarList);
             }
@@ -3815,6 +3807,9 @@ namespace System.Management.Automation
             if (this.PipelineVariable != null)
             {
                 this.OutputPipe.RemovePipelineVariable();
+                // '_state' could be null when a 'DynamicParam' block runs because the 'DynamicParam' block runs in 'DoPrepare',
+                // before 'PipelineProcessor.SetupParameterVariables' is called, where '_state' is initialized.
+                _state?.PSVariable.Remove(this.PipelineVariable);
             }
         }
     }

src/System.Management.Automation/engine/NativeCommandProcessor.cs

@@ -884,7 +884,7 @@ namespace System.Management.Automation
                         errorMsg,
                         errorId);
 
-                    var errorRecord = new ErrorRecord(exception, errorId, ErrorCategory.NotSpecified, targetObject: Path);
+                    var errorRecord = new ErrorRecord(exception, errorId, ErrorCategory.NotSpecified, targetObject: NativeCommandName);
                     this.commandRuntime._WriteErrorSkipAllowCheck(errorRecord);
                 }
             }
@@ -1106,6 +1106,18 @@ namespace System.Management.Automation
                 return false;
             }
 
+            // The function 'SHGetFileInfo()' does not understand reparse points and returns 0 ("non exe or error")
+            // for a symbolic link file, so we try to get the immediate link target in that case.
+            // Why not get the final target (use 'returnFinalTarget: true')? Because:
+            //  1. When starting a process on Windows, if the 'FileName' is a symbolic link, the immediate link target will automatically be used,
+            //     but the OS does not do recursive resolution when the immediate link target is also a symbolic link.
+            //  2. Keep the same behavior as before adopting the 'LinkTarget' and 'ResolveLinkTarget' APIs in .NET 6.
+            string linkTarget = File.ResolveLinkTarget(fileName, returnFinalTarget: false)?.FullName;
+            if (linkTarget is not null)
+            {
+                fileName = linkTarget;
+            }
+
             SHFILEINFO shinfo = new SHFILEINFO();
             IntPtr type = SHGetFileInfo(fileName, 0, ref shinfo, (uint)Marshal.SizeOf(shinfo), SHGFI_EXETYPE);
 

src/System.Management.Automation/engine/PSVersionInfo.cs

@@ -64,7 +64,6 @@ namespace System.Management.Automation
         private static readonly SemanticVersion s_psV62Version = new SemanticVersion(6, 2, 0, preReleaseLabel: null, buildLabel: null);
         private static readonly SemanticVersion s_psV7Version = new SemanticVersion(7, 0, 0, preReleaseLabel: null, buildLabel: null);
         private static readonly SemanticVersion s_psV71Version = new SemanticVersion(7, 1, 0, preReleaseLabel: null, buildLabel: null);
-        private static readonly SemanticVersion s_psV72Version = new SemanticVersion(7, 2, 0, preReleaseLabel: null, buildLabel: null);
         private static readonly SemanticVersion s_psSemVersion;
         private static readonly Version s_psVersion;
 
@@ -111,7 +110,7 @@ namespace System.Management.Automation
             s_psVersionTable[PSVersionInfo.PSVersionName] = s_psSemVersion;
             s_psVersionTable[PSVersionInfo.PSEditionName] = PSEditionValue;
             s_psVersionTable[PSGitCommitIdName] = rawGitCommitId;
-            s_psVersionTable[PSCompatibleVersionsName] = new Version[] { s_psV1Version, s_psV2Version, s_psV3Version, s_psV4Version, s_psV5Version, s_psV51Version, s_psV6Version, s_psV61Version, s_psV62Version, s_psV7Version, s_psV71Version, s_psV72Version, s_psVersion };
+            s_psVersionTable[PSCompatibleVersionsName] = new Version[] { s_psV1Version, s_psV2Version, s_psV3Version, s_psV4Version, s_psV5Version, s_psV51Version, s_psV6Version, s_psV61Version, s_psV62Version, s_psV7Version, s_psV71Version, s_psVersion };
             s_psVersionTable[PSVersionInfo.SerializationVersionName] = new Version(InternalSerializer.DefaultVersion);
             s_psVersionTable[PSVersionInfo.PSRemotingProtocolVersionName] = RemotingConstants.ProtocolVersion;
             s_psVersionTable[PSVersionInfo.WSManStackVersionName] = GetWSManStackVersion();

src/System.Management.Automation/engine/Pipe.cs

@@ -109,13 +109,6 @@ namespace System.Management.Automation.Internal
         /// </summary>
         internal int OutBufferCount { get; set; } = 0;
 
-        /// <summary>
-        /// Gets whether the out variable list should be ignored.
-        /// This is used for scenarios like the `clean` block, where writing to output stream is intentionally
-        /// disabled and thus out variables should also be ignored.
-        /// </summary>
-        internal bool IgnoreOutVariableList { get; set; }
-
         /// <summary>
         /// If true, then all input added to this pipe will simply be discarded...
         /// </summary>

src/System.Management.Automation/engine/ProxyCommand.cs

@@ -247,30 +247,6 @@ namespace System.Management.Automation
             return commandMetadata.GetEndBlock();
         }
 
-        /// <summary>
-        /// This method constructs a string representing the clean block of the command
-        /// specified by <paramref name="commandMetadata"/>. The returned string only contains the
-        /// script, it is not enclosed in "clean { }".
-        /// </summary>
-        /// <param name="commandMetadata">
-        /// An instance of CommandMetadata representing a command.
-        /// </param>
-        /// <returns>
-        /// A string representing the end block of the command.
-        /// </returns>
-        /// <exception cref="ArgumentNullException">
-        /// If <paramref name="commandMetadata"/> is null.
-        /// </exception>
-        public static string GetClean(CommandMetadata commandMetadata)
-        {
-            if (commandMetadata == null)
-            {
-                throw PSTraceSource.NewArgumentNullException(nameof(commandMetadata));
-            }
-
-            return commandMetadata.GetCleanBlock();
-        }
-
         private static T GetProperty<T>(PSObject obj, string property) where T : class
         {
             T result = null;

src/System.Management.Automation/engine/ScriptCommandProcessor.cs

@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Management.Automation.Internal;
 using System.Management.Automation.Language;
-using System.Management.Automation.Runspaces;
 using System.Reflection;
 
 using Dbg = System.Management.Automation.Diagnostics;
@@ -48,7 +47,7 @@ namespace System.Management.Automation
         protected bool _dontUseScopeCommandOrigin;
 
         /// <summary>
-        /// If true, then an exit exception will be rethrown instead of caught and processed...
+        /// If true, then an exit exception will be rethrown to instead of caught and processed...
         /// </summary>
         protected bool _rethrowExitException;
 
@@ -238,7 +237,6 @@ namespace System.Management.Automation
         private MutableTuple _localsTuple;
         private bool _runOptimizedCode;
         private bool _argsBound;
-        private bool _anyClauseExecuted;
         private FunctionContext _functionContext;
 
         internal DlrScriptCommandProcessor(ScriptBlock scriptBlock, ExecutionContext context, bool useNewScope, CommandOrigin origin, SessionStateInternal sessionState, object dollarUnderbar)
@@ -329,7 +327,8 @@ namespace System.Management.Automation
 
                 ScriptBlock.LogScriptBlockStart(_scriptBlock, Context.CurrentRunspace.InstanceId);
 
-                // Even if there is no begin, we need to set up the execution scope for this script...
+                // Even if there is no begin, we need to set up the execution scope for this
+                // script...
                 SetCurrentScopeToExecutionScope();
                 CommandProcessorBase oldCurrentCommandProcessor = Context.CurrentCommandProcessor;
                 try
@@ -411,7 +410,6 @@ namespace System.Management.Automation
                 if (_scriptBlock.HasEndBlock)
                 {
                     var endBlock = _runOptimizedCode ? _scriptBlock.EndBlock : _scriptBlock.UnoptimizedEndBlock;
-
                     if (this.CommandRuntime.InputPipe.ExternalReader == null)
                     {
                         if (IsPipelineInputExpected())
@@ -435,33 +433,7 @@ namespace System.Management.Automation
             }
             finally
             {
-                if (!_scriptBlock.HasCleanBlock)
-                {
-                    ScriptBlock.LogScriptBlockEnd(_scriptBlock, Context.CurrentRunspace.InstanceId);
-                }
-            }
-        }
-
-        protected override void CleanResource()
-        {
-            if (_scriptBlock.HasCleanBlock && _anyClauseExecuted)
-            {
-                // The 'Clean' block doesn't write to pipeline.
-                Pipe oldOutputPipe = _functionContext._outputPipe;
-                _functionContext._outputPipe = new Pipe { NullPipe = true };
-
-                try
-                {
-                    RunClause(
-                        clause: _runOptimizedCode ? _scriptBlock.CleanBlock : _scriptBlock.UnoptimizedCleanBlock,
-                        dollarUnderbar: AutomationNull.Value,
-                        inputToProcess: AutomationNull.Value);
-                }
-                finally
-                {
-                    _functionContext._outputPipe = oldOutputPipe;
-                    ScriptBlock.LogScriptBlockEnd(_scriptBlock, Context.CurrentRunspace.InstanceId);
-                }
+                ScriptBlock.LogScriptBlockEnd(_scriptBlock, Context.CurrentRunspace.InstanceId);
             }
         }
 
@@ -487,7 +459,6 @@ namespace System.Management.Automation
         {
             ExecutionContext.CheckStackDepth();
 
-            _anyClauseExecuted = true;
             Pipe oldErrorOutputPipe = this.Context.ShellFunctionErrorOutputPipe;
 
             // If the script block has a different language mode than the current,
@@ -582,7 +553,7 @@ namespace System.Management.Automation
                 }
                 finally
                 {
-                    Context.ShellFunctionErrorOutputPipe = oldErrorOutputPipe;
+                    this.Context.RestoreErrorPipe(oldErrorOutputPipe);
 
                     if (oldLanguageMode.HasValue)
                     {
@@ -613,12 +584,15 @@ namespace System.Management.Automation
             }
             catch (RuntimeException e)
             {
-                // This method always throws.
-                ManageScriptException(e);
+                ManageScriptException(e); // always throws
+                // This quiets the compiler which wants to see a return value
+                // in all codepaths.
+                throw;
             }
             catch (Exception e)
             {
-                // This cmdlet threw an exception, so wrap it and bubble it up.
+                // This cmdlet threw an exception, so
+                // wrap it and bubble it up.
                 throw ManageInvocationException(e);
             }
         }

src/System.Management.Automation/engine/TypeTable.cs

@@ -1747,7 +1747,7 @@ namespace System.Management.Automation.Runspaces
 
     /// <summary>
     /// This exception is used by TypeTable constructor to indicate errors
-    /// occurred during construction time.
+    /// occured during construction time.
     /// </summary>
     [Serializable]
     public class TypeTableLoadException : RuntimeException
@@ -1796,7 +1796,7 @@ namespace System.Management.Automation.Runspaces
         /// time.
         /// </summary>
         /// <param name="loadErrors">
-        /// The errors that occurred
+        /// The errors that occured
         /// </param>
         internal TypeTableLoadException(ConcurrentBag<string> loadErrors)
             : base(TypesXmlStrings.TypeTableLoadErrors)

src/System.Management.Automation/engine/debugger/Breakpoint.cs

@@ -531,16 +531,15 @@ namespace System.Management.Automation
 
             // Not found.  First, we check if the line/column is before any real code.  If so, we'll
             // move the breakpoint to the first interesting sequence point (could be a dynamicparam,
-            // begin, process, end, or clean block.)
+            // begin, process, or end block.)
             if (scriptBlock != null)
             {
                 var ast = scriptBlock.Ast;
                 var bodyAst = ((IParameterMetadataProvider)ast).Body;
-                if ((bodyAst.DynamicParamBlock == null || bodyAst.DynamicParamBlock.Extent.IsAfter(Line, Column))
-                    && (bodyAst.BeginBlock == null || bodyAst.BeginBlock.Extent.IsAfter(Line, Column))
-                    && (bodyAst.ProcessBlock == null || bodyAst.ProcessBlock.Extent.IsAfter(Line, Column))
-                    && (bodyAst.EndBlock == null || bodyAst.EndBlock.Extent.IsAfter(Line, Column))
-                    && (bodyAst.CleanBlock == null || bodyAst.CleanBlock.Extent.IsAfter(Line, Column)))
+                if ((bodyAst.DynamicParamBlock == null || bodyAst.DynamicParamBlock.Extent.IsAfter(Line, Column)) &&
+                    (bodyAst.BeginBlock == null || bodyAst.BeginBlock.Extent.IsAfter(Line, Column)) &&
+                    (bodyAst.ProcessBlock == null || bodyAst.ProcessBlock.Extent.IsAfter(Line, Column)) &&
+                    (bodyAst.EndBlock == null || bodyAst.EndBlock.Extent.IsAfter(Line, Column)))
                 {
                     SetBreakpoint(functionContext, 0);
                     return true;

src/System.Management.Automation/engine/hostifaces/Pipeline.cs

@@ -445,7 +445,7 @@ namespace System.Management.Automation.Runspaces
         ///
         /// This flag is used to force the redirection. By default it is false to maintain compatibility with
         /// V1, but the V2 hosting interface (PowerShell class) sets this flag to true to ensure the global
-        /// error output pipe is always set and $ErrorActionPreference is checked when invoking the Pipeline.
+        /// error output pipe is always set and $ErrorActionPreference when invoking the Pipeline.
         /// </summary>
         internal bool RedirectShellErrorOutputPipe { get; set; } = false;
 

src/System.Management.Automation/engine/lang/scriptblock.cs

@@ -1280,42 +1280,7 @@ namespace System.Management.Automation
             {
                 // then pop this pipeline and dispose it...
                 _context.PopPipelineProcessor(true);
-                Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Clean resources for script commands of this steppable pipeline.
-        /// </summary>
-        /// <remarks>
-        /// The way we handle 'Clean' blocks in a steppable pipeline makes sure that:
-        ///  1. The 'Clean' blocks get to run if any exception is thrown from 'Begin/Process/End'.
-        ///  2. The 'Clean' blocks get to run if 'End' finished successfully.
-        /// However, this is not enough for a steppable pipeline, because the function, where the steppable
-        /// pipeline gets used, may fail (think about a proxy function). And that may lead to the situation
-        /// where "no exception was thrown from the steppable pipeline" but "the steppable pipeline didn't
-        /// run to the end". In that case, 'Clean' won't run unless it's triggered explicitly on the steppable
-        /// pipeline. This method allows a user to do that from the 'Clean' block of the proxy function.
-        /// </remarks>
-        public void Clean()
-        {
-            if (_pipeline.Commands is null)
-            {
-                // The pipeline commands have been disposed. In this case, 'Clean'
-                // should have already been called on the pipeline processor.
-                return;
-            }
-
-            try
-            {
-                _context.PushPipelineProcessor(_pipeline);
-                _pipeline.DoCleanup();
-            }
-            finally
-            {
-                // then pop this pipeline and dispose it...
-                _context.PopPipelineProcessor(true);
-                Dispose();
+                _pipeline.Dispose();
             }
         }
 
@@ -1328,13 +1293,23 @@ namespace System.Management.Automation
         /// When this object is disposed, the contained pipeline should also be disposed.
         /// </summary>
         public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
         {
             if (_disposed)
             {
                 return;
             }
 
-            _pipeline.Dispose();
+            if (disposing)
+            {
+                _pipeline.Dispose();
+            }
+
             _disposed = true;
         }
 

src/System.Management.Automation/engine/parser/Compiler.cs

@@ -2026,7 +2026,6 @@ namespace System.Management.Automation.Language
                 scriptBlock.BeginBlock = CompileTree(_beginBlockLambda, compileInterpretChoice);
                 scriptBlock.ProcessBlock = CompileTree(_processBlockLambda, compileInterpretChoice);
                 scriptBlock.EndBlock = CompileTree(_endBlockLambda, compileInterpretChoice);
-                scriptBlock.CleanBlock = CompileTree(_cleanBlockLambda, compileInterpretChoice);
                 scriptBlock.LocalsMutableTupleType = LocalVariablesTupleType;
                 scriptBlock.LocalsMutableTupleCreator = MutableTuple.TupleCreator(LocalVariablesTupleType);
                 scriptBlock.NameToIndexMap = nameToIndexMap;
@@ -2037,7 +2036,6 @@ namespace System.Management.Automation.Language
                 scriptBlock.UnoptimizedBeginBlock = CompileTree(_beginBlockLambda, compileInterpretChoice);
                 scriptBlock.UnoptimizedProcessBlock = CompileTree(_processBlockLambda, compileInterpretChoice);
                 scriptBlock.UnoptimizedEndBlock = CompileTree(_endBlockLambda, compileInterpretChoice);
-                scriptBlock.UnoptimizedCleanBlock = CompileTree(_cleanBlockLambda, compileInterpretChoice);
                 scriptBlock.UnoptimizedLocalsMutableTupleType = LocalVariablesTupleType;
                 scriptBlock.UnoptimizedLocalsMutableTupleCreator = MutableTuple.TupleCreator(LocalVariablesTupleType);
             }
@@ -2223,7 +2221,6 @@ namespace System.Management.Automation.Language
         private Expression<Action<FunctionContext>> _beginBlockLambda;
         private Expression<Action<FunctionContext>> _processBlockLambda;
         private Expression<Action<FunctionContext>> _endBlockLambda;
-        private Expression<Action<FunctionContext>> _cleanBlockLambda;
 
         private readonly List<LoopGotoTargets> _loopTargets = new List<LoopGotoTargets>();
         private bool _generatingWhileOrDoLoop;
@@ -2466,13 +2463,6 @@ namespace System.Management.Automation.Language
                 }
 
                 _endBlockLambda = CompileNamedBlock(scriptBlockAst.EndBlock, funcName, rootForDefiningTypesAndUsings);
-                rootForDefiningTypesAndUsings = null;
-            }
-
-            if (scriptBlockAst.CleanBlock != null)
-            {
-                _cleanBlockLambda = CompileNamedBlock(scriptBlockAst.CleanBlock, funcName + "<Clean>", rootForDefiningTypesAndUsings);
-                rootForDefiningTypesAndUsings = null;
             }
 
             return null;

src/System.Management.Automation/engine/parser/Parser.cs

@@ -724,13 +724,12 @@ namespace System.Management.Automation.Language
             ParseError[] parseErrors;
             var ast = Parser.ParseInput(input, out throwAwayTokens, out parseErrors);
 
-            if (ast == null
-                || parseErrors.Length > 0
-                || ast.BeginBlock != null
-                || ast.ProcessBlock != null
-                || ast.CleanBlock != null
-                || ast.DynamicParamBlock != null
-                || ast.EndBlock.Traps != null)
+            if ((ast == null) ||
+                parseErrors.Length > 0 ||
+                ast.BeginBlock != null ||
+                ast.ProcessBlock != null ||
+                ast.DynamicParamBlock != null ||
+                ast.EndBlock.Traps != null)
             {
                 return false;
             }
@@ -1535,25 +1534,6 @@ namespace System.Management.Automation.Language
                             token = NextToken();
                         } while (token.Kind == TokenKind.Comma);
 
-                        // The dimensions for an array must be less than or equal to 32.
-                        // Search the doc for 'Type.MakeArrayType(int rank)' for more details.
-                        if (dim > 32)
-                        {
-                            // If the next token is right bracket, we swallow it to make it easier to parse the rest of script.
-                            // Otherwise, we unget the token for the subsequent parsing to consume.
-                            if (token.Kind != TokenKind.RBracket)
-                            {
-                                UngetToken(token);
-                            }
-
-                            ReportError(
-                                ExtentOf(firstTokenAfterLBracket, lastComma),
-                                nameof(ParserStrings.ArrayHasTooManyDimensions),
-                                ParserStrings.ArrayHasTooManyDimensions,
-                                arg: dim);
-                            break;
-                        }
-
                         if (token.Kind != TokenKind.RBracket)
                         {
                             // ErrorRecovery: just pretend we saw a ']'.
@@ -1733,9 +1713,9 @@ namespace System.Management.Automation.Language
             NamedBlockAst beginBlock = null;
             NamedBlockAst processBlock = null;
             NamedBlockAst endBlock = null;
-            NamedBlockAst cleanBlock = null;
-
-            IScriptExtent startExtent = lCurly?.Extent ?? paramBlockAst?.Extent;
+            IScriptExtent startExtent = lCurly != null
+                                            ? lCurly.Extent
+                                            : paramBlockAst?.Extent;
             IScriptExtent endExtent = null;
             IScriptExtent extent = null;
             IScriptExtent scriptBlockExtent = null;
@@ -1777,7 +1757,6 @@ namespace System.Management.Automation.Language
                     case TokenKind.Begin:
                     case TokenKind.Process:
                     case TokenKind.End:
-                    case TokenKind.Clean:
                         break;
                 }
 
@@ -1818,10 +1797,6 @@ namespace System.Management.Automation.Language
                 {
                     endBlock = new NamedBlockAst(extent, TokenKind.End, statementBlock, false);
                 }
-                else if (blockNameToken.Kind == TokenKind.Clean && cleanBlock == null)
-                {
-                    cleanBlock = new NamedBlockAst(extent, TokenKind.Clean, statementBlock, false);
-                }
                 else if (blockNameToken.Kind == TokenKind.Dynamicparam && dynamicParamBlock == null)
                 {
                     dynamicParamBlock = new NamedBlockAst(extent, TokenKind.Dynamicparam, statementBlock, false);
@@ -1843,14 +1818,7 @@ namespace System.Management.Automation.Language
             CompleteScriptBlockBody(lCurly, ref extent, out scriptBlockExtent);
 
         return_script_block_ast:
-            return new ScriptBlockAst(
-                scriptBlockExtent,
-                usingStatements,
-                paramBlockAst,
-                beginBlock,
-                processBlock,
-                endBlock,
-                cleanBlock,
+            return new ScriptBlockAst(scriptBlockExtent, usingStatements, paramBlockAst, beginBlock, processBlock, endBlock,
                 dynamicParamBlock);
         }
 

src/System.Management.Automation/engine/parser/SemanticChecks.cs

@@ -406,11 +406,10 @@ namespace System.Management.Automation.Language
                     ParserStrings.ParamBlockNotAllowedInMethod);
             }
 
-            if (body.BeginBlock != null
-                || body.ProcessBlock != null
-                || body.CleanBlock != null
-                || body.DynamicParamBlock != null
-                || !body.EndBlock.Unnamed)
+            if (body.BeginBlock != null ||
+                body.ProcessBlock != null ||
+                body.DynamicParamBlock != null ||
+                !body.EndBlock.Unnamed)
             {
                 _parser.ReportError(Parser.ExtentFromFirstOf(body.DynamicParamBlock, body.BeginBlock, body.ProcessBlock, body.EndBlock),
                     nameof(ParserStrings.NamedBlockNotAllowedInMethod),

src/System.Management.Automation/engine/parser/VariableAnalysis.cs

@@ -945,11 +945,25 @@ namespace System.Management.Automation.Language
         {
             _currentBlock = _entryBlock;
 
-            scriptBlockAst.DynamicParamBlock?.Accept(this);
-            scriptBlockAst.BeginBlock?.Accept(this);
-            scriptBlockAst.ProcessBlock?.Accept(this);
-            scriptBlockAst.EndBlock?.Accept(this);
-            scriptBlockAst.CleanBlock?.Accept(this);
+            if (scriptBlockAst.DynamicParamBlock != null)
+            {
+                scriptBlockAst.DynamicParamBlock.Accept(this);
+            }
+
+            if (scriptBlockAst.BeginBlock != null)
+            {
+                scriptBlockAst.BeginBlock.Accept(this);
+            }
+
+            if (scriptBlockAst.ProcessBlock != null)
+            {
+                scriptBlockAst.ProcessBlock.Accept(this);
+            }
+
+            if (scriptBlockAst.EndBlock != null)
+            {
+                scriptBlockAst.EndBlock.Accept(this);
+            }
 
             _currentBlock.FlowsTo(_exitBlock);
 

src/System.Management.Automation/engine/parser/ast.cs

@@ -818,46 +818,6 @@ namespace System.Management.Automation.Language
                               NamedBlockAst processBlock,
                               NamedBlockAst endBlock,
                               NamedBlockAst dynamicParamBlock)
-            : this(
-                extent,
-                usingStatements,
-                attributes,
-                paramBlock,
-                beginBlock,
-                processBlock,
-                endBlock,
-                cleanBlock: null,
-                dynamicParamBlock)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ScriptBlockAst"/> class.
-        /// This construction uses explicitly named begin/process/end/clean blocks.
-        /// </summary>
-        /// <param name="extent">The extent of the script block.</param>
-        /// <param name="usingStatements">The list of using statments, may be null.</param>
-        /// <param name="attributes">The set of attributes for the script block.</param>
-        /// <param name="paramBlock">The ast for the param block, may be null.</param>
-        /// <param name="beginBlock">The ast for the begin block, may be null.</param>
-        /// <param name="processBlock">The ast for the process block, may be null.</param>
-        /// <param name="endBlock">The ast for the end block, may be null.</param>
-        /// <param name="cleanBlock">The ast for the clean block, may be null.</param>
-        /// <param name="dynamicParamBlock">The ast for the dynamicparam block, may be null.</param>
-        /// <exception cref="PSArgumentNullException">
-        /// If <paramref name="extent"/> is null.
-        /// </exception>
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "param")]
-        public ScriptBlockAst(
-            IScriptExtent extent,
-            IEnumerable<UsingStatementAst> usingStatements,
-            IEnumerable<AttributeAst> attributes,
-            ParamBlockAst paramBlock,
-            NamedBlockAst beginBlock,
-            NamedBlockAst processBlock,
-            NamedBlockAst endBlock,
-            NamedBlockAst cleanBlock,
-            NamedBlockAst dynamicParamBlock)
             : base(extent)
         {
             SetUsingStatements(usingStatements);
@@ -896,12 +856,6 @@ namespace System.Management.Automation.Language
                 SetParent(endBlock);
             }
 
-            if (cleanBlock != null)
-            {
-                this.CleanBlock = cleanBlock;
-                SetParent(cleanBlock);
-            }
-
             if (dynamicParamBlock != null)
             {
                 this.DynamicParamBlock = dynamicParamBlock;
@@ -934,35 +888,6 @@ namespace System.Management.Automation.Language
         {
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ScriptBlockAst"/> class.
-        /// This construction uses explicitly named begin/process/end/clean blocks.
-        /// </summary>
-        /// <param name="extent">The extent of the script block.</param>
-        /// <param name="usingStatements">The list of using statments, may be null.</param>
-        /// <param name="paramBlock">The ast for the param block, may be null.</param>
-        /// <param name="beginBlock">The ast for the begin block, may be null.</param>
-        /// <param name="processBlock">The ast for the process block, may be null.</param>
-        /// <param name="endBlock">The ast for the end block, may be null.</param>
-        /// <param name="cleanBlock">The ast for the clean block, may be null.</param>
-        /// <param name="dynamicParamBlock">The ast for the dynamicparam block, may be null.</param>
-        /// <exception cref="PSArgumentNullException">
-        /// If <paramref name="extent"/> is null.
-        /// </exception>
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "param")]
-        public ScriptBlockAst(
-            IScriptExtent extent,
-            IEnumerable<UsingStatementAst> usingStatements,
-            ParamBlockAst paramBlock,
-            NamedBlockAst beginBlock,
-            NamedBlockAst processBlock,
-            NamedBlockAst endBlock,
-            NamedBlockAst cleanBlock,
-            NamedBlockAst dynamicParamBlock)
-            : this(extent, usingStatements, null, paramBlock, beginBlock, processBlock, endBlock, cleanBlock, dynamicParamBlock)
-        {
-        }
-
         /// <summary>
         /// Construct a ScriptBlockAst that uses explicitly named begin/process/end blocks.
         /// </summary>
@@ -986,33 +911,6 @@ namespace System.Management.Automation.Language
         {
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ScriptBlockAst"/> class.
-        /// This construction uses explicitly named begin/process/end/clean blocks.
-        /// </summary>
-        /// <param name="extent">The extent of the script block.</param>
-        /// <param name="paramBlock">The ast for the param block, may be null.</param>
-        /// <param name="beginBlock">The ast for the begin block, may be null.</param>
-        /// <param name="processBlock">The ast for the process block, may be null.</param>
-        /// <param name="endBlock">The ast for the end block, may be null.</param>
-        /// <param name="cleanBlock">The ast for the clean block, may be null.</param>
-        /// <param name="dynamicParamBlock">The ast for the dynamicparam block, may be null.</param>
-        /// <exception cref="PSArgumentNullException">
-        /// If <paramref name="extent"/> is null.
-        /// </exception>
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "param")]
-        public ScriptBlockAst(
-            IScriptExtent extent,
-            ParamBlockAst paramBlock,
-            NamedBlockAst beginBlock,
-            NamedBlockAst processBlock,
-            NamedBlockAst endBlock,
-            NamedBlockAst cleanBlock,
-            NamedBlockAst dynamicParamBlock)
-            : this(extent, null, paramBlock, beginBlock, processBlock, endBlock, cleanBlock, dynamicParamBlock)
-        {
-        }
-
         /// <summary>
         /// Construct a ScriptBlockAst that does not use explicitly named blocks.
         /// </summary>
@@ -1217,11 +1115,6 @@ namespace System.Management.Automation.Language
         /// </summary>
         public NamedBlockAst EndBlock { get; }
 
-        /// <summary>
-        /// Gets the ast representing the clean block for a script block, or null if no clean block was specified.
-        /// </summary>
-        public NamedBlockAst CleanBlock { get; }
-
         /// <summary>
         /// The ast representing the dynamicparam block for a script block, or null if no dynamicparam block was specified.
         /// </summary>
@@ -1301,25 +1194,17 @@ namespace System.Management.Automation.Language
             var newBeginBlock = CopyElement(this.BeginBlock);
             var newProcessBlock = CopyElement(this.ProcessBlock);
             var newEndBlock = CopyElement(this.EndBlock);
-            var newCleanBlock = CopyElement(this.CleanBlock);
             var newDynamicParamBlock = CopyElement(this.DynamicParamBlock);
             var newAttributes = CopyElements(this.Attributes);
             var newUsingStatements = CopyElements(this.UsingStatements);
 
-            return new ScriptBlockAst(
-                this.Extent,
-                newUsingStatements,
-                newAttributes,
-                newParamBlock,
-                newBeginBlock,
-                newProcessBlock,
-                newEndBlock,
-                newCleanBlock,
-                newDynamicParamBlock)
+            var scriptBlockAst = new ScriptBlockAst(this.Extent, newUsingStatements, newAttributes, newParamBlock, newBeginBlock, newProcessBlock,
+                                                    newEndBlock, newDynamicParamBlock)
             {
                 IsConfiguration = this.IsConfiguration,
                 ScriptRequirements = this.ScriptRequirements
             };
+            return scriptBlockAst;
         }
 
         internal string ToStringForSerialization()
@@ -1482,27 +1367,17 @@ namespace System.Management.Automation.Language
                 }
             }
 
-            if (action == AstVisitAction.Continue)
-            {
-                _ = VisitAndShallContinue(ParamBlock) &&
-                    VisitAndShallContinue(DynamicParamBlock) &&
-                    VisitAndShallContinue(BeginBlock) &&
-                    VisitAndShallContinue(ProcessBlock) &&
-                    VisitAndShallContinue(EndBlock) &&
-                    VisitAndShallContinue(CleanBlock);
-            }
-
+            if (action == AstVisitAction.Continue && ParamBlock != null)
+                action = ParamBlock.InternalVisit(visitor);
+            if (action == AstVisitAction.Continue && DynamicParamBlock != null)
+                action = DynamicParamBlock.InternalVisit(visitor);
+            if (action == AstVisitAction.Continue && BeginBlock != null)
+                action = BeginBlock.InternalVisit(visitor);
+            if (action == AstVisitAction.Continue && ProcessBlock != null)
+                action = ProcessBlock.InternalVisit(visitor);
+            if (action == AstVisitAction.Continue && EndBlock != null)
+                action = EndBlock.InternalVisit(visitor);
             return visitor.CheckForPostAction(this, action);
-
-            bool VisitAndShallContinue(Ast ast)
-            {
-                if (ast is not null)
-                {
-                    action = ast.InternalVisit(visitor);
-                }
-
-                return action == AstVisitAction.Continue;
-            }
         }
 
         #endregion Visitors
@@ -1706,12 +1581,9 @@ namespace System.Management.Automation.Language
 
         internal PipelineAst GetSimplePipeline(bool allowMultiplePipelines, out string errorId, out string errorMsg)
         {
-            if (BeginBlock != null
-                || ProcessBlock != null
-                || CleanBlock != null
-                || DynamicParamBlock != null)
+            if (BeginBlock != null || ProcessBlock != null || DynamicParamBlock != null)
             {
-                errorId = nameof(AutomationExceptions.CanConvertOneClauseOnly);
+                errorId = "CanConvertOneClauseOnly";
                 errorMsg = AutomationExceptions.CanConvertOneClauseOnly;
                 return null;
             }
@@ -1877,7 +1749,7 @@ namespace System.Management.Automation.Language
     public class NamedBlockAst : Ast
     {
         /// <summary>
-        /// Construct the ast for a begin, process, end, clean, or dynamic param block.
+        /// Construct the ast for a begin, process, end, or dynamic param block.
         /// </summary>
         /// <param name="extent">
         /// The extent of the block.  If <paramref name="unnamed"/> is false, the extent includes
@@ -1889,7 +1761,6 @@ namespace System.Management.Automation.Language
         /// <item><see cref="TokenKind.Begin"/></item>
         /// <item><see cref="TokenKind.Process"/></item>
         /// <item><see cref="TokenKind.End"/></item>
-        /// <item><see cref="TokenKind.Clean"/></item>
         /// <item><see cref="TokenKind.Dynamicparam"/></item>
         /// </list>
         /// </param>
@@ -1908,7 +1779,8 @@ namespace System.Management.Automation.Language
         {
             // Validate the block name.  If the block is unnamed, it must be an End block (for a function)
             // or Process block (for a filter).
-            if (HasInvalidBlockName(blockName, unnamed))
+            if (!blockName.HasTrait(TokenFlags.ScriptBlockBlockName)
+                || (unnamed && (blockName == TokenKind.Begin || blockName == TokenKind.Dynamicparam)))
             {
                 throw PSTraceSource.NewArgumentException(nameof(blockName));
             }
@@ -1966,7 +1838,6 @@ namespace System.Management.Automation.Language
         /// <item><see cref="TokenKind.Begin"/></item>
         /// <item><see cref="TokenKind.Process"/></item>
         /// <item><see cref="TokenKind.End"/></item>
-        /// <item><see cref="TokenKind.Clean"/></item>
         /// <item><see cref="TokenKind.Dynamicparam"/></item>
         /// </list>
         /// </summary>
@@ -2006,14 +1877,6 @@ namespace System.Management.Automation.Language
             return new NamedBlockAst(this.Extent, this.BlockKind, statementBlock, this.Unnamed);
         }
 
-        private static bool HasInvalidBlockName(TokenKind blockName, bool unnamed)
-        {
-            return !blockName.HasTrait(TokenFlags.ScriptBlockBlockName)
-                || (unnamed
-                    && blockName != TokenKind.Process
-                    && blockName != TokenKind.End);
-        }
-
         // Used by the debugger for command breakpoints
         internal IScriptExtent OpenCurlyExtent { get; }
 

src/System.Management.Automation/engine/parser/token.cs

@@ -588,9 +588,6 @@ namespace System.Management.Automation.Language
         /// <summary>The 'default' keyword</summary>
         Default = 169,
 
-        /// <summary>The 'clean' keyword.</summary>
-        Clean = 170,
-
         #endregion Keywords
     }
 
@@ -662,7 +659,7 @@ namespace System.Management.Automation.Language
         Keyword = 0x00000010,
 
         /// <summary>
-        /// The token is one of the keywords that is a part of a script block: 'begin', 'process', 'end', 'clean', or 'dynamicparam'.
+        /// The token one of the keywords that is a part of a script block: 'begin', 'process', 'end', or 'dynamicparam'.
         /// </summary>
         ScriptBlockBlockName = 0x00000020,
 
@@ -951,7 +948,6 @@ namespace System.Management.Automation.Language
             /*               Hidden */ TokenFlags.Keyword,
             /*                 Base */ TokenFlags.Keyword,
             /*              Default */ TokenFlags.Keyword,
-            /*                Clean */ TokenFlags.Keyword | TokenFlags.ScriptBlockBlockName,
 
             #endregion Flags for keywords
         };
@@ -1151,7 +1147,6 @@ namespace System.Management.Automation.Language
             /*               Hidden */ "hidden",
             /*                 Base */ "base",
             /*              Default */ "default",
-            /*                Clean */ "clean",
 
             #endregion Text for keywords
         };
@@ -1159,12 +1154,10 @@ namespace System.Management.Automation.Language
 #if DEBUG
         static TokenTraits()
         {
-            Diagnostics.Assert(
-                s_staticTokenFlags.Length == ((int)TokenKind.Clean + 1),
-                "Table size out of sync with enum - _staticTokenFlags");
-            Diagnostics.Assert(
-                s_tokenText.Length == ((int)TokenKind.Clean + 1),
-                "Table size out of sync with enum - _tokenText");
+            Diagnostics.Assert(s_staticTokenFlags.Length == ((int)TokenKind.Default + 1),
+                               "Table size out of sync with enum - _staticTokenFlags");
+            Diagnostics.Assert(s_tokenText.Length == ((int)TokenKind.Default + 1),
+                               "Table size out of sync with enum - _tokenText");
             // Some random assertions to make sure the enum and the traits are in sync
             Diagnostics.Assert(GetTraits(TokenKind.Begin) == (TokenFlags.Keyword | TokenFlags.ScriptBlockBlockName),
                                "Table out of sync with enum - flags Begin");

src/System.Management.Automation/engine/parser/tokenizer.cs

@@ -635,23 +635,23 @@ namespace System.Management.Automation.Language
         /*A*/    "configuration",           "public",           "private",          "static",                     /*A*/
         /*B*/    "interface",               "enum",             "namespace",        "module",                     /*B*/
         /*C*/    "type",                    "assembly",         "command",          "hidden",                     /*C*/
-        /*D*/    "base",                    "default",          "clean",                                          /*D*/
+        /*D*/    "base",                    "default",                                                            /*D*/
         };
 
         private static readonly TokenKind[] s_keywordTokenKind = new TokenKind[] {
-        /*1*/    TokenKind.ElseIf,          TokenKind.If,       TokenKind.Else,      TokenKind.Switch,             /*1*/
-        /*2*/    TokenKind.Foreach,         TokenKind.From,     TokenKind.In,        TokenKind.For,                /*2*/
-        /*3*/    TokenKind.While,           TokenKind.Until,    TokenKind.Do,        TokenKind.Try,                /*3*/
-        /*4*/    TokenKind.Catch,           TokenKind.Finally,  TokenKind.Trap,      TokenKind.Data,               /*4*/
-        /*5*/    TokenKind.Return,          TokenKind.Continue, TokenKind.Break,     TokenKind.Exit,               /*5*/
-        /*6*/    TokenKind.Throw,           TokenKind.Begin,    TokenKind.Process,   TokenKind.End,                /*6*/
-        /*7*/    TokenKind.Dynamicparam,    TokenKind.Function, TokenKind.Filter,    TokenKind.Param,              /*7*/
-        /*8*/    TokenKind.Class,           TokenKind.Define,   TokenKind.Var,       TokenKind.Using,              /*8*/
-        /*9*/    TokenKind.Workflow,        TokenKind.Parallel, TokenKind.Sequence,  TokenKind.InlineScript,       /*9*/
-        /*A*/    TokenKind.Configuration,   TokenKind.Public,   TokenKind.Private,   TokenKind.Static,             /*A*/
-        /*B*/    TokenKind.Interface,       TokenKind.Enum,     TokenKind.Namespace, TokenKind.Module,             /*B*/
-        /*C*/    TokenKind.Type,            TokenKind.Assembly, TokenKind.Command,   TokenKind.Hidden,             /*C*/
-        /*D*/    TokenKind.Base,            TokenKind.Default,  TokenKind.Clean,                                   /*D*/
+        /*1*/    TokenKind.ElseIf,          TokenKind.If,       TokenKind.Else,      TokenKind.Switch,            /*1*/
+        /*2*/    TokenKind.Foreach,         TokenKind.From,     TokenKind.In,        TokenKind.For,               /*2*/
+        /*3*/    TokenKind.While,           TokenKind.Until,    TokenKind.Do,        TokenKind.Try,               /*3*/
+        /*4*/    TokenKind.Catch,           TokenKind.Finally,  TokenKind.Trap,      TokenKind.Data,              /*4*/
+        /*5*/    TokenKind.Return,          TokenKind.Continue, TokenKind.Break,     TokenKind.Exit,              /*5*/
+        /*6*/    TokenKind.Throw,           TokenKind.Begin,    TokenKind.Process,   TokenKind.End,               /*6*/
+        /*7*/    TokenKind.Dynamicparam,    TokenKind.Function, TokenKind.Filter,    TokenKind.Param,             /*7*/
+        /*8*/    TokenKind.Class,           TokenKind.Define,   TokenKind.Var,       TokenKind.Using,             /*8*/
+        /*9*/    TokenKind.Workflow,        TokenKind.Parallel, TokenKind.Sequence,  TokenKind.InlineScript,      /*9*/
+        /*A*/    TokenKind.Configuration,   TokenKind.Public,   TokenKind.Private,   TokenKind.Static,            /*A*/
+        /*B*/    TokenKind.Interface,       TokenKind.Enum,     TokenKind.Namespace, TokenKind.Module,            /*B*/
+        /*C*/    TokenKind.Type,            TokenKind.Assembly, TokenKind.Command,   TokenKind.Hidden,            /*C*/
+        /*D*/    TokenKind.Base,            TokenKind.Default,                                                    /*D*/
         };
 
         internal static readonly string[] _operatorText = new string[] {
@@ -699,16 +699,8 @@ namespace System.Management.Automation.Language
             Diagnostics.Assert(s_keywordText.Length == s_keywordTokenKind.Length, "Keyword table sizes must match");
             Diagnostics.Assert(_operatorText.Length == s_operatorTokenKind.Length, "Operator table sizes must match");
 
-            bool isCleanBlockFeatureEnabled = ExperimentalFeature.IsEnabled(ExperimentalFeature.PSCleanBlockFeatureName);
-
             for (int i = 0; i < s_keywordText.Length; ++i)
             {
-                if (!isCleanBlockFeatureEnabled && s_keywordText[i] == "clean")
-                {
-                    // Skip adding the 'clean' keyword when the feature is disabled.
-                    continue;
-                }
-
                 s_keywordTable.Add(s_keywordText[i], s_keywordTokenKind[i]);
             }
 

src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs

@@ -1762,39 +1762,7 @@ namespace System.Management.Automation.Remoting.Client
 
                 while (true)
                 {
-                    string error;
-
-                    if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSRemotingSSHTransportErrorHandling))
-                    {
-                        // Blocking read from StdError stream
-                        error = reader.ReadLine();
-
-                        if (error == null)
-                        {
-                            // Stream is closed unexpectedly.
-                            throw new PSInvalidOperationException(RemotingErrorIdStrings.SSHAbruptlyTerminated);
-                        }
-
-                        if (error.Length == 0)
-                        {
-                            // Ignore
-                            continue;
-                        }
-
-                        try
-                        {
-                            // Messages in error stream from ssh are unreliable, and may just be warnings or
-                            // banner text.
-                            // So just report the messages but don't act on them.
-                            System.Console.WriteLine(error);
-                        }
-                        catch (IOException)
-                        { }
-
-                        continue;
-                    }
-
-                    error = ReadError(reader);
+                    string error = ReadError(reader);
 
                     if (error.Length == 0)
                     {

src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs

@@ -12,9 +12,11 @@ using System.Management.Automation.Language;
 using System.Management.Automation.Runspaces;
 using System.Management.Automation.Tracing;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using System.Threading.Tasks;
 #if LEGACYTELEMETRY
 using Microsoft.PowerShell.Telemetry.Internal;
 #endif
@@ -33,7 +35,6 @@ namespace System.Management.Automation
         Begin,
         Process,
         End,
-        Clean,
         ProcessBlockOnly,
     }
 
@@ -246,7 +247,6 @@ namespace System.Management.Automation
 
                 if (scriptBlockAst.BeginBlock != null
                     || scriptBlockAst.ProcessBlock != null
-                    || scriptBlockAst.CleanBlock != null
                     || scriptBlockAst.ParamBlock != null
                     || scriptBlockAst.DynamicParamBlock != null
                     || scriptBlockAst.ScriptRequirements != null
@@ -316,8 +316,6 @@ namespace System.Management.Automation
 
         internal Dictionary<string, int> NameToIndexMap { get; set; }
 
-        #region Named Blocks
-
         internal Action<FunctionContext> DynamicParamBlock { get; set; }
 
         internal Action<FunctionContext> UnoptimizedDynamicParamBlock { get; set; }
@@ -334,12 +332,6 @@ namespace System.Management.Automation
 
         internal Action<FunctionContext> UnoptimizedEndBlock { get; set; }
 
-        internal Action<FunctionContext> CleanBlock { get; set; }
-
-        internal Action<FunctionContext> UnoptimizedCleanBlock { get; set; }
-
-        #endregion Named Blocks
-
         internal IScriptExtent[] SequencePoints { get; set; }
 
         private RuntimeDefinedParameterDictionary _runtimeDefinedParameterDictionary;
@@ -761,7 +753,7 @@ namespace System.Management.Automation
         {
             errorHandler ??= (static _ => null);
 
-            if (HasBeginBlock || HasProcessBlock || HasCleanBlock)
+            if (HasBeginBlock || HasProcessBlock)
             {
                 return errorHandler(AutomationExceptions.CanConvertOneClauseOnly);
             }
@@ -899,10 +891,7 @@ namespace System.Management.Automation
             Parser parser = new Parser();
 
             var ast = AstInternal;
-            if (HasBeginBlock
-                || HasProcessBlock
-                || HasCleanBlock
-                || ast.Body.ParamBlock is not null)
+            if (HasBeginBlock || HasProcessBlock || ast.Body.ParamBlock != null)
             {
                 Ast errorAst = ast.Body.BeginBlock ?? (Ast)ast.Body.ProcessBlock ?? ast.Body.ParamBlock;
                 parser.ReportError(
@@ -985,11 +974,6 @@ namespace System.Management.Automation
             InvocationInfo invocationInfo,
             params object[] args)
         {
-            if (clauseToInvoke == ScriptBlockClauseToInvoke.Clean)
-            {
-                throw new PSNotSupportedException(ParserStrings.InvokingCleanBlockNotSupported);
-            }
-
             if ((clauseToInvoke == ScriptBlockClauseToInvoke.Begin && !HasBeginBlock)
                 || (clauseToInvoke == ScriptBlockClauseToInvoke.Process && !HasProcessBlock)
                 || (clauseToInvoke == ScriptBlockClauseToInvoke.End && !HasEndBlock))
@@ -1007,7 +991,7 @@ namespace System.Management.Automation
                 throw new PipelineStoppedException();
             }
 
-            // Validate that the arguments are consistent. The only public API that gets you here never sets createLocalScope to false...
+            // Validate at the arguments are consistent. The only public API that gets you here never sets createLocalScope to false...
             Diagnostics.Assert(
                 createLocalScope || functionsToDefine == null,
                 "When calling ScriptBlock.InvokeWithContext(), if 'functionsToDefine' != null then 'createLocalScope' must be true");
@@ -1211,7 +1195,7 @@ namespace System.Management.Automation
                     _sequencePoints = SequencePoints,
                 };
 
-                LogScriptBlockStart(this, context.CurrentRunspace.InstanceId);
+                ScriptBlock.LogScriptBlockStart(this, context.CurrentRunspace.InstanceId);
 
                 try
                 {
@@ -1219,7 +1203,7 @@ namespace System.Management.Automation
                 }
                 finally
                 {
-                    LogScriptBlockEnd(this, context.CurrentRunspace.InstanceId);
+                    ScriptBlock.LogScriptBlockEnd(this, context.CurrentRunspace.InstanceId);
                 }
             }
             catch (TargetInvocationException tie)
@@ -1378,7 +1362,7 @@ namespace System.Management.Automation
         private Action<FunctionContext> GetCodeToInvoke(ref bool optimized, ScriptBlockClauseToInvoke clauseToInvoke)
         {
             if (clauseToInvoke == ScriptBlockClauseToInvoke.ProcessBlockOnly
-                && (HasBeginBlock || HasCleanBlock || (HasEndBlock && HasProcessBlock)))
+                && (HasBeginBlock || (HasEndBlock && HasProcessBlock)))
             {
                 throw PSTraceSource.NewInvalidOperationException(AutomationExceptions.ScriptBlockInvokeOnOneClauseOnly);
             }
@@ -1395,8 +1379,6 @@ namespace System.Management.Automation
                         return _scriptBlockData.ProcessBlock;
                     case ScriptBlockClauseToInvoke.End:
                         return _scriptBlockData.EndBlock;
-                    case ScriptBlockClauseToInvoke.Clean:
-                        return _scriptBlockData.CleanBlock;
                     default:
                         return HasProcessBlock ? _scriptBlockData.ProcessBlock : _scriptBlockData.EndBlock;
                 }
@@ -1410,8 +1392,6 @@ namespace System.Management.Automation
                     return _scriptBlockData.UnoptimizedProcessBlock;
                 case ScriptBlockClauseToInvoke.End:
                     return _scriptBlockData.UnoptimizedEndBlock;
-                case ScriptBlockClauseToInvoke.Clean:
-                    return _scriptBlockData.UnoptimizedCleanBlock;
                 default:
                     return HasProcessBlock ? _scriptBlockData.UnoptimizedProcessBlock : _scriptBlockData.UnoptimizedEndBlock;
             }
@@ -2167,17 +2147,11 @@ namespace System.Management.Automation
 
         internal Action<FunctionContext> UnoptimizedEndBlock { get => _scriptBlockData.UnoptimizedEndBlock; }
 
-        internal Action<FunctionContext> CleanBlock { get => _scriptBlockData.CleanBlock; }
-
-        internal Action<FunctionContext> UnoptimizedCleanBlock { get => _scriptBlockData.UnoptimizedCleanBlock; }
-
         internal bool HasBeginBlock { get => AstInternal.Body.BeginBlock != null; }
 
         internal bool HasProcessBlock { get => AstInternal.Body.ProcessBlock != null; }
 
         internal bool HasEndBlock { get => AstInternal.Body.EndBlock != null; }
-
-        internal bool HasCleanBlock { get => AstInternal.Body.CleanBlock != null; }
     }
 
     [Serializable]
@@ -2223,12 +2197,10 @@ namespace System.Management.Automation
         private readonly bool _useLocalScope;
         private readonly bool _runOptimized;
         private readonly bool _rethrowExitException;
-        private readonly MutableTuple _localsTuple;
-        private readonly FunctionContext _functionContext;
-
         private MshCommandRuntime _commandRuntime;
+        private readonly MutableTuple _localsTuple;
         private bool _exitWasCalled;
-        private bool _anyClauseExecuted;
+        private readonly FunctionContext _functionContext;
 
         public PSScriptCmdlet(ScriptBlock scriptBlock, bool useNewScope, bool fromScriptFile, ExecutionContext context)
         {
@@ -2319,34 +2291,6 @@ namespace System.Management.Automation
             }
         }
 
-        internal override void DoCleanResource()
-        {
-            if (_scriptBlock.HasCleanBlock && _anyClauseExecuted)
-            {
-                // The 'Clean' block doesn't write any output to pipeline, so we use a 'NullPipe' here and
-                // disallow the output to be collected by an 'out' variable. However, the error, warning,
-                // and information records should still be collectable by the corresponding variables.
-                Pipe oldOutputPipe = _commandRuntime.OutputPipe;
-                _functionContext._outputPipe = _commandRuntime.OutputPipe = new Pipe
-                {
-                    NullPipe = true,
-                    IgnoreOutVariableList = true,
-                };
-
-                try
-                {
-                    RunClause(
-                        clause: _runOptimized ? _scriptBlock.CleanBlock : _scriptBlock.UnoptimizedCleanBlock,
-                        dollarUnderbar: AutomationNull.Value,
-                        inputToProcess: AutomationNull.Value);
-                }
-                finally
-                {
-                    _functionContext._outputPipe = _commandRuntime.OutputPipe = oldOutputPipe;
-                }
-            }
-        }
-
         private void EnterScope()
         {
             _commandRuntime.SetVariableListsInPipe();
@@ -2359,7 +2303,6 @@ namespace System.Management.Automation
 
         private void RunClause(Action<FunctionContext> clause, object dollarUnderbar, object inputToProcess)
         {
-            _anyClauseExecuted = true;
             Pipe oldErrorOutputPipe = this.Context.ShellFunctionErrorOutputPipe;
 
             // If the script block has a different language mode than the current,
@@ -2413,9 +2356,9 @@ namespace System.Management.Automation
                 }
                 finally
                 {
-                    Context.ShellFunctionErrorOutputPipe = oldErrorOutputPipe;
+                    this.Context.RestoreErrorPipe(oldErrorOutputPipe);
 
-                    // Restore the language mode
+                    // Set the language mode
                     if (oldLanguageMode.HasValue)
                     {
                         Context.LanguageMode = oldLanguageMode.Value;
@@ -2575,6 +2518,9 @@ namespace System.Management.Automation
             commandRuntime = null;
             currentObjectInPipeline = null;
             _input.Clear();
+            // _scriptBlock = null;
+            // _localsTuple = null;
+            // _functionContext = null;
 
             base.InternalDispose(true);
             _disposed = true;

src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs

@@ -1578,33 +1578,23 @@ namespace System.Management.Automation
 
         internal static bool SuspendStoppingPipeline(ExecutionContext context)
         {
-            var localPipeline = (LocalPipeline)context.CurrentRunspace.GetCurrentlyRunningPipeline();
-            return SuspendStoppingPipelineImpl(localPipeline);
-        }
-
-        internal static void RestoreStoppingPipeline(ExecutionContext context, bool oldIsStopping)
-        {
-            var localPipeline = (LocalPipeline)context.CurrentRunspace.GetCurrentlyRunningPipeline();
-            RestoreStoppingPipelineImpl(localPipeline, oldIsStopping);
-        }
-
-        internal static bool SuspendStoppingPipelineImpl(LocalPipeline localPipeline)
-        {
-            if (localPipeline is not null)
+            LocalPipeline lpl = (LocalPipeline)context.CurrentRunspace.GetCurrentlyRunningPipeline();
+            if (lpl != null)
             {
-                bool oldIsStopping = localPipeline.Stopper.IsStopping;
-                localPipeline.Stopper.IsStopping = false;
+                bool oldIsStopping = lpl.Stopper.IsStopping;
+                lpl.Stopper.IsStopping = false;
                 return oldIsStopping;
             }
 
             return false;
         }
 
-        internal static void RestoreStoppingPipelineImpl(LocalPipeline localPipeline, bool oldIsStopping)
+        internal static void RestoreStoppingPipeline(ExecutionContext context, bool oldIsStopping)
         {
-            if (localPipeline is not null)
+            LocalPipeline lpl = (LocalPipeline)context.CurrentRunspace.GetCurrentlyRunningPipeline();
+            if (lpl != null)
             {
-                localPipeline.Stopper.IsStopping = oldIsStopping;
+                lpl.Stopper.IsStopping = oldIsStopping;
             }
         }
 
@@ -2865,11 +2855,6 @@ namespace System.Management.Automation
             ScriptBlock sb = expression as ScriptBlock;
             if (sb != null)
             {
-                if (sb.HasCleanBlock)
-                {
-                    throw new PSNotSupportedException(ParserStrings.ForEachNotSupportCleanBlock);
-                }
-
                 Pipe outputPipe = new Pipe(result);
                 if (sb.HasBeginBlock)
                 {

src/System.Management.Automation/namespaces/FileSystemProvider.cs

@@ -5851,15 +5851,6 @@ namespace Microsoft.PowerShell.Commands
                         destination = MakePath(destination, dir.Name);
                     }
 
-                    // Don't allow moving a directory into itself
-                    if (destination.StartsWith(Path.TrimEndingDirectorySeparator(path) + Path.DirectorySeparatorChar))
-                    {
-                        string error = StringUtil.Format(FileSystemProviderStrings.TargetCannotBeSubdirectoryOfSource, destination);
-                        var e = new IOException(error);
-                        WriteError(new ErrorRecord(e, "MoveItemArgumentError", ErrorCategory.InvalidArgument, destination));
-                        return;
-                    }
-
                     // Get the confirmation text
                     string action = FileSystemProviderStrings.MoveItemActionDirectory;
 

src/System.Management.Automation/resources/FileSystemProviderStrings.resx

@@ -345,7 +345,4 @@
   <data name="AlreadyListedDirectory" xml:space="preserve">
     <value>Skip already-visited directory {0}.</value>
   </data>
-  <data name="TargetCannotBeSubdirectoryOfSource" xml:space="preserve">
-    <value>Destination path cannot be a subdirectory of the source: {0}.</value>
-  </data>
 </root>

src/System.Management.Automation/resources/ParserStrings.resx

@@ -296,9 +296,6 @@ Possible matches are</value>
   <data name="CannotIndexWithByRefLikeReturnType" xml:space="preserve">
     <value>Unable to index into an object of type "{0}" with the ByRef-like return type "{1}". ByRef-like types are not supported in PowerShell.</value>
   </data>
-  <data name="ArrayHasTooManyDimensions" xml:space="preserve">
-    <value>The array has too many dimensions: {0}. The number of dimensions for an array must be less than or equal to 32.</value>
-  </data>
   <data name="ArrayAssignmentFailed" xml:space="preserve">
     <value>Array assignment to [{0}] failed: {1}.</value>
   </data>
@@ -500,7 +497,7 @@ The correct form is: foreach ($a in $b) {...}</value>
     <value>Script command clause '{0}' has already been defined.</value>
   </data>
   <data name="MissingNamedBlocks" xml:space="preserve">
-    <value>unexpected token '{0}', expected 'begin', 'process', 'end', 'clean', or 'dynamicparam'.</value>
+    <value>unexpected token '{0}', expected 'begin', 'process', 'end', or 'dynamicparam'.</value>
   </data>
   <data name="MissingEndCurlyBrace" xml:space="preserve">
     <value>Missing closing '}' in statement block or type definition.</value>
@@ -1129,9 +1126,6 @@ ModuleVersion : Version of module to import. If used, ModuleName must represent
   <data name="ForEachTypeConversionFailed" xml:space="preserve">
     <value>Unable to convert input to the target type [{0}] passed to the ForEach() operator. Please check the specified type and try running your script again.</value>
   </data>
-  <data name="ForEachNotSupportCleanBlock" xml:space="preserve">
-    <value>Script block with a 'clean' block is not supported by the 'ForEach' method.</value>
-  </data>
   <data name="NumberToReturnMustBeGreaterThanZero" xml:space="preserve">
     <value>The 'numberToReturn' value provided to the third argument of the Where() operator must be greater than zero. Please correct the argument's value and try running your script again.</value>
   </data>
@@ -1485,7 +1479,4 @@ ModuleVersion : Version of module to import. If used, ModuleName must represent
   <data name="BackgroundOperatorInPipelineChain" xml:space="preserve">
     <value>Background operators can only be used at the end of a pipeline chain.</value>
   </data>
-  <data name="InvokingCleanBlockNotSupported" xml:space="preserve">
-    <value>Directly invoking the 'clean' block of a script block is not supported.</value>
-  </data>
 </root>