From 40928f7a97ab244a102381a0ac2206dc0c8a44c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Aug 2021 09:24:35 -0700
Subject: [PATCH 001/645] Bump `Microsoft.CodeAnalysis.NetAnalyzers` to newer
 version (#15962)

---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index c8d452755b8..b6270442e99 100644
--- a/Analyzers.props
+++ b/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-rc2.21417.3" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc2.21419.1" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From e70ad6ce251d2e1d4ef79e31756cededde7ccc91 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 20 Aug 2021 11:23:30 -0700
Subject: [PATCH 002/645] Publish global tool package for stable releases
 (#15961)

---
 .../azureDevOps/templates/release-ReleaseToNuGet.yml       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml b/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml
index e134e4ccc7b..117cf8f91df 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml
@@ -29,8 +29,11 @@ steps:
 
     $releaseVersion = Get-Content "$ENV:PIPELINE_WORKSPACE/releasePipeline/metadata/release.json" | ConvertFrom-Json | Select-Object -ExpandProperty 'ReleaseVersion'
     $globalToolPath = "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/PowerShell.$releaseVersion.nupkg"
-    ### -WhatIf to make sure we do not release global tool. Remove -WhatIf when the PowerShell name reservation is done.
-    Copy-Item $globalToolPath -Destination "$(Pipeline.Workspace)/release" -WhatIf
+
+    if ($releaseVersion -notlike '*-*') {
+        # Copy the global tool package for stable releases
+        Copy-Item $globalToolPath -Destination "$(Pipeline.Workspace)/release"
+    }
 
     Get-ChildItem "$(Pipeline.Workspace)/release" -recurse
   displayName: Download and capture nupkgs

From c39d672560948a06a1391e37bb460d6b223eb749 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Sun, 22 Aug 2021 10:49:07 -0700
Subject: [PATCH 003/645] Remove 4 assertions which cause debug build test runs
 to fail (#15963)

---
 .../host/msh/PendingProgress.cs                      | 12 ------------
 .../help/UpdatableHelpModuleInfo.cs                  |  1 -
 .../help/UpdatableHelpUri.cs                         |  1 -
 3 files changed, 14 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
index 6bb85c64729..fad667dba2d 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
@@ -851,18 +851,6 @@ internal override
             }
 
             // If we get all the way to here, then we've compressed all the nodes and we still don't fit.
-
-#if DEBUG || ASSERTIONS_TRACE
-
-            Dbg.Assert(
-                nodesCompressed == CountNodes(),
-                "We should have compressed every node in the tree.");
-            Dbg.Assert(
-                AllNodesHaveGivenStyle(_topLevelNodes, newStyle),
-                "We should have compressed every node in the tree.");
-
-#endif
-
             return false;
         }
 
diff --git a/src/System.Management.Automation/help/UpdatableHelpModuleInfo.cs b/src/System.Management.Automation/help/UpdatableHelpModuleInfo.cs
index b46717920f4..ccf0b95f0f6 100644
--- a/src/System.Management.Automation/help/UpdatableHelpModuleInfo.cs
+++ b/src/System.Management.Automation/help/UpdatableHelpModuleInfo.cs
@@ -28,7 +28,6 @@ internal class UpdatableHelpModuleInfo
         internal UpdatableHelpModuleInfo(string name, Guid guid, string path, string uri)
         {
             Debug.Assert(!string.IsNullOrEmpty(name));
-            Debug.Assert(guid != Guid.Empty);
             Debug.Assert(!string.IsNullOrEmpty(path));
             Debug.Assert(!string.IsNullOrEmpty(uri));
 
diff --git a/src/System.Management.Automation/help/UpdatableHelpUri.cs b/src/System.Management.Automation/help/UpdatableHelpUri.cs
index 8b854e82a5d..82bbb4016fb 100644
--- a/src/System.Management.Automation/help/UpdatableHelpUri.cs
+++ b/src/System.Management.Automation/help/UpdatableHelpUri.cs
@@ -21,7 +21,6 @@ internal class UpdatableHelpUri
         internal UpdatableHelpUri(string moduleName, Guid moduleGuid, CultureInfo culture, string resolvedUri)
         {
             Debug.Assert(!string.IsNullOrEmpty(moduleName));
-            Debug.Assert(moduleGuid != Guid.Empty);
             Debug.Assert(!string.IsNullOrEmpty(resolvedUri));
 
             ModuleName = moduleName;

From b28318857336c0981ea59d779717834cb0ff072a Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 23 Aug 2021 15:08:41 -0700
Subject: [PATCH 004/645] Update `readme` and `metadata.json` for
 7.2.0-preview.9 release (#15957)

---
 README.md           | 32 ++++++++++++++++----------------
 tools/metadata.json |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index d30953d7d5b..7f83f92f6bc 100644
--- a/README.md
+++ b/README.md
@@ -58,8 +58,8 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 | Platform       | Downloads (stable)                                  | Downloads (preview)                             | How to Install                                 |
 | ---------------| --------------------------------------------------- | ------------------------------------------------| -----------------------------------------------|
 | 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          | [64-bit][rl-macos-tar]                              | [64-bit][pv-macos-tar]                          | [Instructions][in-tar-macos]                   |
-| macOS          |                                                     | [64-bit][pv-macos-tar-arm64]                    | [Instructions][in-tar-macos]                   |
+| macOS (x64)    | [64-bit][rl-macos-tar]                              | [64-bit][pv-macos-tar]                          | [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]                    |
@@ -94,20 +94,20 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 [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-preview.8/PowerShell-7.2.0-preview.8-win-x64.msi
-[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.8/PowerShell-7.2.0-preview.8-win-x86.msi
-[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.8/powershell-preview_7.2.0-preview.8-1.deb_amd64.deb
-[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.8/powershell-preview-7.2.0_preview.8-1.rh.x86_64.rpm
-[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.8/powershell-7.2.0-preview.8-osx-x64.pkg
-[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.8/powershell-7.2.0-preview.8-osx-arm64.pkg
-[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.8/PowerShell-7.2.0-preview.8-win-arm64.zip
-[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.8/PowerShell-7.2.0-preview.8-win-x86.zip
-[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.8/PowerShell-7.2.0-preview.8-win-x64.zip
-[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.8/powershell-7.2.0-preview.8-osx-x64.tar.gz
-[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.8/powershell-7.2.0-preview.8-osx-arm64.tar.gz
-[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.8/powershell-7.2.0-preview.8-linux-x64.tar.gz
-[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.8/powershell-7.2.0-preview.8-linux-arm32.tar.gz
-[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.8/powershell-7.2.0-preview.8-linux-arm64.tar.gz
+[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-x64.msi
+[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-x86.msi
+[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-preview_7.2.0-preview.9-1.deb_amd64.deb
+[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-preview-7.2.0_preview.9-1.rh.x86_64.rpm
+[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-osx-x64.pkg
+[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-osx-arm64.pkg
+[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-arm64.zip
+[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-x86.zip
+[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-x64.zip
+[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-osx-x64.tar.gz
+[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-osx-arm64.tar.gz
+[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-linux-x64.tar.gz
+[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-linux-arm32.tar.gz
+[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-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
diff --git a/tools/metadata.json b/tools/metadata.json
index 0a2ce2ebffd..88db98aa613 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,9 +1,9 @@
 {
   "StableReleaseTag": "v7.1.4",
-  "PreviewReleaseTag": "v7.2.0-preview.8",
+  "PreviewReleaseTag": "v7.2.0-preview.9",
   "ServicingReleaseTag": "v7.0.7",
   "ReleaseTag": "v7.1.4",
   "LTSReleaseTag" : ["v7.0.7"],
-  "NextReleaseTag": "v7.2.0-preview.9",
+  "NextReleaseTag": "v7.2.0-preview.10",
   "LTSRelease": false
 }

From ab5e1779a3b31cd652a367fa55554747f4261c93 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 23 Aug 2021 17:20:29 -0700
Subject: [PATCH 005/645] Revert "Use `GetValueOrDefault()` for nullable
 `PSLanguageMode` (#13849)" (#15980)

---
 src/System.Management.Automation/engine/ExternalScriptInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/ExternalScriptInfo.cs b/src/System.Management.Automation/engine/ExternalScriptInfo.cs
index 9bf3318a2c8..bbd49c76d36 100644
--- a/src/System.Management.Automation/engine/ExternalScriptInfo.cs
+++ b/src/System.Management.Automation/engine/ExternalScriptInfo.cs
@@ -242,7 +242,7 @@ private static ScriptBlock ParseScriptContents(Parser parser, string fileName, s
             // If we are in ConstrainedLanguage mode but the defining language mode is FullLanguage, then we need
             // to parse the script contents in FullLanguage mode context.  Otherwise we will get bogus parsing errors
             // such as "Configuration keyword not allowed".
-            if (definingLanguageMode.GetValueOrDefault() == PSLanguageMode.FullLanguage)
+            if (definingLanguageMode.HasValue && (definingLanguageMode == PSLanguageMode.FullLanguage))
             {
                 var context = LocalPipeline.GetExecutionContextFromTLS();
                 if ((context != null) && (context.LanguageMode == PSLanguageMode.ConstrainedLanguage))

From 07e466871a8f6e50e23ca82c46d8c9e67196fd99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Aug 2021 08:09:55 -0700
Subject: [PATCH 006/645] Bump `Microsoft.CodeAnalysis.NetAnalyzers` (#15985)

---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index b6270442e99..d85c827bf21 100644
--- a/Analyzers.props
+++ b/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-rc2.21419.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc2.21423.3" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From bd84f4265bfb9e3e80d4af6a5730db19d7ae5846 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 24 Aug 2021 09:55:42 -0700
Subject: [PATCH 007/645] Update metadata to start using .NET 6 RC1 builds
 (#15981)

---
 DotnetRuntimeMetadata.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index e7a597bae5a..18778f58555 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "channel": "6.0.1xx-preview6",
+    "channel": "6.0.1xx-rc1",
     "quality": "signed",
     "qualityFallback": "daily",
-    "packageVersionPattern": "6.0.0-preview.6",
+    "packageVersionPattern": "6.0.0-rc.1",
     "sdkImageVersion": "6.0.100",
-    "nextChannel": "6.0.1xx-preview7"
+    "nextChannel": "6.0.1xx-rc1"
   },
   "internalfeed" : {
     "url": null

From 56d22bc3865fca445145fd685d6d6f6d63194701 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 24 Aug 2021 10:20:49 -0700
Subject: [PATCH 008/645] Enable sending Teams notification when workflow fails
 (#15982)

---
 .github/workflows/daily.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 1535fced837..6e3a38ac1b1 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -43,6 +43,11 @@ jobs:
             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
+        if: failure()
+        with:
+          webhook_url: ${{ secrets.PS_BUILD_TEAMS_CHANNEL }}
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v2
         id: cpr

From a4d14576b3a0c9a1898daedbdf29fbf5436a63e3 Mon Sep 17 00:00:00 2001
From: Robert Holt <rjmholt_msft@outlook.com>
Date: Tue, 24 Aug 2021 15:27:22 -0700
Subject: [PATCH 009/645] Make the native command error handling optionally
 honor `ErrorActionPreference` (#15897)

---
 .../ExperimentalFeature.cs                    |   4 +
 .../engine/InitialSessionState.cs             | 309 ++++++++++--------
 .../engine/MshCommandRuntime.cs               |  18 +-
 .../engine/NativeCommandProcessor.cs          | 146 ++++++++-
 .../engine/SpecialVariables.cs                |  48 +--
 .../resources/CommandBaseStrings.resx         |   9 +
 .../resources/RunspaceInit.resx               |   3 +
 .../NativeCommandErrorHandling.Tests.ps1      | 178 ++++++++++
 8 files changed, 534 insertions(+), 181 deletions(-)
 create mode 100644 test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1

diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index 9268003ee87..dd0f7209635 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -22,6 +22,7 @@ public class ExperimentalFeature
 
         internal const string EngineSource = "PSEngine";
         internal const string PSNativeCommandArgumentPassingFeatureName = "PSNativeCommandArgumentPassing";
+        internal const string PSNativeCommandErrorActionPreferenceFeatureName = "PSNativeCommandErrorActionPreference";
 
         #endregion
 
@@ -122,6 +123,9 @@ static ExperimentalFeature()
                 new ExperimentalFeature(
                     name: "PSAnsiRenderingFileInfo",
                     description: "Enable coloring for FileInfo objects"),
+                new ExperimentalFeature(
+                    name: PSNativeCommandErrorActionPreferenceFeatureName,
+                    description: "Native commands with non-zero exit codes issue errors according to $ErrorActionPreference when $PSNativeCommandUseErrorActionPreference is $true"),
             };
 
             EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index 99aa639d09c..07c0d250004 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -4471,154 +4471,173 @@ .ForwardHelpCategory Cmdlet
         internal const ActionPreference DefaultInformationPreference = ActionPreference.SilentlyContinue;
 
         internal const ErrorView DefaultErrorView = ErrorView.ConciseView;
+        internal const bool DefaultPSNativeCommandUseErrorActionPreference = false;
         internal const bool DefaultWhatIfPreference = false;
         internal const ConfirmImpact DefaultConfirmPreference = ConfirmImpact.High;
 
-        internal static readonly SessionStateVariableEntry[] BuiltInVariables = new SessionStateVariableEntry[]
-        {
-            // Engine variables that should be precreated before running profile
-            // Bug fix for Win7:2202228 Engine halts if initial command fulls up variable table
-            // Anytime a new variable that the engine depends on to run is added, this table
-            // must be updated...
-            new SessionStateVariableEntry(SpecialVariables.LastToken, null, string.Empty),
-            new SessionStateVariableEntry(SpecialVariables.FirstToken, null, string.Empty),
-            new SessionStateVariableEntry(SpecialVariables.StackTrace, null, string.Empty),
-
-            // Variable which controls the output rendering
-            new SessionStateVariableEntry(
-                SpecialVariables.PSStyle,
-                PSStyle.Instance,
-                RunspaceInit.PSStyleDescription,
-                ScopedItemOptions.None),
-
-            // Variable which controls the encoding for piping data to a NativeCommand
-            new SessionStateVariableEntry(
-                SpecialVariables.OutputEncoding,
-                Utils.utf8NoBom,
-                RunspaceInit.OutputEncodingDescription,
-                ScopedItemOptions.None,
-                new ArgumentTypeConverterAttribute(typeof(System.Text.Encoding))),
-
-            // Preferences
-            //
-            // NTRAID#Windows Out Of Band Releases-931461-2006/03/13
-            // ArgumentTypeConverterAttribute is applied to these variables,
-            // but this only reaches the global variable.  If these are
-            // redefined in script scope etc, the type conversion
-            // is not applicable.
-            //
-            // Variables typed to ActionPreference
-            new SessionStateVariableEntry(
-                SpecialVariables.ConfirmPreference,
-                DefaultConfirmPreference,
-                RunspaceInit.ConfirmPreferenceDescription,
-                ScopedItemOptions.None,
-                new ArgumentTypeConverterAttribute(typeof(ConfirmImpact))),
-            new SessionStateVariableEntry(
-                SpecialVariables.DebugPreference,
-                DefaultDebugPreference,
-                RunspaceInit.DebugPreferenceDescription,
-                ScopedItemOptions.None,
-                new ArgumentTypeConverterAttribute(typeof(ActionPreference))),
-            new SessionStateVariableEntry(
-                SpecialVariables.ErrorActionPreference,
-                DefaultErrorActionPreference,
-                RunspaceInit.ErrorActionPreferenceDescription,
-                ScopedItemOptions.None,
-                new ArgumentTypeConverterAttribute(typeof(ActionPreference))),
-            new SessionStateVariableEntry(
-                SpecialVariables.ProgressPreference,
-                DefaultProgressPreference,
-                RunspaceInit.ProgressPreferenceDescription,
-                ScopedItemOptions.None,
-                new ArgumentTypeConverterAttribute(typeof(ActionPreference))),
-            new SessionStateVariableEntry(
-                SpecialVariables.VerbosePreference,
-                DefaultVerbosePreference,
-                RunspaceInit.VerbosePreferenceDescription,
-                ScopedItemOptions.None,
-                new ArgumentTypeConverterAttribute(typeof(ActionPreference))),
-            new SessionStateVariableEntry(
-                SpecialVariables.WarningPreference,
-                DefaultWarningPreference,
-                RunspaceInit.WarningPreferenceDescription,
-                ScopedItemOptions.None,
-                new ArgumentTypeConverterAttribute(typeof(ActionPreference))),
-            new SessionStateVariableEntry(
-                SpecialVariables.InformationPreference,
-                DefaultInformationPreference,
-                RunspaceInit.InformationPreferenceDescription,
-                ScopedItemOptions.None,
-                new ArgumentTypeConverterAttribute(typeof(ActionPreference))),
-            new SessionStateVariableEntry(
-                SpecialVariables.ErrorView,
-                DefaultErrorView,
-                RunspaceInit.ErrorViewDescription,
-                ScopedItemOptions.None,
-                new ArgumentTypeConverterAttribute(typeof(ErrorView))),
-            new SessionStateVariableEntry(
-                SpecialVariables.NestedPromptLevel,
-                0,
-                RunspaceInit.NestedPromptLevelDescription),
-            new SessionStateVariableEntry(
-                SpecialVariables.WhatIfPreference,
-                DefaultWhatIfPreference,
-                RunspaceInit.WhatIfPreferenceDescription),
-            new SessionStateVariableEntry(
-                FormatEnumerationLimit,
-                DefaultFormatEnumerationLimit,
-                RunspaceInit.FormatEnumerationLimitDescription),
-
-             // variable for PSEmailServer
-            new SessionStateVariableEntry(
-                SpecialVariables.PSEmailServer,
-                string.Empty,
-                RunspaceInit.PSEmailServerDescription),
-
-            // Start: Variables which control remoting behavior
-            new SessionStateVariableEntry(
-                Microsoft.PowerShell.Commands.PSRemotingBaseCmdlet.DEFAULT_SESSION_OPTION,
-                new System.Management.Automation.Remoting.PSSessionOption(),
-                RemotingErrorIdStrings.PSDefaultSessionOptionDescription,
-                ScopedItemOptions.None),
-            new SessionStateVariableEntry(
-                SpecialVariables.PSSessionConfigurationName,
-                "http://schemas.microsoft.com/powershell/Microsoft.PowerShell",
-                RemotingErrorIdStrings.PSSessionConfigurationName,
-                ScopedItemOptions.None),
-            new SessionStateVariableEntry(
-                SpecialVariables.PSSessionApplicationName,
-                "wsman",
-                RemotingErrorIdStrings.PSSessionAppName,
-                ScopedItemOptions.None),
-            // End: Variables which control remoting behavior
-
-            #region Platform
-            new SessionStateVariableEntry(
-                SpecialVariables.IsLinux,
-                Platform.IsLinux,
-                string.Empty,
-                ScopedItemOptions.ReadOnly | ScopedItemOptions.AllScope),
-
-            new SessionStateVariableEntry(
-                SpecialVariables.IsMacOS,
-                Platform.IsMacOS,
-                string.Empty,
-                ScopedItemOptions.ReadOnly | ScopedItemOptions.AllScope),
-
-            new SessionStateVariableEntry(
-                SpecialVariables.IsWindows,
-                Platform.IsWindows,
-                string.Empty,
-                ScopedItemOptions.ReadOnly | ScopedItemOptions.AllScope),
-
-            new SessionStateVariableEntry(
-                SpecialVariables.IsCoreCLR,
-                Platform.IsCoreCLR,
-                string.Empty,
-                ScopedItemOptions.ReadOnly | ScopedItemOptions.AllScope),
-            #endregion
-        };
+        static InitialSessionState()
+        {
+            var builtinVariables = new List<SessionStateVariableEntry>()
+            {
+                // Engine variables that should be precreated before running profile
+                // Bug fix for Win7:2202228 Engine halts if initial command fulls up variable table
+                // Anytime a new variable that the engine depends on to run is added, this table
+                // must be updated...
+                new SessionStateVariableEntry(SpecialVariables.LastToken, null, string.Empty),
+                new SessionStateVariableEntry(SpecialVariables.FirstToken, null, string.Empty),
+                new SessionStateVariableEntry(SpecialVariables.StackTrace, null, string.Empty),
+
+                // Variable which controls the output rendering
+                new SessionStateVariableEntry(
+                    SpecialVariables.PSStyle,
+                    PSStyle.Instance,
+                    RunspaceInit.PSStyleDescription,
+                    ScopedItemOptions.None),
+
+                // Variable which controls the encoding for piping data to a NativeCommand
+                new SessionStateVariableEntry(
+                    SpecialVariables.OutputEncoding,
+                    Utils.utf8NoBom,
+                    RunspaceInit.OutputEncodingDescription,
+                    ScopedItemOptions.None,
+                    new ArgumentTypeConverterAttribute(typeof(System.Text.Encoding))),
+
+                // Preferences
+                //
+                // NTRAID#Windows Out Of Band Releases-931461-2006/03/13
+                // ArgumentTypeConverterAttribute is applied to these variables,
+                // but this only reaches the global variable.  If these are
+                // redefined in script scope etc, the type conversion
+                // is not applicable.
+                //
+                // Variables typed to ActionPreference
+                new SessionStateVariableEntry(
+                    SpecialVariables.ConfirmPreference,
+                    DefaultConfirmPreference,
+                    RunspaceInit.ConfirmPreferenceDescription,
+                    ScopedItemOptions.None,
+                    new ArgumentTypeConverterAttribute(typeof(ConfirmImpact))),
+                new SessionStateVariableEntry(
+                    SpecialVariables.DebugPreference,
+                    DefaultDebugPreference,
+                    RunspaceInit.DebugPreferenceDescription,
+                    ScopedItemOptions.None,
+                    new ArgumentTypeConverterAttribute(typeof(ActionPreference))),
+                new SessionStateVariableEntry(
+                    SpecialVariables.ErrorActionPreference,
+                    DefaultErrorActionPreference,
+                    RunspaceInit.ErrorActionPreferenceDescription,
+                    ScopedItemOptions.None,
+                    new ArgumentTypeConverterAttribute(typeof(ActionPreference))),
+                new SessionStateVariableEntry(
+                    SpecialVariables.ProgressPreference,
+                    DefaultProgressPreference,
+                    RunspaceInit.ProgressPreferenceDescription,
+                    ScopedItemOptions.None,
+                    new ArgumentTypeConverterAttribute(typeof(ActionPreference))),
+                new SessionStateVariableEntry(
+                    SpecialVariables.VerbosePreference,
+                    DefaultVerbosePreference,
+                    RunspaceInit.VerbosePreferenceDescription,
+                    ScopedItemOptions.None,
+                    new ArgumentTypeConverterAttribute(typeof(ActionPreference))),
+                new SessionStateVariableEntry(
+                    SpecialVariables.WarningPreference,
+                    DefaultWarningPreference,
+                    RunspaceInit.WarningPreferenceDescription,
+                    ScopedItemOptions.None,
+                    new ArgumentTypeConverterAttribute(typeof(ActionPreference))),
+                new SessionStateVariableEntry(
+                    SpecialVariables.InformationPreference,
+                    DefaultInformationPreference,
+                    RunspaceInit.InformationPreferenceDescription,
+                    ScopedItemOptions.None,
+                    new ArgumentTypeConverterAttribute(typeof(ActionPreference))),
+                new SessionStateVariableEntry(
+                    SpecialVariables.ErrorView,
+                    DefaultErrorView,
+                    RunspaceInit.ErrorViewDescription,
+                    ScopedItemOptions.None,
+                    new ArgumentTypeConverterAttribute(typeof(ErrorView))),
+                new SessionStateVariableEntry(
+                    SpecialVariables.NestedPromptLevel,
+                    0,
+                    RunspaceInit.NestedPromptLevelDescription),
+                new SessionStateVariableEntry(
+                    SpecialVariables.WhatIfPreference,
+                    DefaultWhatIfPreference,
+                    RunspaceInit.WhatIfPreferenceDescription),
+                new SessionStateVariableEntry(
+                    FormatEnumerationLimit,
+                    DefaultFormatEnumerationLimit,
+                    RunspaceInit.FormatEnumerationLimitDescription),
+
+                // variable for PSEmailServer
+                new SessionStateVariableEntry(
+                    SpecialVariables.PSEmailServer,
+                    string.Empty,
+                    RunspaceInit.PSEmailServerDescription),
+
+                // Start: Variables which control remoting behavior
+                new SessionStateVariableEntry(
+                    Microsoft.PowerShell.Commands.PSRemotingBaseCmdlet.DEFAULT_SESSION_OPTION,
+                    new System.Management.Automation.Remoting.PSSessionOption(),
+                    RemotingErrorIdStrings.PSDefaultSessionOptionDescription,
+                    ScopedItemOptions.None),
+                new SessionStateVariableEntry(
+                    SpecialVariables.PSSessionConfigurationName,
+                    "http://schemas.microsoft.com/powershell/Microsoft.PowerShell",
+                    RemotingErrorIdStrings.PSSessionConfigurationName,
+                    ScopedItemOptions.None),
+                new SessionStateVariableEntry(
+                    SpecialVariables.PSSessionApplicationName,
+                    "wsman",
+                    RemotingErrorIdStrings.PSSessionAppName,
+                    ScopedItemOptions.None),
+                // End: Variables which control remoting behavior
+
+                #region Platform
+                new SessionStateVariableEntry(
+                    SpecialVariables.IsLinux,
+                    Platform.IsLinux,
+                    string.Empty,
+                    ScopedItemOptions.ReadOnly | ScopedItemOptions.AllScope),
+
+                new SessionStateVariableEntry(
+                    SpecialVariables.IsMacOS,
+                    Platform.IsMacOS,
+                    string.Empty,
+                    ScopedItemOptions.ReadOnly | ScopedItemOptions.AllScope),
+
+                new SessionStateVariableEntry(
+                    SpecialVariables.IsWindows,
+                    Platform.IsWindows,
+                    string.Empty,
+                    ScopedItemOptions.ReadOnly | ScopedItemOptions.AllScope),
+
+                new SessionStateVariableEntry(
+                    SpecialVariables.IsCoreCLR,
+                    Platform.IsCoreCLR,
+                    string.Empty,
+                    ScopedItemOptions.ReadOnly | ScopedItemOptions.AllScope),
+                #endregion
+            };
+
+            if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSNativeCommandErrorActionPreferenceFeatureName))
+            {
+                builtinVariables.Add(
+                    new SessionStateVariableEntry(
+                        SpecialVariables.PSNativeCommandUseErrorActionPreference,
+                        DefaultPSNativeCommandUseErrorActionPreference,
+                        RunspaceInit.PSNativeCommandUseErrorActionPreferenceDescription,
+                        ScopedItemOptions.None,
+                        new ArgumentTypeConverterAttribute(typeof(bool))));
+            }
+
+            BuiltInVariables = builtinVariables.ToArray();
+        }
+
+        internal static readonly SessionStateVariableEntry[] BuiltInVariables;
 
         /// <summary>
         /// Returns a new array of alias entries everytime it's called. This
diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
index 3a440478d1a..a801278aa04 100644
--- a/src/System.Management.Automation/engine/MshCommandRuntime.cs
+++ b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -2804,8 +2804,16 @@ private void DoWriteError(object obj)
             _WriteErrorSkipAllowCheck(errorRecord, preference);
         }
 
-        // NOTICE-2004/06/08-JonN 959638
-        // Use this variant to skip the ThrowIfWriteNotPermitted check
+        /// <summary>
+        /// Write an error, skipping the ThrowIfWriteNotPermitted check.
+        /// </summary>
+        /// <param name="errorRecord">The error record to write.</param>
+        /// <param name="actionPreference">The configured error action preference.</param>
+        /// <param name="isFromNativeStdError">
+        /// True when this method is called to write from a native command's stderr stream.
+        /// When errors are written through a native stderr stream, they do not interact with the error preference system,
+        /// but must still present as errors in PowerShell.
+        /// </param>
         /// <exception cref="System.Management.Automation.PipelineStoppedException">
         /// The pipeline has already been terminated, or was terminated
         /// during the execution of this method.
@@ -2819,7 +2827,7 @@ private void DoWriteError(object obj)
         /// but the command failure will ultimately be
         /// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
         /// </remarks>
-        internal void _WriteErrorSkipAllowCheck(ErrorRecord errorRecord, ActionPreference? actionPreference = null, bool isNativeError = false)
+        internal void _WriteErrorSkipAllowCheck(ErrorRecord errorRecord, ActionPreference? actionPreference = null, bool isFromNativeStdError = false)
         {
             ThrowIfStopping();
 
@@ -2839,7 +2847,7 @@ internal void _WriteErrorSkipAllowCheck(ErrorRecord errorRecord, ActionPreferenc
                 this.PipelineProcessor.LogExecutionError(_thisCommand.MyInvocation, errorRecord);
             }
 
-            if (!isNativeError)
+            if (!isFromNativeStdError)
             {
                 this.PipelineProcessor.ExecutionFailed = true;
 
@@ -2905,7 +2913,7 @@ internal void _WriteErrorSkipAllowCheck(ErrorRecord errorRecord, ActionPreferenc
             // when tracing), so don't add the member again.
 
             // We don't add a note property on messages that comes from stderr stream.
-            if (!isNativeError)
+            if (!isFromNativeStdError)
             {
                 errorWrap.WriteStream = WriteStreamType.Error;
             }
diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index 3407532acdb..18d5b16c82f 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -3,21 +3,22 @@
 
 #pragma warning disable 1634, 1691
 
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.IO;
-using System.ComponentModel;
+using System.Management.Automation.Internal;
+using System.Management.Automation.Runspaces;
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
 using System.Text;
-using System.Collections;
 using System.Threading;
-using System.Management.Automation.Internal;
 using System.Xml;
-using System.Runtime.InteropServices;
 using Dbg = System.Management.Automation.Diagnostics;
-using System.Runtime.Serialization;
-using System.Globalization;
-using System.Diagnostics.CodeAnalysis;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
 
 namespace System.Management.Automation
 {
@@ -130,6 +131,100 @@ internal ProcessOutputObject(object data, MinishellStream stream)
         }
     }
 
+    #nullable enable
+    /// <summary>
+    /// This exception is used by the NativeCommandProcessor to indicate an error
+    /// when a native command retuns a non-zero exit code.
+    /// </summary>
+    [Serializable]
+    public sealed class NativeCommandExitException : RuntimeException
+    {
+        // NOTE:
+        // When implementing the native error action preference integration,
+        // reusing ApplicationFailedException was rejected.
+        // Instead of reusing a type already used in another scenario
+        // it was decided instead to use a fresh type to avoid conflating the two scenarios:
+        // * ApplicationFailedException: PowerShell was not able to complete execution of the application.
+        // * NativeCommandExitException: the application completed execution but returned a non-zero exit code.
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NativeCommandExitException"/> class with information on the native
+        /// command, a specified error message and a specified error ID.
+        /// </summary>
+        /// <param name="path">The full path of the native command.</param>
+        /// <param name="exitCode">The exit code returned by the native command.</param>
+        /// <param name="processId">The process ID of the process before it ended.</param>
+        /// <param name="message">The error message.</param>
+        /// <param name="errorId">The PowerShell runtime error ID.</param>
+        internal NativeCommandExitException(string path, int exitCode, int processId, string message, string errorId)
+            : base(message)
+        {
+            SetErrorId(errorId);
+            SetErrorCategory(ErrorCategory.NotSpecified);
+            Path = path;
+            ExitCode = exitCode;
+            ProcessId = processId;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NativeCommandExitException"/> class with serialized data.
+        /// </summary>
+        /// <param name="info"></param>
+        /// <param name="context"></param>
+        private NativeCommandExitException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+            if (info is null)
+            {
+                throw new PSArgumentNullException(nameof(info));
+            }
+
+            Path = info.GetString(nameof(Path));
+            ExitCode = info.GetInt32(nameof(ExitCode));
+            ProcessId = info.GetInt32(nameof(ProcessId));
+        }
+
+        #endregion Constructors
+
+        /// <summary>
+        /// Serializes the exception data.
+        /// </summary>
+        /// <param name="info">Serialization information.</param>
+        /// <param name="context">Streaming context.</param>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            if (info is null)
+            {
+                throw new PSArgumentNullException(nameof(info));
+            }
+
+            base.GetObjectData(info, context);
+
+            info.AddValue(nameof(Path), Path);
+            info.AddValue(nameof(ExitCode), ExitCode);
+            info.AddValue(nameof(ProcessId), ProcessId);
+        }
+
+        /// <summary>
+        /// Gets the path of the native command.
+        /// </summary>
+        public string? Path { get; }
+
+        /// <summary>
+        /// Gets the exit code returned by the native command.
+        /// </summary>
+        public int ExitCode { get; }
+
+        /// <summary>
+        /// Gets the native command's process ID.
+        /// </summary>
+        public int ProcessId { get; }
+
+    }
+    #nullable restore
+
     /// <summary>
     /// Provides way to create and execute native commands.
     /// </summary>
@@ -762,8 +857,35 @@ internal override void Complete()
                     }
 
                     this.Command.Context.SetVariable(SpecialVariables.LastExitCodeVarPath, _nativeProcess.ExitCode);
-                    if (_nativeProcess.ExitCode != 0)
-                        this.commandRuntime.PipelineProcessor.ExecutionFailed = true;
+                    if (_nativeProcess.ExitCode == 0)
+                    {
+                        return;
+                    }
+
+                    this.commandRuntime.PipelineProcessor.ExecutionFailed = true;
+
+                    if (!ExperimentalFeature.IsEnabled(ExperimentalFeature.PSNativeCommandErrorActionPreferenceFeatureName)
+                        || !(bool)Command.Context.GetVariableValue(SpecialVariables.PSNativeCommandUseErrorActionPreferenceVarPath, defaultValue: false))
+                    {
+                        return;
+                    }
+
+                    const string errorId = nameof(CommandBaseStrings.ProgramExitedWithNonZeroCode);
+
+                    string errorMsg = StringUtil.Format(
+                        CommandBaseStrings.ProgramExitedWithNonZeroCode,
+                        NativeCommandName,
+                        _nativeProcess.ExitCode);
+
+                    var exception = new NativeCommandExitException(
+                        Path,
+                        _nativeProcess.ExitCode,
+                        _nativeProcess.Id,
+                        errorMsg,
+                        errorId);
+
+                    var errorRecord = new ErrorRecord(exception, errorId, ErrorCategory.NotSpecified, targetObject: NativeCommandName);
+                    this.commandRuntime._WriteErrorSkipAllowCheck(errorRecord);
                 }
             }
             catch (Win32Exception e)
@@ -1087,7 +1209,7 @@ private void ProcessOutputRecord(ProcessOutputObject outputValue)
                 ErrorRecord record = outputValue.Data as ErrorRecord;
                 Dbg.Assert(record != null, "ProcessReader should ensure that data is ErrorRecord");
                 record.SetInvocationInfo(this.Command.MyInvocation);
-                this.commandRuntime._WriteErrorSkipAllowCheck(record, isNativeError: true);
+                this.commandRuntime._WriteErrorSkipAllowCheck(record, isFromNativeStdError: true);
             }
             else if (outputValue.Stream == MinishellStream.Output)
             {
diff --git a/src/System.Management.Automation/engine/SpecialVariables.cs b/src/System.Management.Automation/engine/SpecialVariables.cs
index 0f95349664f..0137ace9d66 100644
--- a/src/System.Management.Automation/engine/SpecialVariables.cs
+++ b/src/System.Management.Automation/engine/SpecialVariables.cs
@@ -255,6 +255,11 @@ internal static class SpecialVariables
 
         internal static readonly VariablePath InformationPreferenceVarPath = new VariablePath(InformationPreference);
 
+        internal const string PSNativeCommandUseErrorActionPreference = nameof(PSNativeCommandUseErrorActionPreference);
+
+        internal static readonly VariablePath PSNativeCommandUseErrorActionPreferenceVarPath =
+            new(PSNativeCommandUseErrorActionPreference);
+
         #endregion Preference Variables
 
         // Native command argument passing style
@@ -321,25 +326,30 @@ internal static class SpecialVariables
                                                                    /* PSCommandPath */     typeof(string),
                                                                  };
 
-        internal static readonly string[] PreferenceVariables = {
-                                                                    SpecialVariables.DebugPreference,
-                                                                    SpecialVariables.VerbosePreference,
-                                                                    SpecialVariables.ErrorActionPreference,
-                                                                    SpecialVariables.WhatIfPreference,
-                                                                    SpecialVariables.WarningPreference,
-                                                                    SpecialVariables.InformationPreference,
-                                                                    SpecialVariables.ConfirmPreference,
-                                                                };
-
-        internal static readonly Type[] PreferenceVariableTypes = {
-                                                                    /* DebugPreference */       typeof(ActionPreference),
-                                                                    /* VerbosePreference */     typeof(ActionPreference),
-                                                                    /* ErrorPreference */       typeof(ActionPreference),
-                                                                    /* WhatIfPreference */      typeof(SwitchParameter),
-                                                                    /* WarningPreference */     typeof(ActionPreference),
-                                                                    /* InformationPreference */ typeof(ActionPreference),
-                                                                    /* ConfirmPreference */     typeof(ConfirmImpact),
-                                                                  };
+        // This array and the one below it exist to optimize the way common parameters work in advanced functions.
+        // Common parameters work by setting preference variables in the scope of the function and restoring the old value afterward.
+        // Variables that don't correspond to common cmdlet parameters don't need to be added here.
+        internal static readonly string[] PreferenceVariables =
+        {
+            SpecialVariables.DebugPreference,
+            SpecialVariables.VerbosePreference,
+            SpecialVariables.ErrorActionPreference,
+            SpecialVariables.WhatIfPreference,
+            SpecialVariables.WarningPreference,
+            SpecialVariables.InformationPreference,
+            SpecialVariables.ConfirmPreference,
+        };
+
+        internal static readonly Type[] PreferenceVariableTypes =
+        {
+            /* DebugPreference */                         typeof(ActionPreference),
+            /* VerbosePreference */                       typeof(ActionPreference),
+            /* ErrorPreference */                         typeof(ActionPreference),
+            /* WhatIfPreference */                        typeof(SwitchParameter),
+            /* WarningPreference */                       typeof(ActionPreference),
+            /* InformationPreference */                   typeof(ActionPreference),
+            /* ConfirmPreference */                       typeof(ConfirmImpact),
+        };
 
         // The following variables are created in every session w/ AllScope.  We avoid creating local slots when we
         // see an assignment to any of these variables so that they get handled properly (either throwing an exception
diff --git a/src/System.Management.Automation/resources/CommandBaseStrings.resx b/src/System.Management.Automation/resources/CommandBaseStrings.resx
index 656dc226f22..dc2dd4bbbf5 100644
--- a/src/System.Management.Automation/resources/CommandBaseStrings.resx
+++ b/src/System.Management.Automation/resources/CommandBaseStrings.resx
@@ -156,6 +156,15 @@
   <data name="PauseHelpMessage" xml:space="preserve">
     <value>Pause the current pipeline and return to the command prompt. Type "{0}" to resume the pipeline.</value>
   </data>
+  <data name="ProgramExitedWithNonZeroCode" xml:space="preserve">
+    <!-- NOTE:
+      This string was added for the native command error action preference integration feature.
+      ParserStrings already declares a ProgramFailedToExecute string,
+      however that is used for ApplicationFailedExceptions thrown when the NativeCommandProcessor fails in an unexpected way.
+      In this case, we have a more specific error for the native command scenario, so the two are not conflated.
+    -->
+    <value>Program "{0}" ended with non-zero exit code: {1}.</value>
+  </data>
   <data name="ShouldProcessMessage" xml:space="preserve">
     <value>Performing the operation "{0}" on target "{1}".</value>
   </data>
diff --git a/src/System.Management.Automation/resources/RunspaceInit.resx b/src/System.Management.Automation/resources/RunspaceInit.resx
index a2497961901..f12ba3f71c5 100644
--- a/src/System.Management.Automation/resources/RunspaceInit.resx
+++ b/src/System.Management.Automation/resources/RunspaceInit.resx
@@ -186,6 +186,9 @@
   <data name="NestedPromptLevelDescription" xml:space="preserve">
     <value>Dictates what type of prompt should be displayed for the current nesting level</value>
   </data>
+  <data name="PSNativeCommandUseErrorActionPreferenceDescription" xml:space="preserve">
+    <value>If true, $ErrorActionPreference applies to native executables, so that non-zero exit codes will generate cmdlet-style errors governed by error action settings</value>
+  </data>
   <data name="WhatIfPreferenceDescription" xml:space="preserve">
     <value>If true, WhatIf is considered to be enabled for all commands.</value>
   </data>
diff --git a/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1 b/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1
new file mode 100644
index 00000000000..83bf3d66c37
--- /dev/null
+++ b/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1
@@ -0,0 +1,178 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Functional tests to verify that native executables throw errors (non-terminating and terminating) appropriately
+# when $PSNativeCommandUseErrorActionPreference is $true
+
+Describe 'Native command error handling tests' -Tags 'CI' {
+    BeforeAll {
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        if (-not [ExperimentalFeature]::IsEnabled('PSNativeCommandErrorActionPreference'))
+        {
+            $PSDefaultParameterValues['It:Skip'] = $true
+            return
+        }
+
+        $exeName = $IsWindows ? 'testexe.exe' : 'testexe'
+
+        $errorActionPrefTestCases = @(
+            @{ ErrorActionPref = 'Stop' }
+            @{ ErrorActionPref = 'Continue' }
+            @{ ErrorActionPref = 'SilentlyContinue' }
+            @{ ErrorActionPref = 'Ignore' }
+        )
+    }
+
+    AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
+    }
+
+    BeforeEach {
+        $Error.Clear()
+    }
+
+    Context 'PSNativeCommandUseErrorActionPreference is $true' {
+        BeforeEach {
+            $PSNativeCommandUseErrorActionPreference = $true
+        }
+
+        It 'Non-zero exit code throws teminating error for $ErrorActionPreference = ''Stop''' {
+            $ErrorActionPreference = 'Stop'
+
+            { testexe -returncode 1 } | Should -Throw -ErrorId 'ProgramExitedWithNonZeroCode'
+
+            $error.Count | Should -Be 1
+            $error[0].FullyQualifiedErrorId | Should -BeExactly 'ProgramExitedWithNonZeroCode'
+            $error[0].TargetObject | Should -BeExactly $exeName
+        }
+
+        It 'Non-zero exit code outputs a non-teminating error for $ErrorActionPreference = ''Continue''' {
+            $ErrorActionPreference = 'Continue'
+
+            $stderr = testexe -returncode 1 2>&1
+
+            $error[0].FullyQualifiedErrorId | Should -BeExactly 'ProgramExitedWithNonZeroCode'
+            $error[0].TargetObject | Should -BeExactly $exeName
+            $stderr[1].Exception.Message | Should -BeExactly "Program `"$exeName`" ended with non-zero exit code: 1."
+        }
+
+        It 'Non-zero exit code generates a non-teminating error for $ErrorActionPreference = ''SilentlyContinue''' {
+            $ErrorActionPreference = 'SilentlyContinue'
+
+            testexe -returncode 1 > $null
+
+            $error.Count | Should -Be 1
+            $error[0].FullyQualifiedErrorId | Should -BeExactly 'ProgramExitedWithNonZeroCode'
+            $error[0].TargetObject | Should -BeExactly $exeName
+        }
+
+        It 'Non-zero exit code does not generates an error record for $ErrorActionPreference = ''Ignore''' {
+            $ErrorActionPreference = 'Ignore'
+
+            testexe -returncode 1 > $null
+
+            $LASTEXITCODE | Should -Be 1
+            $error.Count | Should -Be 0
+        }
+
+        It 'Zero exit code generates no error for $ErrorActionPreference = ''<ErrorActionPref>''' -TestCases $errorActionPrefTestCases {
+            param($ErrorActionPref)
+
+            $ErrorActionPreference = $ErrorActionPref
+
+            $output = testexe -returncode 0
+
+            $output | Should -BeExactly '0'
+            $LASTEXITCODE | Should -Be 0
+            $Error.Count | Should -Be 0
+        }
+
+        It 'Works as expected with a try/catch block when $ErrorActionPreference = ''<ErrorActionPref>''' -TestCase $errorActionPrefTestCases {
+            param($ErrorActionPref)
+
+            $ErrorActionPreference = $ErrorActionPref
+
+            $threw = $false
+            $continued = $false
+            $hitFinally = $false
+            try
+            {
+                testexe -returncode 17 2>&1 > $null
+                $continued = $true
+            }
+            catch
+            {
+                $threw = $true
+                $exception = $_.Exception
+            }
+            finally
+            {
+                $hitFinally = $true
+            }
+
+            $hitFinally | Should -BeTrue
+            $continued  | Should -Be ($ErrorActionPreference -ne 'Stop')
+            $threw      | Should -Be ($ErrorActionPreference -eq 'Stop')
+
+            if ($threw)
+            {
+                $exception.Path      | Should -BeExactly (Get-Command -Name testexe -CommandType Application).Path
+                $exception.ExitCode  | Should -Be $LASTEXITCODE
+                $exception.ProcessId | Should -BeGreaterThan 0
+            }
+        }
+
+        It 'Works with trap when $ErrorActionPreference = ''<ErrorActionPref>''' -TestCases $errorActionPrefTestCases {
+            param($ErrorActionPref)
+
+            $ErrorActionPreference = $ErrorActionPref
+
+            trap
+            {
+                $hitTrap = $true
+                $exception = $_
+                continue
+            }
+
+            $hitTrap = $false
+
+            # Expect this to be trapped
+            testexe -returncode 17 2>&1 > $null
+
+            if ($ErrorActionPreference -eq 'Stop')
+            {
+                $hitTrap             | Should -BeTrue
+                $exception.ExitCode  | Should -Be $LASTEXITCODE
+                $exception.Path      | Should -BeExactly (Get-Command -Name testexe -CommandType Application).Path
+                $exception.ProcessId | Should -BeGreaterThan 0
+            }
+            else
+            {
+                $hitTrap   | Should -BeFalse
+                $exception | Should -BeNullOrEmpty
+            }
+        }
+    }
+
+    Context 'PSNativeCommandUseErrorActionPreference is $false' {
+        BeforeEach {
+            $PSNativeCommandUseErrorActionPreference = $false
+        }
+
+        It 'Non-zero exit code generates no error for $ErrorActionPreference = ''<ErrorActionPref>''' -TestCases $errorActionPrefTestCases {
+            param($ErrorActionPref)
+
+            $ErrorActionPreference = $ErrorActionPref
+
+            if ($ErrorActionPref -eq 'Stop') {
+                { testexe -returncode 1 } | Should -Not -Throw
+            }
+            else {
+                testexe -returncode 1 > $null
+            }
+
+            $LASTEXITCODE | Should -Be 1
+            $Error.Count | Should -Be 0
+        }
+    }
+}

From 321b726306fcee2e79c955fdf00e06df10a7d220 Mon Sep 17 00:00:00 2001
From: Daryl Graves <46203429+DarylGraves@users.noreply.github.com>
Date: Wed, 25 Aug 2021 17:45:00 +0100
Subject: [PATCH 010/645] Format-Wide: Fix NullReferenceException (#15990)

---
 .../FormatAndOutput/common/TableWriter.cs                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs
index 74d5f543e07..fb5ef0bf930 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs
@@ -458,7 +458,7 @@ private string GenerateRow(string[] values, ReadOnlySpan<int> alignment, Display
                 }
 
                 sb.Append(GenerateRowField(values[k], _si.columnInfo[k].width, alignment[k], dc, addPadding));
-                if (values[k].Contains(ESC))
+                if (values[k] is not null && values[k].Contains(ESC))
                 {
                     // Reset the console output if the content of this column contains ESC
                     sb.Append(PSStyle.Instance.Reset);

From b09f6973fdc6ea062366dd718cb2978516cc4573 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 25 Aug 2021 14:19:55 -0700
Subject: [PATCH 011/645] Find packages separately for each source in
 `UpdateDotnetRuntime.ps1` script (#15998)

---
 tools/UpdateDotnetRuntime.ps1 | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index 29aefe3ee71..f02f35da866 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -107,12 +107,24 @@ function Update-PackageVersion {
     }
 
     $packages.GetEnumerator() | ForEach-Object {
-        $pkgs = Find-Package -Name $_.Key -AllVersions -AllowPrereleaseVersions -Source $source
+        $pkgName = $_.Key
+
+        $pkgs = [System.Collections.Generic.Dictionary[string, Microsoft.PackageManagement.Packaging.SoftwareIdentity]]::new()
+
+        # We have to find packages for all sources separately as Find-Package does not return all packages when both sources are provided at the same time.
+        # Since there will be a lot of duplicates we add the package to a dictionary so we only get a unique set by version.
+        $source | ForEach-Object {
+            Find-Package -Name $pkgName -AllVersions -AllowPrereleaseVersions -Source $_ | ForEach-Object {
+                if (-not $pkgs.ContainsKey($_.Version)) {
+                    $pkgs.Add($_.Version, $_)
+                }
+            }
+        }
 
         foreach ($v in $_.Value) {
             $version = $v.Version
 
-            foreach ($p in $pkgs) {
+            foreach ($p in $pkgs.Values) {
                 # some packages are directly updated on nuget.org so need to check that too.
                 if ($p.Version -like "$versionPattern*" -or $p.Source -eq 'nuget.org') {
                     if ([System.Management.Automation.SemanticVersion] ($version) -lt [System.Management.Automation.SemanticVersion] ($p.Version)) {

From 15836f289cab3f2a2f8c6afb0bd8fe2cc3adba1b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 25 Aug 2021 15:59:58 -0700
Subject: [PATCH 012/645] Ignore error from `Find-Package` (#15999)

---
 tools/UpdateDotnetRuntime.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index f02f35da866..cbaa69bfd02 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -114,7 +114,7 @@ function Update-PackageVersion {
         # We have to find packages for all sources separately as Find-Package does not return all packages when both sources are provided at the same time.
         # Since there will be a lot of duplicates we add the package to a dictionary so we only get a unique set by version.
         $source | ForEach-Object {
-            Find-Package -Name $pkgName -AllVersions -AllowPrereleaseVersions -Source $_ | ForEach-Object {
+            Find-Package -Name $pkgName -AllVersions -AllowPrereleaseVersions -Source $_ -ErrorAction SilentlyContinue | ForEach-Object {
                 if (-not $pkgs.ContainsKey($_.Version)) {
                     $pkgs.Add($_.Version, $_)
                 }

From 403767d7f7b910a6f315505287fe9a72c3960c52 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 25 Aug 2021 17:05:54 -0700
Subject: [PATCH 013/645] Fix a casting error when using
 `$PSNativeCommandUsesErrorActionPreference` (#15993)

---
 .../engine/ExecutionContext.cs                | 62 ++-----------------
 .../engine/InitialSessionState.cs             | 53 +++++-----------
 .../engine/MshCommandRuntime.cs               |  3 +-
 .../engine/NativeCommandParameterBinder.cs    |  6 +-
 .../engine/NativeCommandProcessor.cs          |  2 +-
 .../engine/SpecialVariables.cs                |  6 +-
 .../NativeCommandErrorHandling.Tests.ps1      | 26 ++++++++
 7 files changed, 55 insertions(+), 103 deletions(-)

diff --git a/src/System.Management.Automation/engine/ExecutionContext.cs b/src/System.Management.Automation/engine/ExecutionContext.cs
index cfcc417de4a..8ffd25949c5 100644
--- a/src/System.Management.Automation/engine/ExecutionContext.cs
+++ b/src/System.Management.Automation/engine/ExecutionContext.cs
@@ -525,9 +525,7 @@ internal object GetVariableValue(VariablePath path)
         /// </summary>
         internal object GetVariableValue(VariablePath path, object defaultValue)
         {
-            CmdletProviderContext context;
-            SessionStateScope scope;
-            return EngineSessionState.GetVariableValue(path, out context, out scope) ?? defaultValue;
+            return EngineSessionState.GetVariableValue(path, out _, out _) ?? defaultValue;
         }
 
         /// <summary>
@@ -612,19 +610,15 @@ private void CheckActionPreference(VariablePath preferenceVariablePath, ActionPr
         /// <returns></returns>
         internal bool GetBooleanPreference(VariablePath preferenceVariablePath, bool defaultPref, out bool defaultUsed)
         {
-            CmdletProviderContext context = null;
-            SessionStateScope scope = null;
-            object val = EngineSessionState.GetVariableValue(preferenceVariablePath, out context, out scope);
-            if (val == null)
+            object val = EngineSessionState.GetVariableValue(preferenceVariablePath, out _, out _);
+            if (val is null)
             {
                 defaultUsed = true;
                 return defaultPref;
             }
 
-            bool converted = defaultPref;
-            defaultUsed = !LanguagePrimitives.TryConvertTo<bool>
-                (val, out converted);
-            return (defaultUsed) ? defaultPref : converted;
+            defaultUsed = !LanguagePrimitives.TryConvertTo(val, out bool converted);
+            return defaultUsed ? defaultPref : converted;
         }
         #endregion GetSetVariable methods
 
@@ -1568,23 +1562,6 @@ internal ExecutionContext(AutomationEngine engine, PSHost hostInterface, Initial
         private void InitializeCommon(AutomationEngine engine, PSHost hostInterface)
         {
             Engine = engine;
-#if !CORECLR// System.AppDomain is not in CoreCLR
-            // Set the assembly resolve handler if it isn't already set...
-            if (!_assemblyEventHandlerSet)
-            {
-                // we only want to set the event handler once for the entire app domain...
-                lock (lockObject)
-                {
-                    // Need to check again inside the lock due to possibility of a race condition...
-                    if (!_assemblyEventHandlerSet)
-                    {
-                        AppDomain currentAppDomain = AppDomain.CurrentDomain;
-                        currentAppDomain.AssemblyResolve += new ResolveEventHandler(PowerShellAssemblyResolveHandler);
-                        _assemblyEventHandlerSet = true;
-                    }
-                }
-            }
-#endif
             Events = new PSLocalEventManager(this);
             transactionManager = new PSTransactionManager();
             _debugger = new ScriptDebugger(this);
@@ -1609,35 +1586,6 @@ private void InitializeCommon(AutomationEngine engine, PSHost hostInterface)
         }
 
         private static readonly object lockObject = new object();
-
-#if !CORECLR // System.AppDomain is not in CoreCLR
-        private static bool _assemblyEventHandlerSet = false;
-
-        /// <summary>
-        /// AssemblyResolve event handler that will look in the assembly cache to see
-        /// if the named assembly has been loaded. This is necessary so that assemblies loaded
-        /// with LoadFrom, which are in a different loaded context than Load, can still be used to
-        /// resolve types.
-        /// </summary>
-        /// <param name="sender">The event sender.</param>
-        /// <param name="args">The event args.</param>
-        /// <returns>The resolve assembly or null if not found.</returns>
-        private static Assembly PowerShellAssemblyResolveHandler(object sender, ResolveEventArgs args)
-        {
-            ExecutionContext ecFromTLS = Runspaces.LocalPipeline.GetExecutionContextFromTLS();
-            if (ecFromTLS != null)
-            {
-                if (ecFromTLS.AssemblyCache != null)
-                {
-                    Assembly assembly;
-                    ecFromTLS.AssemblyCache.TryGetValue(args.Name, out assembly);
-                    return assembly;
-                }
-            }
-
-            return null;
-        }
-#endif
     }
 
     /// <summary>
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index 07c0d250004..815f7ea5628 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -1308,37 +1308,6 @@ private static void MakeDisallowedEntriesPrivate<T>(InitialSessionStateEntryColl
             }
         }
 
-        #region VariableHelper
-        /// <summary>
-        /// A helper for adding variables to session state.
-        /// Experimental features can be handled here.
-        /// </summary>
-        /// <param name="variables">The variables to add to session state.</param>
-        private void AddVariables(IEnumerable<SessionStateVariableEntry> variables)
-        {
-            Variables.Add(variables);
-
-            // If the PSNativeCommandArgumentPassing feature is enabled, create the variable which controls the behavior
-            // Since the BuiltInVariables list is static, and this should be done dynamically
-            // we need to do this here. Also, since the defaults are different based on platform we need a
-            // bit more logic.
-            if (ExperimentalFeature.IsEnabled("PSNativeCommandArgumentPassing"))
-            {
-                NativeArgumentPassingStyle style = NativeArgumentPassingStyle.Standard;
-                if (Platform.IsWindows) {
-                    style = NativeArgumentPassingStyle.Windows;
-                }
-                Variables.Add(
-                    new SessionStateVariableEntry(
-                        SpecialVariables.NativeArgumentPassing,
-                        style,
-                        RunspaceInit.NativeCommandArgumentPassingDescription,
-                        ScopedItemOptions.None,
-                        new ArgumentTypeConverterAttribute(typeof(NativeArgumentPassingStyle))));
-            }
-        }
-        #endregion
-
         /// <summary>
         /// Creates an initial session state from a PSSC configuration file.
         /// </summary>
@@ -1444,7 +1413,7 @@ private static InitialSessionState CreateRestrictedForRemoteServer()
             }
 
             // Add built-in variables.
-            iss.AddVariables(BuiltInVariables);
+            iss.Variables.Add(BuiltInVariables);
 
             // wrap some commands in a proxy function to restrict their parameters
             foreach (KeyValuePair<string, CommandMetadata> proxyFunction in CommandMetadata.GetRestrictedCommands(SessionCapabilities.RemoteServer))
@@ -1531,7 +1500,7 @@ public static InitialSessionState CreateDefault()
 
             InitialSessionState ss = new InitialSessionState();
 
-            ss.AddVariables(BuiltInVariables);
+            ss.Variables.Add(BuiltInVariables);
             ss.Commands.Add(new SessionStateApplicationEntry("*"));
             ss.Commands.Add(new SessionStateScriptEntry("*"));
             ss.Commands.Add(BuiltInFunctions);
@@ -1598,7 +1567,7 @@ public static InitialSessionState CreateDefault2()
         {
             InitialSessionState ss = new InitialSessionState();
 
-            ss.AddVariables(BuiltInVariables);
+            ss.Variables.Add(BuiltInVariables);
             ss.Commands.Add(new SessionStateApplicationEntry("*"));
             ss.Commands.Add(new SessionStateScriptEntry("*"));
             ss.Commands.Add(BuiltInFunctions);
@@ -1639,7 +1608,7 @@ public InitialSessionState Clone()
         {
             InitialSessionState ss = new InitialSessionState();
 
-            ss.AddVariables(this.Variables.Clone());
+            ss.Variables.Add(this.Variables.Clone());
             ss.EnvironmentVariables.Add(this.EnvironmentVariables.Clone());
             ss.Commands.Add(this.Commands.Clone());
             ss.Assemblies.Add(this.Assemblies.Clone());
@@ -4471,7 +4440,6 @@ .ForwardHelpCategory Cmdlet
         internal const ActionPreference DefaultInformationPreference = ActionPreference.SilentlyContinue;
 
         internal const ErrorView DefaultErrorView = ErrorView.ConciseView;
-        internal const bool DefaultPSNativeCommandUseErrorActionPreference = false;
         internal const bool DefaultWhatIfPreference = false;
         internal const ConfirmImpact DefaultConfirmPreference = ConfirmImpact.High;
 
@@ -4628,12 +4596,23 @@ static InitialSessionState()
                 builtinVariables.Add(
                     new SessionStateVariableEntry(
                         SpecialVariables.PSNativeCommandUseErrorActionPreference,
-                        DefaultPSNativeCommandUseErrorActionPreference,
+                        value: false,
                         RunspaceInit.PSNativeCommandUseErrorActionPreferenceDescription,
                         ScopedItemOptions.None,
                         new ArgumentTypeConverterAttribute(typeof(bool))));
             }
 
+            if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSNativeCommandArgumentPassingFeatureName))
+            {
+                builtinVariables.Add(
+                    new SessionStateVariableEntry(
+                        SpecialVariables.NativeArgumentPassing,
+                        Platform.IsWindows ? NativeArgumentPassingStyle.Windows : NativeArgumentPassingStyle.Standard,
+                        RunspaceInit.NativeCommandArgumentPassingDescription,
+                        ScopedItemOptions.None,
+                        new ArgumentTypeConverterAttribute(typeof(NativeArgumentPassingStyle))));
+            }
+
             BuiltInVariables = builtinVariables.ToArray();
         }
 
diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
index a801278aa04..f76723d64e1 100644
--- a/src/System.Management.Automation/engine/MshCommandRuntime.cs
+++ b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -3250,8 +3250,7 @@ internal SwitchParameter WhatIf
             {
                 if (!IsWhatIfFlagSet && !_isWhatIfPreferenceCached)
                 {
-                    bool defaultUsed = false;
-                    _whatIfFlag = Context.GetBooleanPreference(SpecialVariables.WhatIfPreferenceVarPath, _whatIfFlag, out defaultUsed);
+                    _whatIfFlag = Context.GetBooleanPreference(SpecialVariables.WhatIfPreferenceVarPath, _whatIfFlag, out _);
                     _isWhatIfPreferenceCached = true;
                 }
 
diff --git a/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs b/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
index 511449bc7e5..59715a02125 100644
--- a/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
+++ b/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
@@ -20,8 +20,6 @@ namespace System.Management.Automation
     /// </summary>
     internal class NativeCommandParameterBinder : ParameterBinderBase
     {
-        private readonly VariablePath s_nativeArgumentPassingVarPath = new VariablePath(SpecialVariables.NativeArgumentPassing);
-
         #region ctor
 
         /// <summary>
@@ -193,13 +191,13 @@ internal NativeArgumentPassingStyle ArgumentPassingStyle
         {
             get
             {
-                if (ExperimentalFeature.IsEnabled("PSNativeCommandArgumentPassing"))
+                if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSNativeCommandArgumentPassingFeatureName))
                 {
                     try
                     {
                         // This will default to the new behavior if it is set to anything other than Legacy
                         var preference = LanguagePrimitives.ConvertTo<NativeArgumentPassingStyle>(
-                            Context.GetVariableValue(s_nativeArgumentPassingVarPath, NativeArgumentPassingStyle.Standard));
+                            Context.GetVariableValue(SpecialVariables.NativeArgumentPassingVarPath, NativeArgumentPassingStyle.Standard));
                         return preference;
                     }
                     catch
diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index 18d5b16c82f..7df3dd82546 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -865,7 +865,7 @@ internal override void Complete()
                     this.commandRuntime.PipelineProcessor.ExecutionFailed = true;
 
                     if (!ExperimentalFeature.IsEnabled(ExperimentalFeature.PSNativeCommandErrorActionPreferenceFeatureName)
-                        || !(bool)Command.Context.GetVariableValue(SpecialVariables.PSNativeCommandUseErrorActionPreferenceVarPath, defaultValue: false))
+                        || !Command.Context.GetBooleanPreference(SpecialVariables.PSNativeCommandUseErrorActionPreferenceVarPath, defaultPref: false, out _))
                     {
                         return;
                     }
diff --git a/src/System.Management.Automation/engine/SpecialVariables.cs b/src/System.Management.Automation/engine/SpecialVariables.cs
index 0137ace9d66..d093cdbbb50 100644
--- a/src/System.Management.Automation/engine/SpecialVariables.cs
+++ b/src/System.Management.Automation/engine/SpecialVariables.cs
@@ -204,6 +204,7 @@ internal static class SpecialVariables
         internal static readonly VariablePath PSModuleAutoLoadingPreferenceVarPath = new VariablePath("global:" + PSModuleAutoLoading);
 
         #region Platform Variables
+
         internal const string IsLinux = "IsLinux";
 
         internal static readonly VariablePath IsLinuxPath = new VariablePath("IsLinux");
@@ -221,6 +222,7 @@ internal static class SpecialVariables
         internal static readonly VariablePath IsCoreCLRPath = new VariablePath("IsCoreCLR");
 
         #endregion
+
         #region Preference Variables
 
         internal const string DebugPreference = "DebugPreference";
@@ -255,13 +257,13 @@ internal static class SpecialVariables
 
         internal static readonly VariablePath InformationPreferenceVarPath = new VariablePath(InformationPreference);
 
+        #endregion Preference Variables
+
         internal const string PSNativeCommandUseErrorActionPreference = nameof(PSNativeCommandUseErrorActionPreference);
 
         internal static readonly VariablePath PSNativeCommandUseErrorActionPreferenceVarPath =
             new(PSNativeCommandUseErrorActionPreference);
 
-        #endregion Preference Variables
-
         // Native command argument passing style
         internal const string NativeArgumentPassing = "PSNativeCommandArgumentPassing";
 
diff --git a/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1 b/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1
index 83bf3d66c37..b8d6b20e126 100644
--- a/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1
+++ b/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1
@@ -56,6 +56,19 @@ Describe 'Native command error handling tests' -Tags 'CI' {
             $stderr[1].Exception.Message | Should -BeExactly "Program `"$exeName`" ended with non-zero exit code: 1."
         }
 
+        It "Non-boolean value should not cause type casting error when the native command exited with non-zero code" {
+            $ErrorActionPreference = 'Continue'
+
+            $PSNativeCommandUseErrorActionPreference = 'Yeah'
+            $PSNativeCommandUseErrorActionPreference | Should -BeExactly 'Yeah'
+
+            $stderr = testexe -returncode 1 2>&1
+
+            $error[0].FullyQualifiedErrorId | Should -BeExactly 'ProgramExitedWithNonZeroCode'
+            $error[0].TargetObject | Should -BeExactly $exeName
+            $stderr[1].Exception.Message | Should -BeExactly "Program `"$exeName`" ended with non-zero exit code: 1."
+        }
+
         It 'Non-zero exit code generates a non-teminating error for $ErrorActionPreference = ''SilentlyContinue''' {
             $ErrorActionPreference = 'SilentlyContinue'
 
@@ -174,5 +187,18 @@ Describe 'Native command error handling tests' -Tags 'CI' {
             $LASTEXITCODE | Should -Be 1
             $Error.Count | Should -Be 0
         }
+
+        It "Non-boolean value should not cause type casting error when the native command exited with non-zero code" {
+            $ErrorActionPreference = 'Continue'
+
+            $PSNativeCommandUseErrorActionPreference = 0
+            $PSNativeCommandUseErrorActionPreference | Should -Be 0
+            $PSNativeCommandUseErrorActionPreference | Should -BeOfType 'System.Int32'
+
+            testexe -returncode 1 > $null
+
+            $LASTEXITCODE | Should -Be 1
+            $Error.Count | Should -Be 0
+        }
     }
 }

From d33b223674996e0159fd77416fd59706fba73856 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 26 Aug 2021 13:07:43 -0700
Subject: [PATCH 014/645] Update .NET SDK version from
 `6.0.100-preview.6.21355.2` to `6.0.100-rc.1.21426.1` (#15648)

---
 assets/wix/files.wxs                             | 14 +++++++-------
 global.json                                      |  2 +-
 ...crosoft.PowerShell.Commands.Management.csproj |  2 +-
 .../Microsoft.PowerShell.Commands.Utility.csproj |  6 +++---
 .../Microsoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj              |  8 ++++----
 .../Microsoft.WSMan.Management.csproj            |  2 +-
 .../System.Management.Automation.csproj          | 16 ++++++++--------
 .../engine/Api/TypeInference.Tests.ps1           |  2 +-
 test/tools/TestService/TestService.csproj        |  2 +-
 test/tools/WebListener/WebListener.csproj        |  4 ++--
 11 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index f205226a49d..84539cac520 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1608,9 +1608,6 @@
         <Component Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" Guid="{ee32f38f-14ee-4a85-914f-d02522cc3635}">
           <File Id="fil04B0F83A7AED430A86A7E6E3E99AB45D" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
         </Component>
-        <Component Id="cmp49588B1BA09F4BBCA352B162F387AAF1">
-          <File Id="fil77BEE4F2A1A44842B4135984E1D71538" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Net.Quic.dll" />
-        </Component>
         <Component Id="cmpEE26930D65E346FDAE1B3E07F5DBEF77">
           <File Id="filBC93A3F22F78439F8D4173E4C64ACFDC" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
         </Component>
@@ -3054,8 +3051,11 @@
       <Component Id="cmp3547A55EA9D04784B4CF2FC717447E16">
         <File Id="fil463DDA419769417A8D5A34C433E194F2" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Speech.dll" />
       </Component>
-      <Component Id="cmp8A922220F11C42439D6447B6654A8FC2">
-        <File Id="fil1EE3A80C6C944700A5C2B75C4AB30B21" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.35212.dll" />
+      <Component Id="cmp957498053E01454DA1E21E6D7317DCD6">
+        <File Id="fil2AA6F0D8A51D4BB89F33F2B73AB12391" KeyPath="yes" Source="$(var.ProductSourcePath)\msquic.dll" />
+      </Component>
+      <Component Id="cmpFF0AD067132E492DA31F4E9921B01375">
+        <File Id="fil2646459F2E774B48BC5FA3E7F8BED502" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.42515.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4027,7 +4027,6 @@
       <ComponentRef Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D" />
       <ComponentRef Id="cmp1EBDE676D79B4B0DB859B3F601D78513" />
       <ComponentRef Id="cmpB92B70CEFC2F438386F97264FB436CDD" />
-      <ComponentRef Id="cmp49588B1BA09F4BBCA352B162F387AAF1" />
       <ComponentRef Id="cmpEE26930D65E346FDAE1B3E07F5DBEF77" />
       <ComponentRef Id="cmp8635213A03B04AAE8E1BFB7EA85E0DB2" />
       <ComponentRef Id="cmp834F3E0C83664E92B0D115A39A8FAACB" />
@@ -4038,10 +4037,11 @@
       <ComponentRef Id="cmpFAD6557C4AEC48B89DDC4E6485C020C4" />
       <ComponentRef Id="cmpB5458B36303A472B80582AF1C2E7FB94" />
       <ComponentRef Id="cmp0EBD333D501A45089F58504074E229E7" />
-      <ComponentRef Id="cmp8A922220F11C42439D6447B6654A8FC2" />
       <ComponentRef Id="cmpD11E9CA5069045578BA5D89C86F7FDEF" />
       <ComponentRef Id="cmp708913639F7A46E784CC0FA862A1A2CE" />
       <ComponentRef Id="cmpA75DEF5617C54DA1937CB37D5824BF79" />
+      <ComponentRef Id="cmp957498053E01454DA1E21E6D7317DCD6" />
+      <ComponentRef Id="cmpFF0AD067132E492DA31F4E9921B01375" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 26b49e6e30a..21a9b9bc28f 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.6.21355.2"
+    "version": "6.0.100-rc.1.21426.1"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 1fb088cfdd7..e8c7e78918e 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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-preview.6.21352.12" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.1.21425.7" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index be3bf2892e9..19645f35ae0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-1.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-preview.6.21352.12" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0-preview.6.21352.12" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-3.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.1.21425.7" />
     <PackageReference Include="NJsonSchema" Version="10.5.2" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index fc257238436..a309820ffab 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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-preview.6.21352.12" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-rc.1.21425.7" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 0907eaa3736..5875f9904dd 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <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-preview.6.21352.12" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-preview.6.21352.12" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-preview.6.21352.12" />
+    <PackageReference Include="System.IO.Packaging" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rc.1.21425.7" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0-preview1.21220.1" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.9.0-preview1.21220.1" />
@@ -30,7 +30,7 @@
     <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-preview.4.21253.7" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21425.7" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index d32fb47a456..fbd381b9d6f 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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-preview.6.21352.12" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.1.21425.7" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 37d3686dbaa..4b6917b168e 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <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-preview.6.21352.12" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-preview.6.21352.12" />
-    <PackageReference Include="System.DirectoryServices" Version="6.0.0-preview.6.21352.12" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="System.DirectoryServices" Version="6.0.0-rc.1.21425.7" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" />
-    <PackageReference Include="System.Management" Version="6.0.0-preview.6.21352.12" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.6.21352.12" />
+    <PackageReference Include="System.Management" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rc.1.21425.7" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.5.21301.5" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-preview.6.21352.12" />
-    <PackageReference Include="System.Security.Permissions" Version="6.0.0-preview.6.21352.12" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.6.21352.12" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="System.Security.Permissions" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21425.7" />
     <!-- 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-preview.2" />
diff --git a/test/powershell/engine/Api/TypeInference.Tests.ps1 b/test/powershell/engine/Api/TypeInference.Tests.ps1
index 9ce41f54e29..1d65047c34c 100644
--- a/test/powershell/engine/Api/TypeInference.Tests.ps1
+++ b/test/powershell/engine/Api/TypeInference.Tests.ps1
@@ -504,7 +504,7 @@ Describe "Type inference Tests" -tags "CI" {
     It "Infers typeof Select-Object when Parameter is ExcludeProperty" {
         $res = [AstTypeInference]::InferTypeOf( {  [io.fileinfo]::new("file")  |  Select-Object -ExcludeProperty *Time*, E* }.Ast)
         $res.Count | Should -Be 1
-        $res[0].Name | Should -BeExactly "System.Management.Automation.PSObject#Attributes:BaseName:Directory:DirectoryName:FullName:IsReadOnly:Length:LengthString:LinkType:Mode:ModeWithoutHardLink:Name:NameString:Target:VersionInfo"
+        $res[0].Name | Should -BeExactly "System.Management.Automation.PSObject#Attributes:BaseName:Directory:DirectoryName:FullName:IsReadOnly:Length:LengthString:LinkTarget:LinkType:Mode:ModeWithoutHardLink:Name:NameString:Target:VersionInfo"
         $names = $res[0].Members.Name
         $names -contains "BaseName" | Should -BeTrue
         $names -contains "Name" | Should -BeTrue
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index da9976c3a42..a3ce2faa839 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-preview.4.21253.7" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21425.7" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 4217232a67d..6939ea252a3 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-preview.6.21355.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.6.21352.12" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.1.21425.8" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21425.7" />
   </ItemGroup>
 
   <ItemGroup>

From 02b532fb1da782b3594404c779e9226145fee897 Mon Sep 17 00:00:00 2001
From: Steven Liekens <steven.liekens@gmail.com>
Date: Fri, 27 Aug 2021 00:11:15 +0200
Subject: [PATCH 015/645] Fix link header parsing to handle unquoted `rel`
 types (#15973)

---
 .../utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
index 85860aa19e6..d0abc8f3cd7 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
@@ -1830,7 +1830,7 @@ internal void ParseLinkHeader(HttpResponseMessage response, System.Uri requestUr
 
             // we only support the URL in angle brackets and `rel`, other attributes are ignored
             // user can still parse it themselves via the Headers property
-            const string pattern = "<(?<url>.*?)>;\\s*rel=(\"?)(?<rel>.*?)\\1[^\\w -.]?";
+            const string pattern = "<(?<url>.*?)>;\\s*rel=(?<quoted>\")?(?<rel>(?(quoted).*?|[^,;]*))(?(quoted)\")";
             IEnumerable<string> links;
             if (response.Headers.TryGetValues("Link", out links))
             {

From fde119e28b7bc52aa9b7186e9369a8d88736c94e Mon Sep 17 00:00:00 2001
From: "Joel Sallow (/u/ta11ow)" <32407840+vexx32@users.noreply.github.com>
Date: Fri, 27 Aug 2021 00:41:01 -0400
Subject: [PATCH 016/645] Use `CurrentCulture` when handling conversions to
 `DateTime` in `Add-History` (#16005)

---
 .../engine/hostifaces/History.cs              |  5 +-
 .../History.Tests.ps1                         | 52 +++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/engine/hostifaces/History.cs b/src/System.Management.Automation/engine/hostifaces/History.cs
index e1100b97487..dc74a46213f 100644
--- a/src/System.Management.Automation/engine/hostifaces/History.cs
+++ b/src/System.Management.Automation/engine/hostifaces/History.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.IO;
 using System.Management.Automation;
 using System.Management.Automation.Host;
@@ -1449,14 +1450,14 @@ void ProcessRecord()
 
                 // Read StartExecutionTime property
                 object temp = GetPropertyValue(mshObject, "StartExecutionTime");
-                if (temp == null || !LanguagePrimitives.TryConvertTo<DateTime>(temp, out DateTime startExecutionTime))
+                if (temp == null || !LanguagePrimitives.TryConvertTo<DateTime>(temp, CultureInfo.CurrentCulture, out DateTime startExecutionTime))
                 {
                     break;
                 }
 
                 // Read EndExecutionTime property
                 temp = GetPropertyValue(mshObject, "EndExecutionTime");
-                if (temp == null || !LanguagePrimitives.TryConvertTo<DateTime>(temp, out DateTime endExecutionTime))
+                if (temp == null || !LanguagePrimitives.TryConvertTo<DateTime>(temp, CultureInfo.CurrentCulture, out DateTime endExecutionTime))
                 {
                     break;
                 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/History.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/History.Tests.ps1
index 6841778af19..dc1b8b81b4d 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/History.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/History.Tests.ps1
@@ -49,6 +49,58 @@ Describe "History cmdlet test cases" -Tags "CI" {
         }
     }
 
+    Context 'Conversions and Culture tests' {
+
+        BeforeAll {
+            $cultureTestCases = @(
+                @{
+                    Culture   = 'en-us'
+                    StartTime = '08/18/2021 16:43:50'
+                    EndTime   = '08/18/2021 16:44:50'
+                }
+                @{
+                    Culture   = 'en-au'
+                    StartTime = '18/08/2021 16:43:50'
+                    EndTime   = '18/08/2021 16:44:50'
+                }
+            )
+
+            $oldCulture = [cultureinfo]::CurrentCulture
+        }
+
+        AfterEach {
+            [cultureinfo]::CurrentCulture = $oldCulture
+        }
+
+        It "respects current culture settings when handling datetime conversions" -TestCases $cultureTestCases {
+            param($Culture, $StartTime, $EndTime)
+
+            [cultureinfo]::CurrentCulture = [cultureinfo]::GetCultureInfo($Culture)
+
+            $history = [PSCustomObject] @{
+                CommandLine        = "test-command"
+                ExecutionStatus    = [Management.Automation.Runspaces.PipelineState]::Completed
+                StartExecutionTime = $StartTime
+                EndExecutionTime   = $EndTime
+            }
+
+            { $history | Add-History -ErrorAction Stop } | Should -Not -Throw -Because 'the datetime should be converted according to the current culture'
+        }
+
+        It "throws an error when asked to convert a date format that doesn't match the current culture" {
+            [cultureinfo]::CurrentCulture = [cultureinfo]::GetCultureInfo('en-au')
+            $history = [PSCustomObject] @{
+                CommandLine        = "test-command"
+                ExecutionStatus    = [Management.Automation.Runspaces.PipelineState]::Completed
+                StartExecutionTime = '08/18/2021 16:43:50'
+                EndExecutionTime   = '08/18/2021 16:44:50'
+            }
+
+            $errorMessage = 'Cannot add history because the input object has a format that is not valid.'
+            { $history | Add-History -ErrorAction Stop } | Should -Throw -ExpectedMessage $errorMessage
+        }
+    }
+
     It "Tests Invoke-History on a cmdlet that generates output on all streams" {
         $streamSpammer = '
         function StreamSpammer

From 102ccffd1479d8ab6a47755fcc7b33b8e28d936b Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Fri, 27 Aug 2021 09:53:27 +0500
Subject: [PATCH 017/645] Enable two previously disabled `Get-Process` tests
 (#15845)

---
 .../Microsoft.PowerShell.Management/Get-Process.Tests.ps1   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Process.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Process.Tests.ps1
index 2169c23b705..345b2affa2e 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Process.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Process.Tests.ps1
@@ -70,8 +70,7 @@ Describe "Get-Process" -Tags "CI" {
         { (Get-Process -Id $idleProcessPid).Name } | Should -Not -Throw
     }
 
-    It "Test for process property = Name" -Pending {
-        # Bug in .Net 5.0 Preview4. See https://github.com/PowerShell/PowerShell/pull/12894
+    It "Test for process property = Name" {
         (Get-Process -Id $PID).Name | Should -BeExactly "pwsh"
     }
 
@@ -129,8 +128,7 @@ Describe "Get-Process Formatting" -Tags "Feature" {
 }
 
 Describe "Process Parent property" -Tags "CI" {
-    It "Has Parent process property" -Pending {
-        # Bug in .Net 5.0 Preview4. See https://github.com/PowerShell/PowerShell/pull/12894
+    It "Has Parent process property" {
         $powershellexe = (Get-Process -Id $PID).mainmodule.filename
         & $powershellexe -noprofile -command '(Get-Process -Id $PID).Parent' | Should -Not -BeNullOrEmpty
     }

From 008f4b057fdc1482d3200de0a61d23570b4d30e4 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 27 Aug 2021 14:05:39 -0700
Subject: [PATCH 018/645] Use Alpine 3.12 for building PowerShell for alpine
 (#16008)

---
 .../releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile b/tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile
index c0541b7bbd8..fb1070fcd52 100644
--- a/tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile
+++ b/tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile
@@ -1,6 +1,6 @@
 # Docker image file that describes an Centos7 image with PowerShell installed from Microsoft YUM Repo
 
-FROM mcr.microsoft.com/powershell:alpine-3.8
+FROM mcr.microsoft.com/powershell:alpine-3.12
 LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
 
 # Install dependencies and clean up

From e3d8353e3cb815568ab896751821263735aa2964 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Sat, 28 Aug 2021 12:51:37 -0700
Subject: [PATCH 019/645] Fix the mac build by updating the pool image name
 (#16010)

---
 tools/releaseBuild/azureDevOps/templates/mac-package-build.yml | 3 ++-
 tools/releaseBuild/azureDevOps/templates/mac.yml               | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
index 1bd853dec53..34437b295a1 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
@@ -7,7 +7,8 @@ jobs:
   displayName: Package macOS ${{ parameters.buildArchitecture }}
   dependsOn: MacFileSigningJob_${{ parameters.buildArchitecture }}
   condition: succeeded()
-  pool: Hosted Mac Internal
+  pool:
+    vmImage: internal-macos-10.14
   variables:
     # Turn off Homebrew analytics
     - name: HOMEBREW_NO_ANALYTICS
diff --git a/tools/releaseBuild/azureDevOps/templates/mac.yml b/tools/releaseBuild/azureDevOps/templates/mac.yml
index 54f4354ed1d..6bf7814d93b 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac.yml
@@ -5,7 +5,8 @@ jobs:
 - job: build_macOS_${{ parameters.buildArchitecture }}
   displayName: Build macOS ${{ parameters.buildArchitecture }}
   condition: succeeded()
-  pool: Hosted Mac Internal
+  pool:
+    vmImage: internal-macos-10.14
   variables:
     # Turn off Homebrew analytics
     - name: HOMEBREW_NO_ANALYTICS

From fa50e4dcaee6a4e23d1bd54d8ee3451fd7f72353 Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Mon, 30 Aug 2021 16:51:07 +0100
Subject: [PATCH 020/645] Use `bool?.GetValueOrDefault()` in
 `FormatWideCommand` (#15988)

---
 .../format-wide/Format-Wide.cs                | 49 ++++++-------------
 1 file changed, 14 insertions(+), 35 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs
index 8d80462c12f..b3e593160b5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs
@@ -47,17 +47,8 @@ public object Property
         [Parameter]
         public SwitchParameter AutoSize
         {
-            get
-            {
-                if (_autosize.HasValue)
-                    return _autosize.Value;
-                return false;
-            }
-
-            set
-            {
-                _autosize = value;
-            }
+            get => _autosize.GetValueOrDefault();
+            set => _autosize = value;
         }
 
         private bool? _autosize = null;
@@ -70,17 +61,8 @@ public SwitchParameter AutoSize
         [ValidateRangeAttribute(1, int.MaxValue)]
         public int Column
         {
-            get
-            {
-                if (_column.HasValue)
-                    return _column.Value;
-                return -1;
-            }
-
-            set
-            {
-                _column = value;
-            }
+            get => _column.GetValueOrDefault(-1);
+            set => _column = value;
         }
 
         private int? _column = null;
@@ -110,22 +92,19 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()
             }
 
             // we cannot specify -column and -autosize, they are mutually exclusive
-            if (_autosize.HasValue && _column.HasValue)
+            if (AutoSize && _column.HasValue)
             {
-                if (_autosize.Value)
-                {
-                    // the user specified -autosize:true AND a column number
-                    string msg = StringUtil.Format(FormatAndOut_format_xxx.CannotSpecifyAutosizeAndColumnsError);
+                // the user specified -autosize:true AND a column number
+                string msg = StringUtil.Format(FormatAndOut_format_xxx.CannotSpecifyAutosizeAndColumnsError);
 
-                    ErrorRecord errorRecord = new(
-                        new InvalidDataException(),
-                        "FormatCannotSpecifyAutosizeAndColumns",
-                        ErrorCategory.InvalidArgument,
-                        null);
+                ErrorRecord errorRecord = new(
+                    new InvalidDataException(),
+                    "FormatCannotSpecifyAutosizeAndColumns",
+                    ErrorCategory.InvalidArgument,
+                    null);
 
-                    errorRecord.ErrorDetails = new ErrorDetails(msg);
-                    this.ThrowTerminatingError(errorRecord);
-                }
+                errorRecord.ErrorDetails = new ErrorDetails(msg);
+                this.ThrowTerminatingError(errorRecord);
             }
 
             parameters.groupByParameter = this.ProcessGroupByParameter();

From 3bb6b2736a845f0c644787ece9251f91de3d9619 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 30 Aug 2021 13:56:52 -0700
Subject: [PATCH 021/645] Update Ubuntu images to use Ubuntu 20.04 (#15906)

---
 .vsts-ci/linux-daily.yml                      |  6 ++---
 .vsts-ci/linux.yml                            | 16 ++++++------
 .vsts-ci/linux/templates/packaging.yml        |  2 +-
 .vsts-ci/misc-analysis.yml                    |  2 +-
 .vsts-ci/templates/nix-test.yml               | 12 +++++++++
 build.psm1                                    | 25 ++++++++++++++++---
 .../Parser/ParameterBinding.Tests.ps1         |  8 +++++-
 .../Language/Scripting/ScriptHelp.Tests.ps1   | 14 +++++++++--
 .../Test-Connection.Tests.ps1                 |  3 ++-
 .../Add-Type.Tests.ps1                        |  8 +++++-
 .../Set-PSBreakpoint.Tests.ps1                |  9 ++++++-
 .../engine/Basic/Assembly.LoadFrom.Tests.ps1  |  9 ++++++-
 .../Basic/Assembly.LoadNative.Tests.ps1       |  8 +++++-
 .../engine/Remoting/PSSession.Tests.ps1       |  3 ++-
 .../Remoting/RemoteSession.Basic.Tests.ps1    |  3 +++
 .../Modules/WebListener/WebListener.psm1      |  2 +-
 tools/packaging/packaging.psm1                | 10 ++++----
 17 files changed, 109 insertions(+), 31 deletions(-)

diff --git a/.vsts-ci/linux-daily.yml b/.vsts-ci/linux-daily.yml
index 6ab1832dfd9..e6a5375b0c9 100644
--- a/.vsts-ci/linux-daily.yml
+++ b/.vsts-ci/linux-daily.yml
@@ -47,7 +47,7 @@ stages:
   jobs:
   - template: templates/ci-build.yml
     parameters:
-      pool: ubuntu-16.04
+      pool: ubuntu-20.04
       jobName: linux_build
       displayName: linux Build
 
@@ -56,7 +56,7 @@ stages:
   jobs:
   - job: linux_test
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-20.04
     displayName: Linux Test
 
     steps:
@@ -149,7 +149,7 @@ stages:
   - job: CodeCovTestPackage
     displayName: CodeCoverage and Test Packages
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-20.04
     steps:
     - pwsh: |
         Import-Module .\tools\ci.psm1
diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
index bed0c4fd296..0cc59284859 100644
--- a/.vsts-ci/linux.yml
+++ b/.vsts-ci/linux.yml
@@ -52,7 +52,7 @@ stages:
   jobs:
   - template: templates/ci-build.yml
     parameters:
-      pool: ubuntu-16.04
+      pool: ubuntu-20.04
       jobName: linux_build
       displayName: linux Build
 
@@ -62,34 +62,34 @@ stages:
   - template: templates/nix-test.yml
     parameters:
       name: Linux
-      pool: ubuntu-16.04
+      pool: ubuntu-20.04
       purpose: UnelevatedPesterTests
       tagSet: CI
 
   - template: templates/nix-test.yml
     parameters:
       name: Linux
-      pool: ubuntu-16.04
+      pool: ubuntu-20.04
       purpose: ElevatedPesterTests
       tagSet: CI
 
   - template: templates/nix-test.yml
     parameters:
       name: Linux
-      pool: ubuntu-16.04
+      pool: ubuntu-20.04
       purpose: UnelevatedPesterTests
       tagSet: Others
 
   - template: templates/nix-test.yml
     parameters:
       name: Linux
-      pool: ubuntu-16.04
+      pool: ubuntu-20.04
       purpose: ElevatedPesterTests
       tagSet: Others
 
   - template: templates/verify-xunit.yml
     parameters:
-      pool: ubuntu-16.04
+      pool: ubuntu-20.04
 
 - stage: PackageLinux
   displayName: Package Linux
@@ -97,7 +97,7 @@ stages:
   jobs:
   - template: linux/templates/packaging.yml
     parameters:
-      pool: ubuntu-16.04
+      pool: ubuntu-20.04
 
 - stage: CodeCovTestPackage
   displayName: CodeCoverage and Test Packages
@@ -106,7 +106,7 @@ stages:
   - job: CodeCovTestPackage
     displayName: CodeCoverage and Test Packages
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-20.04
     steps:
     - pwsh: |
         Import-Module .\tools\ci.psm1
diff --git a/.vsts-ci/linux/templates/packaging.yml b/.vsts-ci/linux/templates/packaging.yml
index 530232cbf67..74a234aff78 100644
--- a/.vsts-ci/linux/templates/packaging.yml
+++ b/.vsts-ci/linux/templates/packaging.yml
@@ -1,5 +1,5 @@
 parameters:
-  pool: 'ubuntu-16.04'
+  pool: 'ubuntu-20.04'
   parentJobs: []
   name: 'Linux'
 
diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index d760a6e4931..5de5e28265a 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -51,7 +51,7 @@ jobs:
   displayName: Markdown and Common Tests
 
   pool:
-    vmImage: ubuntu-16.04
+    vmImage: ubuntu-20.04
 
   variables:
     - name: repoPath
diff --git a/.vsts-ci/templates/nix-test.yml b/.vsts-ci/templates/nix-test.yml
index 6a1b6e6f9de..89c1a39dd44 100644
--- a/.vsts-ci/templates/nix-test.yml
+++ b/.vsts-ci/templates/nix-test.yml
@@ -63,6 +63,18 @@ jobs:
     continueOnError: true
 
   - pwsh: |
+      Import-Module .\build.psm1 -Force
+      $environment = Get-EnvironmentInformation
+      $isUbuntu20 = $environment.IsUbuntu -and $environment.IsUbuntu20
+      if ($isUbuntu20) {
+        $env:LC_ALL='en_US.UTF-8'
+        $env:LANG='en_US.UTF-8'
+        sudo locale-gen $LANG
+        sudo update-locale
+      }
+
+      locale
+
       Import-Module .\tools\ci.psm1
       Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
       $options = (Get-PSOptions)
diff --git a/build.psm1 b/build.psm1
index f9887250490..c87e1147571 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1223,7 +1223,13 @@ function Start-PSPester {
 
     if ($Unelevate)
     {
-        $outputBufferFilePath = [System.IO.Path]::GetTempFileName()
+        if ($environment.IsWindows) {
+            $outputBufferFilePath = [System.IO.Path]::GetTempFileName()
+        }
+        else {
+            # Azure DevOps agents do not have Temp folder setup on Ubuntu 20.04, hence using HOME directory
+            $outputBufferFilePath = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
+        }
     }
 
     $command += "Invoke-Pester "
@@ -1305,7 +1311,14 @@ function Start-PSPester {
 
     $PSFlags = @("-noprofile")
     if (-not [string]::IsNullOrEmpty($ExperimentalFeatureName)) {
-        $configFile = [System.IO.Path]::GetTempFileName()
+
+        if ($environment.IsWindows) {
+            $configFile = [System.IO.Path]::GetTempFileName()
+        }
+        else {
+            $configFile = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
+        }
+
         $configFile = [System.IO.Path]::ChangeExtension($configFile, ".json")
 
         ## Create the config.json file to enable the given experimental feature.
@@ -1384,7 +1397,13 @@ function Start-PSPester {
         {
             if ($PassThru.IsPresent)
             {
-                $passThruFile = [System.IO.Path]::GetTempFileName()
+                if ($environment.IsWindows) {
+                    $passThruFile = [System.IO.Path]::GetTempFileName()
+                }
+                else {
+                    $passThruFile = Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName())
+                }
+
                 try
                 {
                     $command += "| Export-Clixml -Path '$passThruFile' -Force"
diff --git a/test/powershell/Language/Parser/ParameterBinding.Tests.ps1 b/test/powershell/Language/Parser/ParameterBinding.Tests.ps1
index 7fd26912ead..493ea9083a0 100644
--- a/test/powershell/Language/Parser/ParameterBinding.Tests.ps1
+++ b/test/powershell/Language/Parser/ParameterBinding.Tests.ps1
@@ -168,7 +168,13 @@ Describe "Custom type conversion in parameter binding" -Tags 'Feature' {
             }
         }
 '@
-        $asmFile = [System.IO.Path]::GetTempFileName() + ".dll"
+        if ($IsWindows) {
+            $asmFile = [System.IO.Path]::GetTempFileName() + ".dll"
+        }
+        else {
+            $asmFile = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName() + ".dll"))
+        }
+
         Add-Type -TypeDefinition $code -OutputAssembly $asmFile
 
         ## Helper function to execute script
diff --git a/test/powershell/Language/Scripting/ScriptHelp.Tests.ps1 b/test/powershell/Language/Scripting/ScriptHelp.Tests.ps1
index 8824d962090..7553fc96207 100644
--- a/test/powershell/Language/Scripting/ScriptHelp.Tests.ps1
+++ b/test/powershell/Language/Scripting/ScriptHelp.Tests.ps1
@@ -180,7 +180,12 @@ Describe 'get-help HelpFunc1' -Tags "Feature" {
 Describe 'get-help file' -Tags "CI" {
     BeforeAll {
         try {
-            $tmpfile = [IO.Path]::ChangeExtension([IO.Path]::GetTempFileName(), "ps1")
+            if ($IsWindows) {
+                $tmpfile = [IO.Path]::ChangeExtension([IO.Path]::GetTempFileName(), "ps1")
+            }
+            else {
+                $tmpfile = Join-Path $env:HOME $([IO.Path]::ChangeExtension([IO.Path]::GetRandomFileName(), "ps1"))
+            }
         } catch {
             return
         }
@@ -233,7 +238,12 @@ Describe 'get-help file' -Tags "CI" {
 Describe 'get-help other tests' -Tags "CI" {
     BeforeAll {
         try {
-            $tempFile = [IO.Path]::ChangeExtension([IO.Path]::GetTempFileName(), "ps1")
+            if ($IsWindows) {
+                $tempFile = [IO.Path]::ChangeExtension([IO.Path]::GetTempFileName(), "ps1")
+            }
+            else {
+                $tempFile = Join-Path $env:HOME $([IO.Path]::ChangeExtension([IO.Path]::GetRandomFileName(), "ps1"))
+            }
         } catch {
             return
         }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
index fc5cf7a69d4..c41b60c3ecb 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
@@ -96,7 +96,8 @@ Describe "Test-Connection" -tags "CI" {
             { Test-Connection "fakeHost" -Count 1 -ErrorAction Stop } |
                 Should -Throw -ErrorId "TestConnectionException,Microsoft.PowerShell.Commands.TestConnectionCommand"
             # Error code = 11001 - Host not found.
-            if ((Get-PlatformInfo).Platform -match "raspbian") {
+            $platform = Get-PlatformInfo
+            if ($platform.Platform -match "raspbian" -or ( $platform.Platform -match 'ubuntu' -and $platform.Version -eq '20.04')) {
                 $code = 11
             } elseif (!$IsWindows) {
                 $code = -131073
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Add-Type.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Add-Type.Tests.ps1
index b818dc64012..72d42af1d12 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Add-Type.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Add-Type.Tests.ps1
@@ -155,7 +155,13 @@ public class SMAAttributeTest$guid : PSCmdlet
 
         ## The assembly files cannot be removed once they are loaded, unless the current PowerShell session exits.
         ## If we use $TestDrive here, then Pester will try to remove them afterward and result in errors.
-        $TempPath = [System.IO.Path]::GetTempFileName()
+        if ($IsWindows) {
+            $TempPath = [System.IO.Path]::GetTempFileName()
+        }
+        else {
+            $TempPath = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
+        }
+
         if (Test-Path $TempPath) { Remove-Item -Path $TempPath -Force -Recurse }
         New-Item -Path $TempPath -ItemType Directory -Force > $null
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-PSBreakpoint.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-PSBreakpoint.Tests.ps1
index 21c84fe4770..a5b809d8f15 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-PSBreakpoint.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-PSBreakpoint.Tests.ps1
@@ -154,7 +154,14 @@ set-psbreakpoint -command foo
     }
 
     It "Fail to set psbreakpoints when script is a file of wrong type" {
-        $tempFile = [System.IO.Path]::GetTempFileName()
+
+        if ($IsWindows) {
+            $tempFile = [System.IO.Path]::GetTempFileName()
+        }
+        else {
+            $tempFile = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
+        }
+
         $ErrorActionPreference = "Stop"
         {
             Set-PSBreakpoint -Script $tempFile -Line 1
diff --git a/test/powershell/engine/Basic/Assembly.LoadFrom.Tests.ps1 b/test/powershell/engine/Basic/Assembly.LoadFrom.Tests.ps1
index 67ee0677c51..383f20bfb10 100644
--- a/test/powershell/engine/Basic/Assembly.LoadFrom.Tests.ps1
+++ b/test/powershell/engine/Basic/Assembly.LoadFrom.Tests.ps1
@@ -35,7 +35,14 @@ Describe "Assembly.LoadFrom Validation Test" -Tags "CI" {
 
         ## The assembly files cannot be removed once they are loaded, unless the current PowerShell session exits.
         ## If we use $TestDrive here, then Pester will try to remove them afterward and result in errors.
-        $TempPath = [System.IO.Path]::GetTempFileName()
+
+        if ($IsWindows) {
+            $TempPath = [System.IO.Path]::GetTempFileName()
+        }
+        else {
+            $TempPath = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
+        }
+
         if (Test-Path $TempPath) { Remove-Item -Path $TempPath -Force -Recurse }
         New-Item -Path $TempPath -ItemType Directory -Force > $null
 
diff --git a/test/powershell/engine/Basic/Assembly.LoadNative.Tests.ps1 b/test/powershell/engine/Basic/Assembly.LoadNative.Tests.ps1
index bb383573672..9196ccc0e13 100644
--- a/test/powershell/engine/Basic/Assembly.LoadNative.Tests.ps1
+++ b/test/powershell/engine/Basic/Assembly.LoadNative.Tests.ps1
@@ -6,7 +6,13 @@ Describe "Can load a native assembly" -Tags "CI" {
     BeforeAll {
         ## The assembly files cannot be removed once they are loaded, unless the current PowerShell session exits.
         ## If we use $TestDrive here, then Pester will try to remove them afterward and result in errors.
-        $TempPath = [System.IO.Path]::GetTempFileName()
+        if ($IsWindows) {
+            $TempPath = [System.IO.Path]::GetTempFileName()
+        }
+        else {
+            $TempPath = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
+        }
+
         if (Test-Path $TempPath) { Remove-Item -Path $TempPath -Force -Recurse }
         New-Item -Path $TempPath -ItemType Directory -Force > $null
 
diff --git a/test/powershell/engine/Remoting/PSSession.Tests.ps1 b/test/powershell/engine/Remoting/PSSession.Tests.ps1
index 3b8259f3707..25c7ab9c582 100644
--- a/test/powershell/engine/Remoting/PSSession.Tests.ps1
+++ b/test/powershell/engine/Remoting/PSSession.Tests.ps1
@@ -83,7 +83,8 @@ Describe "SkipCACheck and SkipCNCheck PSSession options are required for New-PSS
         if (
             ($platformInfo.Platform -match "alpine|raspbian") -or
             ($platformInfo.Platform -eq "debian" -and ($platformInfo.Version -eq '10' -or $platformInfo.Version -eq '')) -or # debian 11 has empty Version ID
-            ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -eq '8')
+            ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -eq '8') -or
+            ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -eq '20.04')
         ) {
             Set-ItResult -Skipped -Because "MI library not available for Alpine, Raspberry Pi, Debian 10 and 11, and CentOS 8"
             return
diff --git a/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1 b/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1
index a8054b47182..d56ed1999ac 100644
--- a/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1
+++ b/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1
@@ -15,6 +15,7 @@ Describe "New-PSSession basic test" -Tag @("CI") {
             ($platformInfo.Platform -match "alpine|raspbian") -or
             ($platformInfo.Platform -eq "debian" -and ($platformInfo.Version -eq '10' -or $platformInfo.Version -eq '')) -or # debian 11 has empty Version ID
             ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -eq '8') -or
+            ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -eq '20.04') -or
             ($IsMacOS)
         ) {
             Set-ItResult -Skipped -Because "MI library not available for Alpine, Raspberry Pi, Debian 10 and 11, CentOS 8, and not compatible with macOS"
@@ -33,6 +34,7 @@ Describe "Basic Auth over HTTP not allowed on Unix" -Tag @("CI") {
             ($platformInfo.Platform -match "alpine|raspbian") -or
             ($platformInfo.Platform -eq "debian" -and ($platformInfo.Version -eq '10' -or $platformInfo.Version -eq '')) -or # debian 11 has empty Version ID
             ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -eq '8') -or
+            ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -eq '20.04') -or
             ($IsMacOS)
         ) {
             Set-ItResult -Skipped -Because "MI library not available for Alpine, Raspberry Pi, Debian 10 and 11, CentOS 8, and not compatible with macOS"
@@ -56,6 +58,7 @@ Describe "Basic Auth over HTTP not allowed on Unix" -Tag @("CI") {
             ($platformInfo.Platform -match "alpine|raspbian") -or
             ($platformInfo.Platform -eq "debian" -and ($platformInfo.Version -eq '10' -or $platformInfo.Version -eq '')) -or # debian 11 has empty Version ID
             ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -eq '8') -or
+            ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -eq '20.04') -or
             ($IsMacOS)
         ) {
             Set-ItResult -Skipped -Because "MI library not available for Alpine, Raspberry Pi, Debian 10 and 11, CentOS 8, and not compatible with macOS"
diff --git a/test/tools/Modules/WebListener/WebListener.psm1 b/test/tools/Modules/WebListener/WebListener.psm1
index 6436da97d1c..655b4cdd638 100644
--- a/test/tools/Modules/WebListener/WebListener.psm1
+++ b/test/tools/Modules/WebListener/WebListener.psm1
@@ -102,7 +102,7 @@ function Start-WebListener
         [int]$HttpPort = 8083,
 
         [ValidateRange(1,65535)]
-        [int]$HttpsPort = 8084,
+        [int]$HttpsPort = 9084,
 
         [ValidateRange(1,65535)]
         [int]$Tls11Port = 8085,
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 9b1602a095e..000d48067e1 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -1351,21 +1351,21 @@ function New-AfterScripts
     Write-Verbose -Message "AfterScript Distribution: $Distribution" -Verbose
 
     if ($Environment.IsRedHatFamily) {
-        $AfterInstallScript = [io.path]::GetTempFileName()
-        $AfterRemoveScript = [io.path]::GetTempFileName()
+        $AfterInstallScript = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
+        $AfterRemoveScript = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
         $packagingStrings.RedHatAfterInstallScript -f "$Link", $Destination  | Out-File -FilePath $AfterInstallScript -Encoding ascii
         $packagingStrings.RedHatAfterRemoveScript -f "$Link", $Destination | Out-File -FilePath $AfterRemoveScript -Encoding ascii
     }
     elseif ($Environment.IsDebianFamily -or $Environment.IsSUSEFamily) {
-        $AfterInstallScript = [io.path]::GetTempFileName()
-        $AfterRemoveScript = [io.path]::GetTempFileName()
+        $AfterInstallScript = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
+        $AfterRemoveScript = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
         $packagingStrings.UbuntuAfterInstallScript -f "$Link", $Destination | Out-File -FilePath $AfterInstallScript -Encoding ascii
         $packagingStrings.UbuntuAfterRemoveScript -f "$Link", $Destination | Out-File -FilePath $AfterRemoveScript -Encoding ascii
     }
     elseif ($Environment.IsMacOS) {
         # NOTE: The macos pkgutil doesn't support uninstall actions so we did not implement it.
         # Handling uninstall can be done in Homebrew so we'll take advantage of that in the brew formula.
-        $AfterInstallScript = [io.path]::GetTempFileName()
+        $AfterInstallScript = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
         $packagingStrings.MacOSAfterInstallScript -f "$Link" | Out-File -FilePath $AfterInstallScript -Encoding ascii
     }
 

From 6de53f89cf68d957f3c235d847264308ea31ff5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Aug 2021 12:44:55 +0500
Subject: [PATCH 022/645] Bump Microsoft.CodeAnalysis.NetAnalyzers (#16021)

Bumps [Microsoft.CodeAnalysis.NetAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 6.0.0-rc2.21423.3 to 6.0.0-rc2.21430.2.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/main/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/commits)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.NetAnalyzers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index d85c827bf21..0dc31a83b3e 100644
--- a/Analyzers.props
+++ b/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-rc2.21423.3" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc2.21430.2" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From 15f2730c4c99bdcb79caddb73c539e65d2400cf7 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 31 Aug 2021 15:16:10 -0700
Subject: [PATCH 023/645] Move from `PkgES` hosted agents to 1ES hosted agents
 (#16023)

---
 tools/releaseBuild/azureDevOps/releaseBuild.yml        |  4 +++-
 .../azureDevOps/templates/checkAzureContainer.yml      |  4 +++-
 .../releaseBuild/azureDevOps/templates/compliance.yml  | 10 +++++++++-
 tools/releaseBuild/azureDevOps/templates/json.yml      |  4 +++-
 tools/releaseBuild/azureDevOps/templates/linux.yml     |  8 ++++++--
 .../azureDevOps/templates/mac-file-signing.yml         |  4 +++-
 .../azureDevOps/templates/mac-package-signing.yml      |  4 +++-
 tools/releaseBuild/azureDevOps/templates/nuget.yml     |  5 ++++-
 .../templates/windows-component-governance.yml         |  4 +++-
 .../azureDevOps/templates/windows-hosted-build.yml     |  4 +++-
 .../azureDevOps/templates/windows-package-signing.yml  |  4 +++-
 .../azureDevOps/templates/windows-packaging.yml        |  4 +++-
 12 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index ca4f098d208..bd45d7ffb8a 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -189,7 +189,9 @@ stages:
       - job: release_json
         displayName: Create and Upload release.json
         pool:
-          vmImage: 'windows-latest'
+          name: PowerShell1ES
+          demands:
+          - ImageOverride -equals MMS2019
         steps:
         - checkout: self
           clean: true
diff --git a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
index 9000d42bd61..8019a5de3b9 100644
--- a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
+++ b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
@@ -8,7 +8,9 @@ jobs:
   - group: Azure Blob variable group
   displayName: Delete blob is exists
   pool:
-    vmImage: windows-latest
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019
   steps:
   - checkout: self
     clean: true
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml
index 497dfc8613b..9e6c7ad1c61 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance.yml
@@ -8,11 +8,17 @@ jobs:
     value : false
   - name: NugetSecurityAnalysisWarningLevel
     value: none
+
+  # Defines the variables APIScanClient, APIScanTenant and APIScanSecret
+  - group: PS-PS-APIScan
+
   displayName: Compliance
   dependsOn:
     ${{ parameters.parentJobs }}
   pool:
-    name: Package ES Standard Build
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019
 
   # APIScan can take a long time
   timeoutInMinutes: 180
@@ -115,6 +121,8 @@ jobs:
       softwareVersionNum: '$(ReleaseTagVar)'
       isLargeApp: false
       preserveTempFiles: true
+    env:
+      AzureServicesAuthConnectionString: RunAs=App;AppId=$(APIScanClient);TenantId=$(APIScanTenant);AppKey=$(APIScanSecret)
     continueOnError: true
 
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
diff --git a/tools/releaseBuild/azureDevOps/templates/json.yml b/tools/releaseBuild/azureDevOps/templates/json.yml
index 0dca065e25d..570a658756a 100644
--- a/tools/releaseBuild/azureDevOps/templates/json.yml
+++ b/tools/releaseBuild/azureDevOps/templates/json.yml
@@ -13,7 +13,9 @@ jobs:
     ${{ parameters.parentJobs }}
   condition: succeeded()
   pool:
-    vmImage: windows-latest
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019
 
   steps:
   #- task: <task type name>@<version>
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index 952b12183ce..bf7662a9711 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -8,7 +8,9 @@ jobs:
   displayName: Build ${{ parameters.buildName }}
   condition: succeeded()
   pool:
-    vmImage: ubuntu-16.04
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMSUbuntu20.04
   dependsOn: ${{ parameters.parentJob }}
   variables:
     - name: runCodesignValidationInjection
@@ -66,7 +68,9 @@ jobs:
   dependsOn: build_${{ parameters.buildName }}
   condition: succeeded()
   pool:
-    vmImage: windows-latest
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019
   variables:
     - name: buildName
       value: ${{ parameters.buildName }}
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
index bc111a46b07..1f43d39ab61 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
@@ -7,7 +7,9 @@ jobs:
     dependsOn: build_macOS_${{ parameters.buildArchitecture }}
     condition: succeeded()
     pool:
-      name: Package ES Standard Build
+      name: PowerShell1ES
+      demands:
+      - ImageOverride -equals MMS2019
     variables:
       - group: ESRP
       - name: runCodesignValidationInjection
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
index c8a7ab7e2bc..cba0ed6f9c3 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
@@ -7,7 +7,9 @@ jobs:
   dependsOn: package_macOS_${{ parameters.buildArchitecture }}
   condition: succeeded()
   pool:
-    name: Package ES Standard Build
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019
   variables:
     - group: ESRP
     - name: runCodesignValidationInjection
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index c6f21ec81f0..cd3972d5fab 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -7,7 +7,10 @@ jobs:
     ${{ parameters.parentJobs }}
   displayName: Build NuGet packages
   condition: succeeded()
-  pool: Package ES Standard Build
+  pool:
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019
 
   timeoutInMinutes: 90
 
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
index 572be144c51..b21ab208f1b 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
@@ -10,7 +10,9 @@ jobs:
   condition: succeeded()
 
   pool:
-    name: Package ES Standard Build
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019
 
   steps:
   - checkout: self
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
index 2c5f4cc138d..2820654d167 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -14,7 +14,9 @@ jobs:
   condition: succeeded()
   dependsOn: ${{ parameters.parentJob }}
   pool:
-    vmImage: windows-latest
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019
   variables:
     - name: runCodesignValidationInjection
       value: false
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
index e06ea954c5d..dd547da6a60 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -8,7 +8,9 @@ jobs:
     ${{ parameters.parentJobs }}
   condition: succeeded()
   pool:
-    vmImage: windows-latest
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019
   variables:
     - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
       value: 1
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index 0aa0f235165..5ce2c90a8e3 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -14,7 +14,9 @@ jobs:
   condition: succeeded()
   dependsOn: ${{ parameters.parentJob }}
   pool:
-    vmImage: windows-latest
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019
   variables:
     - name: BuildConfiguration
       value: ${{ parameters.BuildConfiguration }}

From 946341b2ebe6a61f081f4c9143668dc7be1f9119 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Wed, 1 Sep 2021 09:31:19 -0700
Subject: [PATCH 024/645] Remove duplicate remote server mediator code (#16027)

---
 .../host/msh/ConsoleHost.cs                   |  29 ++--
 .../server/OutOfProcServerMediator.cs         | 142 +++++-------------
 2 files changed, 52 insertions(+), 119 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
index 06d61548048..b0ae4735026 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -193,7 +193,20 @@ internal static int Start(string bannerText, string helpText)
                 {
                     ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("ServerMode");
                     ProfileOptimization.StartProfile("StartupProfileData-ServerMode");
-                    System.Management.Automation.Remoting.Server.OutOfProcessMediator.Run(s_cpp.InitialCommand, s_cpp.WorkingDirectory);
+                    System.Management.Automation.Remoting.Server.StdIOProcessMediator.Run(
+                        initialCommand: s_cpp.InitialCommand,
+                        workingDirectory: s_cpp.WorkingDirectory,
+                        configurationName: null);
+                    exitCode = 0;
+                }
+                else if (s_cpp.SSHServerMode)
+                {
+                    ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("SSHServer");
+                    ProfileOptimization.StartProfile("StartupProfileData-SSHServerMode");
+                    System.Management.Automation.Remoting.Server.StdIOProcessMediator.Run(
+                        initialCommand: s_cpp.InitialCommand,
+                        workingDirectory: null,
+                        configurationName: null);
                     exitCode = 0;
                 }
                 else if (s_cpp.NamedPipeServerMode)
@@ -201,22 +214,16 @@ internal static int Start(string bannerText, string helpText)
                     ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("NamedPipe");
                     ProfileOptimization.StartProfile("StartupProfileData-NamedPipeServerMode");
                     System.Management.Automation.Remoting.RemoteSessionNamedPipeServer.RunServerMode(
-                        s_cpp.ConfigurationName);
-                    exitCode = 0;
-                }
-                else if (s_cpp.SSHServerMode)
-                {
-                    ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("SSHServer");
-                    ProfileOptimization.StartProfile("StartupProfileData-SSHServerMode");
-                    System.Management.Automation.Remoting.Server.SSHProcessMediator.Run(s_cpp.InitialCommand);
+                        configurationName: s_cpp.ConfigurationName);
                     exitCode = 0;
                 }
                 else if (s_cpp.SocketServerMode)
                 {
                     ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("SocketServerMode");
                     ProfileOptimization.StartProfile("StartupProfileData-SocketServerMode");
-                    System.Management.Automation.Remoting.Server.HyperVSocketMediator.Run(s_cpp.InitialCommand,
-                        s_cpp.ConfigurationName);
+                    System.Management.Automation.Remoting.Server.HyperVSocketMediator.Run(
+                        initialCommand: s_cpp.InitialCommand,
+                        configurationName: s_cpp.ConfigurationName);
                     exitCode = 0;
                 }
                 else
diff --git a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
index 06c992b842b..fe17a31f0cb 100644
--- a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
+++ b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
@@ -8,7 +8,6 @@
 #if !UNIX
 using System.Security.Principal;
 #endif
-using Microsoft.Win32.SafeHandles;
 
 using Dbg = System.Management.Automation.Diagnostics;
 
@@ -73,14 +72,6 @@ protected void ProcessingThreadStart(object state)
         {
             try
             {
-#if !CORECLR
-                // CurrentUICulture is not available in Thread Class in CSS
-                // WinBlue: 621775. Thread culture is not properly set
-                // for local background jobs causing experience differences
-                // between local console and local background jobs.
-                Thread.CurrentThread.CurrentUICulture = Microsoft.PowerShell.NativeCultureResolver.UICulture;
-                Thread.CurrentThread.CurrentCulture = Microsoft.PowerShell.NativeCultureResolver.Culture;
-#endif
                 string data = state as string;
                 OutOfProcessUtils.ProcessData(data, callbacks);
             }
@@ -307,7 +298,10 @@ protected void OnCloseAckPacketReceived(Guid psGuid)
 
         #region Methods
 
-        protected OutOfProcessServerSessionTransportManager CreateSessionTransportManager(string configurationName, PSRemotingCryptoHelperServer cryptoHelper, string workingDirectory)
+        protected OutOfProcessServerSessionTransportManager CreateSessionTransportManager(
+            string configurationName,
+            PSRemotingCryptoHelperServer cryptoHelper,
+            string workingDirectory)
         {
             PSSenderInfo senderInfo;
 #if !UNIX
@@ -335,7 +329,11 @@ protected OutOfProcessServerSessionTransportManager CreateSessionTransportManage
             return tm;
         }
 
-        protected void Start(string initialCommand, PSRemotingCryptoHelperServer cryptoHelper, string workingDirectory = null, string configurationName = null)
+        protected void Start(
+            string initialCommand,
+            PSRemotingCryptoHelperServer cryptoHelper,
+            string workingDirectory,
+            string configurationName)
         {
             _initialCommand = initialCommand;
 
@@ -417,35 +415,13 @@ protected void Start(string initialCommand, PSRemotingCryptoHelperServer cryptoH
         }
 
         #endregion
-
-        #region Static Methods
-
-        internal static void AppDomainUnhandledException(object sender, UnhandledExceptionEventArgs args)
-        {
-            // args can never be null.
-            Exception exception = (Exception)args.ExceptionObject;
-            // log the exception to crimson event logs
-            PSEtwLog.LogOperationalError(PSEventId.AppDomainUnhandledException,
-                PSOpcode.Close, PSTask.None,
-                PSKeyword.UseAlwaysOperational,
-                exception.GetType().ToString(), exception.Message,
-                exception.StackTrace);
-
-            PSEtwLog.LogAnalyticError(PSEventId.AppDomainUnhandledException_Analytic,
-                    PSOpcode.Close, PSTask.None,
-                    PSKeyword.ManagedPlugin | PSKeyword.UseAlwaysAnalytic,
-                    exception.GetType().ToString(), exception.Message,
-                    exception.StackTrace);
-        }
-
-        #endregion
     }
 
-    internal sealed class OutOfProcessMediator : OutOfProcessMediatorBase
+    internal sealed class StdIOProcessMediator : OutOfProcessMediatorBase
     {
         #region Private Data
 
-        private static OutOfProcessMediator s_singletonInstance;
+        private static StdIOProcessMediator s_singletonInstance;
 
         #endregion
 
@@ -453,10 +429,10 @@ internal sealed class OutOfProcessMediator : OutOfProcessMediatorBase
 
         /// <summary>
         /// The mediator will take actions from the StdIn stream and responds to them.
-        /// It will replace StdIn,StdOut and StdErr stream with TextWriter.Null's. This is
+        /// It will replace StdIn,StdOut and StdErr stream with TextWriter.Null. This is
         /// to make sure these streams are totally used by our Mediator.
         /// </summary>
-        private OutOfProcessMediator() : base(true)
+        private StdIOProcessMediator() : base(true)
         {
             // Create input stream reader from Console standard input stream.
             // We don't use the provided Console.In TextReader because it can have
@@ -465,9 +441,6 @@ private OutOfProcessMediator() : base(true)
             // stream encoding.  This way the stream encoding is determined by the
             // stream BOM as needed.
             originalStdIn = new StreamReader(Console.OpenStandardInput(), true);
-
-            // replacing StdIn with Null so that no other app messes with the
-            // original stream.
             Console.SetIn(TextReader.Null);
 
             // replacing StdOut with Null so that no other app messes with the
@@ -490,61 +463,11 @@ private OutOfProcessMediator() : base(true)
         /// </summary>
         /// <param name="initialCommand">Specifies the initialization script.</param>
         /// <param name="workingDirectory">Specifies the initial working directory. The working directory is set before the initial command.</param>
-        internal static void Run(string initialCommand, string workingDirectory)
-        {
-            lock (SyncObject)
-            {
-                if (s_singletonInstance != null)
-                {
-                    Dbg.Assert(false, "Run should not be called multiple times");
-                    return;
-                }
-
-                s_singletonInstance = new OutOfProcessMediator();
-            }
-
-#if !CORECLR // AppDomain is not available in CoreCLR
-            // Setup unhandled exception to log events
-            AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomainUnhandledException);
-#endif
-            s_singletonInstance.Start(initialCommand, new PSRemotingCryptoHelperServer(), workingDirectory);
-        }
-
-        #endregion
-    }
-
-    internal sealed class SSHProcessMediator : OutOfProcessMediatorBase
-    {
-        #region Private Data
-
-        private static SSHProcessMediator s_singletonInstance;
-
-        #endregion
-
-        #region Constructors
-
-        private SSHProcessMediator() : base(true)
-        {
-            originalStdIn = new StreamReader(Console.OpenStandardInput(), true);
-            originalStdOut = new OutOfProcessTextWriter(
-                new StreamWriter(Console.OpenStandardOutput()));
-            originalStdErr = new OutOfProcessTextWriter(
-                new StreamWriter(Console.OpenStandardError()));
-
-            // Disable console from writing to the PSRP streams.
-            Console.SetIn(TextReader.Null);
-            Console.SetOut(TextWriter.Null);
-            Console.SetError(TextWriter.Null);
-        }
-
-        #endregion
-
-        #region Static Methods
-
-        /// <summary>
-        /// </summary>
-        /// <param name="initialCommand"></param>
-        internal static void Run(string initialCommand)
+        /// <param name="configurationName">Specifies an optional configuration name that configures the endpoint session.</param>
+        internal static void Run(
+            string initialCommand,
+            string workingDirectory,
+            string configurationName)
         {
             lock (SyncObject)
             {
@@ -554,10 +477,14 @@ internal static void Run(string initialCommand)
                     return;
                 }
 
-                s_singletonInstance = new SSHProcessMediator();
+                s_singletonInstance = new StdIOProcessMediator();
             }
 
-            s_singletonInstance.Start(initialCommand, new PSRemotingCryptoHelperServer());
+            s_singletonInstance.Start(
+                initialCommand: initialCommand,
+                cryptoHelper: new PSRemotingCryptoHelperServer(),
+                workingDirectory: workingDirectory,
+                configurationName: configurationName);
         }
 
         #endregion
@@ -626,11 +553,11 @@ internal static void Run(
                 s_singletonInstance = new NamedPipeProcessMediator(namedPipeServer);
             }
 
-#if !CORECLR
-            // AppDomain is not available in CoreCLR
-            AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomainUnhandledException);
-#endif
-            s_singletonInstance.Start(initialCommand, new PSRemotingCryptoHelperServer(), namedPipeServer.ConfigurationName);
+            s_singletonInstance.Start(
+                initialCommand: initialCommand,
+                cryptoHelper: new PSRemotingCryptoHelperServer(),
+                workingDirectory: null,
+                configurationName: namedPipeServer.ConfigurationName);
         }
 
         #endregion
@@ -716,12 +643,11 @@ internal static void Run(
                 s_instance = new HyperVSocketMediator();
             }
 
-#if !CORECLR
-            // AppDomain is not available in CoreCLR
-            AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomainUnhandledException);
-#endif
-
-            s_instance.Start(initialCommand, new PSRemotingCryptoHelperServer(), configurationName);
+            s_instance.Start(
+                initialCommand: initialCommand,
+                cryptoHelper: new PSRemotingCryptoHelperServer(),
+                workingDirectory: null,
+                configurationName: configurationName);
         }
 
         #endregion

From 7fc60d1d5fa2f59c58ba261c7f220ccd3d6fcf9b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 1 Sep 2021 10:35:27 -0700
Subject: [PATCH 025/645] Bump .NET to `6.0.100-rc.1.21430.44` (#16028)

---
 DotnetRuntimeMetadata.json                       |  2 +-
 assets/wix/files.wxs                             |  6 +++---
 global.json                                      |  2 +-
 nuget.config                                     |  1 +
 ...crosoft.PowerShell.Commands.Management.csproj |  2 +-
 .../Microsoft.PowerShell.Commands.Utility.csproj |  4 ++--
 .../Microsoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj              |  8 ++++----
 .../Microsoft.WSMan.Management.csproj            |  2 +-
 .../System.Management.Automation.csproj          | 16 ++++++++--------
 test/tools/TestService/TestService.csproj        |  2 +-
 test/tools/WebListener/WebListener.csproj        |  4 ++--
 tools/UpdateDotnetRuntime.ps1                    |  1 +
 13 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 18778f58555..ed45c403569 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -8,6 +8,6 @@
     "nextChannel": "6.0.1xx-rc1"
   },
   "internalfeed" : {
-    "url": null
+    "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21430.44-shipping/nuget/v2"
   }
 }
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 84539cac520..e8fdfdefcb4 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3054,8 +3054,8 @@
       <Component Id="cmp957498053E01454DA1E21E6D7317DCD6">
         <File Id="fil2AA6F0D8A51D4BB89F33F2B73AB12391" KeyPath="yes" Source="$(var.ProductSourcePath)\msquic.dll" />
       </Component>
-      <Component Id="cmpFF0AD067132E492DA31F4E9921B01375">
-        <File Id="fil2646459F2E774B48BC5FA3E7F8BED502" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.42515.dll" />
+      <Component Id="cmpC0B842EBB4D244718CA6CEF819EE242B">
+        <File Id="fil229AFC7374F34B97AC3E4296BCB45CE7" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.43011.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4041,7 +4041,7 @@
       <ComponentRef Id="cmp708913639F7A46E784CC0FA862A1A2CE" />
       <ComponentRef Id="cmpA75DEF5617C54DA1937CB37D5824BF79" />
       <ComponentRef Id="cmp957498053E01454DA1E21E6D7317DCD6" />
-      <ComponentRef Id="cmpFF0AD067132E492DA31F4E9921B01375" />
+      <ComponentRef Id="cmpC0B842EBB4D244718CA6CEF819EE242B" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 21a9b9bc28f..35448cc72b6 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.100-rc.1.21426.1"
+    "version": "6.0.100-rc.1.21430.44"
   }
 }
diff --git a/nuget.config b/nuget.config
index a8ed27bf99e..0e9671d1a70 100644
--- a/nuget.config
+++ b/nuget.config
@@ -4,6 +4,7 @@
     <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 />
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index e8c7e78918e..67394beef83 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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-rc.1.21425.7" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.1.21430.11" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 19645f35ae0..74921e9ea62 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -32,8 +32,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-3.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.1.21425.7" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.1.21430.11" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.1.21430.11" />
     <PackageReference Include="NJsonSchema" Version="10.5.2" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index a309820ffab..1d5a865f535 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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-rc.1.21425.7" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-rc.1.21430.11" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 5875f9904dd..e03dbe4701a 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <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-rc.1.21425.7" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rc.1.21425.7" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="System.IO.Packaging" Version="6.0.0-rc.1.21430.11" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rc.1.21430.11" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rc.1.21430.11" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0-preview1.21220.1" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.9.0-preview1.21220.1" />
@@ -30,7 +30,7 @@
     <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-rc.1.21425.7" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21430.11" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index fbd381b9d6f..c3fcff08ffc 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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-rc.1.21425.7" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.1.21430.11" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 4b6917b168e..0f167c7ef35 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <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-rc.1.21425.7" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rc.1.21425.7" />
-    <PackageReference Include="System.DirectoryServices" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-rc.1.21430.11" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rc.1.21430.11" />
+    <PackageReference Include="System.DirectoryServices" Version="6.0.0-rc.1.21430.11" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" />
-    <PackageReference Include="System.Management" Version="6.0.0-rc.1.21425.7" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="System.Management" Version="6.0.0-rc.1.21430.11" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rc.1.21430.11" />
     <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.21425.7" />
-    <PackageReference Include="System.Security.Permissions" Version="6.0.0-rc.1.21425.7" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rc.1.21430.11" />
+    <PackageReference Include="System.Security.Permissions" Version="6.0.0-rc.1.21430.11" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21430.11" />
     <!-- 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-preview.2" />
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index a3ce2faa839..a44ac7810c6 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21430.11" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 6939ea252a3..4a0c0c38cba 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.1.21425.8" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21425.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.1.21430.26" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21430.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index cbaa69bfd02..15c482ba630 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -181,6 +181,7 @@ function Get-DotnetUpdate {
             NewVersion   = $SDKVersionOverride
             Message      = $null
             FeedUrl      = $feedUrl
+            Quality      = $quality
         }
     }
 

From 6cde546203bd2ce8d94ca70b0660e43b03b44899 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 1 Sep 2021 10:36:58 -0700
Subject: [PATCH 026/645] Add `.stylecop` to `filetypexml` and format it
 (#16025)

---
 CHANGELOG/6.0.md                              |   2 +-
 CHANGELOG/6.1.md                              |   2 +-
 CHANGELOG/6.2.md                              |   2 +-
 CHANGELOG/7.0.md                              |   2 +-
 .../CommandCompletion/CompletionCompleters.cs |   2 +-
 .../releaseBuild/azureDevOps/releaseBuild.yml |   8 +
 .../azureDevOps/templates/compliance.yml      |   5 +-
 tools/terms/FileTypeSet.xml                   | 379 ------------------
 tools/terms/TermsExclusion.xml                |  11 +
 9 files changed, 26 insertions(+), 387 deletions(-)
 delete mode 100644 tools/terms/FileTypeSet.xml
 create mode 100644 tools/terms/TermsExclusion.xml

diff --git a/CHANGELOG/6.0.md b/CHANGELOG/6.0.md
index 2c4da7b7098..948197f0619 100644
--- a/CHANGELOG/6.0.md
+++ b/CHANGELOG/6.0.md
@@ -104,7 +104,7 @@
 work is required for Microsoft to continue to sign and release packages from the project as official Microsoft packages.
 
 - Remove `PerformWSManPluginReportCompletion`, which was not used, from `pwrshplugin.dll` (#5498) (Thanks @bergmeister!)
-- Remove exclusion for hang and add context exception for remaining instances (#5595)
+- Remove exclusion for unresponsive condition and add context exception for remaining instances (#5595)
 - Replace `strlen` with `strnlen` in native code (#5510)
 
 ## [6.0.0-rc] - 2017-11-16
diff --git a/CHANGELOG/6.1.md b/CHANGELOG/6.1.md
index f8e12f47001..59cf2842d78 100644
--- a/CHANGELOG/6.1.md
+++ b/CHANGELOG/6.1.md
@@ -428,7 +428,7 @@
 - Fix crash when terminal is reset (#6777)
 - Fix a module-loading regression that caused an infinite loop (#6843)
 - Further improve `PSMethod` to `Delegate` conversion (#6851)
-- Blacklist `System.Windows.Forms` from loading to prevent a crash (#6822)
+- Block list `System.Windows.Forms` from loading to prevent a crash (#6822)
 - Fix `Format-Table` where rows were being trimmed unnecessarily if there's only one row of headers (#6772)
 - Fix `SetDate` function in `libpsl-native` to avoid corrupting memory during `P/Invoke` (#6881)
 - Fix tab completions for hash table (#6839) (Thanks @iSazonov!)
diff --git a/CHANGELOG/6.2.md b/CHANGELOG/6.2.md
index 06ad8f41482..bf54f978eba 100644
--- a/CHANGELOG/6.2.md
+++ b/CHANGELOG/6.2.md
@@ -844,7 +844,7 @@
 
 ### Documentation and Help Content
 
-- Replace ambiguous `hang` term (#7902, #7931) (Thanks @iSazonov!)
+- Replace ambiguous term (#7902, #7931) (Thanks @iSazonov!)
 - Updating incorrect example of `PowerShell.Create()` (#7926) (Thanks @1RedOne!)
 - Update `governance.md` (#7927) (Thanks @tommymaynard!)
 - Add `cURL` to the Bash users list in `README.md` (#7948) (Thanks @vmsilvamolina!)
diff --git a/CHANGELOG/7.0.md b/CHANGELOG/7.0.md
index fe0eca4c5a7..9b7c0a9f45b 100644
--- a/CHANGELOG/7.0.md
+++ b/CHANGELOG/7.0.md
@@ -327,7 +327,7 @@ Move to .NET Core 3.1.202 SDK and update packages.
 - Skip null data in output data received handler to fix a `NullReferenceException` (#11448) (Thanks @iSazonov!)
 - Add `ssh` parameter sets for the parameter `-JobName` in `Invoke-Command` (#11444)
 - Adding `PowerShell Editor Services` and `PSScriptAnalyzer` to tracked modules (#11514)
-- Fix key exchange hang with `SecureString` for the `OutOfProc` transports (#11380, #11406)
+- Fix condition when key exchange stops responding with `SecureString` for the `OutOfProc` transports (#11380, #11406)
 - Add setting to disable the implicit `WinPS` module loading (#11332)
 
 ### General Cmdlet Updates and Fixes
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index b525098ac6c..d8360e714d8 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -7652,7 +7652,7 @@ public PropertyNameCompleter()
         /// <summary>
         /// Initializes a new instance of the <see cref="PropertyNameCompleter"/> class.
         /// </summary>
-        /// <param name="parameterNameOfInput">The name of the property of the input object for witch to complete with property names.</param>
+        /// <param name="parameterNameOfInput">The name of the property of the input object for which to complete with property names.</param>
         public PropertyNameCompleter(string parameterNameOfInput)
         {
             _parameterNameOfInput = parameterNameOfInput;
diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index bd45d7ffb8a..4ffa04fe3f2 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -10,6 +10,11 @@ pr:
     - master
     - release*
 
+parameters:
+  - name: ForceAzureBlobDelete
+    displayName: Delete Azure Blob
+    default: false
+
 resources:
   repositories:
   - repository: ComplianceRepo
@@ -29,6 +34,9 @@ variables:
     value: $[format('{0:yyyyMMdd}-{1}', pipeline.startTime,variables['Build.SourceBranch'])]
   - name: branchCounter
     value: $[counter(variables['branchCounterKey'], 1)]
+  - name: ForceAzureBlobDelete
+    value:  ${{ parameters.ForceAzureBlobDelete }}
+
 stages:
   - stage: prep
     jobs:
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml
index 9e6c7ad1c61..280ae3551f6 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance.yml
@@ -85,12 +85,11 @@ jobs:
     inputs:
       targetType: F
       optionsFC: 0
-      optionsXS: 0
+      optionsXS: 1
       optionsPE: '1|2|3|4'
       optionsHMENABLE: 0
       optionsRulesDBPath: '$(Build.SourcesDirectory)\tools\terms\PowerShell-Terms-Rules.mdb'
-      optionsFTPATH: '$(Build.SourcesDirectory)\tools\terms\FileTypeSet.xml'
-      toolVersion: 5.8.2.1
+      optionsUEPath: $(Build.SourcesDirectory)\tools\terms\TermsExclusion.xml
     continueOnError: true
 
   # add RoslynAnalyzers
diff --git a/tools/terms/FileTypeSet.xml b/tools/terms/FileTypeSet.xml
deleted file mode 100644
index 2b0821d6777..00000000000
--- a/tools/terms/FileTypeSet.xml
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xmldata>
-<PckFileTypes TotalTypes="35" TotalExts="198" UnsupportedFilesOnly="False">
-<Type ID="0" Check="1">
-<Name>Pure Text Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.txt</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.des</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.pwd</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.asm</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.cmd</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.ini</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.poc</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.pwt</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hpj</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.sql</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.inf</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.log</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.def</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.url</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.bat</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.aspx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.idl</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.sys</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.resources</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.strings</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.md</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.yml</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.yaml</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.spelling</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.gitignore</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.gitattributes</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.gitmodules</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.csv</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.tsv</Ext>
-</Extensions>
-</Type>
-<Type ID="1" Check="1">
-<Name>CodeFiles</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.frm</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.inc</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.cpp</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.cls</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.c</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hpp</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.vbs</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.java</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.cs</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.cxx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.h</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.jav</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.bas</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.js</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.pl</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.rc</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.vb</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.json</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.resjson</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.fs</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.fsi</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.fsx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.m</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.psm1</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.config</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.ps1</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.psd1</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.cmake</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.sh</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.cshtml</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.plist</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.mof</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.mc</Ext>
-</Extensions>
-</Type>
-<Type ID="2" Check="1">
-<Name>XML Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xml</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxa</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxk</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxl</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xsl</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxc</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxt</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxm</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.resx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxe</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxf</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxv</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.acctb</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.accfl</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xaml</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.ttml</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.ddue</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.sln</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.props</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.ps1xml</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.csproj</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xsd</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.svg</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.clixml</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.nuspec</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.cdxml</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.manifest</Ext>
-</Extensions>
-</Type>
-<Type ID="3" Check="1">
-<Name>Microsoft Word Documents</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.doc</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.dot</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.wiz</Ext>
-</Extensions>
-</Type>
-<Type ID="4" Check="1">
-<Name>Microsoft Access Database Compatible</Name>
-<Extensions>
-<Ext Check="0" UseCustomParser="0" DllPath="" ClassName="">.mdb</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.mda</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.mde</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.mpd</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.mdt</Ext>
-</Extensions>
-</Type>
-<Type ID="5" Check="1">
-<Name>Microsoft PowerPoint Presentation</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.ppt</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.pot</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.pps</Ext>
-</Extensions>
-</Type>
-<Type ID="6" Check="1">
-<Name>Microsoft Publisher Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.pub</Ext>
-</Extensions>
-</Type>
-<Type ID="7" Check="1">
-<Name>Microsoft Excel Workbooks</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xls</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xlt</Ext>
-</Extensions>
-</Type>
-<Type ID="8" Check="1">
-<Name>Pure Binary Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.com</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.bin</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.tlb</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.drv</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.fon</Ext>
-<Ext Check="0" UseCustomParser="0" DllPath="" ClassName="">.blg</Ext>
-<Ext Check="0" UseCustomParser="0" DllPath="" ClassName="">.gif</Ext>
-<Ext Check="0" UseCustomParser="0" DllPath="" ClassName="">.png</Ext>
-<Ext Check="0" UseCustomParser="0" DllPath="" ClassName="">.icns</Ext>
-<Ext Check="0" UseCustomParser="0" DllPath="" ClassName="">.ico</Ext>
-<Ext Check="0" UseCustomParser="0" DllPath="" ClassName="">.bmp</Ext>
-<Ext Check="0" UseCustomParser="0" DllPath="" ClassName="">.pfx</Ext>
-</Extensions>
-</Type>
-<Type ID="9" Check="1">
-<Name>Localization resource databases</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.edb</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.lcl</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xlf</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xliff</Ext>
-</Extensions>
-</Type>
-<Type ID="10" Check="1">
-<Name>Microsoft Project Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.mpp</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.mpt</Ext>
-</Extensions>
-</Type>
-<Type ID="11" Check="1">
-<Name>Microsoft Visio Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.vsd</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.vdx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.vss</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.vst</Ext>
-</Extensions>
-</Type>
-<Type ID="12" Check="1">
-<Name>Windows Installer databases</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.msi</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.msm</Ext>
-</Extensions>
-</Type>
-<Type ID="13" Check="1">
-<Name>Zip Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.zip</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.accdt</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.axtr</Ext>
-</Extensions>
-</Type>
-<Type ID="14" Check="1">
-<Name>Cabinet / MS Compression Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.cab</Ext>
-</Extensions>
-</Type>
-<Type ID="15" Check="1">
-<Name>Table driven IME lexicons</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.mb</Ext>
-</Extensions>
-</Type>
-<Type ID="16" Check="1">
-<Name>IME ( IMD ) Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.imd</Ext>
-</Extensions>
-</Type>
-<Type ID="17" Check="1">
-<Name>TrueType Font Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.ttf</Ext>
-</Extensions>
-</Type>
-<Type ID="18" Check="1">
-<Name>Microsoft Outlook Mail Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.msg</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.oft</Ext>
-</Extensions>
-</Type>
-<Type ID="19" Check="1">
-<Name>HTML Help 2.0 Files / InfoTech5.x Storage System Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.its</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxh</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxr</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxw</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxi</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxs</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hxq</Ext>
-</Extensions>
-</Type>
-<Type ID="20" Check="1">
-<Name>Adobe Acrobat PDF Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.pdf</Ext>
-</Extensions>
-</Type>
-<Type ID="21" Check="1">
-<Name>HTML Files / Web Page</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.htm</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.dtd</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hhk</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.htw</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.asp</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.htc</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.htx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.html</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.hhc</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.css</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.stm</Ext>
-</Extensions>
-</Type>
-<Type ID="22" Check="1">
-<Name>Rich Text Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.rtf</Ext>
-</Extensions>
-</Type>
-<Type ID="23" Check="1">
-<Name>Windows 3.x Write Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.wri</Ext>
-</Extensions>
-</Type>
-<Type ID="24" Check="1">
-<Name>MHTML Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.eml</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.nws</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.mht</Ext>
-</Extensions>
-</Type>
-<Type ID="25" Check="1">
-<Name>Word 2007 Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.docx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.docm</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.dotx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.dotm</Ext>
-</Extensions>
-</Type>
-<Type ID="26" Check="1">
-<Name>Excel 2007 Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xlsx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xlsm</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xltx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xltm</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xlsb</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.xlam</Ext>
-</Extensions>
-</Type>
-<Type ID="27" Check="1">
-<Name>Power Point 2007 Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.pptx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.pptm</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.potx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.potm</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.ppsx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.ppsm</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.ppam</Ext>
-</Extensions>
-</Type>
-<Type ID="28" Check="1">
-<Name>Access 2007 Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.accdb</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.accde</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.accdr</Ext>
-</Extensions>
-</Type>
-<Type ID="29" Check="1">
-<Name>Win32/64-based executable (image) Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.exe</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.dll</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.ocx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.scr</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.acm</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.rll</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.cpl</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.mui</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.ax</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.ime</Ext>
-</Extensions>
-</Type>
-<Type ID="30" Check="1">
-<Name>HTML Help 1.0 Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.chm</Ext>
-</Extensions>
-</Type>
-<Type ID="31" Check="1">
-<Name>LocStudio lsg</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.lsg</Ext>
-</Extensions>
-</Type>
-<Type ID="32" Check="1">
-<Name>Microsoft Office OneNote Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.one</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.onepkg</Ext>
-</Extensions>
-</Type>
-<Type ID="33" Check="1">
-<Name>Custom Parsers</Name>
-<Extensions>
-</Extensions>
-</Type>
-<Type ID="34" Check="1">
-<Name>Visio 2011 Files</Name>
-<Extensions>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.vstx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.vsdx</Ext>
-<Ext Check="1" UseCustomParser="0" DllPath="" ClassName="">.vssx</Ext>
-</Extensions>
-</Type>
-
-</PckFileTypes>
-</xmldata>
diff --git a/tools/terms/TermsExclusion.xml b/tools/terms/TermsExclusion.xml
new file mode 100644
index 00000000000..e314fc1b7a2
--- /dev/null
+++ b/tools/terms/TermsExclusion.xml
@@ -0,0 +1,11 @@
+<PoliCheckExclusions>
+  <!-- All strings must be UPPER CASE -->
+  <!--Each of these exclusions is a folder name -if \[name]\exists in the file path, it will be skipped -->
+  <Exclusion Type="FolderPathFull">.GIT</Exclusion>
+  <!--Each of these exclusions is a folder name -if any folder or file starts with "\[name]", it will be skipped -->
+  <!--<Exclusion Type="FolderPathStart">ABC|XYZ</Exclusion>-->
+  <!--Each of these file types will be completely skipped for the entire scan -->
+  <!--<Exclusion Type="FileType">.ABC|.XYZ</Exclusion>-->
+  <!--The specified file names will be skipped during the scan regardless which folder they are in -->
+  <!--<Exclusion Type="FileName">ABC.TXT|XYZ.CS</Exclusion>-->
+</PoliCheckExclusions>

From 3f571d8a8f39a21e2eecb8737a490b8c1d161c69 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Thu, 2 Sep 2021 21:42:06 +0900
Subject: [PATCH 027/645] Fix typo in build.psm1 (#16038)

targetting -> targeting
---
 build.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index c87e1147571..7441f48eb25 100644
--- a/build.psm1
+++ b/build.psm1
@@ -865,7 +865,7 @@ function New-PSOptions {
                 }
             }
 
-            # We plan to release packages targetting win7-x64 and win7-x86 RIDs,
+            # We plan to release packages targeting win7-x64 and win7-x86 RIDs,
             # which supports all supported windows platforms.
             # So we, will change the RID to win7-<arch>
             $Runtime = $RID -replace "win\d+", "win7"

From d3d88976190ee39fdf0b5040388fd8d13e4cb140 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Sep 2021 09:59:58 -0700
Subject: [PATCH 028/645] Bump Microsoft.CodeAnalysis.CSharp from 4.0.0-3.final
 to 4.0.0-4.21430.4 (#16036)

---
 .../Microsoft.PowerShell.Commands.Utility.csproj                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 74921e9ea62..1aff829f1d4 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-3.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-4.21430.4" />
     <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.1.21430.11" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.1.21430.11" />
     <PackageReference Include="NJsonSchema" Version="10.5.2" />

From 14ced821c94547ae1d5c66840c4bdd560224b04e Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 3 Sep 2021 15:18:50 -0700
Subject: [PATCH 029/645] Fix the GitHub Action for updating .NET daily builds
 (#16042)

---
 .github/workflows/daily.yml   |  5 +++--
 tools/UpdateDotnetRuntime.ps1 | 27 ++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 6e3a38ac1b1..a1c883c98f0 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -34,7 +34,7 @@ jobs:
           Write-Verbose "OLD_VERSION=$currentVersion" -Verbose
           "OLD_VERSION=$currentVersion" | Out-File $env:GITHUB_ENV -Append
 
-          ./tools/UpdateDotnetRuntime.ps1 -UpdateMSIPackaging
+          ./tools/UpdateDotnetRuntime.ps1 -UpdateMSIPackaging -UseInternalFeed
           $newVersion = (Get-Content .\global.json | ConvertFrom-Json).sdk.version
           Write-Verbose "NEW_VERSION=$newVersion" -Verbose
           "NEW_VERSION=$newVersion" | Out-File $env:GITHUB_ENV -Append
@@ -48,8 +48,9 @@ jobs:
         if: failure()
         with:
           webhook_url: ${{ secrets.PS_BUILD_TEAMS_CHANNEL }}
+          overwrite: "{title: `Failure in updating .NET build. Look at ${workflow_link}`}"
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v2
+        uses: peter-evans/create-pull-request@v3
         id: cpr
         if: env.CREATE_PR == 'true'
         with:
diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index 15c482ba630..5126d109999 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -187,17 +187,23 @@ function Get-DotnetUpdate {
 
     try {
 
-        $latestSDKVersionString = Invoke-RestMethod -Uri "http://aka.ms/dotnet/$channel/$quality/sdk-productVersion.txt" -ErrorAction Stop | ForEach-Object { $_.Trim() }
-        $selectedQuality = $quality
+        try {
+            $latestSDKVersionString = Invoke-RestMethod -Uri "http://aka.ms/dotnet/$channel/$quality/sdk-productVersion.txt" -ErrorAction Stop | ForEach-Object { $_.Trim() }
+            $selectedQuality = $quality
+        } catch {
+            if ($_.exception.Response.StatusCode -eq 'NotFound') {
+                Write-Verbose "Build not found for Channel: $Channel and Quality: $Quality" -Verbose
+            } else {
+                throw $_
+            }
+        }
 
-        if (-not $latestSDKVersionString.StartsWith($sdkImageVersion))
-        {
+        if (-not $latestSDKVersionString -or -not $latestSDKVersionString.StartsWith($sdkImageVersion)) {
             # we did not get a version number so fall back to daily
             $latestSDKVersionString = Invoke-RestMethod -Uri "http://aka.ms/dotnet/$channel/$qualityFallback/sdk-productVersion.txt" -ErrorAction Stop | ForEach-Object { $_.Trim() }
             $selectedQuality = $qualityFallback
 
-            if (-not $latestSDKVersionString.StartsWith($sdkImageVersion))
-            {
+            if (-not $latestSDKVersionString.StartsWith($sdkImageVersion)) {
                 throw "No build found!"
             }
         }
@@ -272,8 +278,15 @@ if ($dotnetUpdate.ShouldUpdate) {
         if ($feedname -eq 'dotnet-internal') {
             # This NuGet feed is for internal to Microsoft use only.
             $dotnetInternalFeed = $dotnetMetadataJson.internalfeed.url
-            $updatedNugetFile = $nugetFileContent -replace "</packageSources>", "  <add key=`"dotnet-internal`" value=`"$dotnetInternalFeed`" />`r`n  </packageSources>"
+
+            $updatedNugetFile = if ($nugetFileContent.Contains('dotnet-internal')) {
+                $nugetFileContent -replace ".<add key=`"dotnet-internal?.*', ' <add key=`"dotnet-internal`" value=`"$dotnetInternalFeed`" />`r`n  </packageSources>"
+            } else {
+                $nugetFileContent -replace "</packageSources>", "  <add key=`"dotnet-internal`" value=`"$dotnetInternalFeed`" />`r`n  </packageSources>"
+            }
+
             $updatedNugetFile | Out-File "$PSScriptRoot/../nuget.config" -Force
+
             Register-PackageSource -Name 'dotnet-internal' -Location $dotnetInternalFeed -ProviderName NuGet
             Write-Verbose -Message "Register new package source 'dotnet-internal'" -verbose
         }

From 66b5d5017059bb1ae49b72b6e1dcb2411ee0f670 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 3 Sep 2021 15:36:31 -0700
Subject: [PATCH 030/645] Set $? correctly for command expression with
 redirections (#16046)

---
 .../engine/parser/Compiler.cs                 | 20 ++++-
 .../Language/Scripting/DollarHook.Tests.ps1   | 80 +++++++++++++++++++
 2 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index 14057f05f68..bcddbee0b24 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -3279,9 +3279,9 @@ private bool ShouldSetExecutionStatusToSuccess(StatementAst statementAst)
         /// <returns>True is the compiler should add the success setting, false otherwise.</returns>
         private bool ShouldSetExecutionStatusToSuccess(PipelineAst pipelineAst)
         {
-            ExpressionAst expressionAst = pipelineAst.GetPureExpression();
+            ExpressionAst expressionAst = GetSingleExpressionFromPipeline(pipelineAst);
 
-            // If the pipeline is not a simple expression, it will set $?
+            // If the pipeline is not a single expression, it will set $?
             if (expressionAst == null)
             {
                 return false;
@@ -3291,6 +3291,22 @@ private bool ShouldSetExecutionStatusToSuccess(PipelineAst pipelineAst)
             return ShouldSetExecutionStatusToSuccess(expressionAst);
         }
 
+        /// <summary>
+        /// If the pipeline contains a single expression, the expression is returned, otherwise null is returned.
+        /// This method is different from <see cref="PipelineAst.GetPureExpression"/> in that it allows the single
+        /// expression to have redirections.
+        /// </summary>
+        private static ExpressionAst GetSingleExpressionFromPipeline(PipelineAst pipelineAst)
+        {
+            var pipelineElements = pipelineAst.PipelineElements;
+            if (pipelineElements.Count == 1 && pipelineElements[0] is CommandExpressionAst expr)
+            {
+                return expr.Expression;
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Determines whether an assignment statement must have an explicit setting
         /// for $? = $true after it by the compiler.
diff --git a/test/powershell/Language/Scripting/DollarHook.Tests.ps1 b/test/powershell/Language/Scripting/DollarHook.Tests.ps1
index 86fb70306d2..198b93a1de4 100644
--- a/test/powershell/Language/Scripting/DollarHook.Tests.ps1
+++ b/test/powershell/Language/Scripting/DollarHook.Tests.ps1
@@ -85,4 +85,84 @@ Describe 'Tests for setting $? for execution success' -Tag 'CI' {
         $script:hookValues | Should -Be $HookResults
         $output | Should -Be $PipelineResults
     }
+
+    It 'Sets $? correctly for single expression with redirection ''<Expression>''' -TestCases @(
+        @{ Expression = 'Write-Error "Bad"; Hook $?; "b" > $null; Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; "b" >> $null; Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; "b" > TESTDRIVE:\out.txt; Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; "b" >> TESTDRIVE:\out.txt; Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; "b" 2> $null; Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; "b" 2>> $null; Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; "b" 2> TESTDRIVE:\out.txt; Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; "b" 2>> TESTDRIVE:\out.txt; Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; "b" 2>&1; Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; "b" 2>&1; Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; "b" 2>&1 > $null; Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; "b" 2>&1 > TESTDRIVE:\out.txt; Hook $?'; HookResults = $($false, $true); }
+
+        @{ Expression = 'Write-Error "Bad"; Hook $?; ("b" > $null); Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; ("b" >> $null); Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; ("b" > TESTDRIVE:\out.txt); Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; ("b" >> TESTDRIVE:\out.txt); Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; ("b" 2> $null); Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; ("b" 2>> $null); Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; ("b" 2> TESTDRIVE:\out.txt); Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; ("b" 2>> TESTDRIVE:\out.txt); Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; ("b" 2>&1); Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; ("b" 2>&1 > $null); Hook $?'; HookResults = $($false, $true); }
+        @{ Expression = 'Write-Error "Bad"; Hook $?; ("b" 2>&1 > TESTDRIVE:\out.txt); Hook $?'; HookResults = $($false, $true); }
+    ) {
+        param([string]$Expression, [object[]]$HookResults)
+
+        Invoke-Expression $Expression 2>&1 >$null
+
+        $script:hookValues | Should -Be $HookResults
+    }
+
+    Context 'Validate $? with potential terminating error' {
+
+        ## Script execution directly in Pester tests will be enclosed in try/catch by the Pester,
+        ## and therefore, general exceptions thrown from an expression like "1/0" will be turned
+        ## into a terminating exception, which will stop the execution of remaining scripts.
+        ##
+        ## For those test cases, we have to use a PowerShell instance, so as to keep the default
+        ## error handling behavior for the general exceptions.
+
+        BeforeAll {
+            $pwsh = [powershell]::Create()
+
+            function Invoke([string] $script)
+            {
+                $pwsh.Commands.Clear()
+                $pwsh.Streams.ClearStreams()
+                $pwsh.AddScript($script).Invoke()
+            }
+
+            $root = Join-Path ([System.IO.Path]::GetTempPath()) ([guid]::NewGuid().ToString())
+            $null = Invoke "New-PSDrive -Name TESTDRIVE -PSProvider FileSystem -Root $root"
+        }
+
+        Afterall {
+            $null = Invoke "Remove-PSDrive -Name TESTDRIVE -PSProvider FileSystem -Force"
+            $pwsh.Dispose()
+        }
+
+        It 'Sets $? correctly for single expression with redirection ''<Expression>''' -TestCases @(
+            @{ Expression = '1/0 > $null; $?'; Result = $false; }
+            @{ Expression = '1/0 >> $null; $?'; Result = $false; }
+            @{ Expression = '1/0 > TESTDRIVE:\out.txt; $?'; Result = $false; }
+            @{ Expression = '1/0 >> TESTDRIVE:\out.txt; $?'; Result = $false; }
+            @{ Expression = '1/0 2>&1; $?'; Result = $false; }
+            @{ Expression = '1/0 2>&1 > $null; $?'; Result = $false; }
+            @{ Expression = '1/0 2>&1 > TESTDRIVE:\out.txt; $?'; Result = $false; }
+
+            @{ Expression = '"b" > NonExistDrive:\nowhere.txt; $?'; Result = $false; }
+            @{ Expression = '"b" >> NonExistDrive:\nowhere.txt; $?'; Result = $false; }
+            @{ Expression = '"b" 2>&1 > NonExistDrive:\nowhere.txt; $?'; Result = $false; }
+        ) {
+            param([string]$Expression, $Result)
+
+            Invoke $Expression | Should -Be $Result
+        }
+    }
 }

From 17986d88c10eb6271b1aad2ca955889e45e2b285 Mon Sep 17 00:00:00 2001
From: Robert Holt <rjmholt_msft@outlook.com>
Date: Fri, 3 Sep 2021 16:05:30 -0700
Subject: [PATCH 031/645] Improve `CommandInvocationIntrinsics` API
 documentation and style (#14369)

---
 .../engine/MshCmdlet.cs                       | 65 ++++++++++++-------
 1 file changed, 42 insertions(+), 23 deletions(-)

diff --git a/src/System.Management.Automation/engine/MshCmdlet.cs b/src/System.Management.Automation/engine/MshCmdlet.cs
index 2c899531866..c11e674660c 100644
--- a/src/System.Management.Automation/engine/MshCmdlet.cs
+++ b/src/System.Management.Automation/engine/MshCmdlet.cs
@@ -674,40 +674,46 @@ internal IEnumerable<CommandInfo> GetCommands(string name, CommandTypes commandT
         }
 
         /// <summary>
-        /// Executes a piece of text as a script synchronously.
+        /// Executes a piece of text as a script synchronously in the caller's session state.
+        /// The given text will be executed in a child scope rather than dot-sourced.
         /// </summary>
         /// <param name="script">The script text to evaluate.</param>
-        /// <returns>A collection of MshCobjects generated by the script.</returns>
+        /// <returns>A collection of MshCobjects generated by the script. Never null, but may be empty.</returns>
         /// <exception cref="ParseException">Thrown if there was a parsing error in the script.</exception>
         /// <exception cref="RuntimeException">Represents a script-level exception.</exception>
         /// <exception cref="FlowControlException"></exception>
         public Collection<PSObject> InvokeScript(string script)
         {
-            return InvokeScript(script, true, PipelineResultTypes.None, null);
+            return InvokeScript(script, useNewScope: true, PipelineResultTypes.None, input: null);
         }
 
         /// <summary>
-        /// Executes a piece of text as a script synchronously.
+        /// Executes a piece of text as a script synchronously in the caller's session state.
+        /// The given text will be executed in a child scope rather than dot-sourced.
         /// </summary>
         /// <param name="script">The script text to evaluate.</param>
-        /// <param name="args">The arguments to the script.</param>
-        /// <returns>A collection of MshCobjects generated by the script.</returns>
+        /// <param name="args">The arguments to the script, available as $args.</param>
+        /// <returns>A collection of MshCobjects generated by the script. Never null, but may be empty.</returns>
         /// <exception cref="ParseException">Thrown if there was a parsing error in the script.</exception>
         /// <exception cref="RuntimeException">Represents a script-level exception.</exception>
         /// <exception cref="FlowControlException"></exception>
         public Collection<PSObject> InvokeScript(string script, params object[] args)
         {
-            return InvokeScript(script, true, PipelineResultTypes.None, null, args);
+            return InvokeScript(script, useNewScope: true, PipelineResultTypes.None, input: null, args);
         }
 
         /// <summary>
+        /// Executes a given scriptblock synchonously in the given session state.
+        /// The scriptblock will be executed in the calling scope (dot-sourced) rather than in a new child scope.
         /// </summary>
-        /// <param name="sessionState"></param>
-        /// <param name="scriptBlock"></param>
-        /// <param name="args"></param>
-        /// <returns></returns>
+        /// <param name="sessionState">The session state in which to execute the scriptblock.</param>
+        /// <param name="scriptBlock">The scriptblock to execute.</param>
+        /// <param name="args">The arguments to the scriptblock, available as $args.</param>
+        /// <returns>A collection of the PSObjects emitted by the executing scriptblock. Never null, but may be empty.</returns>
         public Collection<PSObject> InvokeScript(
-            SessionState sessionState, ScriptBlock scriptBlock, params object[] args)
+            SessionState sessionState,
+            ScriptBlock scriptBlock,
+            params object[] args)
         {
             if (scriptBlock == null)
             {
@@ -739,13 +745,18 @@ public Collection<PSObject> InvokeScript(
         /// <summary>
         /// Invoke a scriptblock in the current runspace, controlling if it gets a new scope.
         /// </summary>
-        /// <param name="useLocalScope">If true, a new scope will be created.</param>
+        /// <param name="useLocalScope">If true, executes the scriptblock in a new child scope, otherwise the scriptblock is dot-sourced into the calling scope.</param>
         /// <param name="scriptBlock">The scriptblock to execute.</param>
         /// <param name="input">Optionall input to the command.</param>
         /// <param name="args">Arguments to pass to the scriptblock.</param>
-        /// <returns>The result of the evaluation.</returns>
+        /// <returns>
+        /// A collection of the PSObjects generated by executing the script. Never null, but may be empty.
+        /// </returns>
         public Collection<PSObject> InvokeScript(
-            bool useLocalScope, ScriptBlock scriptBlock, IList input, params object[] args)
+            bool useLocalScope,
+            ScriptBlock scriptBlock,
+            IList input,
+            params object[] args)
         {
             if (scriptBlock == null)
             {
@@ -771,21 +782,25 @@ public Collection<PSObject> InvokeScript(
         /// </summary>
         /// <param name="script">The script to evaluate.</param>
         /// <param name="useNewScope">If true, evaluate the script in its own scope.
-        /// If false, the script will be evaluated in the current scope i.e. it will be "dotted"</param>
+        /// If false, the script will be evaluated in the current scope i.e. it will be dot-sourced.</param>
         /// <param name="writeToPipeline">If set to Output, all output will be streamed
         /// to the output pipe of the calling cmdlet. If set to None, the result will be returned
         /// to the caller as a collection of PSObjects. No other flags are supported at this time and
         /// will result in an exception if used.</param>
         /// <param name="input">The list of objects to use as input to the script.</param>
-        /// <param name="args">The array of arguments to the command.</param>
-        /// <returns>A collection of MshCobjects generated by the script. This will be
-        /// empty if output was redirected.</returns>
+        /// <param name="args">The array of arguments to the command, available as $args.</param>
+        /// <returns>A collection of PSObjects generated by the script. This will be
+        /// empty if output was redirected. Never null.</returns>
         /// <exception cref="ParseException">Thrown if there was a parsing error in the script.</exception>
         /// <exception cref="RuntimeException">Represents a script-level exception.</exception>
         /// <exception cref="NotImplementedException">Thrown if any redirect other than output is attempted.</exception>
         /// <exception cref="FlowControlException"></exception>
-        public Collection<PSObject> InvokeScript(string script, bool useNewScope,
-            PipelineResultTypes writeToPipeline, IList input, params object[] args)
+        public Collection<PSObject> InvokeScript(
+            string script,
+            bool useNewScope,
+            PipelineResultTypes writeToPipeline,
+            IList input,
+            params object[] args)
         {
             if (script == null)
                 throw new ArgumentNullException(nameof(script));
@@ -796,8 +811,12 @@ public Collection<PSObject> InvokeScript(string script, bool useNewScope,
             return InvokeScript(sb, useNewScope, writeToPipeline, input, args);
         }
 
-        private Collection<PSObject> InvokeScript(ScriptBlock sb, bool useNewScope,
-            PipelineResultTypes writeToPipeline, IList input, params object[] args)
+        private Collection<PSObject> InvokeScript(
+            ScriptBlock sb,
+            bool useNewScope,
+            PipelineResultTypes writeToPipeline,
+            IList input,
+            params object[] args)
         {
             if (_cmdlet != null)
                 _cmdlet.ThrowIfStopping();

From 1e823e6677abb2c1aa4a795d24f1bbe67b51c2e9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 Sep 2021 14:11:13 -0700
Subject: [PATCH 032/645] Update .NET SDK version from `6.0.100-rc.1.21430.44`
 to `6.0.100-rc.1.21455.2` (#16041)

---
 assets/wix/files.wxs | 6 +++---
 global.json          | 2 +-
 nuget.config         | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index e8fdfdefcb4..8e821f1c6fc 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3054,8 +3054,8 @@
       <Component Id="cmp957498053E01454DA1E21E6D7317DCD6">
         <File Id="fil2AA6F0D8A51D4BB89F33F2B73AB12391" KeyPath="yes" Source="$(var.ProductSourcePath)\msquic.dll" />
       </Component>
-      <Component Id="cmpC0B842EBB4D244718CA6CEF819EE242B">
-        <File Id="fil229AFC7374F34B97AC3E4296BCB45CE7" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.43011.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>
@@ -4041,7 +4041,7 @@
       <ComponentRef Id="cmp708913639F7A46E784CC0FA862A1A2CE" />
       <ComponentRef Id="cmpA75DEF5617C54DA1937CB37D5824BF79" />
       <ComponentRef Id="cmp957498053E01454DA1E21E6D7317DCD6" />
-      <ComponentRef Id="cmpC0B842EBB4D244718CA6CEF819EE242B" />
+      <ComponentRef Id="cmp2EB55EB6B44F4CF186F0BAFD6B33BCD6" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 35448cc72b6..0c2a82ceaf6 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.100-rc.1.21430.44"
+    "version": "6.0.100-rc.1.21455.2"
   }
 }
diff --git a/nuget.config b/nuget.config
index 0e9671d1a70..ba38f1bad11 100644
--- a/nuget.config
+++ b/nuget.config
@@ -10,3 +10,4 @@
     <clear />
   </disabledPackageSources>
 </configuration>
+

From 5872e47254d921353596d755e92566354ab70f45 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Tue, 7 Sep 2021 23:20:30 -0700
Subject: [PATCH 033/645] Fix regression in `Move-Item` to only fallback to
 CopyAndDelete in specific cases (#16029)

If Move fails, check if known case before attempting CopyAndDelete:

- if an item is attempted to be renamed across filesystem mount boundaries.
- if the source and destination do not have the same root path.
---
 .../namespaces/FileSystemProvider.cs             | 11 ++++++++++-
 .../FileSystem.Tests.ps1                         | 16 ++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index e95669c2961..b7923ab7352 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -6121,7 +6121,16 @@ private void MoveDirectoryInfoUnchecked(DirectoryInfo directory, string destinat
 
                 directory.MoveTo(destinationPath);
             }
-            catch (IOException)
+#if UNIX
+            // This is the errno returned by the rename() syscall
+            // when an item is attempted to be renamed across filesystem mount boundaries.
+            // 0x80131620 is returned if the source and destination do not have the same root path
+            catch (IOException e) when (e.HResult == 18 || e.HResult == -2146232800)
+#else
+            // 0x80070005 ACCESS_DENIED is returned when trying to move files across volumes like DFS
+            // 0x80131620 is returned if the source and destination do not have the same root path
+            catch (IOException e) when (e.HResult == -2147024891 || e.HResult == -2146232800)
+#endif
             {
                 // Rather than try to ascertain whether we can rename a directory ahead of time,
                 // it's both faster and more correct to try to rename it and fall back to copy/deleting it
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
index 70a18ff604f..e5d150013cd 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
@@ -170,11 +170,23 @@ Describe "Basic FileSystem Provider Tests" -Tags "CI" {
         }
 
         It "Verify Move-Item will not move to an existing file" {
-            { Move-Item -Path $testDir -Destination $testFile -ErrorAction Stop } | Should -Throw -ErrorId 'DirectoryExist,Microsoft.PowerShell.Commands.MoveItemCommand'
-            $error[0].Exception | Should -BeOfType System.IO.IOException
+            if ($IsWindows) {
+                $expectedError = 'MoveDirectoryItemIOError,Microsoft.PowerShell.Commands.MoveItemCommand'
+            }
+            else {
+                $expectedError = 'DirectoryExist,Microsoft.PowerShell.Commands.MoveItemCommand'
+            }
+
+            $e = { Move-Item -Path $testDir -Destination $testFile -ErrorAction Stop } | Should -Throw -ErrorId $expectedError -PassThru
+            $e.Exception | Should -BeOfType System.IO.IOException
             $testDir | Should -Exist
         }
 
+        It 'Verify Move-Item fails for non-existing destination path' {
+            $e = { Move-Item -Path $testDir -Destination TestDrive:/0/2/0 -ErrorAction Stop } | Should -Throw -ErrorId 'MoveDirectoryItemIOError,Microsoft.PowerShell.Commands.MoveItemCommand' -PassThru
+            $e.Exception | Should -BeOfType System.IO.IOException
+        }
+
         It "Verify Move-Item throws correct error for non-existent source" {
             { Move-Item -Path /does/not/exist -Destination $testFile -ErrorAction Stop } | Should -Throw -ErrorId 'PathNotFound,Microsoft.PowerShell.Commands.MoveItemCommand'
         }

From 4c5f987e6c1f850429cf7d808a249a84ffbf88c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Sep 2021 14:19:07 -0700
Subject: [PATCH 034/645] Bump `Microsoft.CodeAnalysis.NetAnalyzers` (#16045)

---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index 0dc31a83b3e..ab1655e1527 100644
--- a/Analyzers.props
+++ b/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-rc2.21430.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc2.21452.5" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From 12dbdd9f05ff32e4d42e923e13a21894ce3e1c73 Mon Sep 17 00:00:00 2001
From: Robert Holt <rjmholt_msft@outlook.com>
Date: Wed, 8 Sep 2021 14:30:44 -0700
Subject: [PATCH 035/645] Ensure locale is set correctly on Ubuntu 20.04 in CI
 (#16067)

---
 .vsts-ci/linux-daily.yml        |  6 ++++++
 .vsts-ci/templates/nix-test.yml | 11 +----------
 build.psm1                      | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/.vsts-ci/linux-daily.yml b/.vsts-ci/linux-daily.yml
index e6a5375b0c9..14cdcc1372c 100644
--- a/.vsts-ci/linux-daily.yml
+++ b/.vsts-ci/linux-daily.yml
@@ -122,6 +122,9 @@ stages:
       condition: succeededOrFailed()
 
     - pwsh: |
+        Import-Module .\build.psm1
+        Set-CorrectLocale
+
         Import-Module .\tools\ci.psm1
         Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
         Invoke-CITest -Purpose UnelevatedPesterTests -TagSet Others
@@ -129,6 +132,9 @@ stages:
       condition: succeededOrFailed()
 
     - pwsh: |
+        Import-Module .\build.psm1
+        Set-CorrectLocale
+
         Import-Module .\tools\ci.psm1
         Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
         Invoke-CITest -Purpose ElevatedPesterTests -TagSet Others
diff --git a/.vsts-ci/templates/nix-test.yml b/.vsts-ci/templates/nix-test.yml
index 89c1a39dd44..d9ed3e35712 100644
--- a/.vsts-ci/templates/nix-test.yml
+++ b/.vsts-ci/templates/nix-test.yml
@@ -64,16 +64,7 @@ jobs:
 
   - pwsh: |
       Import-Module .\build.psm1 -Force
-      $environment = Get-EnvironmentInformation
-      $isUbuntu20 = $environment.IsUbuntu -and $environment.IsUbuntu20
-      if ($isUbuntu20) {
-        $env:LC_ALL='en_US.UTF-8'
-        $env:LANG='en_US.UTF-8'
-        sudo locale-gen $LANG
-        sudo update-locale
-      }
-
-      locale
+      Set-CorrectLocale
 
       Import-Module .\tools\ci.psm1
       Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
diff --git a/build.psm1 b/build.psm1
index 7441f48eb25..bbb98110d2a 100644
--- a/build.psm1
+++ b/build.psm1
@@ -3386,3 +3386,23 @@ function New-NugetConfigFile
 
     Set-Content -Path (Join-Path $Destination 'nuget.config') -Value $content -Force
 }
+
+function Set-CorrectLocale
+{
+    if (-not $IsLinux)
+    {
+        return
+    }
+
+    $environment = Get-EnvironmentInformation
+    if ($environment.IsUbuntu -and $environment.IsUbuntu20)
+    {
+        $env:LC_ALL = 'en_US.UTF-8'
+        $env:LANG = 'en_US.UTF-8'
+        sudo locale-gen $env:LANG
+        sudo update-locale
+    }
+
+    # Output the locale to log it
+    locale
+}

From 0d7ba2fe5a11d642b7f8b32e25a2539642fafe86 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Thu, 9 Sep 2021 10:36:05 -0700
Subject: [PATCH 036/645] Fix `ConvertTo-SecureString` with key regression due
 to .NET breaking change (#16068)

---
 .../security/SecureStringHelper.cs            | 151 ++++++++----------
 .../SecureString.Tests.ps1                    |  15 +-
 2 files changed, 79 insertions(+), 87 deletions(-)

diff --git a/src/System.Management.Automation/security/SecureStringHelper.cs b/src/System.Management.Automation/security/SecureStringHelper.cs
index 6d38859162f..ddb94e52ee8 100644
--- a/src/System.Management.Automation/security/SecureStringHelper.cs
+++ b/src/System.Management.Automation/security/SecureStringHelper.cs
@@ -217,8 +217,6 @@ internal static SecureString Unprotect(string input)
         /// <returns>A string (see summary).</returns>
         internal static EncryptionResult Encrypt(SecureString input, SecureString key)
         {
-            EncryptionResult output = null;
-
             //
             // get clear text key from the SecureString key
             //
@@ -227,14 +225,14 @@ internal static EncryptionResult Encrypt(SecureString input, SecureString key)
             //
             // encrypt the data
             //
-            output = Encrypt(input, keyBlob);
-
-            //
-            // clear the clear text key
-            //
-            Array.Clear(keyBlob, 0, keyBlob.Length);
-
-            return output;
+            try
+            {
+                return Encrypt(input, keyBlob);
+            }
+            finally
+            {
+                Array.Clear(keyBlob);
+            }
         }
 
         /// <summary>
@@ -254,48 +252,46 @@ internal static EncryptionResult Encrypt(SecureString input, byte[] key, byte[]
             Utils.CheckSecureStringArg(input, "input");
             Utils.CheckKeyArg(key, "key");
 
-            byte[] encryptedData = null;
-            MemoryStream ms = null;
-            ICryptoTransform encryptor = null;
-            CryptoStream cs = null;
-
             //
             // prepare the crypto stuff. Initialization Vector is
             // randomized by default.
             //
-            Aes aes = Aes.Create();
-            if (iv == null)
-                iv = aes.IV;
-
-            encryptor = aes.CreateEncryptor(key, iv);
-            ms = new MemoryStream();
-
-            using (cs = new CryptoStream(ms, encryptor, CryptoStreamMode.Write))
+            using (Aes aes = Aes.Create())
             {
+                if (iv is null)
+                {
+                    iv = aes.IV;
+                }
+
                 //
                 // get clear text data from the input SecureString
                 //
                 byte[] data = GetData(input);
+                try
+                {
+                    using (ICryptoTransform encryptor = aes.CreateEncryptor(key, iv))
+                    using (var sourceStream = new MemoryStream(data))
+                    using (var encryptedStream = new MemoryStream())
+                    {
+                        //
+                        // encrypt it
+                        //
+                        using (var cryptoStream = new CryptoStream(encryptedStream, encryptor, CryptoStreamMode.Write))
+                        {
+                            sourceStream.CopyTo(cryptoStream);
+                        }
 
-                //
-                // encrypt it
-                //
-                cs.Write(data, 0, data.Length);
-                cs.FlushFinalBlock();
-
-                //
-                // clear the clear text data array
-                //
-                Array.Clear(data, 0, data.Length);
-
-                //
-                // convert the encrypted blob to a string
-                //
-                encryptedData = ms.ToArray();
-
-                EncryptionResult output = new EncryptionResult(ByteArrayToString(encryptedData), Convert.ToBase64String(iv));
-
-                return output;
+                        //
+                        // return encrypted data
+                        //
+                        byte[] encryptedData = encryptedStream.ToArray();
+                        return new EncryptionResult(ByteArrayToString(encryptedData), Convert.ToBase64String(iv));
+                    }
+                }
+                finally
+                {
+                    Array.Clear(data, 0, data.Length);
+                }
             }
         }
 
@@ -311,8 +307,6 @@ internal static EncryptionResult Encrypt(SecureString input, byte[] key, byte[]
         /// <returns>SecureString .</returns>
         internal static SecureString Decrypt(string input, SecureString key, byte[] IV)
         {
-            SecureString output = null;
-
             //
             // get clear text key from the SecureString key
             //
@@ -321,14 +315,14 @@ internal static SecureString Decrypt(string input, SecureString key, byte[] IV)
             //
             // decrypt the data
             //
-            output = Decrypt(input, keyBlob, IV);
-
-            //
-            // clear the clear text key
-            //
-            Array.Clear(keyBlob, 0, keyBlob.Length);
-
-            return output;
+            try
+            {
+                return Decrypt(input, keyBlob, IV);
+            }
+            finally
+            {
+                Array.Clear(keyBlob);
+            }
         }
 
         /// <summary>
@@ -346,44 +340,33 @@ internal static SecureString Decrypt(string input, byte[] key, byte[] IV)
             Utils.CheckArgForNullOrEmpty(input, "input");
             Utils.CheckKeyArg(key, "key");
 
-            byte[] decryptedData = null;
-            byte[] encryptedData = null;
-            SecureString s = null;
-
             //
             // prepare the crypto stuff
             //
-            Aes aes = Aes.Create();
-            encryptedData = ByteArrayFromString(input);
-
-            var decryptor = aes.CreateDecryptor(key, IV ?? aes.IV);
-
-            MemoryStream ms = new MemoryStream(encryptedData);
-
-            using (CryptoStream cs = new CryptoStream(ms, decryptor, CryptoStreamMode.Read))
+            using (var aes = Aes.Create())
             {
-                byte[] tempDecryptedData = new byte[encryptedData.Length];
-
-                int numBytesRead = 0;
-
-                //
-                // decrypt the data
-                //
-                numBytesRead = cs.Read(tempDecryptedData, 0,
-                                       tempDecryptedData.Length);
-
-                decryptedData = new byte[numBytesRead];
-
-                for (int i = 0; i < numBytesRead; i++)
+                using (ICryptoTransform decryptor = aes.CreateDecryptor(key, IV ?? aes.IV))
+                using (var encryptedStream = new MemoryStream(ByteArrayFromString(input)))
+                using (var targetStream = new MemoryStream())
                 {
-                    decryptedData[i] = tempDecryptedData[i];
-                }
-
-                s = New(decryptedData);
-                Array.Clear(decryptedData, 0, decryptedData.Length);
-                Array.Clear(tempDecryptedData, 0, tempDecryptedData.Length);
+                    //
+                    // decrypt the data and return as SecureString
+                    //
+                    using (var sourceStream = new CryptoStream(encryptedStream, decryptor, CryptoStreamMode.Read))
+                    {
+                        sourceStream.CopyTo(targetStream);
+                    }
 
-                return s;
+                    byte[] decryptedData = targetStream.ToArray();
+                    try
+                    {
+                        return New(decryptedData);
+                    }
+                    finally
+                    {
+                        Array.Clear(decryptedData);
+                    }
+                }
             }
         }
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/SecureString.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/SecureString.Tests.ps1
index 6b8f45d509f..df1fa9294e1 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/SecureString.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/SecureString.Tests.ps1
@@ -11,12 +11,12 @@ Describe "SecureString conversion tests" -Tags "CI" {
         $string.ToCharArray() | ForEach-Object { $securestring.AppendChar($_) }
     }
 
-    It "using null arguments to ConvertFrom-SecureString produces an exception" {
+    It "Using null arguments to ConvertFrom-SecureString produces an exception" {
         { ConvertFrom-SecureString -SecureString $null -Key $null } |
             Should -Throw -ErrorId "ParameterArgumentValidationErrorNullNotAllowed,Microsoft.PowerShell.Commands.ConvertFromSecureStringCommand"
     }
 
-    It "using a bad key produces an exception" {
+    It "Using a bad key produces an exception" {
         $badkey = [byte[]]@(1,2)
         { ConvertFrom-SecureString -SecureString $secureString -Key $badkey } |
             Should -Throw -ErrorId "Argument,Microsoft.PowerShell.Commands.ConvertFromSecureStringCommand"
@@ -27,9 +27,18 @@ Describe "SecureString conversion tests" -Tags "CI" {
         $ss | Should -BeOfType SecureString
     }
 
-    It "can convert back from a secure string" {
+    It "Can convert back from a secure string" {
         $ss1 = ConvertTo-SecureString -AsPlainText -Force $string
         $ss2 = ConvertFrom-SecureString $ss1 | ConvertTo-SecureString
         $ss2 | ConvertFrom-SecureString -AsPlainText | Should -Be $string
     }
+
+    It "Can encode secure string with key" {
+        $testString = '[8Chars][8Chars][Not8]'
+        $key = [System.Text.Encoding]::UTF8.GetBytes("1234"*8)
+        $ss1 = $testString | ConvertTo-SecureString -AsPlainText -Force
+        $encodedStr = $ss1 | ConvertFrom-SecureString -Key $key
+        $ss2 = $encodedStr | ConvertTo-SecureString -Key $key
+        $ss2 | ConvertFrom-SecureString -AsPlainText | Should -BeExactly $testString
+    }
 }

From 024f4097630e028440b35e08933b0fefc31da399 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Thu, 9 Sep 2021 11:50:36 -0700
Subject: [PATCH 037/645] Add `isOutputRedirected` parameter to
 `GetFormatStyleString()` method (#14397)

---
 .../host/msh/ConsoleHostUserInterface.cs               |  6 +++---
 src/System.Management.Automation/engine/Utils.cs       |  5 ++---
 .../engine/Formatting/OutputRendering.Tests.ps1        | 10 ----------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
index 756e294b226..87a65dfdcbd 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
@@ -1215,7 +1215,7 @@ public override void WriteDebugLine(string message)
             {
                 if (SupportsVirtualTerminal)
                 {
-                    WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Debug) + StringUtil.Format(ConsoleHostUserInterfaceStrings.DebugFormatString, message) + PSStyle.Instance.Reset);
+                    WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Debug, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.DebugFormatString, message) + PSStyle.Instance.Reset);
                 }
                 else
                 {
@@ -1276,7 +1276,7 @@ public override void WriteVerboseLine(string message)
             {
                 if (SupportsVirtualTerminal)
                 {
-                    WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Verbose) + StringUtil.Format(ConsoleHostUserInterfaceStrings.VerboseFormatString, message) + PSStyle.Instance.Reset);
+                    WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Verbose, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.VerboseFormatString, message) + PSStyle.Instance.Reset);
                 }
                 else
                 {
@@ -1320,7 +1320,7 @@ public override void WriteWarningLine(string message)
             {
                 if (SupportsVirtualTerminal)
                 {
-                    WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Warning) + StringUtil.Format(ConsoleHostUserInterfaceStrings.WarningFormatString, message) + PSStyle.Instance.Reset);
+                    WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Warning, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.WarningFormatString, message) + PSStyle.Instance.Reset);
                 }
                 else
                 {
diff --git a/src/System.Management.Automation/engine/Utils.cs b/src/System.Management.Automation/engine/Utils.cs
index eb2470e6d17..91f6083596d 100644
--- a/src/System.Management.Automation/engine/Utils.cs
+++ b/src/System.Management.Automation/engine/Utils.cs
@@ -1617,13 +1617,12 @@ internal enum FormatStyle
             Debug,
         }
 
-        internal static string GetFormatStyleString(FormatStyle formatStyle)
+        internal static string GetFormatStyleString(FormatStyle formatStyle, bool isOutputRedirected)
         {
             // redirected console gets plaintext output to preserve existing behavior
             if (!InternalTestHooks.BypassOutputRedirectionCheck &&
                 ((PSStyle.Instance.OutputRendering == OutputRendering.PlainText) ||
-                (formatStyle == FormatStyle.Error && Console.IsErrorRedirected) ||
-                (formatStyle != FormatStyle.Error && Console.IsOutputRedirected)))
+                isOutputRedirected))
             {
                 return string.Empty;
             }
diff --git a/test/powershell/engine/Formatting/OutputRendering.Tests.ps1 b/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
index 106197b10f5..14085cc23ba 100644
--- a/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
+++ b/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
@@ -2,14 +2,6 @@
 # Licensed under the MIT License.
 
 Describe 'OutputRendering tests' {
-    BeforeAll {
-        $th = New-TestHost
-        $rs = [runspacefactory]::Createrunspace($th)
-        $rs.open()
-        $ps = [powershell]::Create()
-        $ps.Runspace = $rs
-    }
-
     BeforeEach {
         if ($null -ne $PSStyle) {
             $oldOutputRendering = $PSStyle.OutputRendering
@@ -20,8 +12,6 @@ Describe 'OutputRendering tests' {
         if ($null -ne $PSStyle) {
             $PSStyle.OutputRendering = $oldOutputRendering
         }
-
-        $ps.Commands.Clear()
     }
 
     It 'OutputRendering works for "<outputRendering>" to the host' -TestCases @(

From 74e283c4f9777f73e45e08f377b0b28415f65535 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 9 Sep 2021 13:59:31 -0700
Subject: [PATCH 038/645] Set locale correctly on Linux CI (#16073)

---
 .vsts-ci/linux-daily.yml        | 6 ------
 .vsts-ci/templates/nix-test.yml | 3 ---
 tools/ci.psm1                   | 3 +++
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.vsts-ci/linux-daily.yml b/.vsts-ci/linux-daily.yml
index 14cdcc1372c..e6a5375b0c9 100644
--- a/.vsts-ci/linux-daily.yml
+++ b/.vsts-ci/linux-daily.yml
@@ -122,9 +122,6 @@ stages:
       condition: succeededOrFailed()
 
     - pwsh: |
-        Import-Module .\build.psm1
-        Set-CorrectLocale
-
         Import-Module .\tools\ci.psm1
         Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
         Invoke-CITest -Purpose UnelevatedPesterTests -TagSet Others
@@ -132,9 +129,6 @@ stages:
       condition: succeededOrFailed()
 
     - pwsh: |
-        Import-Module .\build.psm1
-        Set-CorrectLocale
-
         Import-Module .\tools\ci.psm1
         Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
         Invoke-CITest -Purpose ElevatedPesterTests -TagSet Others
diff --git a/.vsts-ci/templates/nix-test.yml b/.vsts-ci/templates/nix-test.yml
index d9ed3e35712..6a1b6e6f9de 100644
--- a/.vsts-ci/templates/nix-test.yml
+++ b/.vsts-ci/templates/nix-test.yml
@@ -63,9 +63,6 @@ jobs:
     continueOnError: true
 
   - pwsh: |
-      Import-Module .\build.psm1 -Force
-      Set-CorrectLocale
-
       Import-Module .\tools\ci.psm1
       Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
       $options = (Get-PSOptions)
diff --git a/tools/ci.psm1 b/tools/ci.psm1
index c7b2735abb0..f53c9271c01 100644
--- a/tools/ci.psm1
+++ b/tools/ci.psm1
@@ -215,6 +215,9 @@ function Invoke-CITest
         [string] $TagSet
     )
 
+    # Set locale correctly for Linux CIs
+    Set-CorrectLocale
+
     # Pester doesn't allow Invoke-Pester -TagAll@('CI', 'RequireAdminOnWindows') currently
     # https://github.com/pester/Pester/issues/608
     # To work-around it, we exlude all categories, but 'CI' from the list

From dad7a34ee743c81dd96e742ed5516ac782388972 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Fri, 10 Sep 2021 09:05:07 -0700
Subject: [PATCH 039/645] Move `GetOuputString()` and `GetFormatStyleString()`
 to `PSHostUserInterface` as public API (#16075)

---
 .../host/msh/ConsoleHostUserInterface.cs      |   8 +-
 .../FormatAndOutput/common/ILineOutput.cs     |   3 +-
 .../engine/Utils.cs                           |  93 -----------
 .../engine/hostifaces/MshHostUserInterface.cs | 155 ++++++++++++++++++
 4 files changed, 161 insertions(+), 98 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
index 87a65dfdcbd..ad20eadf3d8 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
@@ -729,7 +729,7 @@ private void WriteImpl(string value, bool newLine)
             }
 
             TextWriter writer = Console.IsOutputRedirected ? Console.Out : _parent.ConsoleTextWriter;
-            value = Utils.GetOutputString(value, isHost: true, SupportsVirtualTerminal, Console.IsOutputRedirected);
+            value = GetOutputString(value, SupportsVirtualTerminal, Console.IsOutputRedirected);
 
             if (_parent.IsRunningAsync)
             {
@@ -1215,7 +1215,7 @@ public override void WriteDebugLine(string message)
             {
                 if (SupportsVirtualTerminal)
                 {
-                    WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Debug, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.DebugFormatString, message) + PSStyle.Instance.Reset);
+                    WriteLine(GetFormatStyleString(FormatStyle.Debug, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.DebugFormatString, message) + PSStyle.Instance.Reset);
                 }
                 else
                 {
@@ -1276,7 +1276,7 @@ public override void WriteVerboseLine(string message)
             {
                 if (SupportsVirtualTerminal)
                 {
-                    WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Verbose, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.VerboseFormatString, message) + PSStyle.Instance.Reset);
+                    WriteLine(GetFormatStyleString(FormatStyle.Verbose, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.VerboseFormatString, message) + PSStyle.Instance.Reset);
                 }
                 else
                 {
@@ -1320,7 +1320,7 @@ public override void WriteWarningLine(string message)
             {
                 if (SupportsVirtualTerminal)
                 {
-                    WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Warning, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.WarningFormatString, message) + PSStyle.Instance.Reset);
+                    WriteLine(GetFormatStyleString(FormatStyle.Warning, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.WarningFormatString, message) + PSStyle.Instance.Reset);
                 }
                 else
                 {
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs b/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
index 32d4565da5d..8c672b62063 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
@@ -4,6 +4,7 @@
 using System.Globalization;
 using System.IO;
 using System.Management.Automation;
+using System.Management.Automation.Host;
 using System.Management.Automation.Internal;
 using System.Text;
 
@@ -413,7 +414,7 @@ internal override void WriteLine(string s)
         {
             CheckStopProcessing();
 
-            s = Utils.GetOutputString(s, isHost: false);
+            s = PSHostUserInterface.GetOutputString(s, isHost: false);
 
             if (_suppressNewline)
             {
diff --git a/src/System.Management.Automation/engine/Utils.cs b/src/System.Management.Automation/engine/Utils.cs
index 91f6083596d..f277dcb1e49 100644
--- a/src/System.Management.Automation/engine/Utils.cs
+++ b/src/System.Management.Automation/engine/Utils.cs
@@ -1559,99 +1559,6 @@ internal static bool IsComObject(object obj)
 
             return oldMode;
         }
-
-        #region PSAnsiRendering
-
-        internal static bool ShouldOutputPlainText(bool isHost, bool? supportsVirtualTerminal)
-        {
-            var outputRendering = OutputRendering.Ansi;
-
-            if (supportsVirtualTerminal != false)
-            {
-                switch (PSStyle.Instance.OutputRendering)
-                {
-                    case OutputRendering.Host:
-                        outputRendering = isHost ? OutputRendering.Ansi : OutputRendering.PlainText;
-                        break;
-                    default:
-                        outputRendering = PSStyle.Instance.OutputRendering;
-                        break;
-                }
-            }
-
-            return outputRendering == OutputRendering.PlainText;
-        }
-
-        internal static string GetOutputString(string s, bool isHost, bool? supportsVirtualTerminal = null, bool isOutputRedirected = false)
-        {
-            var sd = new ValueStringDecorated(s);
-
-            if (sd.IsDecorated)
-            {
-                var outputRendering = OutputRendering.Ansi;
-                if (InternalTestHooks.BypassOutputRedirectionCheck)
-                {
-                    isOutputRedirected = false;
-                }
-
-                if (isOutputRedirected || ShouldOutputPlainText(isHost, supportsVirtualTerminal))
-                {
-                    outputRendering = OutputRendering.PlainText;
-                }
-
-                s = sd.ToString(outputRendering);
-            }
-
-            return s;
-        }
-
-        internal enum FormatStyle
-        {
-            Reset,
-            FormatAccent,
-            TableHeader,
-            ErrorAccent,
-            Error,
-            Warning,
-            Verbose,
-            Debug,
-        }
-
-        internal static string GetFormatStyleString(FormatStyle formatStyle, bool isOutputRedirected)
-        {
-            // redirected console gets plaintext output to preserve existing behavior
-            if (!InternalTestHooks.BypassOutputRedirectionCheck &&
-                ((PSStyle.Instance.OutputRendering == OutputRendering.PlainText) ||
-                isOutputRedirected))
-            {
-                return string.Empty;
-            }
-
-            PSStyle psstyle = PSStyle.Instance;                
-            switch (formatStyle)
-            {
-                case FormatStyle.Reset:
-                    return psstyle.Reset;
-                case FormatStyle.FormatAccent:
-                    return psstyle.Formatting.FormatAccent;
-                case FormatStyle.TableHeader:
-                    return psstyle.Formatting.TableHeader;
-                case FormatStyle.ErrorAccent:
-                    return psstyle.Formatting.ErrorAccent;
-                case FormatStyle.Error:
-                    return psstyle.Formatting.Error;
-                case FormatStyle.Warning:
-                    return psstyle.Formatting.Warning;
-                case FormatStyle.Verbose:
-                    return psstyle.Formatting.Verbose;
-                case FormatStyle.Debug:
-                    return psstyle.Formatting.Debug;
-                default:
-                    return string.Empty;
-            }
-        }
-
-        #endregion
     }
 }
 
diff --git a/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
index 2d8c16f2b7b..cf2dea14a5f 100644
--- a/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
+++ b/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
@@ -232,6 +232,161 @@ public virtual void WriteLine(ConsoleColor foregroundColor, ConsoleColor backgro
         /// </summary>
         public virtual void WriteInformation(InformationRecord record) { }
 
+        private static bool ShouldOutputPlainText(bool isHost, bool? supportsVirtualTerminal)
+        {
+            var outputRendering = OutputRendering.Ansi;
+
+            if (supportsVirtualTerminal != false)
+            {
+                switch (PSStyle.Instance.OutputRendering)
+                {
+                    case OutputRendering.Host:
+                        outputRendering = isHost ? OutputRendering.Ansi : OutputRendering.PlainText;
+                        break;
+                    default:
+                        outputRendering = PSStyle.Instance.OutputRendering;
+                        break;
+                }
+            }
+
+            return outputRendering == OutputRendering.PlainText;
+        }
+
+        /// <summary>
+        /// The format styles that are supported by the host.
+        /// </summary>
+        public enum FormatStyle
+        {
+            /// <summary>
+            /// Reset the formatting to the default.
+            /// </summary>
+            Reset,
+
+            /// <summary>
+            /// Highlight text used in output formatting.
+            /// </summary>
+            FormatAccent,
+
+            /// <summary>
+            /// Highlight for table headers.
+            /// </summary>
+            TableHeader,
+
+            /// <summary>
+            /// Highlight for detailed error view.
+            /// </summary>
+            ErrorAccent,
+
+            /// <summary>
+            /// Style for error messages.
+            /// </summary>
+            Error,
+
+            /// <summary>
+            /// Style for warning messages.
+            /// </summary>
+            Warning,
+
+            /// <summary>
+            /// Style for verbose messages.
+            /// </summary>
+            Verbose,
+
+            /// <summary>
+            /// Style for debug messages.
+            /// </summary>
+            Debug,
+        }
+
+        /// <summary>
+        /// Get the ANSI escape sequence for the given format style.
+        /// </summary>
+        /// <param name="formatStyle">
+        /// The format style to get the escape sequence for.
+        /// </param>
+        /// <param name="isOutputRedirected">
+        /// True if the output is redirected.
+        /// </param>
+        /// <returns>
+        /// The ANSI escape sequence for the given format style.
+        /// </returns>
+        public static string GetFormatStyleString(FormatStyle formatStyle, bool isOutputRedirected)
+        {
+            // redirected console gets plaintext output to preserve existing behavior
+            if (!InternalTestHooks.BypassOutputRedirectionCheck &&
+                (PSStyle.Instance.OutputRendering == OutputRendering.PlainText ||
+                isOutputRedirected))
+            {
+                return string.Empty;
+            }
+
+            PSStyle psstyle = PSStyle.Instance;                
+            switch (formatStyle)
+            {
+                case FormatStyle.Reset:
+                    return psstyle.Reset;
+                case FormatStyle.FormatAccent:
+                    return psstyle.Formatting.FormatAccent;
+                case FormatStyle.TableHeader:
+                    return psstyle.Formatting.TableHeader;
+                case FormatStyle.ErrorAccent:
+                    return psstyle.Formatting.ErrorAccent;
+                case FormatStyle.Error:
+                    return psstyle.Formatting.Error;
+                case FormatStyle.Warning:
+                    return psstyle.Formatting.Warning;
+                case FormatStyle.Verbose:
+                    return psstyle.Formatting.Verbose;
+                case FormatStyle.Debug:
+                    return psstyle.Formatting.Debug;
+                default:
+                    return string.Empty;
+            }
+        }
+
+        /// <summary>
+        /// Get the appropriate output string based on different criteria.
+        /// </summary>
+        /// <param name="text">
+        /// The text to format.
+        /// </param>
+        /// <param name="supportsVirtualTerminal">
+        /// True if the host supports virtual terminal.
+        /// </param>
+        /// <param name="isOutputRedirected">
+        /// True if the output is redirected.
+        /// </param>
+        /// <returns>
+        /// The formatted text.
+        /// </returns>
+        public static string GetOutputString(string text, bool supportsVirtualTerminal, bool isOutputRedirected)
+        {
+            return GetOutputString(text, isHost: true, supportsVirtualTerminal: supportsVirtualTerminal, isOutputRedirected: isOutputRedirected);
+        }
+
+        internal static string GetOutputString(string text, bool isHost, bool? supportsVirtualTerminal = null, bool isOutputRedirected = false)
+        {
+            var sd = new ValueStringDecorated(text);
+
+            if (sd.IsDecorated)
+            {
+                var outputRendering = OutputRendering.Ansi;
+                if (InternalTestHooks.BypassOutputRedirectionCheck)
+                {
+                    isOutputRedirected = false;
+                }
+
+                if (isOutputRedirected || ShouldOutputPlainText(isHost, supportsVirtualTerminal))
+                {
+                    outputRendering = OutputRendering.PlainText;
+                }
+
+                text = sd.ToString(outputRendering);
+            }
+
+            return text;
+        }
+
         // Gets the state associated with PowerShell transcription.
         //
         // Ideally, this would be associated with the host instance, but remoting recycles host instances

From 8b962ca1dbae2cdb49586d3c8dc5f51820d6724c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 13 Sep 2021 15:56:12 -0700
Subject: [PATCH 040/645] Update minimum required OS version for macOS (#16088)

---
 tools/packaging/packaging.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 000d48067e1..7b652f9b3bf 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -1115,7 +1115,7 @@ function New-MacOsDistributionPackage
     # 2 - package path
     # 3 - minimum os version
     # 4 - Package Identifier
-    $PackagingStrings.OsxDistributionTemplate -f "PowerShell - $packageVersion", $packageVersion, $packageName, '10.13', $packageId | Out-File -Encoding ascii -FilePath $distributionXmlPath -Force
+    $PackagingStrings.OsxDistributionTemplate -f "PowerShell - $packageVersion", $packageVersion, $packageName, '10.14', $packageId | Out-File -Encoding ascii -FilePath $distributionXmlPath -Force
 
     Write-Log "Applying distribution.xml to package..."
     Push-Location $tempDir

From 55ccbb6803162965eead3a08aace37f11ea7630b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 13 Sep 2021 16:45:10 -0700
Subject: [PATCH 041/645] Update .NET to `6.0.100-rc.1.21458.32` (#16066)

---
 DotnetRuntimeMetadata.json                       |  2 +-
 global.json                                      |  2 +-
 ...crosoft.PowerShell.Commands.Management.csproj |  2 +-
 .../Microsoft.PowerShell.Commands.Utility.csproj |  4 ++--
 .../Microsoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj              |  8 ++++----
 .../Microsoft.WSMan.Management.csproj            |  2 +-
 .../System.Management.Automation.csproj          | 16 ++++++++--------
 test/tools/TestService/TestService.csproj        |  2 +-
 test/tools/WebListener/WebListener.csproj        |  4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index ed45c403569..7a24b57b192 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -8,6 +8,6 @@
     "nextChannel": "6.0.1xx-rc1"
   },
   "internalfeed" : {
-    "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21430.44-shipping/nuget/v2"
+    "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21458.32-shipping/nuget/v2"
   }
 }
diff --git a/global.json b/global.json
index 0c2a82ceaf6..5f03d7d7c48 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.100-rc.1.21455.2"
+    "version": "6.0.100-rc.1.21458.32"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 67394beef83..05b7b4e7472 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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-rc.1.21430.11" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.1.21451.13" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 1aff829f1d4..df92bc5a746 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -32,8 +32,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-4.21430.4" />
-    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.1.21430.11" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.1.21430.11" />
+    <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>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 1d5a865f535..e30019fac81 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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-rc.1.21430.11" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-rc.1.21451.13" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index e03dbe4701a..4b8485ac58b 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <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-rc.1.21430.11" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rc.1.21430.11" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rc.1.21430.11" />
+    <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-preview1.21220.1" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.9.0-preview1.21220.1" />
@@ -30,7 +30,7 @@
     <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-rc.1.21430.11" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21451.13" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index c3fcff08ffc..56c0310e2a0 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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-rc.1.21430.11" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.1.21451.13" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 0f167c7ef35..2ebdabb9593 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <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-rc.1.21430.11" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rc.1.21430.11" />
-    <PackageReference Include="System.DirectoryServices" Version="6.0.0-rc.1.21430.11" />
+    <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.21430.11" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rc.1.21430.11" />
+    <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.21430.11" />
-    <PackageReference Include="System.Security.Permissions" Version="6.0.0-rc.1.21430.11" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21430.11" />
+    <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-preview.2" />
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index a44ac7810c6..d0d4649878f 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21430.11" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21451.13" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 4a0c0c38cba..f59d5bc8d12 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.1.21430.26" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21430.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.1.21452.15" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21451.13" />
   </ItemGroup>
 
   <ItemGroup>

From 1704ca68857688ced6d7fe2a3b2e8a14ec184d7d Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 14 Sep 2021 13:51:18 -0700
Subject: [PATCH 042/645] Add benchmark to test compiler performance (#16083)

---
 test/perf/benchmarks/Engine.Compiler.cs       |   78 +
 test/perf/benchmarks/Program.cs               |    2 +-
 test/perf/benchmarks/assets/compiler.test.ps1 | 2688 +++++++++++++++++
 test/perf/benchmarks/powershell-perf.csproj   |    3 +
 .../BenchmarkDotNet.Extensions.csproj         |    4 +-
 .../dotnet-tools/ResultsComparer/Program.cs   |    2 +-
 tools/UpdateDotnetRuntime.ps1                 |    1 +
 7 files changed, 2774 insertions(+), 4 deletions(-)
 create mode 100644 test/perf/benchmarks/Engine.Compiler.cs
 create mode 100644 test/perf/benchmarks/assets/compiler.test.ps1

diff --git a/test/perf/benchmarks/Engine.Compiler.cs b/test/perf/benchmarks/Engine.Compiler.cs
new file mode 100644
index 00000000000..10e0054a01c
--- /dev/null
+++ b/test/perf/benchmarks/Engine.Compiler.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#if NET6_0
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Management.Automation;
+using System.Management.Automation.Language;
+
+using BenchmarkDotNet.Attributes;
+using MicroBenchmarks;
+
+namespace Engine
+{
+    [BenchmarkCategory(Categories.Engine, Categories.Internal)]
+    public class Compiler
+    {
+        private static readonly Dictionary<string, ScriptBlockAst> s_scriptBlocksDict;
+        private static readonly List<string> s_functionNames;
+        private ScriptBlockAst _currentAst;
+
+        static Compiler()
+        {
+            string pattern = string.Format("{0}test{0}perf{0}benchmarks", Path.DirectorySeparatorChar);
+            string location = typeof(Compiler).Assembly.Location;
+            string testFilePath = null;
+
+            int start = location.IndexOf(pattern, StringComparison.Ordinal);
+            if (start > 0)
+            {
+                testFilePath = Path.Join(location.AsSpan(0, start + pattern.Length), "assets", "compiler.test.ps1");
+            }
+
+            var topScriptBlockAst = Parser.ParseFile(testFilePath, tokens: out _, errors: out _);
+            var allFunctions = topScriptBlockAst.FindAll(ast => ast is FunctionDefinitionAst, searchNestedScriptBlocks: false);
+
+            s_scriptBlocksDict = new Dictionary<string, ScriptBlockAst>(capacity: 16);
+            s_functionNames = new List<string>(capacity: 16);
+
+            foreach (FunctionDefinitionAst function in allFunctions)
+            {
+                s_functionNames.Add(function.Name);
+                s_scriptBlocksDict.Add(function.Name, function.Body);
+            }
+        }
+
+        [ParamsSource(nameof(FunctionName))]
+        public string FunctionsToCompile { get; set; }
+
+        public IEnumerable<string> FunctionName() => s_functionNames;
+
+        [GlobalSetup(Target = nameof(CompileFunction))]
+        public void GlobalSetup()
+        {
+            _currentAst = s_scriptBlocksDict[FunctionsToCompile];
+
+            // Run it once to get the C# code jitted.
+            // The first call to this takes relatively too long, which makes the BDN's heuristic incorrectly
+            // believe that there is no need to run many ops in each interation. However, the subsequent runs
+            // of this method is much faster than the first run, and this causes 'MinIterationTime' warnings
+            // to our benchmarks and make the benchmark results not reliable.
+            // Calling this method once in 'GlobalSetup' is a workaround. 
+            // See https://github.com/dotnet/BenchmarkDotNet/issues/837#issuecomment-828600157
+            CompileFunction();
+        }
+
+        [Benchmark]
+        public bool CompileFunction()
+        {
+            var compiledData = new CompiledScriptBlockData(_currentAst, isFilter: false);
+            return compiledData.Compile(true);
+        }
+    }
+}
+
+#endif
diff --git a/test/perf/benchmarks/Program.cs b/test/perf/benchmarks/Program.cs
index 2b3aafdb127..53f9a3ce95b 100644
--- a/test/perf/benchmarks/Program.cs
+++ b/test/perf/benchmarks/Program.cs
@@ -10,7 +10,7 @@
 
 namespace MicroBenchmarks
 {
-    public class Program
+    public sealed class Program
     {
         public static int Main(string[] args)
         {
diff --git a/test/perf/benchmarks/assets/compiler.test.ps1 b/test/perf/benchmarks/assets/compiler.test.ps1
new file mode 100644
index 00000000000..c7ca697f2cc
--- /dev/null
+++ b/test/perf/benchmarks/assets/compiler.test.ps1
@@ -0,0 +1,2688 @@
+## Copyright (c) Microsoft Corporation.
+## Licensed under the MIT License.
+
+function Get-EnvInformation
+{
+    $environment = @{'IsWindows' = [System.Environment]::OSVersion.Platform -eq [System.PlatformID]::Win32NT}
+    # PowerShell will likely not be built on pre-1709 nanoserver
+    if ('System.Management.Automation.Platform' -as [type]) {
+        $environment += @{'IsCoreCLR' = [System.Management.Automation.Platform]::IsCoreCLR}
+        $environment += @{'IsLinux' = [System.Management.Automation.Platform]::IsLinux}
+        $environment += @{'IsMacOS' = [System.Management.Automation.Platform]::IsMacOS}
+    } else {
+        $environment += @{'IsCoreCLR' = $false}
+        $environment += @{'IsLinux' = $false}
+        $environment += @{'IsMacOS' = $false}
+    }
+
+    if ($environment.IsWindows)
+    {
+        $environment += @{'IsAdmin' = (New-Object Security.Principal.WindowsPrincipal ([Security.Principal.WindowsIdentity]::GetCurrent())).IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)}
+        $environment += @{'nugetPackagesRoot' = "${env:USERPROFILE}\.nuget\packages", "${env:NUGET_PACKAGES}"}
+    }
+    else
+    {
+        $environment += @{'nugetPackagesRoot' = "${env:HOME}/.nuget/packages"}
+    }
+
+    if ($environment.IsMacOS) {
+        $environment += @{'UsingHomebrew' = [bool](Get-Command brew -ErrorAction ignore)}
+        $environment += @{'UsingMacports' = [bool](Get-Command port -ErrorAction ignore)}
+
+        $environment += @{
+            'OSArchitecture' = if ((uname -v) -match 'ARM64') { 'arm64' } else { 'x64' }
+        }
+
+        if (-not($environment.UsingHomebrew -or $environment.UsingMacports)) {
+            throw "Neither Homebrew nor MacPorts is installed on this system, visit https://brew.sh/ or https://www.macports.org/ to continue"
+        }
+    }
+
+    if ($environment.IsLinux) {
+        $LinuxInfo = Get-Content /etc/os-release -Raw | ConvertFrom-StringData
+        $lsb_release = Get-Command lsb_release -Type Application -ErrorAction Ignore | Select-Object -First 1
+        if ($lsb_release) {
+            $LinuxID = & $lsb_release -is
+        }
+        else {
+            $LinuxID = ""
+        }
+
+        $environment += @{'LinuxInfo' = $LinuxInfo}
+        $environment += @{'IsDebian' = $LinuxInfo.ID -match 'debian' -or $LinuxInfo.ID -match 'kali'}
+        $environment += @{'IsDebian9' = $environment.IsDebian -and $LinuxInfo.VERSION_ID -match '9'}
+        $environment += @{'IsDebian10' = $environment.IsDebian -and $LinuxInfo.VERSION_ID -match '10'}
+        $environment += @{'IsDebian11' = $environment.IsDebian -and $LinuxInfo.PRETTY_NAME -match 'bullseye'}
+        $environment += @{'IsUbuntu' = $LinuxInfo.ID -match 'ubuntu' -or $LinuxID -match 'Ubuntu'}
+        $environment += @{'IsUbuntu16' = $environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '16.04'}
+        $environment += @{'IsUbuntu18' = $environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '18.04'}
+        $environment += @{'IsUbuntu20' = $environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '20.04'}
+        $environment += @{'IsCentOS' = $LinuxInfo.ID -match 'centos' -and $LinuxInfo.VERSION_ID -match '7'}
+        $environment += @{'IsFedora' = $LinuxInfo.ID -match 'fedora' -and $LinuxInfo.VERSION_ID -ge 24}
+        $environment += @{'IsOpenSUSE' = $LinuxInfo.ID -match 'opensuse'}
+        $environment += @{'IsSLES' = $LinuxInfo.ID -match 'sles'}
+        $environment += @{'IsRedHat' = $LinuxInfo.ID -match 'rhel'}
+        $environment += @{'IsRedHat7' = $environment.IsRedHat -and $LinuxInfo.VERSION_ID -match '7' }
+        $environment += @{'IsOpenSUSE13' = $environment.IsOpenSUSE -and $LinuxInfo.VERSION_ID  -match '13'}
+        $environment += @{'IsOpenSUSE42.1' = $environment.IsOpenSUSE -and $LinuxInfo.VERSION_ID  -match '42.1'}
+        $environment += @{'IsDebianFamily' = $environment.IsDebian -or $environment.IsUbuntu}
+        $environment += @{'IsRedHatFamily' = $environment.IsCentOS -or $environment.IsFedora -or $environment.IsRedHat}
+        $environment += @{'IsSUSEFamily' = $environment.IsSLES -or $environment.IsOpenSUSE}
+        $environment += @{'IsAlpine' = $LinuxInfo.ID -match 'alpine'}
+
+        # Workaround for temporary LD_LIBRARY_PATH hack for Fedora 24
+        # https://github.com/PowerShell/PowerShell/issues/2511
+        if ($environment.IsFedora -and (Test-Path ENV:\LD_LIBRARY_PATH)) {
+            Remove-Item -Force ENV:\LD_LIBRARY_PATH
+            Get-ChildItem ENV:
+        }
+
+        if( -not(
+            $environment.IsDebian -or
+            $environment.IsUbuntu -or
+            $environment.IsRedHatFamily -or
+            $environment.IsSUSEFamily -or
+            $environment.IsAlpine)
+        ) {
+            if ($SkipLinuxDistroCheck) {
+                Write-Warning "The current OS : $($LinuxInfo.ID) is not supported for building PowerShell."
+            } else {
+                throw "The current OS : $($LinuxInfo.ID) is not supported for building PowerShell. Import this module with '-ArgumentList `$true' to bypass this check."
+            }
+        }
+    }
+
+    return [PSCustomObject] $environment
+}
+
+function Start-PSBuild {
+    [CmdletBinding(DefaultParameterSetName="Default")]
+    param(
+        # When specified this switch will stops running dev powershell
+        # to help avoid compilation error, because file are in use.
+        [switch]$StopDevPowerShell,
+
+        [switch]$Restore,
+        # Accept a path to the output directory
+        # When specified, --output <path> will be passed to dotnet
+        [string]$Output,
+        [switch]$ResGen,
+        [switch]$TypeGen,
+        [switch]$Clean,
+        [Parameter(ParameterSetName="Legacy")]
+        [switch]$PSModuleRestore,
+        [Parameter(ParameterSetName="Default")]
+        [switch]$NoPSModuleRestore,
+        [switch]$CI,
+        [switch]$ForMinimalSize,
+
+        # Skips the step where the pwsh that's been built is used to create a configuration
+        # Useful when changing parsing/compilation, since bugs there can mean we can't get past this step
+        [switch]$SkipExperimentalFeatureGeneration,
+
+        # this switch will re-build only System.Management.Automation.dll
+        # it's useful for development, to do a quick changes in the engine
+        [switch]$SMAOnly,
+
+        # These runtimes must match those in project.json
+        # We do not use ValidateScript since we want tab completion
+        # If this parameter is not provided it will get determined automatically.
+        [ValidateSet("alpine-x64",
+                     "fxdependent",
+                     "fxdependent-win-desktop",
+                     "linux-arm",
+                     "linux-arm64",
+                     "linux-x64",
+                     "osx-arm64",
+                     "osx-x64",
+                     "win-arm",
+                     "win-arm64",
+                     "win7-x64",
+                     "win7-x86")]
+        [string]$Runtime,
+
+        [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
+    )
+
+    if ($ReleaseTag -and $ReleaseTag -notmatch "^v\d+\.\d+\.\d+(-(preview|rc)(\.\d{1,2})?)?$") {
+        Write-Warning "Only preview or rc are supported for releasing pre-release version of PowerShell"
+    }
+
+    if ($PSCmdlet.ParameterSetName -eq "Default" -and !$NoPSModuleRestore)
+    {
+        $PSModuleRestore = $true
+    }
+
+    if ($Runtime -eq "linux-arm" -and $environment.IsLinux -and -not $environment.IsUbuntu) {
+        throw "Cross compiling for linux-arm is only supported on Ubuntu environment"
+    }
+
+    if ("win-arm","win-arm64" -contains $Runtime -and -not $environment.IsWindows) {
+        throw "Cross compiling for win-arm or win-arm64 is only supported on Windows environment"
+    }
+
+    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'"
+        }
+    }
+
+    function Stop-DevPowerShell {
+        Get-Process pwsh* |
+            Where-Object {
+                $_.Modules |
+                Where-Object {
+                    $_.FileName -eq (Resolve-Path $script:Options.Output).Path
+                }
+            } |
+        Stop-Process -Verbose
+    }
+
+    if ($Clean) {
+        Write-Log -message "Cleaning your working directory. You can also do it with 'git clean -fdX --exclude .vs/PowerShell/v16/Server/sqlite3'"
+        Push-Location $PSScriptRoot
+        try {
+            # Excluded sqlite3 folder is due to this Roslyn issue: https://github.com/dotnet/roslyn/issues/23060
+            # Excluded src/Modules/nuget.config as this is required for release build.
+            # Excluded nuget.config as this is required for release build.
+            git clean -fdX --exclude .vs/PowerShell/v16/Server/sqlite3 --exclude src/Modules/nuget.config  --exclude nuget.config
+        } finally {
+            Pop-Location
+        }
+    }
+
+    # Add .NET CLI tools to PATH
+    Find-Dotnet
+
+    # Verify we have git in place to do the build, and abort if the precheck failed
+    $precheck = precheck 'git' "Build dependency 'git' not found in PATH. See <URL: https://docs.github.com/en/github/getting-started-with-github/set-up-git#setting-up-git >"
+    if (-not $precheck) {
+        return
+    }
+
+    # Verify we have .NET SDK in place to do the build, and abort if the precheck failed
+    $precheck = precheck 'dotnet' "Build dependency 'dotnet' not found in PATH. Run Start-PSBootstrap. Also see <URL: https://dotnet.github.io/getting-started/ >"
+    if (-not $precheck) {
+        return
+    }
+
+    # Verify if the dotnet in-use is the required version
+    $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.
+
+Installed version: $dotnetCLIInstalledVersion
+Required version: $dotnetCLIRequiredVersion
+
+Fix steps:
+
+1. Remove the installed version from:
+    - on windows '`$env:LOCALAPPDATA\Microsoft\dotnet'
+    - on macOS and linux '`$env:HOME/.dotnet'
+2. Run Start-PSBootstrap or Install-Dotnet
+3. Start-PSBuild -Clean
+`n
+"@
+        return
+    }
+
+    # set output options
+    $OptionsArguments = @{
+        CrossGen=$CrossGen
+        Output=$Output
+        Runtime=$Runtime
+        Configuration=$Configuration
+        Verbose=$true
+        SMAOnly=[bool]$SMAOnly
+        PSModuleRestore=$PSModuleRestore
+        ForMinimalSize=$ForMinimalSize
+    }
+    $script:Options = New-PSOptions @OptionsArguments
+
+    if ($StopDevPowerShell) {
+        Stop-DevPowerShell
+    }
+
+    # setup arguments
+    # adding ErrorOnDuplicatePublishOutputFiles=false due to .NET SDk issue: https://github.com/dotnet/sdk/issues/15748
+    # removing --no-restore due to .NET SDK issue: https://github.com/dotnet/sdk/issues/18999
+    # $Arguments = @("publish","--no-restore","/property:GenerateFullPaths=true", "/property:ErrorOnDuplicatePublishOutputFiles=false")
+    $Arguments = @("publish","/property:GenerateFullPaths=true", "/property:ErrorOnDuplicatePublishOutputFiles=false")
+    if ($Output -or $SMAOnly) {
+        $Arguments += "--output", (Split-Path $Options.Output)
+    }
+
+    # 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"
+    }
+    else {
+        $Arguments += "--self-contained"
+    }
+
+    if ($Options.Runtime -like 'win*' -or ($Options.Runtime -like 'fxdependent*' -and $environment.IsWindows)) {
+        $Arguments += "/property:IsWindows=true"
+    }
+    else {
+        $Arguments += "/property:IsWindows=false"
+    }
+
+    # Framework Dependent builds do not support ReadyToRun as it needs a specific runtime to optimize for.
+    # The property is set in Powershell.Common.props file.
+    # We override the property through the build command line.
+    if($Options.Runtime -like 'fxdependent*' -or $ForMinimalSize) {
+        $Arguments += "/property:PublishReadyToRun=false"
+    }
+
+    $Arguments += "--configuration", $Options.Configuration
+    $Arguments += "--framework", $Options.Framework
+
+    if ($Detailed.IsPresent)
+    {
+        $Arguments += '--verbosity', 'd'
+    }
+
+    if (-not $SMAOnly -and $Options.Runtime -notlike 'fxdependent*') {
+        # libraries should not have runtime
+        $Arguments += "--runtime", $Options.Runtime
+    }
+
+    if ($ReleaseTag) {
+        $ReleaseTagToUse = $ReleaseTag -Replace '^v'
+        $Arguments += "/property:ReleaseTag=$ReleaseTagToUse"
+    }
+
+    if ($SkipRoslynAnalyzers) {
+        $Arguments += "/property:RunAnalyzersDuringBuild=false"
+    }
+
+    # handle Restore
+    Restore-PSPackage -Options $Options -Force:$Restore -InteractiveAuth:$InteractiveAuth
+
+    # handle ResGen
+    # Heuristic to run ResGen on the fresh machine
+    if ($ResGen -or -not (Test-Path "$PSScriptRoot/src/Microsoft.PowerShell.ConsoleHost/gen")) {
+        Write-Log -message "Run ResGen (generating C# bindings for resx files)"
+        Start-ResGen
+    }
+
+    # Handle TypeGen
+    # .inc file name must be different for Windows and Linux to allow build on Windows and WSL.
+    $incFileName = "powershell_$($Options.Runtime).inc"
+    if ($TypeGen -or -not (Test-Path "$PSScriptRoot/src/TypeCatalogGen/$incFileName")) {
+        Write-Log -message "Run TypeGen (generating CorePsTypeCatalog.cs)"
+        Start-TypeGen -IncFileName $incFileName
+    }
+
+    # Get the folder path where pwsh.exe is located.
+    if ((Split-Path $Options.Output -Leaf) -like "pwsh*") {
+        $publishPath = Split-Path $Options.Output -Parent
+    }
+    else {
+        $publishPath = $Options.Output
+    }
+
+    try {
+        # Relative paths do not work well if cwd is not changed to project
+        Push-Location $Options.Top
+
+        if ($Options.Runtime -notlike 'fxdependent*') {
+            $sdkToUse = 'Microsoft.NET.Sdk'
+            if ($Options.Runtime -like 'win7-*' -and !$ForMinimalSize) {
+                ## WPF/WinForm and the PowerShell GraphicalHost assemblies are included
+                ## when 'Microsoft.NET.Sdk.WindowsDesktop' is used.
+                $sdkToUse = 'Microsoft.NET.Sdk.WindowsDesktop'
+            }
+
+            $Arguments += "/property:SDKToUse=$sdkToUse"
+
+            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
+
+            if ($Options.Runtime -eq 'fxdependent') {
+                $Arguments += "/property:SDKToUse=Microsoft.NET.Sdk"
+            } elseif ($Options.Runtime -eq 'fxdependent-win-desktop') {
+                $Arguments += "/property:SDKToUse=Microsoft.NET.Sdk.WindowsDesktop"
+            }
+
+            Write-Log -message "Run dotnet $Arguments from $PWD"
+            Start-NativeExecution { dotnet $Arguments }
+            Write-Log -message "PowerShell output: $($Options.Output)"
+
+            try {
+                Push-Location $globalToolSrcFolder
+                $Arguments += "--output", $publishPath
+                Write-Log -message "Run dotnet $Arguments from $PWD to build global tool entry point"
+                Start-NativeExecution { dotnet $Arguments }
+            }
+            finally {
+                Pop-Location
+            }
+        }
+    } finally {
+        Pop-Location
+    }
+
+    # No extra post-building task will run if '-SMAOnly' is specified, because its purpose is for a quick update of S.M.A.dll after full build.
+    if ($SMAOnly) {
+        return
+    }
+
+    # publish reference assemblies
+    try {
+        Push-Location "$PSScriptRoot/src/TypeCatalogGen"
+        $refAssemblies = Get-Content -Path $incFileName | Where-Object { $_ -like "*microsoft.netcore.app*" } | ForEach-Object { $_.TrimEnd(';') }
+        $refDestFolder = Join-Path -Path $publishPath -ChildPath "ref"
+
+        if (Test-Path $refDestFolder -PathType Container) {
+            Remove-Item $refDestFolder -Force -Recurse -ErrorAction Stop
+        }
+        New-Item -Path $refDestFolder -ItemType Directory -Force -ErrorAction Stop > $null
+        Copy-Item -Path $refAssemblies -Destination $refDestFolder -Force -ErrorAction Stop
+    } finally {
+        Pop-Location
+    }
+
+    if ($ReleaseTag) {
+        $psVersion = $ReleaseTag
+    }
+    else {
+        $psVersion = git --git-dir="$PSScriptRoot/.git" describe
+    }
+
+    if ($environment.IsLinux) {
+        if ($environment.IsRedHatFamily -or $environment.IsDebian) {
+            # Symbolic links added here do NOT affect packaging as we do not build on Debian.
+            # add two symbolic links to system shared libraries that libmi.so is dependent on to handle
+            # platform specific changes. This is the only set of platforms needed for this currently
+            # as Ubuntu has these specific library files in the platform and macOS builds for itself
+            # against the correct versions.
+
+            if ($environment.IsDebian10 -or $environment.IsDebian11){
+                $sslTarget = "/usr/lib/x86_64-linux-gnu/libssl.so.1.1"
+                $cryptoTarget = "/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1"
+            }
+            elseif ($environment.IsDebian9){
+                # NOTE: Debian 8 doesn't need these symlinks
+                $sslTarget = "/usr/lib/x86_64-linux-gnu/libssl.so.1.0.2"
+                $cryptoTarget = "/usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.2"
+            }
+            else { #IsRedHatFamily
+                $sslTarget = "/lib64/libssl.so.10"
+                $cryptoTarget = "/lib64/libcrypto.so.10"
+            }
+
+            if ( ! (Test-Path "$publishPath/libssl.so.1.0.0")) {
+                $null = New-Item -Force -ItemType SymbolicLink -Target $sslTarget -Path "$publishPath/libssl.so.1.0.0" -ErrorAction Stop
+            }
+            if ( ! (Test-Path "$publishPath/libcrypto.so.1.0.0")) {
+                $null = New-Item -Force -ItemType SymbolicLink -Target $cryptoTarget -Path "$publishPath/libcrypto.so.1.0.0" -ErrorAction Stop
+            }
+        }
+    }
+
+    # download modules from powershell gallery.
+    #   - PowerShellGet, PackageManagement, Microsoft.PowerShell.Archive
+    if ($PSModuleRestore) {
+        Restore-PSModuleToBuild -PublishPath $publishPath
+    }
+
+    # publish powershell.config.json
+    $config = @{}
+    if ($environment.IsWindows) {
+        $config = @{ "Microsoft.PowerShell:ExecutionPolicy" = "RemoteSigned";
+                     "WindowsPowerShellCompatibilityModuleDenyList" = @("PSScheduledJob","BestPractices","UpdateServices") }
+    }
+
+    # When building preview, we want the configuration to enable all experiemental features by default
+    # ARM is cross compiled, so we can't run pwsh to enumerate Experimental Features
+    if (-not $SkipExperimentalFeatureGeneration -and
+        (Test-IsPreview $psVersion) -and
+        -not (Test-IsReleaseCandidate $psVersion) -and
+        -not $Runtime.Contains("arm") -and
+        -not ($Runtime -like 'fxdependent*')) {
+
+        $json = & $publishPath\pwsh -noprofile -command {
+            # Special case for DSC code in PS;
+            # this experimental feature requires new DSC module that is not inbox,
+            # so we don't want default DSC use case be broken
+            [System.Collections.ArrayList] $expFeatures = Get-ExperimentalFeature | Where-Object Name -NE PS7DscSupport | ForEach-Object -MemberName Name
+
+            $expFeatures | Out-String | Write-Verbose -Verbose
+
+            # Make sure ExperimentalFeatures from modules in PSHome are added
+            # https://github.com/PowerShell/PowerShell/issues/10550
+            $ExperimentalFeaturesFromGalleryModulesInPSHome = @()
+            $ExperimentalFeaturesFromGalleryModulesInPSHome | ForEach-Object {
+                if (!$expFeatures.Contains($_)) {
+                    $null = $expFeatures.Add($_)
+                }
+            }
+
+            ConvertTo-Json $expFeatures
+        }
+
+        $config += @{ ExperimentalFeatures = ([string[]] ($json | ConvertFrom-Json)) }
+    }
+
+    if ($config.Count -gt 0) {
+        $configPublishPath = Join-Path -Path $publishPath -ChildPath "powershell.config.json"
+        Set-Content -Path $configPublishPath -Value ($config | ConvertTo-Json) -Force -ErrorAction Stop
+    }
+
+    # Restore the Pester module
+    if ($CI) {
+        Restore-PSPester -Destination (Join-Path $publishPath "Modules")
+    }
+}
+
+function New-PSOptions {
+    [CmdletBinding()]
+    param(
+        [ValidateSet("Debug", "Release", "CodeCoverage", '')]
+        [string]$Configuration,
+
+        [ValidateSet("net6.0")]
+        [string]$Framework = "net6.0",
+
+        # These are duplicated from Start-PSBuild
+        # We do not use ValidateScript since we want tab completion
+        [ValidateSet("",
+                     "alpine-x64",
+                     "fxdependent",
+                     "fxdependent-win-desktop",
+                     "linux-arm",
+                     "linux-arm64",
+                     "linux-x64",
+                     "osx-arm64",
+                     "osx-x64",
+                     "win-arm",
+                     "win-arm64",
+                     "win7-x64",
+                     "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
+        # of the output executable will be assigned to the Output property
+        [string]$Output,
+
+        [switch]$SMAOnly,
+
+        [switch]$PSModuleRestore,
+
+        [switch]$ForMinimalSize
+    )
+
+    # Add .NET CLI tools to PATH
+    Find-Dotnet
+
+    if (-not $Configuration) {
+        $Configuration = 'Debug'
+    }
+
+    Write-Verbose "Using configuration '$Configuration'"
+    Write-Verbose "Using framework '$Framework'"
+
+    if (-not $Runtime) {
+        if ($environment.IsLinux) {
+            $Runtime = "linux-x64"
+        } elseif ($environment.IsMacOS) {
+            if ($PSVersionTable.OS.Contains('ARM64')) {
+                $Runtime = "osx-arm64"
+            }
+            else {
+                $Runtime = "osx-x64"
+            }
+        } else {
+            $RID = dotnet --info | ForEach-Object {
+                if ($_ -match "RID") {
+                    $_ -split "\s+" | Select-Object -Last 1
+                }
+            }
+
+            # We plan to release packages targeting win7-x64 and win7-x86 RIDs,
+            # which supports all supported windows platforms.
+            # So we, will change the RID to win7-<arch>
+            $Runtime = $RID -replace "win\d+", "win7"
+        }
+
+        if (-not $Runtime) {
+            Throw "Could not determine Runtime Identifier, please update dotnet"
+        } else {
+            Write-Verbose "Using runtime '$Runtime'"
+        }
+    }
+
+    $PowerShellDir = if ($Runtime -like 'win*' -or ($Runtime -like 'fxdependent*' -and $environment.IsWindows)) {
+        "powershell-win-core"
+    } else {
+        "powershell-unix"
+    }
+
+    $Top = [IO.Path]::Combine($PSScriptRoot, "src", $PowerShellDir)
+    Write-Verbose "Top project directory is $Top"
+
+    $Executable = if ($Runtime -like 'fxdependent*') {
+        "pwsh.dll"
+    } elseif ($environment.IsLinux -or $environment.IsMacOS) {
+        "pwsh"
+    } elseif ($environment.IsWindows) {
+        "pwsh.exe"
+    }
+
+    # Build the Output path
+    if (!$Output) {
+        if ($Runtime -like 'fxdependent*') {
+            $Output = [IO.Path]::Combine($Top, "bin", $Configuration, $Framework, "publish", $Executable)
+        } else {
+            $Output = [IO.Path]::Combine($Top, "bin", $Configuration, $Framework, $Runtime, "publish", $Executable)
+        }
+    } else {
+        $Output = [IO.Path]::Combine($Output, $Executable)
+    }
+
+    if ($SMAOnly)
+    {
+        $Top = [IO.Path]::Combine($PSScriptRoot, "src", "System.Management.Automation")
+    }
+
+    $RootInfo = @{RepoPath = $PSScriptRoot}
+
+    # the valid root is the root of the filesystem and the folder PowerShell
+    $RootInfo['ValidPath'] = Join-Path -Path ([system.io.path]::GetPathRoot($RootInfo.RepoPath)) -ChildPath 'PowerShell'
+
+    if($RootInfo.RepoPath -ne $RootInfo.ValidPath)
+    {
+        $RootInfo['Warning'] = "Please ensure your repo is at the root of the file system and named 'PowerShell' (example: '$($RootInfo.ValidPath)'), when building and packaging for release!"
+        $RootInfo['IsValid'] = $false
+    }
+    else
+    {
+        $RootInfo['IsValid'] = $true
+    }
+
+    return New-PSOptionsObject `
+                -RootInfo ([PSCustomObject]$RootInfo) `
+                -Top $Top `
+                -Runtime $Runtime `
+                -Crossgen $Crossgen.IsPresent `
+                -Configuration $Configuration `
+                -PSModuleRestore $PSModuleRestore.IsPresent `
+                -Framework $Framework `
+                -Output $Output `
+                -ForMinimalSize $ForMinimalSize
+}
+
+function Start-PSPester {
+    [CmdletBinding(DefaultParameterSetName='default')]
+    param(
+        [Parameter(Position=0)]
+        [string[]]$Path = @("$PSScriptRoot/test/powershell"),
+        [string]$OutputFormat = "NUnitXml",
+        [string]$OutputFile = "pester-tests.xml",
+        [string[]]$ExcludeTag = 'Slow',
+        [string[]]$Tag = @("CI","Feature"),
+        [switch]$ThrowOnFailure,
+        [string]$BinDir = (Split-Path (Get-PSOptions -DefaultToNew).Output),
+        [string]$powershell = (Join-Path $BinDir 'pwsh'),
+        [string]$Pester = ([IO.Path]::Combine($BinDir, "Modules", "Pester")),
+        [Parameter(ParameterSetName='Unelevate',Mandatory=$true)]
+        [switch]$Unelevate,
+        [switch]$Quiet,
+        [switch]$Terse,
+        [Parameter(ParameterSetName='PassThru',Mandatory=$true)]
+        [switch]$PassThru,
+        [Parameter(ParameterSetName='PassThru',HelpMessage='Run commands on Linux with sudo.')]
+        [switch]$Sudo,
+        [switch]$IncludeFailingTest,
+        [switch]$IncludeCommonTests,
+        [string]$ExperimentalFeatureName,
+        [Parameter(HelpMessage='Title to publish the results as.')]
+        [string]$Title = 'PowerShell 7 Tests',
+        [Parameter(ParameterSetName='Wait', Mandatory=$true,
+            HelpMessage='Wait for the debugger to attach to PowerShell before Pester starts.  Debug builds only!')]
+        [switch]$Wait,
+        [switch]$SkipTestToolBuild
+    )
+
+    if (-not (Get-Module -ListAvailable -Name $Pester -ErrorAction SilentlyContinue | Where-Object { $_.Version -ge "4.2" } ))
+    {
+        Restore-PSPester
+    }
+
+    if ($IncludeFailingTest.IsPresent)
+    {
+        $Path += "$PSScriptRoot/tools/failingTests"
+    }
+
+    if($IncludeCommonTests.IsPresent)
+    {
+        $path = += "$PSScriptRoot/test/common"
+    }
+
+    # we need to do few checks and if user didn't provide $ExcludeTag explicitly, we should alternate the default
+    if ($Unelevate)
+    {
+        if (-not $environment.IsWindows)
+        {
+            throw '-Unelevate is currently not supported on non-Windows platforms'
+        }
+
+        if (-not $environment.IsAdmin)
+        {
+            throw '-Unelevate cannot be applied because the current user is not Administrator'
+        }
+
+        if (-not $PSBoundParameters.ContainsKey('ExcludeTag'))
+        {
+            $ExcludeTag += 'RequireAdminOnWindows'
+        }
+    }
+    elseif ($environment.IsWindows -and (-not $environment.IsAdmin))
+    {
+        if (-not $PSBoundParameters.ContainsKey('ExcludeTag'))
+        {
+            $ExcludeTag += 'RequireAdminOnWindows'
+        }
+    }
+    elseif (-not $environment.IsWindows -and (-not $Sudo.IsPresent))
+    {
+        if (-not $PSBoundParameters.ContainsKey('ExcludeTag'))
+        {
+            $ExcludeTag += 'RequireSudoOnUnix'
+        }
+    }
+    elseif (-not $environment.IsWindows -and $Sudo.IsPresent)
+    {
+        if (-not $PSBoundParameters.ContainsKey('Tag'))
+        {
+            $Tag = 'RequireSudoOnUnix'
+        }
+    }
+
+    Write-Verbose "Running pester tests at '$path' with tag '$($Tag -join ''', ''')' and ExcludeTag '$($ExcludeTag -join ''', ''')'" -Verbose
+    if(!$SkipTestToolBuild.IsPresent)
+    {
+        $publishArgs = @{ }
+        # if we are building for Alpine, we must include the runtime as linux-x64
+        # will not build runnable test tools
+        if ( $environment.IsLinux -and $environment.IsAlpine ) {
+            $publishArgs['runtime'] = 'alpine-x64'
+        }
+        Publish-PSTestTools @publishArgs | ForEach-Object {Write-Host $_}
+    }
+
+    # All concatenated commands/arguments are suffixed with the delimiter (space)
+
+    # Disable telemetry for all startups of pwsh in tests
+    $command = "`$env:POWERSHELL_TELEMETRY_OPTOUT = 'yes';"
+    if ($Terse)
+    {
+        $command += "`$ProgressPreference = 'silentlyContinue'; "
+    }
+
+    # Autoload (in subprocess) temporary modules used in our tests
+    $newPathFragment = $TestModulePath + $TestModulePathSeparator
+    $command += '$env:PSModulePath = '+"'$newPathFragment'" + '+$env:PSModulePath;'
+
+    # Windows needs the execution policy adjusted
+    if ($environment.IsWindows) {
+        $command += "Set-ExecutionPolicy -Scope Process Unrestricted; "
+    }
+
+    $command += "Import-Module '$Pester'; "
+
+    if ($Unelevate)
+    {
+        if ($environment.IsWindows) {
+            $outputBufferFilePath = [System.IO.Path]::GetTempFileName()
+        }
+        else {
+            # Azure DevOps agents do not have Temp folder setup on Ubuntu 20.04, hence using HOME directory
+            $outputBufferFilePath = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
+        }
+    }
+
+    $command += "Invoke-Pester "
+
+    $command += "-OutputFormat ${OutputFormat} -OutputFile ${OutputFile} "
+    if ($ExcludeTag -and ($ExcludeTag -ne "")) {
+        $command += "-ExcludeTag @('" + (${ExcludeTag} -join "','") + "') "
+    }
+    if ($Tag) {
+        $command += "-Tag @('" + (${Tag} -join "','") + "') "
+    }
+    # sometimes we need to eliminate Pester output, especially when we're
+    # doing a daily build as the log file is too large
+    if ( $Quiet ) {
+        $command += "-Quiet "
+    }
+    if ( $PassThru ) {
+        $command += "-PassThru "
+    }
+
+    $command += "'" + ($Path -join "','") + "'"
+    if ($Unelevate)
+    {
+        $command += " *> $outputBufferFilePath; '__UNELEVATED_TESTS_THE_END__' >> $outputBufferFilePath"
+    }
+
+    Write-Verbose $command
+
+    $script:nonewline = $true
+    $script:inerror = $false
+    function Write-Terse([string] $line)
+    {
+        $trimmedline = $line.Trim()
+        if ($trimmedline.StartsWith("[+]")) {
+            Write-Host "+" -NoNewline -ForegroundColor Green
+            $script:nonewline = $true
+            $script:inerror = $false
+        }
+        elseif ($trimmedline.StartsWith("[?]")) {
+            Write-Host "?" -NoNewline -ForegroundColor Cyan
+            $script:nonewline = $true
+            $script:inerror = $false
+        }
+        elseif ($trimmedline.StartsWith("[!]")) {
+            Write-Host "!" -NoNewline -ForegroundColor Gray
+            $script:nonewline = $true
+            $script:inerror = $false
+        }
+        elseif ($trimmedline.StartsWith("Executing script ")) {
+            # Skip lines where Pester reports that is executing a test script
+            return
+        }
+        elseif ($trimmedline -match "^\d+(\.\d+)?m?s$") {
+            # Skip the time elapse like '12ms', '1ms', '1.2s' and '12.53s'
+            return
+        }
+        else {
+            if ($script:nonewline) {
+                Write-Host "`n" -NoNewline
+            }
+            if ($trimmedline.StartsWith("[-]") -or $script:inerror) {
+                Write-Host $line -ForegroundColor Red
+                $script:inerror = $true
+            }
+            elseif ($trimmedline.StartsWith("VERBOSE:")) {
+                Write-Host $line -ForegroundColor Yellow
+                $script:inerror = $false
+            }
+            elseif ($trimmedline.StartsWith("Describing") -or $trimmedline.StartsWith("Context")) {
+                Write-Host $line -ForegroundColor Magenta
+                $script:inerror = $false
+            }
+            else {
+                Write-Host $line -ForegroundColor Gray
+            }
+            $script:nonewline = $false
+        }
+    }
+
+    $PSFlags = @("-noprofile")
+    if (-not [string]::IsNullOrEmpty($ExperimentalFeatureName)) {
+
+        if ($environment.IsWindows) {
+            $configFile = [System.IO.Path]::GetTempFileName()
+        }
+        else {
+            $configFile = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
+        }
+
+        $configFile = [System.IO.Path]::ChangeExtension($configFile, ".json")
+
+        ## Create the config.json file to enable the given experimental feature.
+        ## On Windows, we need to have 'RemoteSigned' declared for ExecutionPolicy because the ExecutionPolicy is 'Restricted' by default.
+        ## On Unix, ExecutionPolicy is not supported, so we don't need to declare it.
+        if ($environment.IsWindows) {
+            $content = @"
+{
+    "Microsoft.PowerShell:ExecutionPolicy":"RemoteSigned",
+    "ExperimentalFeatures": [
+        "$ExperimentalFeatureName"
+    ]
+}
+"@
+        } else {
+            $content = @"
+{
+    "ExperimentalFeatures": [
+        "$ExperimentalFeatureName"
+    ]
+}
+"@
+        }
+
+        Set-Content -Path $configFile -Value $content -Encoding Ascii -Force
+        $PSFlags = @("-settings", $configFile, "-noprofile")
+    }
+
+	# -Wait is only available on Debug builds
+	# It is used to allow the debugger to attach before PowerShell
+	# runs pester in this case
+    if($Wait.IsPresent){
+        $PSFlags += '-wait'
+    }
+
+    # To ensure proper testing, the module path must not be inherited by the spawned process
+    try {
+        $originalModulePath = $env:PSModulePath
+        $originalTelemetry = $env:POWERSHELL_TELEMETRY_OPTOUT
+        $env:POWERSHELL_TELEMETRY_OPTOUT = 'yes'
+        if ($Unelevate)
+        {
+            Start-UnelevatedProcess -process $powershell -arguments ($PSFlags + "-c $Command")
+            $currentLines = 0
+            while ($true)
+            {
+                $lines = Get-Content $outputBufferFilePath | Select-Object -Skip $currentLines
+                if ($Terse)
+                {
+                    foreach ($line in $lines)
+                    {
+                        Write-Terse -line $line
+                    }
+                }
+                else
+                {
+                    $lines | Write-Host
+                }
+                if ($lines | Where-Object { $_ -eq '__UNELEVATED_TESTS_THE_END__'})
+                {
+                    break
+                }
+
+                $count = ($lines | Measure-Object).Count
+                if ($count -eq 0)
+                {
+                    Start-Sleep -Seconds 1
+                }
+                else
+                {
+                    $currentLines += $count
+                }
+            }
+        }
+        else
+        {
+            if ($PassThru.IsPresent)
+            {
+                if ($environment.IsWindows) {
+                    $passThruFile = [System.IO.Path]::GetTempFileName()
+                }
+                else {
+                    $passThruFile = Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName())
+                }
+
+                try
+                {
+                    $command += "| Export-Clixml -Path '$passThruFile' -Force"
+
+                    $passThruCommand = { & $powershell $PSFlags -c $command }
+                    if ($Sudo.IsPresent) {
+                        # -E says to preserve the environment
+                        $passThruCommand =  { & sudo -E $powershell $PSFlags -c $command }
+                    }
+
+                    $writeCommand = { Write-Host $_ }
+                    if ($Terse)
+                    {
+                        $writeCommand = { Write-Terse $_ }
+                    }
+
+                    Start-NativeExecution -sb $passThruCommand | ForEach-Object $writeCommand
+                    Import-Clixml -Path $passThruFile | Where-Object {$_.TotalCount -is [Int32]}
+                }
+                finally
+                {
+                    Remove-Item $passThruFile -ErrorAction SilentlyContinue -Force
+                }
+            }
+            else
+            {
+                if ($Terse)
+                {
+                    Start-NativeExecution -sb {& $powershell $PSFlags -c $command} | ForEach-Object { Write-Terse -line $_ }
+                }
+                else
+                {
+                    Start-NativeExecution -sb {& $powershell $PSFlags -c $command}
+                }
+            }
+        }
+    } finally {
+        $env:PSModulePath = $originalModulePath
+        $env:POWERSHELL_TELEMETRY_OPTOUT = $originalTelemetry
+        if ($Unelevate)
+        {
+            Remove-Item $outputBufferFilePath
+        }
+    }
+
+    Publish-TestResults -Path $OutputFile -Title $Title
+
+    if($ThrowOnFailure)
+    {
+        Test-PSPesterResults -TestResultsFile $OutputFile
+    }
+}
+
+function Install-Dotnet {
+    [CmdletBinding()]
+    param(
+        [string]$Channel = $dotnetCLIChannel,
+        [string]$Version = $dotnetCLIRequiredVersion,
+        [string]$Quality = $dotnetCLIQuality,
+        [switch]$NoSudo,
+        [string]$InstallDir,
+        [string]$AzureFeed,
+        [string]$FeedCredential
+    )
+
+    # 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" }
+
+    $installObtainUrl = "https://dotnet.microsoft.com/download/dotnet-core/scripts/v1"
+    $uninstallObtainUrl = "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain"
+
+    # Install for Linux and OS X
+    if ($environment.IsLinux -or $environment.IsMacOS) {
+        $wget = Get-Command -Name wget -CommandType Application -TotalCount 1 -ErrorAction Stop
+
+        # Uninstall all previous dotnet packages
+        $uninstallScript = if ($environment.IsLinux -and $environment.IsUbuntu) {
+            "dotnet-uninstall-debian-packages.sh"
+        } elseif ($environment.IsMacOS) {
+            "dotnet-uninstall-pkgs.sh"
+        }
+
+        if ($uninstallScript) {
+            Start-NativeExecution {
+                & $wget $uninstallObtainUrl/uninstall/$uninstallScript
+                Invoke-Expression "$sudo bash ./$uninstallScript"
+            }
+        } else {
+            Write-Warning "This script only removes prior versions of dotnet for Ubuntu and OS X"
+        }
+
+        # Install new dotnet 1.1.0 preview packages
+        $installScript = "dotnet-install.sh"
+        Start-NativeExecution {
+            Write-Verbose -Message "downloading install script from $installObtainUrl/$installScript ..." -Verbose
+            & $wget $installObtainUrl/$installScript
+
+            if ((Get-ChildItem "./$installScript").Length -eq 0) {
+                throw "./$installScript was 0 length"
+            }
+
+            if ($Version) {
+                $bashArgs = @("./$installScript", '-v', $Version, '-q', $Quality)
+            }
+            elseif ($Channel) {
+                $bashArgs = @("./$installScript", '-c', $Channel, '-q', $Quality)
+            }
+
+            if ($InstallDir) {
+                $bashArgs += @('-i', $InstallDir)
+            }
+
+            if ($AzureFeed) {
+                $bashArgs += @('-AzureFeed', $AzureFeed, '-FeedCredential', $FeedCredential)
+            }
+
+            bash @bashArgs
+        }
+    } elseif ($environment.IsWindows) {
+        Remove-Item -ErrorAction SilentlyContinue -Recurse -Force ~\AppData\Local\Microsoft\dotnet
+        $installScript = "dotnet-install.ps1"
+        Invoke-WebRequest -Uri $installObtainUrl/$installScript -OutFile $installScript
+        if (-not $environment.IsCoreCLR) {
+            $installArgs = @{
+                Quality = $Quality
+            }
+
+            if ($Version) {
+                $installArgs += @{ Version = $Version }
+            } elseif ($Channel) {
+                $installArgs += @{ Channel = $Channel }
+            }
+
+            if ($InstallDir) {
+                $installArgs += @{ InstallDir = $InstallDir }
+            }
+
+            if ($AzureFeed) {
+                $installArgs += @{
+                    AzureFeed       = $AzureFeed
+                    $FeedCredential = $FeedCredential
+                }
+            }
+
+            & ./$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
+            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
+            }
+        }
+    }
+}
+
+function Start-PSBootstrap {
+    [CmdletBinding()]
+    param(
+        [string]$Channel = $dotnetCLIChannel,
+        # we currently pin dotnet-cli version, and will
+        # update it when more stable version comes out.
+        [string]$Version = $dotnetCLIRequiredVersion,
+        [switch]$Package,
+        [switch]$NoSudo,
+        [switch]$BuildLinuxArm,
+        [switch]$Force
+    )
+
+    Write-Log -message "Installing PowerShell build dependencies"
+
+    Push-Location $PSScriptRoot/tools
+
+    try {
+        if ($environment.IsLinux -or $environment.IsMacOS) {
+            # 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" }
+
+            if ($BuildLinuxArm -and $environment.IsLinux -and -not $environment.IsUbuntu) {
+                Write-Error "Cross compiling for linux-arm is only supported on Ubuntu environment"
+                return
+            }
+
+            # Install ours and .NET's dependencies
+            $Deps = @()
+            if ($environment.IsLinux -and $environment.IsUbuntu) {
+                # Build tools
+                $Deps += "curl", "g++", "cmake", "make"
+
+                if ($BuildLinuxArm) {
+                    $Deps += "gcc-arm-linux-gnueabihf", "g++-arm-linux-gnueabihf"
+                }
+
+                # .NET Core required runtime libraries
+                $Deps += "libunwind8"
+                if ($environment.IsUbuntu16) { $Deps += "libicu55" }
+                elseif ($environment.IsUbuntu18) { $Deps += "libicu60"}
+
+                # Packaging tools
+                if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev" }
+
+                # Install dependencies
+                # change the fontend from apt-get to noninteractive
+                $originalDebianFrontEnd=$env:DEBIAN_FRONTEND
+                $env:DEBIAN_FRONTEND='noninteractive'
+                try {
+                    Start-NativeExecution {
+                        Invoke-Expression "$sudo apt-get update -qq"
+                        Invoke-Expression "$sudo apt-get install -y -qq $Deps"
+                    }
+                }
+                finally {
+                    # change the apt frontend back to the original
+                    $env:DEBIAN_FRONTEND=$originalDebianFrontEnd
+                }
+            } elseif ($environment.IsLinux -and $environment.IsRedHatFamily) {
+                # Build tools
+                $Deps += "which", "curl", "gcc-c++", "cmake", "make"
+
+                # .NET Core required runtime libraries
+                $Deps += "libicu", "libunwind"
+
+                # Packaging tools
+                if ($Package) { $Deps += "ruby-devel", "rpm-build", "groff", 'libffi-devel' }
+
+                $PackageManager = Get-RedHatPackageManager
+
+                $baseCommand = "$sudo $PackageManager"
+
+                # On OpenSUSE 13.2 container, sudo does not exist, so don't use it if not needed
+                if($NoSudo)
+                {
+                    $baseCommand = $PackageManager
+                }
+
+                # Install dependencies
+                Start-NativeExecution {
+                    Invoke-Expression "$baseCommand $Deps"
+                }
+            } elseif ($environment.IsLinux -and $environment.IsSUSEFamily) {
+                # Build tools
+                $Deps += "gcc", "cmake", "make"
+
+                # Packaging tools
+                if ($Package) { $Deps += "ruby-devel", "rpmbuild", "groff", 'libffi-devel' }
+
+                $PackageManager = "zypper --non-interactive install"
+                $baseCommand = "$sudo $PackageManager"
+
+                # On OpenSUSE 13.2 container, sudo does not exist, so don't use it if not needed
+                if($NoSudo)
+                {
+                    $baseCommand = $PackageManager
+                }
+
+                # Install dependencies
+                Start-NativeExecution {
+                    Invoke-Expression "$baseCommand $Deps"
+                }
+            } elseif ($environment.IsMacOS) {
+                if ($environment.UsingHomebrew) {
+                    $PackageManager = "brew"
+                } elseif ($environment.UsingMacports) {
+                    $PackageManager = "$sudo port"
+                }
+
+                # Build tools
+                $Deps += "cmake"
+
+                # .NET Core required runtime libraries
+                $Deps += "openssl"
+
+                # Install dependencies
+                # 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'
+
+                Start-NativeExecution {
+                    Invoke-Expression "apk add $Deps"
+                }
+            }
+
+            # Install [fpm](https://github.com/jordansissel/fpm) and [ronn](https://github.com/rtomayko/ronn)
+            if ($Package) {
+                try {
+                    # We cannot guess if the user wants to run gem install as root on linux and windows,
+                    # but macOs usually requires sudo
+                    $gemsudo = ''
+                    if($environment.IsMacOS -or $env:TF_BUILD) {
+                        $gemsudo = $sudo
+                    }
+                    Start-NativeExecution ([ScriptBlock]::Create("$gemsudo gem install ffi -v 1.12.0 --no-document"))
+                    Start-NativeExecution ([ScriptBlock]::Create("$gemsudo gem install fpm -v 1.11.0 --no-document"))
+                    Start-NativeExecution ([ScriptBlock]::Create("$gemsudo gem install ronn -v 0.7.3 --no-document"))
+                } catch {
+                    Write-Warning "Installation of fpm and ronn gems failed! Must resolve manually."
+                }
+            }
+        }
+
+        # Try to locate dotnet-SDK before installing it
+        Find-Dotnet
+
+        # Install dotnet-SDK
+        $dotNetExists = precheck 'dotnet' $null
+        $dotNetVersion = [string]::Empty
+        if($dotNetExists) {
+            $dotNetVersion = Start-NativeExecution -sb { dotnet --version } -IgnoreExitcode
+        }
+
+        if(!$dotNetExists -or $dotNetVersion -ne $dotnetCLIRequiredVersion -or $Force.IsPresent) {
+            if($Force.IsPresent) {
+                Write-Log -message "Installing dotnet due to -Force."
+            }
+            elseif(!$dotNetExists) {
+                Write-Log -message "dotnet not present.  Installing dotnet."
+            }
+            else {
+                Write-Log -message "dotnet out of date ($dotNetVersion).  Updating dotnet."
+            }
+
+            $DotnetArguments = @{ Channel=$Channel; Version=$Version; NoSudo=$NoSudo }
+            Install-Dotnet @DotnetArguments
+        }
+        else {
+            Write-Log -message "dotnet is already installed.  Skipping installation."
+        }
+
+        # Install Windows dependencies if `-Package` or `-BuildWindowsNative` is specified
+        if ($environment.IsWindows) {
+            ## The VSCode build task requires 'pwsh.exe' to be found in Path
+            if (-not (Get-Command -Name pwsh.exe -CommandType Application -ErrorAction Ignore))
+            {
+                Write-Log -message "pwsh.exe not found. Install latest PowerShell release and add it to Path"
+                $psInstallFile = [System.IO.Path]::Combine($PSScriptRoot, "tools", "install-powershell.ps1")
+                & $psInstallFile -AddToPath
+            }
+        }
+    } finally {
+        Pop-Location
+    }
+}
+
+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
+        }
+    }
+}
+
+function Use-PSClass {
+    [CmdletBinding()]
+    param (
+        [Parameter(ValueFromPipeline = $true, Mandatory = $true, Position = 0)]
+        [string[]]$Logfile,
+        [Parameter()][switch]$IncludeEmpty,
+        [Parameter()][switch]$MultipleLog
+    )
+    <#
+Convert our test logs to
+xunit schema - top level assemblies
+Pester conversion
+foreach $r in "test-results"."test-suite".results."test-suite"
+assembly
+    name = $r.Description
+    config-file = log file (this is the only way we can determine between admin/nonadmin log)
+    test-framework = Pester
+    environment = top-level "test-results.environment.platform
+    run-date = date (doesn't exist in pester except for beginning)
+    run-time = time
+    time =
+#>
+
+    BEGIN {
+        # CLASSES
+        class assemblies {
+            # attributes
+            [datetime]$timestamp
+            # child elements
+            [System.Collections.Generic.List[testAssembly]]$assembly
+            assemblies() {
+                $this.timestamp = [datetime]::now
+                $this.assembly = [System.Collections.Generic.List[testAssembly]]::new()
+            }
+            static [assemblies] op_Addition([assemblies]$ls, [assemblies]$rs) {
+                $newAssembly = [assemblies]::new()
+                $newAssembly.assembly.AddRange($ls.assembly)
+                $newAssembly.assembly.AddRange($rs.assembly)
+                return $newAssembly
+            }
+            [string]ToString() {
+                $sb = [text.stringbuilder]::new()
+                $sb.AppendLine('<assemblies timestamp="{0:MM}/{0:dd}/{0:yyyy} {0:HH}:{0:mm}:{0:ss}">' -f $this.timestamp)
+                foreach ( $a in $this.assembly  ) {
+                    $sb.Append("$a")
+                }
+                $sb.AppendLine("</assemblies>");
+                return $sb.ToString()
+            }
+            # use Write-Output to emit these into the pipeline
+            [array]GetTests() {
+                return $this.Assembly.collection.test
+            }
+        }
+
+        class testAssembly {
+            # attributes
+            [string]$name # path to pester file
+            [string]${config-file}
+            [string]${test-framework} # Pester
+            [string]$environment
+            [string]${run-date}
+            [string]${run-time}
+            [decimal]$time
+            [int]$total
+            [int]$passed
+            [int]$failed
+            [int]$skipped
+            [int]$errors
+            testAssembly ( ) {
+                $this."config-file" = "no config"
+                $this."test-framework" = "Pester"
+                $this.environment = $script:environment
+                $this."run-date" = $script:rundate
+                $this."run-time" = $script:runtime
+                $this.collection = [System.Collections.Generic.List[collection]]::new()
+            }
+            # child elements
+            [error[]]$error
+            [System.Collections.Generic.List[collection]]$collection
+            [string]ToString() {
+                $sb = [System.Text.StringBuilder]::new()
+                $sb.AppendFormat('  <assembly name="{0}" ', $this.name)
+                $sb.AppendFormat('environment="{0}" ', [security.securityelement]::escape($this.environment))
+                $sb.AppendFormat('test-framework="{0}" ', $this."test-framework")
+                $sb.AppendFormat('run-date="{0}" ', $this."run-date")
+                $sb.AppendFormat('run-time="{0}" ', $this."run-time")
+                $sb.AppendFormat('total="{0}" ', $this.total)
+                $sb.AppendFormat('passed="{0}" ', $this.passed)
+                $sb.AppendFormat('failed="{0}" ', $this.failed)
+                $sb.AppendFormat('skipped="{0}" ', $this.skipped)
+                $sb.AppendFormat('time="{0}" ', $this.time)
+                $sb.AppendFormat('errors="{0}" ', $this.errors)
+                $sb.AppendLine(">")
+                if ( $this.error ) {
+                    $sb.AppendLine("    <errors>")
+                    foreach ( $e in $this.error ) {
+                        $sb.AppendLine($e.ToString())
+                    }
+                    $sb.AppendLine("    </errors>")
+                } else {
+                    $sb.AppendLine("    <errors />")
+                }
+                foreach ( $col in $this.collection ) {
+                    $sb.AppendLine($col.ToString())
+                }
+                $sb.AppendLine("  </assembly>")
+                return $sb.ToString()
+            }
+        }
+
+        class collection {
+            # attributes
+            [string]$name
+            [decimal]$time
+            [int]$total
+            [int]$passed
+            [int]$failed
+            [int]$skipped
+            # child element
+            [System.Collections.Generic.List[test]]$test
+            # constructor
+            collection () {
+                $this.test = [System.Collections.Generic.List[test]]::new()
+            }
+            [string]ToString() {
+                $sb = [Text.StringBuilder]::new()
+                if ( $this.test.count -eq 0 ) {
+                    $sb.AppendLine("    <collection />")
+                } else {
+                    $sb.AppendFormat('    <collection total="{0}" passed="{1}" failed="{2}" skipped="{3}" name="{4}" time="{5}">' + "`n",
+                        $this.total, $this.passed, $this.failed, $this.skipped, [security.securityelement]::escape($this.name), $this.time)
+                    foreach ( $t in $this.test ) {
+                        $sb.AppendLine("    " + $t.ToString());
+                    }
+                    $sb.Append("    </collection>")
+                }
+                return $sb.ToString()
+            }
+        }
+
+        class errors {
+            [error[]]$error
+        }
+        class error {
+            # attributes
+            [string]$type
+            [string]$name
+            # child elements
+            [failure]$failure
+            [string]ToString() {
+                $sb = [system.text.stringbuilder]::new()
+                $sb.AppendLine('<error type="{0}" name="{1}" >' -f $this.type, [security.securityelement]::escape($this.Name))
+                $sb.AppendLine($this.failure -as [string])
+                $sb.AppendLine("</error>")
+                return $sb.ToString()
+            }
+        }
+
+        class cdata {
+            [string]$text
+            cdata ( [string]$s ) { $this.text = $s }
+            [string]ToString() {
+                return '<![CDATA[' + [security.securityelement]::escape($this.text) + ']]>'
+            }
+        }
+
+        class failure {
+            [string]${exception-type}
+            [cdata]$message
+            [cdata]${stack-trace}
+            failure ( [string]$message, [string]$stack ) {
+                $this."exception-type" = "Pester"
+                $this.Message = [cdata]::new($message)
+                $this."stack-trace" = [cdata]::new($stack)
+            }
+            [string]ToString() {
+                $sb = [text.stringbuilder]::new()
+                $sb.AppendLine("        <failure>")
+                $sb.AppendLine("          <message>" + ($this.message -as [string]) + "</message>")
+                $sb.AppendLine("          <stack-trace>" + ($this."stack-trace" -as [string]) + "</stack-trace>")
+                $sb.Append("        </failure>")
+                return $sb.ToString()
+            }
+        }
+
+        enum resultenum {
+            Pass
+            Fail
+            Skip
+        }
+
+        class trait {
+            # attributes
+            [string]$name
+            [string]$value
+        }
+        class traits {
+            [trait[]]$trait
+        }
+        class test {
+            # attributes
+            [string]$name
+            [string]$type
+            [string]$method
+            [decimal]$time
+            [resultenum]$result
+            # child elements
+            [trait[]]$traits
+            [failure]$failure
+            [cdata]$reason # skip reason
+            [string]ToString() {
+                $sb = [text.stringbuilder]::new()
+                $sb.appendformat('  <test name="{0}" type="{1}" method="{2}" time="{3}" result="{4}"',
+                    [security.securityelement]::escape($this.name), [security.securityelement]::escape($this.type),
+                    [security.securityelement]::escape($this.method), $this.time, $this.result)
+                if ( $this.failure ) {
+                    $sb.AppendLine(">")
+                    $sb.AppendLine($this.failure -as [string])
+                    $sb.append('      </test>')
+                } else {
+                    $sb.Append("/>")
+                }
+                return $sb.ToString()
+            }
+        }
+
+        function convert-pesterlog ( [xml]$x, $logpath, [switch]$includeEmpty ) {
+            <#$resultMap = @{
+                Success = "Pass"
+                Ignored = "Skip"
+                Failure = "Fail"
+            }#>
+
+            $resultMap = @{
+                Success = "Pass"
+                Ignored = "Skip"
+                Failure = "Fail"
+                Inconclusive = "Skip"
+            }
+
+            $configfile = $logpath
+            $runtime = $x."test-results".time
+            $environment = $x."test-results".environment.platform + "-" + $x."test-results".environment."os-version"
+            $rundate = $x."test-results".date
+            $suites = $x."test-results"."test-suite".results."test-suite"
+            $assemblies = [assemblies]::new()
+            foreach ( $suite in $suites ) {
+                $tCases = $suite.SelectNodes(".//test-case")
+                # only create an assembly group if we have tests
+                if ( $tCases.count -eq 0 -and ! $includeEmpty ) { continue }
+                $tGroup = $tCases | Group-Object result
+                $total = $tCases.Count
+                $asm = [testassembly]::new()
+                $asm.environment = $environment
+                $asm."run-date" = $rundate
+                $asm."run-time" = $runtime
+                $asm.Name = $suite.name
+                $asm."config-file" = $configfile
+                $asm.time = $suite.time
+                $asm.total = $suite.SelectNodes(".//test-case").Count
+                $asm.Passed = $tGroup| Where-Object -FilterScript {$_.Name -eq "Success"} | ForEach-Object -Process {$_.Count}
+                $asm.Failed = $tGroup| Where-Object -FilterScript {$_.Name -eq "Failure"} | ForEach-Object -Process {$_.Count}
+                $asm.Skipped = $tGroup| Where-Object -FilterScript { $_.Name -eq "Ignored" } | ForEach-Object -Process {$_.Count}
+                $asm.Skipped += $tGroup| Where-Object -FilterScript { $_.Name -eq "Inconclusive" } | ForEach-Object -Process {$_.Count}
+                $c = [collection]::new()
+                $c.passed = $asm.Passed
+                $c.failed = $asm.failed
+                $c.skipped = $asm.skipped
+                $c.total = $asm.total
+                $c.time = $asm.time
+                $c.name = $asm.name
+                foreach ( $tc in $suite.SelectNodes(".//test-case")) {
+                    if ( $tc.result -match "Success|Ignored|Failure" ) {
+                        $t = [test]::new()
+                        $t.name = $tc.Name
+                        $t.time = $tc.time
+                        $t.method = $tc.description # the pester actually puts the name of the "it" as description
+                        $t.type = $suite.results."test-suite".description | Select-Object -First 1
+                        $t.result = $resultMap[$tc.result]
+                        if ( $tc.failure ) {
+                            $t.failure = [failure]::new($tc.failure.message, $tc.failure."stack-trace")
+                        }
+                        $null = $c.test.Add($t)
+                    }
+                }
+                $null = $asm.collection.add($c)
+                $assemblies.assembly.Add($asm)
+            }
+            $assemblies
+        }
+
+        # convert it to our object model
+        # a simple conversion
+        function convert-xunitlog {
+            param ( $x, $logpath )
+            $asms = [assemblies]::new()
+            $asms.timestamp = $x.assemblies.timestamp
+            foreach ( $assembly in $x.assemblies.assembly ) {
+                $asm = [testAssembly]::new()
+                $asm.environment = $assembly.environment
+                $asm."test-framework" = $assembly."test-framework"
+                $asm."run-date" = $assembly."run-date"
+                $asm."run-time" = $assembly."run-time"
+                $asm.total = $assembly.total
+                $asm.passed = $assembly.passed
+                $asm.failed = $assembly.failed
+                $asm.skipped = $assembly.skipped
+                $asm.time = $assembly.time
+                $asm.name = $assembly.name
+                foreach ( $coll in $assembly.collection ) {
+                    $c = [collection]::new()
+                    $c.name = $coll.name
+                    $c.total = $coll.total
+                    $c.passed = $coll.passed
+                    $c.failed = $coll.failed
+                    $c.skipped = $coll.skipped
+                    $c.time = $coll.time
+                    foreach ( $t in $coll.test ) {
+                        $test = [test]::new()
+                        $test.name = $t.name
+                        $test.type = $t.type
+                        $test.method = $t.method
+                        $test.time = $t.time
+                        $test.result = $t.result
+                        $c.test.Add($test)
+                    }
+                    $null = $asm.collection.add($c)
+                }
+                $null = $asms.assembly.add($asm)
+            }
+            $asms
+        }
+        $Logs = @()
+    }
+
+    PROCESS {
+        #### MAIN ####
+        foreach ( $log in $Logfile ) {
+            foreach ( $logpath in (Resolve-Path $log).path ) {
+                Write-Progress "converting file $logpath"
+                if ( ! $logpath) { throw "Cannot resolve $Logfile" }
+                $x = [xml](Get-Content -Raw -ReadCount 0 $logpath)
+
+                if ( $x.psobject.properties['test-results'] ) {
+                    $Logs += convert-pesterlog $x $logpath -includeempty:$includeempty
+                } elseif ( $x.psobject.properties['assemblies'] ) {
+                    $Logs += convert-xunitlog $x $logpath -includeEmpty:$includeEmpty
+                } else {
+                    Write-Error "Cannot determine log type"
+                }
+            }
+        }
+    }
+
+    END {
+        if ( $MultipleLog ) {
+            $Logs
+        } else {
+            $combinedLog = $Logs[0]
+            for ( $i = 1; $i -lt $logs.count; $i++ ) {
+                $combinedLog += $Logs[$i]
+            }
+            $combinedLog
+        }
+    }
+}
+
+function Start-PSPackage {
+    [CmdletBinding(DefaultParameterSetName='Version',SupportsShouldProcess=$true)]
+    param(
+        # PowerShell packages use Semantic Versioning https://semver.org/
+        [Parameter(ParameterSetName = "Version")]
+        [string]$Version,
+
+        [Parameter(ParameterSetName = "ReleaseTag")]
+        [ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d{1,2})?)?$")]
+        [ValidateNotNullOrEmpty()]
+        [string]$ReleaseTag,
+
+        # Package name
+        [ValidatePattern("^powershell")]
+        [string]$Name = "powershell",
+
+        # Ubuntu, CentOS, Fedora, macOS, and Windows packages are supported
+        [ValidateSet("msix", "deb", "osxpkg", "rpm", "msi", "zip", "zip-pdb", "nupkg", "tar", "tar-arm", "tar-arm64", "tar-alpine", "fxdependent", "fxdependent-win-desktop", "min-size")]
+        [string[]]$Type,
+
+        # Generate windows downlevel package
+        [ValidateSet("win7-x86", "win7-x64", "win-arm", "win-arm64")]
+        [ValidateScript({$Environment.IsWindows})]
+        [string] $WindowsRuntime,
+
+        [ValidateSet('osx-x64', 'osx-arm64')]
+        [ValidateScript({$Environment.IsMacOS})]
+        [string] $MacOSRuntime,
+
+        [Switch] $Force,
+
+        [Switch] $SkipReleaseChecks,
+
+        [switch] $NoSudo,
+
+        [switch] $LTS
+    )
+
+    DynamicParam {
+        if ($Type -in ('zip', 'min-size') -or $Type -like 'fxdependent*') {
+            # Add a dynamic parameter '-IncludeSymbols' when the specified package type is 'zip' only.
+            # The '-IncludeSymbols' parameter can be used to indicate that the package should only contain powershell binaries and symbols.
+            $ParameterAttr = New-Object "System.Management.Automation.ParameterAttribute"
+            $Attributes = New-Object "System.Collections.ObjectModel.Collection``1[System.Attribute]"
+            $Attributes.Add($ParameterAttr) > $null
+
+            $Parameter = New-Object "System.Management.Automation.RuntimeDefinedParameter" -ArgumentList ("IncludeSymbols", [switch], $Attributes)
+            $Dict = New-Object "System.Management.Automation.RuntimeDefinedParameterDictionary"
+            $Dict.Add("IncludeSymbols", $Parameter) > $null
+            return $Dict
+        }
+    }
+
+    End {
+        $IncludeSymbols = $null
+        if ($PSBoundParameters.ContainsKey('IncludeSymbols')) {
+            Write-Log 'setting IncludeSymbols'
+            $IncludeSymbols = $PSBoundParameters['IncludeSymbols']
+        }
+
+        # Runtime and Configuration settings required by the package
+        ($Runtime, $Configuration) = if ($WindowsRuntime) {
+            $WindowsRuntime, "Release"
+        } elseif ($MacOSRuntime) {
+           $MacOSRuntime, "Release"
+        } elseif ($Type -eq "tar-alpine") {
+            New-PSOptions -Configuration "Release" -Runtime "alpine-x64" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
+        } elseif ($Type -eq "tar-arm") {
+            New-PSOptions -Configuration "Release" -Runtime "Linux-ARM" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
+        } elseif ($Type -eq "tar-arm64") {
+            if ($IsMacOS) {
+                New-PSOptions -Configuration "Release" -Runtime "osx-arm64" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
+            } else {
+                New-PSOptions -Configuration "Release" -Runtime "Linux-ARM64" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
+            }
+        } else {
+            New-PSOptions -Configuration "Release" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
+        }
+
+        if ($Environment.IsWindows) {
+            # Runtime will be one of win7-x64, win7-x86, "win-arm" and "win-arm64" on Windows.
+            # Build the name suffix for universal win-plat packages.
+            switch ($Runtime) {
+                "win-arm"   { $NameSuffix = "win-arm32" }
+                "win-arm64" { $NameSuffix = "win-arm64" }
+                default     { $NameSuffix = $_ -replace 'win\d+', 'win' }
+            }
+        }
+
+        if ($Type -eq 'fxdependent') {
+            $NameSuffix = "win-fxdependent"
+            Write-Log "Packaging : '$Type'; Packaging Configuration: '$Configuration'"
+        } elseif ($Type -eq 'fxdependent-win-desktop') {
+            $NameSuffix = "win-fxdependentWinDesktop"
+            Write-Log "Packaging : '$Type'; Packaging Configuration: '$Configuration'"
+        } elseif ($MacOSRuntime) {
+            $NameSuffix = $MacOSRuntime
+        } else {
+            Write-Log "Packaging RID: '$Runtime'; Packaging Configuration: '$Configuration'"
+        }
+
+        $Script:Options = Get-PSOptions
+        $actualParams = @()
+
+        $crossGenCorrect = $false
+        if ($Runtime -match "arm" -or $Type -eq 'min-size') {
+            ## crossgen doesn't support arm32/64;
+            ## For the min-size package, we intentionally avoid crossgen.
+            $crossGenCorrect = $true
+        }
+        elseif ($Script:Options.CrossGen) {
+            $actualParams += '-CrossGen'
+            $crossGenCorrect = $true
+        }
+
+        $PSModuleRestoreCorrect = $false
+
+        # Require PSModuleRestore for packaging without symbols
+        # But Disallow it when packaging with symbols
+        if (!$IncludeSymbols.IsPresent -and $Script:Options.PSModuleRestore) {
+            $actualParams += '-PSModuleRestore'
+            $PSModuleRestoreCorrect = $true
+        }
+        elseif ($IncludeSymbols.IsPresent -and !$Script:Options.PSModuleRestore) {
+            $PSModuleRestoreCorrect = $true
+        }
+        else {
+            $actualParams += '-PSModuleRestore'
+        }
+
+        $precheckFailed = if ($Type -like 'fxdependent*' -or $Type -eq 'tar-alpine') {
+            ## We do not check for runtime and crossgen for framework dependent package.
+            -not $Script:Options -or                                ## Start-PSBuild hasn't been executed yet
+            -not $PSModuleRestoreCorrect -or                        ## Last build didn't specify '-PSModuleRestore' correctly
+            $Script:Options.Configuration -ne $Configuration -or    ## Last build was with configuration other than 'Release'
+            $Script:Options.Framework -ne $script:netCoreRuntime    ## Last build wasn't for CoreCLR
+        } else {
+            -not $Script:Options -or                                ## Start-PSBuild hasn't been executed yet
+            -not $crossGenCorrect -or                               ## Last build didn't specify '-CrossGen' correctly
+            -not $PSModuleRestoreCorrect -or                        ## Last build didn't specify '-PSModuleRestore' correctly
+            $Script:Options.Runtime -ne $Runtime -or                ## Last build wasn't for the required RID
+            $Script:Options.Configuration -ne $Configuration -or    ## Last build was with configuration other than 'Release'
+            $Script:Options.Framework -ne $script:netCoreRuntime    ## Last build wasn't for CoreCLR
+        }
+
+        # Make sure the most recent build satisfies the package requirement
+        if ($precheckFailed) {
+            # It's possible that the most recent build doesn't satisfy the package requirement but
+            # an earlier build does.
+            # It's also possible that the last build actually satisfies the package requirement but
+            # then `Start-PSPackage` runs from a new PS session or `build.psm1` was reloaded.
+            #
+            # In these cases, the user will be asked to build again even though it's technically not
+            # necessary. However, we want it that way -- being very explict when generating packages.
+            # This check serves as a simple gate to ensure that the user knows what he is doing, and
+            # also ensure `Start-PSPackage` does what the user asks/expects, because once packages
+            # are generated, it'll be hard to verify if they were built from the correct content.
+
+
+            $params = @('-Clean')
+
+            # CrossGen cannot be done for framework dependent package as it is runtime agnostic.
+            if ($Type -notlike 'fxdependent*') {
+                $params += '-CrossGen'
+            }
+
+            if (!$IncludeSymbols.IsPresent) {
+                $params += '-PSModuleRestore'
+            }
+
+            $actualParams += '-Runtime ' + $Script:Options.Runtime
+
+            if ($Type -eq 'fxdependent') {
+                $params += '-Runtime', 'fxdependent'
+            } elseif ($Type -eq 'fxdependent-win-desktop') {
+                $params += '-Runtime', 'fxdependent-win-desktop'
+            } else {
+                $params += '-Runtime', $Runtime
+            }
+
+            $params += '-Configuration', $Configuration
+            $actualParams += '-Configuration ' + $Script:Options.Configuration
+
+            Write-Warning "Build started with unexpected parameters 'Start-PSBuild $actualParams"
+            throw "Please ensure you have run 'Start-PSBuild $params'!"
+        }
+
+        if ($SkipReleaseChecks.IsPresent) {
+            Write-Warning "Skipping release checks."
+        }
+        elseif (!$Script:Options.RootInfo.IsValid){
+            throw $Script:Options.RootInfo.Warning
+        }
+
+        # If ReleaseTag is specified, use the given tag to calculate Version
+        if ($PSCmdlet.ParameterSetName -eq "ReleaseTag") {
+            $Version = $ReleaseTag -Replace '^v'
+        }
+
+        # Use Git tag if not given a version
+        if (-not $Version) {
+            $Version = (git --git-dir="$RepoRoot/.git" describe) -Replace '^v'
+        }
+
+        $Source = Split-Path -Path $Script:Options.Output -Parent
+
+        # Copy the ThirdPartyNotices.txt so it's part of the package
+        Copy-Item "$RepoRoot/ThirdPartyNotices.txt" -Destination $Source -Force
+
+        # Copy the default.help.txt so it's part of the package
+        Copy-Item "$RepoRoot/assets/default.help.txt" -Destination "$Source/en-US" -Force
+
+        # If building a symbols package, we add a zip of the parent to publish
+        if ($IncludeSymbols.IsPresent)
+        {
+            $publishSource = $Source
+            $buildSource = Split-Path -Path $Source -Parent
+            $Source = New-TempFolder
+            $symbolsSource = New-TempFolder
+
+            try
+            {
+                # Copy files which go into the root package
+                Get-ChildItem -Path $publishSource | Copy-Item -Destination $Source -Recurse
+
+                $signingXml = [xml] (Get-Content (Join-Path $PSScriptRoot "..\releaseBuild\signing.xml" -Resolve))
+                # Only include the files we sign for compliance scanning, those are the files we build.
+                $filesToInclude = $signingXml.SignConfigXML.job.file.src | Where-Object {  -not $_.endswith('pwsh.exe') -and ($_.endswith(".dll") -or $_.endswith(".exe")) } | ForEach-Object { ($_ -split '\\')[-1] }
+                $filesToInclude += $filesToInclude | ForEach-Object { $_ -replace '.dll', '.pdb' }
+                Get-ChildItem -Path $buildSource | Where-Object { $_.Name -in $filesToInclude } | Copy-Item -Destination $symbolsSource -Recurse
+
+                # Zip symbols.zip to the root package
+                $zipSource = Join-Path $symbolsSource -ChildPath '*'
+                $zipPath = Join-Path -Path $Source -ChildPath 'symbols.zip'
+                Save-PSOptions -PSOptionsPath (Join-Path -Path $source -ChildPath 'psoptions.json') -Options $Script:Options
+                Compress-Archive -Path $zipSource -DestinationPath $zipPath
+            }
+            finally
+            {
+                Remove-Item -Path $symbolsSource -Recurse -Force -ErrorAction SilentlyContinue
+            }
+        }
+
+        Write-Log "Packaging Source: '$Source'"
+
+        # Decide package output type
+        if (-not $Type) {
+            $Type = if ($Environment.IsLinux) {
+                if ($Environment.LinuxInfo.ID -match "ubuntu") {
+                    "deb", "nupkg", "tar"
+                } elseif ($Environment.IsRedHatFamily) {
+                    "rpm", "nupkg"
+                } elseif ($Environment.IsSUSEFamily) {
+                    "rpm", "nupkg"
+                } else {
+                    throw "Building packages for $($Environment.LinuxInfo.PRETTY_NAME) is unsupported!"
+                }
+            } elseif ($Environment.IsMacOS) {
+                "osxpkg", "nupkg", "tar"
+            } elseif ($Environment.IsWindows) {
+                "msi", "nupkg", "msix"
+            }
+            Write-Warning "-Type was not specified, continuing with $Type!"
+        }
+        Write-Log "Packaging Type: $Type"
+
+        # Add the symbols to the suffix
+        # if symbols are specified to be included
+        if ($IncludeSymbols.IsPresent -and $NameSuffix) {
+            $NameSuffix = "symbols-$NameSuffix"
+        }
+        elseif ($IncludeSymbols.IsPresent) {
+            $NameSuffix = "symbols"
+        }
+
+        switch ($Type) {
+            "zip" {
+                $Arguments = @{
+                    PackageNameSuffix = $NameSuffix
+                    PackageSourcePath = $Source
+                    PackageVersion = $Version
+                    Force = $Force
+                }
+
+                if ($PSCmdlet.ShouldProcess("Create Zip Package")) {
+                    New-ZipPackage @Arguments
+                }
+            }
+            "zip-pdb" {
+                $Arguments = @{
+                    PackageNameSuffix = $NameSuffix
+                    PackageSourcePath = $Source
+                    PackageVersion = $Version
+                    Force = $Force
+                }
+
+                if ($PSCmdlet.ShouldProcess("Create Symbols Zip Package")) {
+                    New-PdbZipPackage @Arguments
+                }
+            }
+            "min-size" {
+                # Remove symbol files, xml document files.
+                Remove-Item "$Source\*.pdb", "$Source\*.xml" -Force
+
+                # Add suffix '-gc' because this package is for the Guest Config team.
+                if ($Environment.IsWindows) {
+                    $Arguments = @{
+                        PackageNameSuffix = "$NameSuffix-gc"
+                        PackageSourcePath = $Source
+                        PackageVersion = $Version
+                        Force = $Force
+                    }
+
+                    if ($PSCmdlet.ShouldProcess("Create Zip Package")) {
+                        New-ZipPackage @Arguments
+                    }
+                }
+                elseif ($Environment.IsLinux) {
+                    $Arguments = @{
+                        PackageSourcePath = $Source
+                        Name = $Name
+                        PackageNameSuffix = 'gc'
+                        Version = $Version
+                        Force = $Force
+                    }
+
+                    if ($PSCmdlet.ShouldProcess("Create tar.gz Package")) {
+                        New-TarballPackage @Arguments
+                    }
+                }
+            }
+            { $_ -like "fxdependent*" } {
+                ## Remove PDBs from package to reduce size.
+                if(-not $IncludeSymbols.IsPresent) {
+                    Get-ChildItem $Source -Filter *.pdb | Remove-Item -Force
+                }
+
+                if ($Environment.IsWindows) {
+                    $Arguments = @{
+                        PackageNameSuffix = $NameSuffix
+                        PackageSourcePath = $Source
+                        PackageVersion = $Version
+                        Force = $Force
+                    }
+
+                    if ($PSCmdlet.ShouldProcess("Create Zip Package")) {
+                        New-ZipPackage @Arguments
+                    }
+                } elseif ($Environment.IsLinux) {
+                    $Arguments = @{
+                        PackageSourcePath = $Source
+                        Name = $Name
+                        PackageNameSuffix = 'fxdependent'
+                        Version = $Version
+                        Force = $Force
+                    }
+
+                    if ($PSCmdlet.ShouldProcess("Create tar.gz Package")) {
+                        New-TarballPackage @Arguments
+                    }
+                }
+            }
+            "msi" {
+                $TargetArchitecture = "x64"
+                if ($Runtime -match "-x86") {
+                    $TargetArchitecture = "x86"
+                }
+                Write-Verbose "TargetArchitecture = $TargetArchitecture" -Verbose
+
+                $Arguments = @{
+                    ProductNameSuffix = $NameSuffix
+                    ProductSourcePath = $Source
+                    ProductVersion = $Version
+                    AssetsPath = "$RepoRoot\assets"
+                    ProductTargetArchitecture = $TargetArchitecture
+                    Force = $Force
+                }
+
+                if ($PSCmdlet.ShouldProcess("Create MSI Package")) {
+                    New-MSIPackage @Arguments
+                }
+            }
+            "msix" {
+                $Arguments = @{
+                    ProductNameSuffix = $NameSuffix
+                    ProductSourcePath = $Source
+                    ProductVersion = $Version
+                    Architecture = $WindowsRuntime.Split('-')[1]
+                    Force = $Force
+                }
+
+                if ($PSCmdlet.ShouldProcess("Create MSIX Package")) {
+                    New-MSIXPackage @Arguments
+                }
+            }
+            'nupkg' {
+                $Arguments = @{
+                    PackageNameSuffix = $NameSuffix
+                    PackageSourcePath = $Source
+                    PackageVersion = $Version
+                    PackageRuntime = $Runtime
+                    PackageConfiguration = $Configuration
+                    Force = $Force
+                }
+
+                if ($PSCmdlet.ShouldProcess("Create NuPkg Package")) {
+                    New-NugetContentPackage @Arguments
+                }
+            }
+            "tar" {
+                $Arguments = @{
+                    PackageSourcePath = $Source
+                    Name = $Name
+                    Version = $Version
+                    Force = $Force
+                }
+
+                if ($MacOSRuntime) {
+                    $Arguments['Architecture'] = $MacOSRuntime.Split('-')[1]
+                }
+
+                if ($PSCmdlet.ShouldProcess("Create tar.gz Package")) {
+                    New-TarballPackage @Arguments
+                }
+            }
+            "tar-arm" {
+                $Arguments = @{
+                    PackageSourcePath = $Source
+                    Name = $Name
+                    Version = $Version
+                    Force = $Force
+                    Architecture = "arm32"
+                    ExcludeSymbolicLinks = $true
+                }
+
+                if ($PSCmdlet.ShouldProcess("Create tar.gz Package")) {
+                    New-TarballPackage @Arguments
+                }
+            }
+            "tar-arm64" {
+                $Arguments = @{
+                    PackageSourcePath = $Source
+                    Name = $Name
+                    Version = $Version
+                    Force = $Force
+                    Architecture = "arm64"
+                    ExcludeSymbolicLinks = $true
+                }
+
+                if ($PSCmdlet.ShouldProcess("Create tar.gz Package")) {
+                    New-TarballPackage @Arguments
+                }
+            }
+            "tar-alpine" {
+                $Arguments = @{
+                    PackageSourcePath = $Source
+                    Name = $Name
+                    Version = $Version
+                    Force = $Force
+                    Architecture = "alpine-x64"
+                    ExcludeSymbolicLinks = $true
+                }
+
+                if ($PSCmdlet.ShouldProcess("Create tar.gz Package")) {
+                    New-TarballPackage @Arguments
+                }
+            }
+            'deb' {
+                $Arguments = @{
+                    Type = 'deb'
+                    PackageSourcePath = $Source
+                    Name = $Name
+                    Version = $Version
+                    Force = $Force
+                    NoSudo = $NoSudo
+                    LTS = $LTS
+                }
+                foreach ($Distro in $Script:DebianDistributions) {
+                    $Arguments["Distribution"] = $Distro
+                    if ($PSCmdlet.ShouldProcess("Create DEB Package for $Distro")) {
+                        New-UnixPackage @Arguments
+                    }
+                }
+            }
+            'rpm' {
+                $Arguments = @{
+                    Type = 'rpm'
+                    PackageSourcePath = $Source
+                    Name = $Name
+                    Version = $Version
+                    Force = $Force
+                    NoSudo = $NoSudo
+                    LTS = $LTS
+                }
+                foreach ($Distro in $Script:RedhatDistributions) {
+                    $Arguments["Distribution"] = $Distro
+                    if ($PSCmdlet.ShouldProcess("Create RPM Package for $Distro")) {
+                        New-UnixPackage @Arguments
+                    }
+                }
+            }
+            default {
+                $Arguments = @{
+                    Type = $_
+                    PackageSourcePath = $Source
+                    Name = $Name
+                    Version = $Version
+                    Force = $Force
+                    NoSudo = $NoSudo
+                    LTS = $LTS
+                }
+
+                if ($PSCmdlet.ShouldProcess("Create $_ Package")) {
+                    New-UnixPackage @Arguments
+                }
+            }
+        }
+
+        if ($IncludeSymbols.IsPresent)
+        {
+            # Source is a temporary folder when -IncludeSymbols is present.  So, we should remove it.
+            Remove-Item -Path $Source -Recurse -Force -ErrorAction SilentlyContinue
+        }
+    }
+}
+
+function New-UnixPackage {
+    [CmdletBinding(SupportsShouldProcess=$true)]
+    param(
+        [Parameter(Mandatory)]
+        [ValidateSet("deb", "osxpkg", "rpm")]
+        [string]$Type,
+
+        [Parameter(Mandatory)]
+        [string]$PackageSourcePath,
+
+        # Must start with 'powershell' but may have any suffix
+        [Parameter(Mandatory)]
+        [ValidatePattern("^powershell")]
+        [string]$Name,
+
+        [Parameter(Mandatory)]
+        [string]$Version,
+
+        # Package iteration version (rarely changed)
+        # This is a string because strings are appended to it
+        [string]$Iteration = "1",
+
+        [Switch]
+        $Force,
+
+        [switch]
+        $NoSudo,
+
+        [switch]
+        $LTS,
+
+        [string]
+        $CurrentLocation = (Get-Location)
+    )
+
+    DynamicParam {
+        if ($Type -eq "deb" -or $Type -eq 'rpm') {
+            # Add a dynamic parameter '-Distribution' when the specified package type is 'deb'.
+            # The '-Distribution' parameter can be used to indicate which Debian distro this pacakge is targeting.
+            $ParameterAttr = New-Object "System.Management.Automation.ParameterAttribute"
+            if($type -eq 'deb')
+            {
+                $ValidateSetAttr = New-Object "System.Management.Automation.ValidateSetAttribute" -ArgumentList $Script:DebianDistributions
+            }
+            else
+            {
+                $ValidateSetAttr = New-Object "System.Management.Automation.ValidateSetAttribute" -ArgumentList $Script:RedHatDistributions
+            }
+            $Attributes = New-Object "System.Collections.ObjectModel.Collection``1[System.Attribute]"
+            $Attributes.Add($ParameterAttr) > $null
+            $Attributes.Add($ValidateSetAttr) > $null
+
+            $Parameter = New-Object "System.Management.Automation.RuntimeDefinedParameter" -ArgumentList ("Distribution", [string], $Attributes)
+            $Dict = New-Object "System.Management.Automation.RuntimeDefinedParameterDictionary"
+            $Dict.Add("Distribution", $Parameter) > $null
+            return $Dict
+        }
+    }
+
+    End {
+        # 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" }
+
+        # Validate platform
+        $ErrorMessage = "Must be on {0} to build '$Type' packages!"
+        switch ($Type) {
+            "deb" {
+                $packageVersion = Get-LinuxPackageSemanticVersion -Version $Version
+                if (!$Environment.IsUbuntu -and !$Environment.IsDebian) {
+                    throw ($ErrorMessage -f "Ubuntu or Debian")
+                }
+
+                if ($PSBoundParameters.ContainsKey('Distribution')) {
+                    $DebDistro = $PSBoundParameters['Distribution']
+                } elseif ($Environment.IsUbuntu16) {
+                    $DebDistro = "ubuntu.16.04"
+                } elseif ($Environment.IsUbuntu18) {
+                    $DebDistro = "ubuntu.18.04"
+                } elseif ($Environment.IsUbuntu20) {
+                    $DebDistro = "ubuntu.20.04"
+                } elseif ($Environment.IsDebian9) {
+                    $DebDistro = "debian.9"
+                } else {
+                    throw "The current Debian distribution is not supported."
+                }
+
+                # iteration is "debian_revision"
+                # usage of this to differentiate distributions is allowed by non-standard
+                $Iteration += ".$DebDistro"
+            }
+            "rpm" {
+                if ($PSBoundParameters.ContainsKey('Distribution')) {
+                    $DebDistro = $PSBoundParameters['Distribution']
+
+                } elseif ($Environment.IsRedHatFamily) {
+                    $DebDistro = "rhel.7"
+                } else {
+                    throw "The current distribution is not supported."
+                }
+
+                $packageVersion = Get-LinuxPackageSemanticVersion -Version $Version
+            }
+            "osxpkg" {
+                $packageVersion = $Version
+                if (!$Environment.IsMacOS) {
+                    throw ($ErrorMessage -f "macOS")
+                }
+
+                $DebDistro = 'macOS'
+            }
+        }
+
+        # Determine if the version is a preview version
+        $IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS
+
+        # Preview versions have preview in the name
+        $Name = if($LTS) {
+            "powershell-lts"
+        }
+        elseif ($IsPreview) {
+            "powershell-preview"
+        }
+        else {
+            "powershell"
+        }
+
+        # Verify dependencies are installed and in the path
+        Test-Dependencies
+
+        $Description = $packagingStrings.Description
+
+        # Break the version down into its components, we are interested in the major version
+        $VersionMatch = [regex]::Match($Version, '(\d+)(?:.(\d+)(?:.(\d+)(?:-preview(?:.(\d+))?)?)?)?')
+        $MajorVersion = $VersionMatch.Groups[1].Value
+
+        # Suffix is used for side-by-side preview/release package installation
+        $Suffix = if ($IsPreview) { $MajorVersion + "-preview" } elseif ($LTS) { $MajorVersion + "-lts" } else { $MajorVersion }
+
+        # Setup staging directory so we don't change the original source directory
+        $Staging = "$PSScriptRoot/staging"
+        if ($PSCmdlet.ShouldProcess("Create staging folder")) {
+            New-StagingFolder -StagingPath $Staging -PackageSourcePath $PackageSourcePath
+        }
+
+        # Follow the Filesystem Hierarchy Standard for Linux and macOS
+        $Destination = if ($Environment.IsLinux) {
+            "/opt/microsoft/powershell/$Suffix"
+        } elseif ($Environment.IsMacOS) {
+            "/usr/local/microsoft/powershell/$Suffix"
+        }
+
+        # Destination for symlink to powershell executable
+        $Link = Get-PwshExecutablePath -IsPreview:$IsPreview
+        $links = @(New-LinkInfo -LinkDestination $Link -LinkTarget "$Destination/pwsh")
+
+        if($LTS) {
+            $links += New-LinkInfo -LinkDestination (Get-PwshExecutablePath -IsLTS:$LTS) -LinkTarget "$Destination/pwsh"
+        }
+
+        if ($PSCmdlet.ShouldProcess("Create package file system"))
+        {
+            # Generate After Install and After Remove scripts
+            $AfterScriptInfo = New-AfterScripts -Link $Link -Distribution $DebDistro -Destination $Destination
+
+            # there is a weird bug in fpm
+            # if the target of the powershell symlink exists, `fpm` aborts
+            # with a `utime` error on macOS.
+            # so we move it to make symlink broken
+            # refers to executable, does not vary by channel
+            $symlink_dest = "$Destination/pwsh"
+            $hack_dest = "./_fpm_symlink_hack_powershell"
+            if ($Environment.IsMacOS) {
+                if (Test-Path $symlink_dest) {
+                    Write-Warning "Move $symlink_dest to $hack_dest (fpm utime bug)"
+                    Start-NativeExecution ([ScriptBlock]::Create("$sudo mv $symlink_dest $hack_dest"))
+                }
+            }
+
+            # Generate gzip of man file
+            $ManGzipInfo = New-ManGzip -IsPreview:$IsPreview -IsLTS:$LTS
+
+            # Change permissions for packaging
+            Write-Log "Setting permissions..."
+            Start-NativeExecution {
+                find $Staging -type d | xargs chmod 755
+                find $Staging -type f | xargs chmod 644
+                chmod 644 $ManGzipInfo.GzipFile
+                # refers to executable, does not vary by channel
+                chmod 755 "$Staging/pwsh" #only the executable file should be granted the execution permission
+            }
+        }
+
+        # Add macOS powershell launcher
+        if ($Type -eq "osxpkg")
+        {
+            Write-Log "Adding macOS launch application..."
+            if ($PSCmdlet.ShouldProcess("Add macOS launch application"))
+            {
+                # Generate launcher app folder
+                $AppsFolder = New-MacOSLauncher -Version $Version
+            }
+        }
+
+        $packageDependenciesParams = @{}
+        if ($DebDistro)
+        {
+            $packageDependenciesParams['Distribution']=$DebDistro
+        }
+
+        # Setup package dependencies
+        $Dependencies = @(Get-PackageDependencies @packageDependenciesParams)
+
+        $Arguments = Get-FpmArguments `
+            -Name $Name `
+            -Version $packageVersion `
+            -Iteration $Iteration `
+            -Description $Description `
+            -Type $Type `
+            -Dependencies $Dependencies `
+            -AfterInstallScript $AfterScriptInfo.AfterInstallScript `
+            -AfterRemoveScript $AfterScriptInfo.AfterRemoveScript `
+            -Staging $Staging `
+            -Destination $Destination `
+            -ManGzipFile $ManGzipInfo.GzipFile `
+            -ManDestination $ManGzipInfo.ManFile `
+            -LinkInfo $Links `
+            -AppsFolder $AppsFolder `
+            -Distribution $DebDistro `
+            -ErrorAction Stop
+
+        # Build package
+        try {
+            if ($PSCmdlet.ShouldProcess("Create $type package")) {
+                Write-Log "Creating package with fpm..."
+                $Output = Start-NativeExecution { fpm $Arguments }
+            }
+        } finally {
+            if ($Environment.IsMacOS) {
+                Write-Log "Starting Cleanup for mac packaging..."
+                if ($PSCmdlet.ShouldProcess("Cleanup macOS launcher"))
+                {
+                    Clear-MacOSLauncher
+                }
+
+                # this is continuation of a fpm hack for a weird bug
+                if (Test-Path $hack_dest) {
+                    Write-Warning "Move $hack_dest to $symlink_dest (fpm utime bug)"
+                    Start-NativeExecution -sb ([ScriptBlock]::Create("$sudo mv $hack_dest $symlink_dest")) -VerboseOutputOnError
+                }
+            }
+            if ($AfterScriptInfo.AfterInstallScript) {
+                Remove-Item -ErrorAction 'silentlycontinue' $AfterScriptInfo.AfterInstallScript -Force
+            }
+            if ($AfterScriptInfo.AfterRemoveScript) {
+                Remove-Item -ErrorAction 'silentlycontinue' $AfterScriptInfo.AfterRemoveScript -Force
+            }
+            Remove-Item -Path $ManGzipInfo.GzipFile -Force -ErrorAction SilentlyContinue
+        }
+
+        # Magic to get path output
+        $createdPackage = Get-Item (Join-Path $CurrentLocation (($Output[-1] -split ":path=>")[-1] -replace '["{}]'))
+
+        if ($Environment.IsMacOS) {
+            if ($PSCmdlet.ShouldProcess("Add distribution information and Fix PackageName"))
+            {
+                $createdPackage = New-MacOsDistributionPackage -FpmPackage $createdPackage -IsPreview:$IsPreview
+            }
+        }
+
+        if (Test-Path $createdPackage)
+        {
+            Write-Verbose "Created package: $createdPackage" -Verbose
+            return $createdPackage
+        }
+        else
+        {
+            throw "Failed to create $createdPackage"
+        }
+    }
+}
diff --git a/test/perf/benchmarks/powershell-perf.csproj b/test/perf/benchmarks/powershell-perf.csproj
index 78608c2e96f..93c164b98b8 100644
--- a/test/perf/benchmarks/powershell-perf.csproj
+++ b/test/perf/benchmarks/powershell-perf.csproj
@@ -46,6 +46,7 @@
   <ItemGroup Condition="'$(PerfTargetVersion)' == ''">
     <ProjectReference Include="../../../src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj" />
     <ProjectReference Include="../../../src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj" />
+    <ProjectReference Include="../../../src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(PerfTargetVersion)' != ''">
@@ -59,6 +60,8 @@
     <PackageReference Include="Microsoft.PowerShell.ConsoleHost" Version="$(PerfTargetVersion)" />
     <PackageReference Include="Microsoft.PowerShell.Security" Version="$(PerfTargetVersion)" />
     <PackageReference Include="Microsoft.PowerShell.CoreCLR.Eventing" Version="$(PerfTargetVersion)" />
+    <PackageReference Include="Microsoft.WSMan.Management" Version="$(PerfTargetVersion)" />
+    <PackageReference Include="Microsoft.WSMan.Runtime" Version="$(PerfTargetVersion)" />
     <PackageReference Include="System.Management.Automation" Version="$(PerfTargetVersion)" />
   </ItemGroup>
 
diff --git a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj
index 1383cfc1d62..f0c3a35115e 100644
--- a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj
+++ b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1.1521" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.1.1521" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/perf/dotnet-tools/ResultsComparer/Program.cs b/test/perf/dotnet-tools/ResultsComparer/Program.cs
index 655c9f3458e..68615f61c78 100644
--- a/test/perf/dotnet-tools/ResultsComparer/Program.cs
+++ b/test/perf/dotnet-tools/ResultsComparer/Program.cs
@@ -20,7 +20,7 @@
 
 namespace ResultsComparer
 {
-    public class Program
+    public sealed class Program
     {
         private const string FullBdnJsonFileExtension = "full.json";
 
diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index 5126d109999..37e2d43dec8 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -79,6 +79,7 @@ function Update-PackageVersion {
         "$PSScriptRoot/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj"
         "$PSScriptRoot/../src/"
         "$PSScriptRoot/../test/tools/"
+        "$PSScriptRoot/../test/perf/dotnet-tools/"
     )
 
     Get-ChildItem -Path $paths -Recurse -Filter "*.csproj" -Exclude 'PSGalleryModules.csproj', 'PSGalleryTestModules.csproj' | ForEach-Object {

From ed249d0fe616f1da40b1d2f30804415c8f24efb6 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Tue, 14 Sep 2021 14:08:00 -0700
Subject: [PATCH 043/645] Remove support for AppExeCLinks to retrieve target
 (#16044)

---
 .../namespaces/FileSystemProvider.cs          | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index b7923ab7352..34c399f7bed 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -7993,18 +7993,6 @@ private struct REPARSE_DATA_BUFFER_MOUNTPOINT
             public byte[] PathBuffer;
         }
 
-        [StructLayout(LayoutKind.Sequential)]
-        private struct REPARSE_DATA_BUFFER_APPEXECLINK
-        {
-            public uint ReparseTag;
-            public ushort ReparseDataLength;
-            public ushort Reserved;
-            public uint StringCount;
-
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x3FF0)]
-            public byte[] StringList;
-        }
-
         [StructLayout(LayoutKind.Sequential)]
         private struct BY_HANDLE_FILE_INFORMATION
         {
@@ -8233,10 +8221,6 @@ private static string WinInternalGetLinkType(string filePath)
                             linkType = "Junction";
                             break;
 
-                        case IO_REPARSE_TAG_APPEXECLINK:
-                            linkType = "AppExeCLink";
-                            break;
-
                         default:
                             linkType = null;
                             break;
@@ -8515,16 +8499,6 @@ private static string WinInternalGetTarget(SafeFileHandle handle)
                         targetDir = Encoding.Unicode.GetString(reparseMountPointDataBuffer.PathBuffer, reparseMountPointDataBuffer.SubstituteNameOffset, reparseMountPointDataBuffer.SubstituteNameLength);
                         break;
 
-                    case IO_REPARSE_TAG_APPEXECLINK:
-                        REPARSE_DATA_BUFFER_APPEXECLINK reparseAppExeDataBuffer = Marshal.PtrToStructure<REPARSE_DATA_BUFFER_APPEXECLINK>(outBuffer);
-                        // The target file is at index 2
-                        if (reparseAppExeDataBuffer.StringCount >= 3)
-                        {
-                            string temp = Encoding.Unicode.GetString(reparseAppExeDataBuffer.StringList);
-                            targetDir = temp.Split('\0')[2];
-                        }
-                        break;
-
                     default:
                         return null;
                 }

From f1b122588b885eb89865728dca2f783e0c87a7fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Sep 2021 08:58:57 +0500
Subject: [PATCH 044/645] Bump Microsoft.CodeAnalysis.NetAnalyzers (#16070)

Bumps [Microsoft.CodeAnalysis.NetAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 6.0.0-rc2.21452.5 to 6.0.0-rc2.21458.5.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/main/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/commits)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.NetAnalyzers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index ab1655e1527..b67dba7625b 100644
--- a/Analyzers.props
+++ b/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-rc2.21452.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc2.21458.5" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From 4c958d8631433e96bfbfcc543b27ab3336e759fe Mon Sep 17 00:00:00 2001
From: Kellen Stuart <37430166+Kellen-Stuart@users.noreply.github.com>
Date: Wed, 15 Sep 2021 09:32:42 -0600
Subject: [PATCH 045/645] Update build documentation to reflect .NET 6 (#15751)

---
 docs/building/windows-core.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/building/windows-core.md b/docs/building/windows-core.md
index ec273d00391..65d76a37adc 100644
--- a/docs/building/windows-core.md
+++ b/docs/building/windows-core.md
@@ -59,11 +59,11 @@ Import-Module ./build.psm1
 Start-PSBuild
 ```
 
-Congratulations! If everything went right, PowerShell is now built and executable as `./src/powershell-win-core/bin/Debug/net5.0/win7-x64/publish/pwsh.exe`.
+Congratulations! If everything went right, PowerShell is now built and executable as `./src/powershell-win-core/bin/Debug/net6.0/win7-x64/publish/pwsh.exe`.
 
 This location is of the form `./[project]/bin/[configuration]/[framework]/[rid]/publish/[binary name]`,
 and our project is `powershell`, configuration is `Debug` by default,
-framework is `net5.0`, runtime identifier is `win7-x64` by default,
+framework is `net6.0`, runtime identifier is `win7-x64` by default,
 and binary name is `pwsh`.
 The function `Get-PSOutput` will return the path to the executable;
 thus you can execute the development copy via `& (Get-PSOutput)`.

From fd3579badbe577f574d497b6571dff2d9f74a230 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 15 Sep 2021 10:38:26 -0700
Subject: [PATCH 046/645] Use `PlainText` when writing to a host that doesn't
 support VT (#16092)

---
 .../engine/hostifaces/MshHostUserInterface.cs                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
index cf2dea14a5f..ea101ade659 100644
--- a/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
+++ b/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
@@ -234,7 +234,7 @@ public virtual void WriteInformation(InformationRecord record) { }
 
         private static bool ShouldOutputPlainText(bool isHost, bool? supportsVirtualTerminal)
         {
-            var outputRendering = OutputRendering.Ansi;
+            var outputRendering = OutputRendering.PlainText;
 
             if (supportsVirtualTerminal != false)
             {

From 6d2feeee388ff388da760de8d5f9c06739cb30a7 Mon Sep 17 00:00:00 2001
From: Sean Wheeler <sean.wheeler@microsoft.com>
Date: Wed, 15 Sep 2021 17:42:13 -0500
Subject: [PATCH 047/645] Change 'snippet' tag to 'code' tag in XML comments
 (#16106)

---
 .../engine/MshCommandRuntime.cs               | 24 ++++++++--------
 .../engine/cmdlet.cs                          | 28 +++++++++----------
 .../hostifaces/MshHostRawUserInterface.cs     |  4 +--
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
index f76723d64e1..7b693ce0ed4 100644
--- a/src/System.Management.Automation/engine/MshCommandRuntime.cs
+++ b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -1063,7 +1063,7 @@ internal int OutBuffer
         /// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         namespace Microsoft.Samples.MSH.Cmdlet
         ///         {
         ///             [Cmdlet(VerbsCommon.Remove,"myobjecttype1")]
@@ -1086,7 +1086,7 @@ internal int OutBuffer
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string)"/>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string,string)"/>
@@ -1157,7 +1157,7 @@ public bool ShouldProcess(string target)
         /// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         namespace Microsoft.Samples.MSH.Cmdlet
         ///         {
         ///             [Cmdlet(VerbsCommon.Remove,"myobjecttype2")]
@@ -1180,7 +1180,7 @@ public bool ShouldProcess(string target)
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string,string)"/>
@@ -1260,7 +1260,7 @@ public bool ShouldProcess(string target, string action)
         /// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         namespace Microsoft.Samples.MSH.Cmdlet
         ///         {
         ///             [Cmdlet(VerbsCommon.Remove,"myobjecttype3")]
@@ -1286,7 +1286,7 @@ public bool ShouldProcess(string target, string action)
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string)"/>
@@ -1375,7 +1375,7 @@ public bool ShouldProcess(
         /// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         namespace Microsoft.Samples.MSH.Cmdlet
         ///         {
         ///             [Cmdlet(VerbsCommon.Remove,"myobjecttype3")]
@@ -1403,7 +1403,7 @@ public bool ShouldProcess(
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string)"/>
@@ -1681,7 +1681,7 @@ internal ShouldProcessPossibleOptimization CalculatePossibleShouldProcessOptimiz
         /// to ShouldProcess for the Cmdlet instance.
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         namespace Microsoft.Samples.MSH.Cmdlet
         ///         {
         ///             [Cmdlet(VerbsCommon.Remove,"myobjecttype4")]
@@ -1725,7 +1725,7 @@ internal ShouldProcessPossibleOptimization CalculatePossibleShouldProcessOptimiz
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldContinue(string,string,ref bool,ref bool)"/>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
@@ -1863,7 +1863,7 @@ public bool ShouldContinue(
         /// to ShouldProcess for the Cmdlet instance.
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         namespace Microsoft.Samples.MSH.Cmdlet
         ///         {
         ///             [Cmdlet(VerbsCommon.Remove,"myobjecttype4")]
@@ -1912,7 +1912,7 @@ public bool ShouldContinue(
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldContinue(string,string)"/>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
diff --git a/src/System.Management.Automation/engine/cmdlet.cs b/src/System.Management.Automation/engine/cmdlet.cs
index ba7548f982d..953156873fa 100644
--- a/src/System.Management.Automation/engine/cmdlet.cs
+++ b/src/System.Management.Automation/engine/cmdlet.cs
@@ -801,7 +801,7 @@ public void WriteInformation(InformationRecord informationRecord)
         /// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         namespace Microsoft.Samples.MSH.Cmdlet
         ///         {
         ///             [Cmdlet(VerbsCommon.Remove,"myobjecttype1")]
@@ -824,7 +824,7 @@ public void WriteInformation(InformationRecord informationRecord)
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string)"/>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string,string)"/>
@@ -897,7 +897,7 @@ public bool ShouldProcess(string target)
         /// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         namespace Microsoft.Samples.MSH.Cmdlet
         ///         {
         ///             [Cmdlet(VerbsCommon.Remove,"myobjecttype2")]
@@ -920,7 +920,7 @@ public bool ShouldProcess(string target)
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string,string)"/>
@@ -1001,7 +1001,7 @@ public bool ShouldProcess(string target, string action)
         /// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         namespace Microsoft.Samples.MSH.Cmdlet
         ///         {
         ///             [Cmdlet(VerbsCommon.Remove,"myobjecttype3")]
@@ -1027,7 +1027,7 @@ public bool ShouldProcess(string target, string action)
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string)"/>
@@ -1117,7 +1117,7 @@ public bool ShouldProcess(
         /// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         namespace Microsoft.Samples.MSH.Cmdlet
         ///         {
         ///             [Cmdlet(VerbsCommon.Remove,"myobjecttype3")]
@@ -1145,7 +1145,7 @@ public bool ShouldProcess(
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string)"/>
@@ -1233,7 +1233,7 @@ public bool ShouldProcess(
         /// to ShouldProcess for the Cmdlet instance.
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         namespace Microsoft.Samples.MSH.Cmdlet
         ///         {
         ///             [Cmdlet(VerbsCommon.Remove,"myobjecttype4")]
@@ -1277,7 +1277,7 @@ public bool ShouldProcess(
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldContinue(string,string,ref bool,ref bool)"/>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
@@ -1362,7 +1362,7 @@ public bool ShouldContinue(string query, string caption)
         /// to ShouldProcess for the Cmdlet instance.
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         namespace Microsoft.Samples.MSH.Cmdlet
         ///         {
         ///             [Cmdlet(VerbsCommon.Remove,"myobjecttype4")]
@@ -1411,7 +1411,7 @@ public bool ShouldContinue(string query, string caption)
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldContinue(string,string)"/>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
@@ -1502,7 +1502,7 @@ public bool ShouldContinue(
         /// to ShouldProcess for the Cmdlet instance.
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         namespace Microsoft.Samples.MSH.Cmdlet
         ///         {
         ///             [Cmdlet(VerbsCommon.Remove,"myobjecttype4")]
@@ -1551,7 +1551,7 @@ public bool ShouldContinue(
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldContinue(string,string)"/>
         /// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
diff --git a/src/System.Management.Automation/engine/hostifaces/MshHostRawUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/MshHostRawUserInterface.cs
index f4c3aedfb69..09d58ea7357 100644
--- a/src/System.Management.Automation/engine/hostifaces/MshHostRawUserInterface.cs
+++ b/src/System.Management.Automation/engine/hostifaces/MshHostRawUserInterface.cs
@@ -1458,7 +1458,7 @@ public abstract
         /// Provided for clearing regions -- less chatty than passing an array of cells.
         /// </remarks>
         /// <example>
-        ///     <snippet Code="C#">
+        ///     <code>
         ///         using System;
         ///         using System.Management.Automation;
         ///         using System.Management.Automation.Host;
@@ -1474,7 +1474,7 @@ public abstract
         ///                 }
         ///             }
         ///         }
-        ///     </snippet>
+        ///     </code>
         /// </example>
         /// <seealso cref="System.Management.Automation.Host.PSHostRawUserInterface.NewBufferCellArray(int, int, BufferCell)"/>
         /// <seealso cref="System.Management.Automation.Host.PSHostRawUserInterface.NewBufferCellArray(Size, BufferCell)"/>

From 49e21be29dbea81998484b2a6d7f6ff2cd6fef99 Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Thu, 16 Sep 2021 04:51:48 +0100
Subject: [PATCH 048/645] Update more docs for `net6.0` TFM (#16102)

---
 docs/building/linux.md | 2 +-
 docs/building/macos.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/building/linux.md b/docs/building/linux.md
index 7b42b04d342..fdf355fcde1 100644
--- a/docs/building/linux.md
+++ b/docs/building/linux.md
@@ -71,7 +71,7 @@ Start-PSBuild
 Congratulations! If everything went right, PowerShell is now built.
 The `Start-PSBuild` script will output the location of the executable:
 
-`./src/powershell-unix/bin/Debug/net5.0/linux-x64/publish/pwsh`.
+`./src/powershell-unix/bin/Debug/net6.0/linux-x64/publish/pwsh`.
 
 You should now be running the PowerShell Core that you just built, if you run the above executable.
 You can run our cross-platform Pester tests with `Start-PSPester`, and our xUnit tests with `Start-PSxUnit`.
diff --git a/docs/building/macos.md b/docs/building/macos.md
index e398451e8da..8898a917877 100644
--- a/docs/building/macos.md
+++ b/docs/building/macos.md
@@ -36,4 +36,4 @@ We cannot do this for you in the build module due to #[847][].
 
 Start a PowerShell session by running `pwsh`, and then use `Start-PSBuild` from the module.
 
-After building, PowerShell will be at `./src/powershell-unix/bin/Debug/net5.0/osx-x64/publish/pwsh`.
+After building, PowerShell will be at `./src/powershell-unix/bin/Debug/net6.0/osx-x64/publish/pwsh`.

From e81048b6ab9a9577b044c664d612ed1032c46297 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Fri, 17 Sep 2021 10:37:18 -0700
Subject: [PATCH 049/645] Remove Joey from Committee and WG membership (#16119)

---
 docs/community/governance.md                | 1 -
 docs/community/working-group-definitions.md | 1 -
 2 files changed, 2 deletions(-)

diff --git a/docs/community/governance.md b/docs/community/governance.md
index e97985a586b..dcad933fb36 100644
--- a/docs/community/governance.md
+++ b/docs/community/governance.md
@@ -27,7 +27,6 @@ The PowerShell Committee and its members (aka Committee Members) are the primary
 
 * Bruce Payette ([BrucePay](https://github.com/BrucePay))
 * Jim Truher ([JamesWTruher](https://github.com/JamesWTruher))
-* Joey Aiello ([joeyaiello](https://github.com/joeyaiello))
 * Paul Higinbotham ([paulhigin](https://github.com/paulhigin))
 * Rob Holt ([rjmholt](https://github.com/rjmholt))
 * Steve Lee ([SteveL-MSFT](https://github.com/SteveL-MSFT))
diff --git a/docs/community/working-group-definitions.md b/docs/community/working-group-definitions.md
index b7e9cf323a7..f3efc89df3c 100644
--- a/docs/community/working-group-definitions.md
+++ b/docs/community/working-group-definitions.md
@@ -19,7 +19,6 @@ Today, DSC is integrated into the PowerShell language, and we need to manage it
 
 * @TravisEz13
 * @theJasonHelmick
-* @joeyaiello
 * @anmenaga
 
 ## Developer Experience

From c4c312cc3198081d3452ed0cd0ed524e1f364feb Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 23 Sep 2021 07:04:14 -0700
Subject: [PATCH 050/645] Update `Microsoft.CodeAnalysis.CSharp` version
 (#16138)

---
 .../Microsoft.PowerShell.Commands.Utility.csproj                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index df92bc5a746..ca77b060e53 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-4.21430.4" />
+    <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" />

From 6589eeb610b5d7b0d3d1de20d67cae32db10a014 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 23 Sep 2021 07:06:06 -0700
Subject: [PATCH 051/645] Change path for Component Governance for build to the
 path we actually use to build (#16137)

---
 .../releaseBuild/azureDevOps/templates/windows-hosted-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
index 2820654d167..8cc5831b8e5 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -76,5 +76,5 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
+      sourceScanPath: '$(PowerShellRoot)'
       snapshotForceEnabled: true

From 9eb63debcd0d5f7f0cfe83b3d554bdda8fb05e61 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 23 Sep 2021 17:31:57 -0700
Subject: [PATCH 052/645] Add sha256 hashes to release (#16147)

* Add sha256 hashes to release

* Update tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
---
 .../templates/release-CreateGitHubDraft.yml           | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
index 3b316e84cbf..4e3e8e998a4 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
@@ -16,6 +16,17 @@ steps:
     git clone https://$(AzureDevOpsPat)@mscodehub.visualstudio.com/PowerShellCore/_git/Internal-PowerShellTeam-Tools '$(Pipeline.Workspace)/tools'
   displayName: Clone Internal-Tools repository
 
+- pwsh: |
+    $Path = "$(System.ArtifactsDirectory)"
+    $OutputPath = Join-Path $Path ‘hashes.sha256’
+    $null = New-Item $OutputPath -ItemType File -Force
+    foreach ($file in Get-ChildItem -Path $Path -File ){
+        Get-FileHash -Algorithm SHA256 -Path $file |
+        ForEach-Object { "$($_.Hash) *$($file.Name)" } |
+        Out-File -Path $OutputPath -Append
+    }
+  displayName: Add sha256 hashes
+
 - pwsh: |
     Import-module '$(Pipeline.Workspace)/tools/Scripts/GitHubRelease.psm1'
     Publish-ReleaseDraft -Tag '$(ReleaseTag)' -Name '$(ReleaseTag) Release of PowerShell' -Description '<-- Update Me -->' -User PowerShell -Repository PowerShell  -PackageFolder $(System.ArtifactsDirectory) -Token $(GitHubReleasePat)

From 3ed7571f94705a81b861efca7854dbcd9c2225bd Mon Sep 17 00:00:00 2001
From: Andy Schwartzmeyer <andrew@schwartzmeyer.com>
Date: Thu, 23 Sep 2021 22:28:57 -0700
Subject: [PATCH 053/645] Update Windows PowerShell issues link (#16105)

---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 4e050986fa5..8471badfb0e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Windows PowerShell
-    url: https://windowsserver.uservoice.com/forums/301869-powershell
+    url: https://support.microsoft.com/windows/send-feedback-to-microsoft-with-the-feedback-hub-app-f59187f8-8739-22d6-ba93-f66612949332
     about: Windows PowerShell issues or suggestions.
   - name: Support
     url: https://github.com/PowerShell/PowerShell/blob/master/.github/SUPPORT.md

From 7f36609cf462139481ff06c55d9dd35804de2d12 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 28 Sep 2021 16:58:26 -0700
Subject: [PATCH 054/645] fix issue with hash file getting created before we
 have finished get-childitem (#16170)

---
 .../templates/release-CreateGitHubDraft.yml   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
index 4e3e8e998a4..6e968cca572 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
@@ -19,12 +19,19 @@ steps:
 - pwsh: |
     $Path = "$(System.ArtifactsDirectory)"
     $OutputPath = Join-Path $Path ‘hashes.sha256’
-    $null = New-Item $OutputPath -ItemType File -Force
-    foreach ($file in Get-ChildItem -Path $Path -File ){
-        Get-FileHash -Algorithm SHA256 -Path $file |
-        ForEach-Object { "$($_.Hash) *$($file.Name)" } |
-        Out-File -Path $OutputPath -Append
-    }
+    $srcPaths = @($Path)
+    $packages  = Get-ChildItem -Path $srcPaths -Include * -Recurse
+    $checksums = $packages |
+        ForEach-Object {
+            Write-Verbose -Verbose "Generating checksum file for $($_.FullName)"
+            $packageName = $_.Name
+            $hash = (Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash.ToLower()
+            # the '*' before the packagename signifies it is a binary
+            "$hash *$packageName"
+        }
+    $checksums | Out-File -FilePath $OutputPath -Force
+    $fileContent = Get-Content -Path $OutputPath -Raw | Out-String
+    Write-Verbose -Verbose -Message $fileContent
   displayName: Add sha256 hashes
 
 - pwsh: |

From f4ee1d7f12a2516273dd7d7e9c7b1654ab0fec39 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 28 Sep 2021 17:13:11 -0700
Subject: [PATCH 055/645] Update `README.md` and `metadata.json` for next
 preview release (#16107)

---
 README.md           | 28 ++++++++++++++--------------
 tools/metadata.json |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 7f83f92f6bc..d0e918001a8 100644
--- a/README.md
+++ b/README.md
@@ -94,20 +94,20 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 [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-preview.9/PowerShell-7.2.0-preview.9-win-x64.msi
-[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-x86.msi
-[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-preview_7.2.0-preview.9-1.deb_amd64.deb
-[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-preview-7.2.0_preview.9-1.rh.x86_64.rpm
-[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-osx-x64.pkg
-[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-osx-arm64.pkg
-[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-arm64.zip
-[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-x86.zip
-[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-x64.zip
-[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-osx-x64.tar.gz
-[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-osx-arm64.tar.gz
-[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-linux-x64.tar.gz
-[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-linux-arm32.tar.gz
-[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-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
diff --git a/tools/metadata.json b/tools/metadata.json
index 88db98aa613..52b88af8a37 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,9 +1,9 @@
 {
   "StableReleaseTag": "v7.1.4",
-  "PreviewReleaseTag": "v7.2.0-preview.9",
+  "PreviewReleaseTag": "v7.2.0-preview.10",
   "ServicingReleaseTag": "v7.0.7",
   "ReleaseTag": "v7.1.4",
   "LTSReleaseTag" : ["v7.0.7"],
-  "NextReleaseTag": "v7.2.0-preview.10",
+  "NextReleaseTag": "v7.2.0-preview.11",
   "LTSRelease": false
 }

From 4336ebaf29bc85e0ac96aee0dfd2dd10c2a248f9 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Sun, 3 Oct 2021 13:35:19 -0700
Subject: [PATCH 056/645] Fix Microsoft update spelling issue. (#16178)

---
 assets/wix/Product.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/wix/Product.wxs b/assets/wix/Product.wxs
index da25dee7b04..3691f5268ca 100644
--- a/assets/wix/Product.wxs
+++ b/assets/wix/Product.wxs
@@ -350,7 +350,7 @@
       <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" TabSkip="yes" />
       <Control Id="Description" Type="Text" X="25" Y="54" Width="280" Height="100" Transparent="yes" NoPrefix="yes" Text="Microsoft Update helps keep your computer secure and up to date for Windows and other Microsoft products, including PowerShell 7. Updates will be delivered based on your current update settings. You can review or change these settings from the Windows Update control panel." TabSkip="yes" />
       <!-- If the checkboxes are defined first, then they are first in the tab order and can be ticked and unticked using the spacebar -->
-      <Control Id="UseMuCheckBox" Type="CheckBox" X="20" Y="100" Width="290" Height="27" Property="USE_MU" CheckBoxValue="1" Text="Enable updating PowerShell through Microsft Update or WSUS (recommended)"/>
+      <Control Id="UseMuCheckBox" Type="CheckBox" X="20" Y="100" Width="290" Height="27" Property="USE_MU" CheckBoxValue="1" Text="Enable updating PowerShell through Microsoft Update or WSUS (recommended)"/>
       <Control Id="EnableMuCheckBox" Type="CheckBox" X="20" Y="130" Width="290" Height="17" Property="ENABLE_MU" CheckBoxValue="1" Text="Use Microsoft Update when I check for updates (recommended)">
       </Control>
       <Control Id="MuWarningText" Type="Text" X="20" Y="160" Width="290" Height="27" Text="Without Microsoft Update enabled, you will need to use another update solution like WSUS or SCCM in order to receive automatic updates.">

From 6b42f445eded6daefc9fa3d6826b29022e94038d Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Sun, 3 Oct 2021 13:36:55 -0700
Subject: [PATCH 057/645] Move vPack build to 1ES Pool (#16169)

---
 tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
index c7ef645a878..8cc31ab8df9 100644
--- a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+++ b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@@ -5,7 +5,7 @@ jobs:
 - job: vpack_${{ parameters.architecture }}
   displayName: Build and Publish VPack - ${{ parameters.architecture }}
   condition: succeeded()
-  pool: Package ES Standard Build
+  pool: PowerShell1ES
   steps:
   - checkout: self
     clean: true

From cfe45defc1ed87a7a7b916f154e56124d81a320b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 3 Oct 2021 13:48:25 -0700
Subject: [PATCH 058/645] Bump `Microsoft.CodeAnalysis.NetAnalyzers` from
 `6.0.0-rc2.21458.5` to `6.0.0-rtm.21480.8` (#16183)

Bumps [Microsoft.CodeAnalysis.NetAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 6.0.0-rc2.21458.5 to 6.0.0-rtm.21480.8.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/main/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/commits)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.NetAnalyzers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index b67dba7625b..770043a87e2 100644
--- a/Analyzers.props
+++ b/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-rc2.21458.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rtm.21480.8" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From 4c84665bc7287be8b0d04652f44481e614a0b061 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 10:28:10 -0700
Subject: [PATCH 059/645] Bump Microsoft.CodeAnalysis.NetAnalyzers (#16194)

Bumps [Microsoft.CodeAnalysis.NetAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 6.0.0-rtm.21480.8 to 6.0.0-rtm.21504.2.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/main/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/commits)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.NetAnalyzers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index 770043a87e2..4ea5f3e0618 100644
--- a/Analyzers.props
+++ b/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-rtm.21480.8" 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>

From 2f57bf848b03828ee6c343b55f7ce80df2e5a23e Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 5 Oct 2021 10:29:16 -0700
Subject: [PATCH 060/645] Change `Target` from a `CodeProperty` to be an
 `AliasProperty` that points to `FileSystemInfo.LinkTarget` (#16165)

---
 .../host/msh/ConsoleHost.cs                   |   2 +-
 .../CoreCLR/CorePsPlatform.cs                 |   5 -
 .../engine/NativeCommandProcessor.cs          |  20 +-
 .../engine/TypeTable_Types_Ps1Xml.cs          |  10 +-
 .../namespaces/FileSystemProvider.cs          | 227 +++++-------------
 .../FileSystem.Tests.ps1                      |  36 +++
 6 files changed, 108 insertions(+), 192 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
index b0ae4735026..c2206ac7de8 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -432,7 +432,7 @@ private static void SpinUpBreakHandlerThread(bool shouldEndSession)
                     host.ShouldEndSession = shouldEndSession;
                 }
 
-                // Creation of the tread and starting it should be an atomic operation.
+                // Creation of the thread and starting it should be an atomic operation.
                 // otherwise the code in Run method can get instance of the breakhandlerThread
                 // after it is created and before started and call join on it. This will result
                 // in ThreadStateException.
diff --git a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
index 884e91e3356..ce37ae12d17 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
@@ -516,11 +516,6 @@ internal static bool NonWindowsIsHardLink(FileSystemInfo fileInfo)
             return Unix.IsHardLink(fileInfo);
         }
 
-        internal static string NonWindowsInternalGetTarget(string path)
-        {
-            return Unix.NativeMethods.FollowSymLink(path);
-        }
-
         internal static string NonWindowsGetUserFromPid(int path)
         {
             return Unix.NativeMethods.GetUserFromPid(path);
diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index 7df3dd82546..2c5efb35668 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -1101,15 +1101,21 @@ private static bool IsWindowsApplication(string fileName)
 #if UNIX
             return false;
 #else
-            if (!Platform.IsWindowsDesktop) { return false; }
+            if (!Platform.IsWindowsDesktop)
+            {
+                return false;
+            }
 
-            // SHGetFileInfo() does not understand reparse points and returns 0 ("non exe or error")
-            // so we are trying to get a real path before.
-            // It is a workaround for Microsoft Store applications.
-            string realPath = Microsoft.PowerShell.Commands.InternalSymbolicLinkLinkCodeMethods.WinInternalGetTarget(fileName);
-            if (realPath is not null)
+            // 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 = realPath;
+                fileName = linkTarget;
             }
 
             SHFILEINFO shinfo = new SHFILEINFO();
diff --git a/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs b/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
index 7113c0953cb..648bafe152c 100644
--- a/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
+++ b/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
@@ -680,10 +680,7 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag<string> errors)
             AddMember(
                 errors,
                 typeName,
-                new PSCodeProperty(
-                    @"Target",
-                    GetMethodInfo(typeof(Microsoft.PowerShell.Commands.InternalSymbolicLinkLinkCodeMethods), @"GetTarget"),
-                    setterCodeReference: null),
+                new PSAliasProperty(@"Target", @"LinkTarget", conversionType: null),
                 typeMembers,
                 isOverride: false);
 
@@ -808,10 +805,7 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag<string> errors)
             AddMember(
                 errors,
                 typeName,
-                new PSCodeProperty(
-                    @"Target",
-                    GetMethodInfo(typeof(Microsoft.PowerShell.Commands.InternalSymbolicLinkLinkCodeMethods), @"GetTarget"),
-                    setterCodeReference: null),
+                new PSAliasProperty(@"Target", @"LinkTarget", conversionType: null),
                 typeMembers,
                 isOverride: false);
 
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index 34c399f7bed..7e6d302b22a 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -2069,7 +2069,7 @@ public static string NameString(PSObject instance)
                 {
                     if (InternalSymbolicLinkLinkCodeMethods.IsReparsePointLikeSymlink(fileInfo))
                     {
-                        return $"{PSStyle.Instance.FileInfo.SymbolicLink}{fileInfo.Name}{PSStyle.Instance.Reset} -> {InternalSymbolicLinkLinkCodeMethods.GetTarget(instance)}";
+                        return $"{PSStyle.Instance.FileInfo.SymbolicLink}{fileInfo.Name}{PSStyle.Instance.Reset} -> {fileInfo.LinkTarget}";
                     }
                     else if (fileInfo.Attributes.HasFlag(FileAttributes.Directory))
                     {
@@ -2096,7 +2096,7 @@ public static string NameString(PSObject instance)
             {
                 return instance?.BaseObject is FileSystemInfo fileInfo
                     ? InternalSymbolicLinkLinkCodeMethods.IsReparsePointLikeSymlink(fileInfo)
-                        ? $"{fileInfo.Name} -> {InternalSymbolicLinkLinkCodeMethods.GetTarget(instance)}"
+                        ? $"{fileInfo.Name} -> {fileInfo.LinkTarget}"
                         : fileInfo.Name
                     : string.Empty;
             }
@@ -8105,15 +8105,18 @@ internal unsafe struct WIN32_FIND_DATA
         /// </summary>
         /// <param name="instance">The object of FileInfo or DirectoryInfo type.</param>
         /// <returns>The target of the reparse point.</returns>
+        [Obsolete("This method is now obsolete. Please use the .NET API 'FileSystemInfo.LinkTarget'", error: true)]
         public static string GetTarget(PSObject instance)
         {
             if (instance.BaseObject is FileSystemInfo fileSysInfo)
             {
-#if !UNIX
-                return WinInternalGetTarget(fileSysInfo.FullName);
-#else
-               return UnixInternalGetTarget(fileSysInfo.FullName);
-#endif
+                if (!fileSysInfo.Exists)
+                {
+                    throw new ArgumentException(
+                        StringUtil.Format(SessionStateStrings.PathNotFound, fileSysInfo.FullName));
+                }
+
+                return fileSysInfo.LinkTarget;
             }
 
             return null;
@@ -8136,20 +8139,6 @@ public static string GetLinkType(PSObject instance)
             return null;
         }
 
-#if UNIX
-        private static string UnixInternalGetTarget(string filePath)
-        {
-            string link = Platform.NonWindowsInternalGetTarget(filePath);
-
-            if (string.IsNullOrEmpty(link))
-            {
-                throw new Win32Exception(Marshal.GetLastWin32Error());
-            }
-
-            return link;
-        }
-#endif
-
         private static string InternalGetLinkType(FileSystemInfo fileInfo)
         {
             if (Platform.IsWindows)
@@ -8165,16 +8154,11 @@ private static string InternalGetLinkType(FileSystemInfo fileInfo)
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods")]
         private static string WinInternalGetLinkType(string filePath)
         {
-            if (!Platform.IsWindows)
-            {
-                throw new PlatformNotSupportedException();
-            }
-
             // We set accessMode parameter to zero because documentation says:
             // If this parameter is zero, the application can query certain metadata
             // such as file, directory, or device attributes without accessing
             // that file or device, even if GENERIC_READ access would have been denied.
-            using (SafeFileHandle handle = OpenReparsePoint(filePath, FileDesiredAccess.GenericZero))
+            using (SafeFileHandle handle = WinOpenReparsePoint(filePath, FileDesiredAccess.GenericZero))
             {
                 int outBufferSize = Marshal.SizeOf<REPARSE_DATA_BUFFER_SYMBOLICLINK>();
 
@@ -8439,176 +8423,77 @@ internal static bool WinIsHardLink(ref IntPtr handle)
             return succeeded && (handleInfo.NumberOfLinks > 1);
         }
 
-#if !UNIX
-        internal static string WinInternalGetTarget(string path)
-        {
-            // We set accessMode parameter to zero because documentation says:
-            // If this parameter is zero, the application can query certain metadata
-            // such as file, directory, or device attributes without accessing
-            // that file or device, even if GENERIC_READ access would have been denied.
-            using (SafeFileHandle handle = OpenReparsePoint(path, FileDesiredAccess.GenericZero))
-            {
-                return WinInternalGetTarget(handle);
-            }
-        }
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods")]
-        private static string WinInternalGetTarget(SafeFileHandle handle)
-        {
-            int outBufferSize = Marshal.SizeOf<REPARSE_DATA_BUFFER_SYMBOLICLINK>();
-
-            IntPtr outBuffer = Marshal.AllocHGlobal(outBufferSize);
-            bool success = false;
-
-            try
-            {
-                int bytesReturned;
-
-                // OACR warning 62001 about using DeviceIOControl has been disabled.
-                // According to MSDN guidance DangerousAddRef() and DangerousRelease() have been used.
-                handle.DangerousAddRef(ref success);
-
-                bool result = DeviceIoControl(
-                    handle.DangerousGetHandle(),
-                    FSCTL_GET_REPARSE_POINT,
-                    InBuffer: IntPtr.Zero,
-                    nInBufferSize: 0,
-                    outBuffer,
-                    outBufferSize,
-                    out bytesReturned,
-                    lpOverlapped: IntPtr.Zero);
-
-                if (!result)
-                {
-                    // It's not a reparse point or the file system doesn't support reparse points.
-                    return null;
-                }
-
-                string targetDir = null;
-
-                REPARSE_DATA_BUFFER_SYMBOLICLINK reparseDataBuffer = Marshal.PtrToStructure<REPARSE_DATA_BUFFER_SYMBOLICLINK>(outBuffer);
-
-                switch (reparseDataBuffer.ReparseTag)
-                {
-                    case IO_REPARSE_TAG_SYMLINK:
-                        targetDir = Encoding.Unicode.GetString(reparseDataBuffer.PathBuffer, reparseDataBuffer.SubstituteNameOffset, reparseDataBuffer.SubstituteNameLength);
-                        break;
-
-                    case IO_REPARSE_TAG_MOUNT_POINT:
-                        REPARSE_DATA_BUFFER_MOUNTPOINT reparseMountPointDataBuffer = Marshal.PtrToStructure<REPARSE_DATA_BUFFER_MOUNTPOINT>(outBuffer);
-                        targetDir = Encoding.Unicode.GetString(reparseMountPointDataBuffer.PathBuffer, reparseMountPointDataBuffer.SubstituteNameOffset, reparseMountPointDataBuffer.SubstituteNameLength);
-                        break;
-
-                    default:
-                        return null;
-                }
-
-                if (targetDir != null && targetDir.StartsWith(NonInterpretedPathPrefix, StringComparison.OrdinalIgnoreCase))
-                {
-                    targetDir = targetDir.Substring(NonInterpretedPathPrefix.Length);
-                }
-
-                return targetDir;
-            }
-            finally
-            {
-                if (success)
-                {
-                    handle.DangerousRelease();
-                }
-
-                Marshal.FreeHGlobal(outBuffer);
-            }
-        }
-#endif
-
         internal static bool CreateJunction(string path, string target)
         {
-            // this is a purely Windows specific feature, no feature flag
-            // used for that reason
+            // this is a purely Windows specific feature, no feature flag used for that reason.
             if (Platform.IsWindows)
             {
                 return WinCreateJunction(path, target);
             }
-            else
-            {
-                return false;
-            }
+
+            return false;
         }
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods")]
         private static bool WinCreateJunction(string path, string target)
         {
-            if (!string.IsNullOrEmpty(path))
+            if (string.IsNullOrEmpty(path))
             {
-                if (!string.IsNullOrEmpty(target))
-                {
-                    using (SafeHandle handle = OpenReparsePoint(path, FileDesiredAccess.GenericWrite))
-                    {
-                        byte[] mountPointBytes = Encoding.Unicode.GetBytes(NonInterpretedPathPrefix + Path.GetFullPath(target));
+                throw new ArgumentNullException(nameof(path));
+            }
 
-                        REPARSE_DATA_BUFFER_MOUNTPOINT mountPoint = new REPARSE_DATA_BUFFER_MOUNTPOINT();
-                        mountPoint.ReparseTag = IO_REPARSE_TAG_MOUNT_POINT;
-                        mountPoint.ReparseDataLength = (ushort)(mountPointBytes.Length + 12); // Added space for the header and null endo
-                        mountPoint.SubstituteNameOffset = 0;
-                        mountPoint.SubstituteNameLength = (ushort)mountPointBytes.Length;
-                        mountPoint.PrintNameOffset = (ushort)(mountPointBytes.Length + 2); // 2 as unicode null take 2 bytes.
-                        mountPoint.PrintNameLength = 0;
-                        mountPoint.PathBuffer = new byte[0x3FF0]; // Buffer for max size.
-                        Array.Copy(mountPointBytes, mountPoint.PathBuffer, mountPointBytes.Length);
+            if (string.IsNullOrEmpty(target))
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
 
-                        int nativeBufferSize = Marshal.SizeOf(mountPoint);
-                        IntPtr nativeBuffer = Marshal.AllocHGlobal(nativeBufferSize);
-                        bool success = false;
+            using (SafeHandle handle = WinOpenReparsePoint(path, FileDesiredAccess.GenericWrite))
+            {
+                byte[] mountPointBytes = Encoding.Unicode.GetBytes(NonInterpretedPathPrefix + Path.GetFullPath(target));
 
-                        try
-                        {
-                            Marshal.StructureToPtr(mountPoint, nativeBuffer, false);
+                var mountPoint = new REPARSE_DATA_BUFFER_MOUNTPOINT();
+                mountPoint.ReparseTag = IO_REPARSE_TAG_MOUNT_POINT;
+                mountPoint.ReparseDataLength = (ushort)(mountPointBytes.Length + 12); // Added space for the header and null endo
+                mountPoint.SubstituteNameOffset = 0;
+                mountPoint.SubstituteNameLength = (ushort)mountPointBytes.Length;
+                mountPoint.PrintNameOffset = (ushort)(mountPointBytes.Length + 2); // 2 as unicode null take 2 bytes.
+                mountPoint.PrintNameLength = 0;
+                mountPoint.PathBuffer = new byte[0x3FF0]; // Buffer for max size.
+                Array.Copy(mountPointBytes, mountPoint.PathBuffer, mountPointBytes.Length);
 
-                            int bytesReturned = 0;
+                int nativeBufferSize = Marshal.SizeOf(mountPoint);
+                IntPtr nativeBuffer = Marshal.AllocHGlobal(nativeBufferSize);
+                bool success = false;
 
-                            // OACR warning 62001 about using DeviceIOControl has been disabled.
-                            // According to MSDN guidance DangerousAddRef() and DangerousRelease() have been used.
-                            handle.DangerousAddRef(ref success);
+                try
+                {
+                    Marshal.StructureToPtr(mountPoint, nativeBuffer, false);
 
-                            bool result = DeviceIoControl(handle.DangerousGetHandle(), FSCTL_SET_REPARSE_POINT, nativeBuffer, mountPointBytes.Length + 20, IntPtr.Zero, 0, out bytesReturned, IntPtr.Zero);
+                    int bytesReturned = 0;
 
-                            if (!result)
-                            {
-                                throw new Win32Exception(Marshal.GetLastWin32Error());
-                            }
+                    // OACR warning 62001 about using DeviceIOControl has been disabled.
+                    // According to MSDN guidance DangerousAddRef() and DangerousRelease() have been used.
+                    handle.DangerousAddRef(ref success);
 
-                            return result;
-                        }
-                        finally
-                        {
-                            Marshal.FreeHGlobal(nativeBuffer);
+                    bool result = DeviceIoControl(handle.DangerousGetHandle(), FSCTL_SET_REPARSE_POINT, nativeBuffer, mountPointBytes.Length + 20, IntPtr.Zero, 0, out bytesReturned, IntPtr.Zero);
 
-                            if (success)
-                            {
-                                handle.DangerousRelease();
-                            }
-                        }
+                    if (!result)
+                    {
+                        throw new Win32Exception(Marshal.GetLastWin32Error());
                     }
+
+                    return result;
                 }
-                else
+                finally
                 {
-                    throw new ArgumentNullException(nameof(target));
+                    Marshal.FreeHGlobal(nativeBuffer);
+
+                    if (success)
+                    {
+                        handle.DangerousRelease();
+                    }
                 }
             }
-            else
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-        }
-
-        private static SafeFileHandle OpenReparsePoint(string reparsePoint, FileDesiredAccess accessMode)
-        {
-#if UNIX
-            throw new PlatformNotSupportedException();
-#else
-            return WinOpenReparsePoint(reparsePoint, accessMode);
-#endif
         }
 
         private static SafeFileHandle WinOpenReparsePoint(string reparsePoint, FileDesiredAccess accessMode)
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
index e5d150013cd..10ec92b6be6 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
@@ -773,6 +773,42 @@ Describe "Hard link and symbolic link tests" -Tags "CI", "RequireAdminOnWindows"
             $childB.Name | Should -BeExactly $childA.Name
         }
     }
+
+    Context "Show immediate target" {
+        BeforeAll {
+            $testDir = Join-Path $TestDrive "immediate-target"
+            New-Item -ItemType Directory $testDir > $null
+
+            $testFile = Join-Path $testDir "target"
+            Set-Content -Path $testFile -Value "Hello world"
+
+            Push-Location $testDir
+            New-Item -ItemType SymbolicLink -Path 'firstLink' -Value 'target' > $null
+            New-Item -ItemType SymbolicLink -Path 'secondLink' -Value 'firstLink' > $null
+            Pop-Location
+        }
+
+        AfterAll {
+            Remove-Item $testDir -Recurse -Force
+        }
+
+        It "Property 'Target' should show the immediate target" {
+            $firstLink = Get-Item (Join-Path $testDir 'firstLink')
+            $firstLink.Target | Should -BeExactly 'target'
+            $str = [Microsoft.PowerShell.Commands.FileSystemProvider]::NameString($firstLink)
+            [System.Management.Automation.Internal.StringDecorated]::new($str).ToString([System.Management.Automation.OutputRendering]::PlainText) | Should -BeExactly 'firstLink -> target'
+
+            $secondLink = Get-Item (Join-Path $testDir 'secondLink')
+            $secondLink.Target | Should -BeExactly 'firstLink'
+            $str = [Microsoft.PowerShell.Commands.FileSystemProvider]::NameString($secondLink)
+            [System.Management.Automation.Internal.StringDecorated]::new($str).ToString([System.Management.Automation.OutputRendering]::PlainText) | Should -BeExactly 'secondLink -> firstLink'
+        }
+
+        It "Get-Content should be able to resolve the final target" {
+            Get-Content (Join-Path $testDir 'firstLink') | Should -BeExactly "Hello world"
+            Get-Content (Join-Path $testDir 'secondLink') | Should -BeExactly "Hello world"
+        }
+    }
 }
 
 Describe "Copy-Item can avoid copying an item onto itself" -Tags "CI", "RequireAdminOnWindows" {

From 53ac646cc0f23e2e150f23cabf98ab4c85b5b0db Mon Sep 17 00:00:00 2001
From: dwtaber <38249738+dwtaber@users.noreply.github.com>
Date: Wed, 6 Oct 2021 13:43:56 -0400
Subject: [PATCH 061/645] Invoke-Command: improve handling of variables with
 $using: expression (#16113)

---
 src/System.Management.Automation/engine/parser/ast.cs       | 6 ++++--
 .../engine/remoting/commands/PSRemotingCmdlet.cs            | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/System.Management.Automation/engine/parser/ast.cs b/src/System.Management.Automation/engine/parser/ast.cs
index 3e1f9ce60a5..1f03eb68df5 100644
--- a/src/System.Management.Automation/engine/parser/ast.cs
+++ b/src/System.Management.Automation/engine/parser/ast.cs
@@ -1261,7 +1261,8 @@ internal string ToStringForSerialization(Tuple<List<VariableExpressionAst>, stri
                 var varAst = ast as VariableExpressionAst;
                 if (varAst != null)
                 {
-                    string varName = varAst.VariablePath.UserPath;
+                    VariablePath varPath = varAst.VariablePath;
+                    string varName = varPath.IsDriveQualified ? $"{varPath.DriveName}_{varPath.UnqualifiedPath}" : $"{varPath.UnqualifiedPath}";
                     string varSign = varAst.Splatted ? "@" : "$";
                     string newVarName = varSign + UsingExpressionAst.UsingPrefix + varName;
 
@@ -2329,7 +2330,8 @@ internal string GetParamTextWithDollarUsingHandling(IEnumerator<VariableExpressi
                 // We are done processing the current ParameterAst
                 if (astStartOffset >= endOffset) { break; }
 
-                string varName = varAst.VariablePath.UserPath;
+                VariablePath varPath = varAst.VariablePath;
+                string varName = varPath.IsDriveQualified ? $"{varPath.DriveName}_{varPath.UnqualifiedPath}" : $"{varPath.UnqualifiedPath}";
                 string varSign = varAst.Splatted ? "@" : "$";
                 string newVarName = varSign + UsingExpressionAst.UsingPrefix + varName;
 
diff --git a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
index d4f5ca427ab..67d0ced9f15 100644
--- a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
@@ -2374,7 +2374,8 @@ private string GetConvertedScript(out List<string> newParameterNames, out List<o
 
                 foreach (var varAst in usingVariables)
                 {
-                    string varName = varAst.VariablePath.UserPath;
+                    VariablePath varPath = varAst.VariablePath;
+                    string varName = varPath.IsDriveQualified ? $"{varPath.DriveName}_{varPath.UnqualifiedPath}" : $"{varPath.UnqualifiedPath}";
                     string paramName = UsingExpressionAst.UsingPrefix + varName;
                     string paramNameWithDollar = "$" + paramName;
 

From e98a8c8601b8f15f479e894323beafb9f6a2300c Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 7 Oct 2021 10:26:21 -0700
Subject: [PATCH 062/645] Fix '-PipelineVariable' to set variable in the right
 scope (#16199)

---
 .../engine/MshCommandRuntime.cs               | 52 +++++++++++--------
 .../engine/pipeline.cs                        | 16 +++++-
 .../ParameterBinding.Tests.ps1                | 34 ++++++++++++
 3 files changed, 78 insertions(+), 24 deletions(-)

diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
index 7b693ce0ed4..20965258462 100644
--- a/src/System.Management.Automation/engine/MshCommandRuntime.cs
+++ b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -928,7 +928,8 @@ private bool InitShouldLogPipelineExecutionDetail()
         /// </summary>
         internal string PipelineVariable { get; set; }
 
-        private PSVariable _pipelineVarReference = null;
+        private PSVariable _pipelineVarReference;
+        private bool _shouldRemovePipelineVariable;
 
         internal void SetupOutVariable()
         {
@@ -972,7 +973,7 @@ internal void SetupPipelineVariable()
             // This can't use the common SetupVariable implementation, as this needs to persist for an entire
             // pipeline.
 
-            if (string.IsNullOrEmpty(this.PipelineVariable))
+            if (string.IsNullOrEmpty(PipelineVariable))
             {
                 return;
             }
@@ -983,12 +984,24 @@ internal void SetupPipelineVariable()
                 _state = new SessionState(Context.EngineSessionState);
 
             // Create the pipeline variable
-            _pipelineVarReference = new PSVariable(this.PipelineVariable);
-            _state.PSVariable.Set(_pipelineVarReference);
+            _pipelineVarReference = new PSVariable(PipelineVariable);
+            object varToUse = _state.Internal.SetVariable(
+                _pipelineVarReference,
+                force: false,
+                CommandOrigin.Internal);
 
-            // Get the reference again in case we re-used one from the
-            // same scope.
-            _pipelineVarReference = _state.PSVariable.Get(this.PipelineVariable);
+            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;
+            }
 
             if (_thisCommand is not PSScriptCmdlet)
             {
@@ -996,6 +1009,15 @@ internal void SetupPipelineVariable()
             }
         }
 
+        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>
@@ -3765,25 +3787,12 @@ internal void SetVariableListsInPipe()
 
             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()
         {
-            // Diagnostics.Assert(thisCommand is PSScriptCmdlet, "this is only done for script cmdlets");
-
             if (_outVarList != null)
             {
                 this.OutputPipe.RemoveVariableList(VariableStreamKind.Output, _outVarList);
@@ -3807,9 +3816,6 @@ internal void RemoveVariableListsInPipe()
             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);
             }
         }
     }
diff --git a/src/System.Management.Automation/engine/pipeline.cs b/src/System.Management.Automation/engine/pipeline.cs
index 58ea07de6ae..78fb19dbc65 100644
--- a/src/System.Management.Automation/engine/pipeline.cs
+++ b/src/System.Management.Automation/engine/pipeline.cs
@@ -1298,7 +1298,21 @@ private void DisposeCommands()
                         // pipeline failure and continue disposing cmdlets.
                         try
                         {
-                            commandProcessor.CommandRuntime.RemoveVariableListsInPipe();
+                            // Only cmdlets can have variables defined via the common parameters.
+                            // We handle the cleanup of those variables only if we need to.
+                            if (commandProcessor is CommandProcessor)
+                            {
+                                if (commandProcessor.Command is not PSScriptCmdlet)
+                                {
+                                    // For script cmdlets, the variable lists were already removed when exiting a scope.
+                                    // So we only need to take care of binary cmdlets here.
+                                    commandProcessor.CommandRuntime.RemoveVariableListsInPipe();
+                                }
+
+                                // Remove the pipeline variable if we need to.
+                                commandProcessor.CommandRuntime.RemovePipelineVariable();
+                            }
+
                             commandProcessor.Dispose();
                         }
                         // 2005/04/13-JonN: The only vaguely plausible reason
diff --git a/test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1 b/test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1
index 5bacbae7b2d..bf48dd34640 100644
--- a/test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1
+++ b/test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1
@@ -264,6 +264,40 @@ Describe "Parameter Binding Tests" -Tags "CI" {
         { Copy-Item "~\$guid*" -Destination ~ -ToSession $null } | Should -Throw -ErrorId 'ParameterArgumentValidationError'
     }
 
+    It 'PipelineVariable should not cause variable-removal exception (issue #16155)' {
+        function Invoke-AddOne {
+            param (
+                [Parameter(ValueFromPipeline)]
+                [int]$Number
+            )
+
+            Begin {
+                $testValue = 'prefix-'
+            }
+
+            Process {
+                $testValue + $Number
+            }
+        }
+
+        1,2,3 | Invoke-AddOne -PipelineVariable testValue | ForEach-Object { $testValue } | Should -Be @('prefix-1', 'prefix-2', 'prefix-3')
+        { Get-Variable -Name testValue -ErrorAction Stop } | Should -Throw -ErrorId 'VariableNotFound,Microsoft.PowerShell.Commands.GetVariableCommand'
+
+        $results = & { $test = 'str'; 1,2,3 | Invoke-AddOne -PipelineVariable test | ForEach-Object { $test }; Get-Variable test }
+        $results | Should -HaveCount 4
+        $results[0] | Should -BeExactly 'prefix-1'
+        $results[1] | Should -BeExactly 'prefix-2'
+        $results[2] | Should -BeExactly 'prefix-3'
+        $results[3] -is [psvariable] | Should -BeTrue
+
+        $results = & { Set-Variable -Name test -Value 'str'; 1,2,3 | Invoke-AddOne -PipelineVariable test | ForEach-Object { $test }; Get-Variable test }
+        $results | Should -HaveCount 4
+        $results[0] | Should -BeExactly 'prefix-1'
+        $results[1] | Should -BeExactly 'prefix-2'
+        $results[2] | Should -BeExactly 'prefix-3'
+        $results[3] -is [psvariable] | Should -BeTrue
+    }
+
     Context "PipelineVariable Behaviour" {
 
         BeforeAll {

From 41093f6d7a6c0b2a2f6f5e896e26dce1e3943ddf Mon Sep 17 00:00:00 2001
From: Sean Wheeler <sean.wheeler@microsoft.com>
Date: Fri, 8 Oct 2021 11:01:28 -0500
Subject: [PATCH 063/645] Fixes #16176 - replace snippet tag with code tag in
 comments (#16177)


From ce951602a4edf4b8d6c813e2f3bef0a280cabfb8 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Tue, 12 Oct 2021 02:15:16 +0900
Subject: [PATCH 064/645] Fix typo in `TypeTable.cs` (#16220)

occured -> occurred
---
 src/System.Management.Automation/engine/TypeTable.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/engine/TypeTable.cs b/src/System.Management.Automation/engine/TypeTable.cs
index 0bcd276a45b..edc870f8933 100644
--- a/src/System.Management.Automation/engine/TypeTable.cs
+++ b/src/System.Management.Automation/engine/TypeTable.cs
@@ -1747,7 +1747,7 @@ internal void AddError(string typeName, int errorLineNumber, string resourceStri
 
     /// <summary>
     /// This exception is used by TypeTable constructor to indicate errors
-    /// occured during construction time.
+    /// occurred during construction time.
     /// </summary>
     [Serializable]
     public class TypeTableLoadException : RuntimeException
@@ -1796,7 +1796,7 @@ public TypeTableLoadException(string message, Exception innerException)
         /// time.
         /// </summary>
         /// <param name="loadErrors">
-        /// The errors that occured
+        /// The errors that occurred
         /// </param>
         internal TypeTableLoadException(ConcurrentBag<string> loadErrors)
             : base(TypesXmlStrings.TypeTableLoadErrors)

From fa4bfb447ee4c7840276ca14aaf82357fe79d648 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 11 Oct 2021 13:43:42 -0700
Subject: [PATCH 065/645] Use Ubuntu 20.04 for SSH remoting test (#16225)

---
 .vsts-ci/sshremoting-tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.vsts-ci/sshremoting-tests.yml b/.vsts-ci/sshremoting-tests.yml
index 016f3bfddca..46af221f8eb 100644
--- a/.vsts-ci/sshremoting-tests.yml
+++ b/.vsts-ci/sshremoting-tests.yml
@@ -34,6 +34,8 @@ 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
 

From a32700a1c15a227bde54a0b80fa83cbe47bd2f27 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 11 Oct 2021 14:49:09 -0700
Subject: [PATCH 066/645] Add `clean` block to script block as a peer to
 `begin`, `process`, and `end` to allow easy resource cleanup (#15177)

---
 .../utility/ImplicitRemotingCommands.cs       |   15 +-
 .../engine/CommandBase.cs                     |    7 +
 .../engine/CommandInfo.cs                     |    2 +-
 .../engine/CommandMetadata.cs                 |   21 +-
 .../engine/CommandProcessor.cs                |   17 +-
 .../engine/CommandProcessorBase.cs            |  227 ++-
 .../engine/ExecutionContext.cs                |   11 +-
 .../ExperimentalFeature.cs                    |    4 +
 .../engine/MshCommandRuntime.cs               |   13 +-
 .../engine/Pipe.cs                            |    7 +
 .../engine/ProxyCommand.cs                    |   24 +
 .../engine/ScriptCommandProcessor.cs          |   48 +-
 .../engine/debugger/Breakpoint.cs             |   11 +-
 .../engine/hostifaces/Pipeline.cs             |    2 +-
 .../engine/lang/scriptblock.cs                |   49 +-
 .../engine/parser/Compiler.cs                 |   10 +
 .../engine/parser/Parser.cs                   |   33 +-
 .../engine/parser/SemanticChecks.cs           |    9 +-
 .../engine/parser/VariableAnalysis.cs         |   24 +-
 .../engine/parser/ast.cs                      |  173 ++-
 .../engine/parser/token.cs                    |   17 +-
 .../engine/parser/tokenizer.cs                |   36 +-
 .../engine/pipeline.cs                        |  801 +++++-----
 .../engine/runtime/CompiledScriptBlock.cs     |   84 +-
 .../engine/runtime/Operations/MiscOps.cs      |   31 +-
 .../resources/ParserStrings.resx              |    8 +-
 .../Language/Parser/Parser.Tests.ps1          |    2 +
 .../Language/Parser/Parsing.Tests.ps1         |    6 +-
 .../CleanBlockErrorHandling.Tests.ps1         | 1374 +++++++++++++++++
 .../Scripting/PipelineBehaviour.Tests.ps1     |  591 +++++++
 30 files changed, 3034 insertions(+), 623 deletions(-)
 create mode 100644 test/powershell/Language/Scripting/CleanBlockErrorHandling.Tests.ps1
 create mode 100644 test/powershell/Language/Scripting/PipelineBehaviour.Tests.ps1

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
index 325632c44ce..19bc5d44aec 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
@@ -2823,13 +2823,14 @@ private void GenerateHelperFunctions(TextWriter writer)
 
             $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)
diff --git a/src/System.Management.Automation/engine/CommandBase.cs b/src/System.Management.Automation/engine/CommandBase.cs
index 048eafd56c8..bb7aec959f6 100644
--- a/src/System.Management.Automation/engine/CommandBase.cs
+++ b/src/System.Management.Automation/engine/CommandBase.cs
@@ -233,6 +233,13 @@ internal virtual void DoStopProcessing()
         {
         }
 
+        /// <summary>
+        /// When overridden in the derived class, performs clean-up after the command execution.
+        /// </summary>
+        internal virtual void DoCleanResource()
+        {
+        }
+
         #endregion Override
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/CommandInfo.cs b/src/System.Management.Automation/engine/CommandInfo.cs
index 7e28fece99d..1acca145ff9 100644
--- a/src/System.Management.Automation/engine/CommandInfo.cs
+++ b/src/System.Management.Automation/engine/CommandInfo.cs
@@ -529,7 +529,7 @@ private void GetMergedCommandParameterMetadata(out MergedCommandParameterMetadat
                 processor = scriptCommand != null
                     ? new CommandProcessor(scriptCommand, _context, useLocalScope: true, fromScriptFile: false,
                         sessionState: scriptCommand.ScriptBlock.SessionStateInternal ?? Context.EngineSessionState)
-                    : new CommandProcessor((CmdletInfo)this, _context) { UseLocalScope = true };
+                    : new CommandProcessor((CmdletInfo)this, _context);
 
                 ParameterBinderController.AddArgumentsToCommandProcessor(processor, Arguments);
                 CommandProcessorBase oldCurrentCommandProcessor = Context.CurrentCommandProcessor;
diff --git a/src/System.Management.Automation/engine/CommandMetadata.cs b/src/System.Management.Automation/engine/CommandMetadata.cs
index eb59f9140a2..bbe2b6666b2 100644
--- a/src/System.Management.Automation/engine/CommandMetadata.cs
+++ b/src/System.Management.Automation/engine/CommandMetadata.cs
@@ -875,8 +875,11 @@ internal string GetProxyCommand(string helpComment, bool generateDynamicParamete
 
 end
 {{{5}}}
+
+clean
+{{{6}}}
 <#
-{6}
+{7}
 #>
 ",
                 GetDecl(),
@@ -885,6 +888,7 @@ internal string GetProxyCommand(string helpComment, bool generateDynamicParamete
                 GetBeginBlock(),
                 GetProcessBlock(),
                 GetEndBlock(),
+                GetCleanBlock(),
                 CodeGeneration.EscapeBlockCommentContent(helpComment));
 
             return result;
@@ -1063,6 +1067,11 @@ internal string GetBeginBlock()
 
         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($_)
@@ -1113,6 +1122,16 @@ internal string GetEndBlock()
 ";
         }
 
+        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
diff --git a/src/System.Management.Automation/engine/CommandProcessor.cs b/src/System.Management.Automation/engine/CommandProcessor.cs
index fb1fe81fc54..62eebe5d937 100644
--- a/src/System.Management.Automation/engine/CommandProcessor.cs
+++ b/src/System.Management.Automation/engine/CommandProcessor.cs
@@ -309,13 +309,11 @@ internal override void DoBegin()
         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)
@@ -326,12 +324,9 @@ internal override void ProcessRecord()
                         Command.DoBeginProcessing();
                     }
                 }
-                // 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 (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);
                 }
             }
@@ -366,6 +361,7 @@ internal override void ProcessRecord()
 
                     // NOTICE-2004/06/08-JonN 959638
                     using (commandRuntime.AllowThisCommandToWrite(true))
+                    using (ParameterBinderBase.bindingTracer.TraceScope("CALLING ProcessRecord"))
                     {
                         if (CmdletParameterBinderController.ObsoleteParameterWarningList != null &&
                             CmdletParameterBinderController.ObsoleteParameterWarningList.Count > 0)
@@ -400,14 +396,13 @@ internal override void ProcessRecord()
                 }
                 catch (LoopFlowException)
                 {
-                    // Win8:84066 - Don't wrap LoopFlowException, we incorrectly raise a PipelineStoppedException
+                    // Don't wrap LoopFlowException, we incorrectly raise a PipelineStoppedException
                     // which gets caught by a script try/catch if we wrap here.
                     throw;
                 }
-                // 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 (Exception e)
                 {
+                    // Catch-all OK, 3rd party callout.
                     exceptionToThrow = e;
                 }
                 finally
diff --git a/src/System.Management.Automation/engine/CommandProcessorBase.cs b/src/System.Management.Automation/engine/CommandProcessorBase.cs
index c6825cc6925..8033e2b3677 100644
--- a/src/System.Management.Automation/engine/CommandProcessorBase.cs
+++ b/src/System.Management.Automation/engine/CommandProcessorBase.cs
@@ -5,8 +5,7 @@
 using System.Collections.ObjectModel;
 using System.Management.Automation.Internal;
 using System.Management.Automation.Language;
-
-using Dbg = System.Management.Automation.Diagnostics;
+using System.Runtime.InteropServices;
 
 namespace System.Management.Automation
 {
@@ -46,6 +45,7 @@ internal CommandProcessorBase(CommandInfo commandInfo)
                     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,6 +54,8 @@ internal CommandProcessorBase(CommandInfo commandInfo)
                         commandInfo);
                     throw new CmdletInvocationException(errorRecord);
                 }
+
+                HasCleanBlock = scriptCommand.ScriptBlock.HasCleanBlock;
             }
 
             CommandInfo = commandInfo;
@@ -87,6 +89,11 @@ internal bool AddedToPipelineAlready
         /// <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.
@@ -371,13 +378,10 @@ internal void RestorePreviousScope()
 
             Context.EngineSessionState = _previousCommandSessionState;
 
-            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 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;
@@ -452,16 +456,14 @@ internal void DoPrepare(IDictionary psDefaultParameterValues)
                     HandleObsoleteCommand(ObsoleteAttribute);
                 }
             }
-            catch (Exception)
+            catch (InvalidComObjectException 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);
-                }
+                // This type of exception could be thrown from parameter binding.
+                string msg = StringUtil.Format(ParserStrings.InvalidComObjectException, e.Message);
+                var newEx = new RuntimeException(msg, e);
 
-                throw;
+                newEx.SetErrorId("InvalidComObjectException");
+                throw newEx;
             }
             finally
             {
@@ -508,26 +510,23 @@ internal virtual void DoBegin()
                     // The RedirectShellErrorOutputPipe flag is used by the V2 hosting API to force the
                     // redirection.
                     //
-                    if (this.RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe != null)
+                    if (RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe is not null)
                     {
-                        _context.ShellFunctionErrorOutputPipe = this.commandRuntime.ErrorOutputPipe;
+                        _context.ShellFunctionErrorOutputPipe = commandRuntime.ErrorOutputPipe;
                     }
 
                     _context.CurrentCommandProcessor = this;
+                    SetCurrentScopeToExecutionScope();
+
                     using (commandRuntime.AllowThisCommandToWrite(true))
+                    using (ParameterBinderBase.bindingTracer.TraceScope("CALLING BeginProcessing"))
                     {
-                        using (ParameterBinderBase.bindingTracer.TraceScope(
-                            "CALLING BeginProcessing"))
+                        if (Context._debuggingMode > 0 && Command is not PSScriptCmdlet)
                         {
-                            SetCurrentScopeToExecutionScope();
-
-                            if (Context._debuggingMode > 0 && Command is not PSScriptCmdlet)
-                            {
-                                Context.Debugger.CheckCommand(this.Command.MyInvocation);
-                            }
-
-                            Command.DoBeginProcessing();
+                            Context.Debugger.CheckCommand(Command.MyInvocation);
                         }
+
+                        Command.DoBeginProcessing();
                     }
                 }
                 catch (Exception e)
@@ -589,20 +588,14 @@ internal virtual void Complete()
             try
             {
                 using (commandRuntime.AllowThisCommandToWrite(true))
+                using (ParameterBinderBase.bindingTracer.TraceScope("CALLING EndProcessing"))
                 {
-                    using (ParameterBinderBase.bindingTracer.TraceScope(
-                        "CALLING EndProcessing"))
-                    {
-                        this.Command.DoEndProcessing();
-                    }
+                    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, so
-                // wrap it and bubble it up.
+                // This cmdlet threw an exception, wrap it as needed and bubble it up.
                 throw ManageInvocationException(e);
             }
         }
@@ -631,46 +624,121 @@ internal void DoComplete()
                 // The RedirectShellErrorOutputPipe flag is used by the V2 hosting API to force the
                 // redirection.
                 //
-                if (this.RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe != null)
+                if (RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe is not null)
                 {
-                    _context.ShellFunctionErrorOutputPipe = this.commandRuntime.ErrorOutputPipe;
+                    _context.ShellFunctionErrorOutputPipe = commandRuntime.ErrorOutputPipe;
                 }
 
                 _context.CurrentCommandProcessor = this;
-
                 SetCurrentScopeToExecutionScope();
                 Complete();
             }
             finally
             {
-                OnRestorePreviousScope();
-
                 _context.ShellFunctionErrorOutputPipe = oldErrorOutputPipe;
                 _context.CurrentCommandProcessor = oldCurrentCommandProcessor;
 
-                // Destroy the local scope at this point if there is one...
-                if (_useLocalScope && CommandScope != null)
-                {
-                    CommandSessionState.RemoveScope(CommandScope);
-                }
+                RestorePreviousScope();
+            }
+        }
 
-                // and the previous scope...
-                if (_previousScope != null)
+        protected virtual void CleanResource()
+        {
+            try
+            {
+                using (commandRuntime.AllowThisCommandToWrite(permittedToWriteToPipeline: true))
+                using (ParameterBinderBase.bindingTracer.TraceScope("CALLING CleanResource"))
                 {
-                    // 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;
+                    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;
 
-                // Restore the previous session state
-                if (_previousCommandSessionState != null)
+            Pipe oldErrorOutputPipe = _context.ShellFunctionErrorOutputPipe;
+            CommandProcessorBase oldCurrentCommandProcessor = _context.CurrentCommandProcessor;
+
+            try
+            {
+                if (RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe is not null)
                 {
-                    Context.EngineSessionState = _previousCommandSessionState;
+                    _context.ShellFunctionErrorOutputPipe = commandRuntime.ErrorOutputPipe;
                 }
+
+                _context.CurrentCommandProcessor = this;
+                SetCurrentScopeToExecutionScope();
+                CleanResource();
+            }
+            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>
         /// For diagnostic purposes.
         /// </summary>
@@ -777,23 +845,16 @@ internal PipelineStoppedException ManageInvocationException(Exception e)
                 {
                     do // false loop
                     {
-                        ProviderInvocationException pie = e as ProviderInvocationException;
-                        if (pie != null)
+                        if (e is ProviderInvocationException pie)
                         {
-                            // If a ProviderInvocationException occurred,
-                            // discard the ProviderInvocationException and
-                            // re-wrap in CmdletProviderInvocationException
-                            e = new CmdletProviderInvocationException(
-                                pie,
-                                Command.MyInvocation);
+                            // If a ProviderInvocationException occurred, discard the ProviderInvocationException
+                            // and re-wrap it in CmdletProviderInvocationException.
+                            e = new CmdletProviderInvocationException(pie, Command.MyInvocation);
                             break;
                         }
 
-                        // 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
+                        // HaltCommandException will cause the command to stop, but not be reported as an error.
+                        // FlowControlException should not be wrapped.
                         if (e is PipelineStoppedException
                             || e is CmdletInvocationException
                             || e is ActionPreferenceStopException
@@ -813,9 +874,7 @@ internal PipelineStoppedException ManageInvocationException(Exception e)
                         }
 
                         // wrap all other exceptions
-                        e = new CmdletInvocationException(
-                                    e,
-                                    Command.MyInvocation);
+                        e = new CmdletInvocationException(e, Command.MyInvocation);
                     } while (false);
 
                     // commandRuntime.ManageException will always throw PipelineStoppedException
@@ -943,15 +1002,27 @@ public void Dispose()
         private void Dispose(bool disposing)
         {
             if (_disposed)
+            {
                 return;
+            }
 
             if (disposing)
             {
-                // 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)
+                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)
                 {
                     id.Dispose();
                 }
diff --git a/src/System.Management.Automation/engine/ExecutionContext.cs b/src/System.Management.Automation/engine/ExecutionContext.cs
index 8ffd25949c5..18ba461a68e 100644
--- a/src/System.Management.Automation/engine/ExecutionContext.cs
+++ b/src/System.Management.Automation/engine/ExecutionContext.cs
@@ -783,11 +783,6 @@ internal Pipe RedirectErrorPipe(Pipe newPipe)
             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.
@@ -840,15 +835,13 @@ internal void ResetRedirection()
         internal void AppendDollarError(object obj)
         {
             ErrorRecord objAsErrorRecord = obj as ErrorRecord;
-            if (objAsErrorRecord == null && obj is not Exception)
+            if (objAsErrorRecord is null && obj is not Exception)
             {
                 Diagnostics.Assert(false, "Object to append was neither an ErrorRecord nor an Exception in ExecutionContext.AppendDollarError");
                 return;
             }
 
-            object old = this.DollarErrorVariable;
-            ArrayList arraylist = old as ArrayList;
-            if (arraylist == null)
+            if (DollarErrorVariable is not ArrayList arraylist)
             {
                 Diagnostics.Assert(false, "$error should be a global constant ArrayList");
                 return;
diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index dd0f7209635..cb0be3193a7 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -23,6 +23,7 @@ public class ExperimentalFeature
         internal const string EngineSource = "PSEngine";
         internal const string PSNativeCommandArgumentPassingFeatureName = "PSNativeCommandArgumentPassing";
         internal const string PSNativeCommandErrorActionPreferenceFeatureName = "PSNativeCommandErrorActionPreference";
+        internal const string PSCleanBlockFeatureName = "PSCleanBlock";
 
         #endregion
 
@@ -126,6 +127,9 @@ static ExperimentalFeature()
                 new ExperimentalFeature(
                     name: PSNativeCommandErrorActionPreferenceFeatureName,
                     description: "Native commands with non-zero exit codes issue errors according to $ErrorActionPreference when $PSNativeCommandUseErrorActionPreference is $true"),
+                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);
diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
index 20965258462..16fa8652bcc 100644
--- a/src/System.Management.Automation/engine/MshCommandRuntime.cs
+++ b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -942,10 +942,8 @@ internal void SetupOutVariable()
 
             // Handle the creation of OutVariable in the case of Out-Default specially,
             // as it needs to handle much of its OutVariable support itself.
-            if (
-                (!string.IsNullOrEmpty(this.OutVariable)) &&
-                (!(this.OutVariable.StartsWith('+'))) &&
-                string.Equals("Out-Default", _thisCommand.CommandInfo.Name, StringComparison.OrdinalIgnoreCase))
+            if (!OutVariable.StartsWith('+') &&
+                string.Equals("Out-Default", _commandInfo.Name, StringComparison.OrdinalIgnoreCase))
             {
                 if (_state == null)
                     _state = new SessionState(Context.EngineSessionState);
@@ -2426,7 +2424,6 @@ public Exception ManageException(Exception e)
                 }
 
                 // Log a command health event
-
                 MshLog.LogCommandHealthEvent(
                     Context,
                     e,
@@ -3765,8 +3762,10 @@ internal void SetVariableListsInPipe()
         {
             Diagnostics.Assert(_thisCommand is PSScriptCmdlet, "this is only done for script cmdlets");
 
-            if (_outVarList != null)
+            if (_outVarList != null && !OutputPipe.IgnoreOutVariableList)
             {
+                // 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);
             }
 
@@ -3793,7 +3792,7 @@ internal void SetVariableListsInPipe()
 
         internal void RemoveVariableListsInPipe()
         {
-            if (_outVarList != null)
+            if (_outVarList != null && !OutputPipe.IgnoreOutVariableList)
             {
                 this.OutputPipe.RemoveVariableList(VariableStreamKind.Output, _outVarList);
             }
diff --git a/src/System.Management.Automation/engine/Pipe.cs b/src/System.Management.Automation/engine/Pipe.cs
index 8ee000a4faf..9e24c6471db 100644
--- a/src/System.Management.Automation/engine/Pipe.cs
+++ b/src/System.Management.Automation/engine/Pipe.cs
@@ -109,6 +109,13 @@ public override string ToString()
         /// </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>
diff --git a/src/System.Management.Automation/engine/ProxyCommand.cs b/src/System.Management.Automation/engine/ProxyCommand.cs
index 5703adec664..6a2e6dce66d 100644
--- a/src/System.Management.Automation/engine/ProxyCommand.cs
+++ b/src/System.Management.Automation/engine/ProxyCommand.cs
@@ -247,6 +247,30 @@ public static string GetEnd(CommandMetadata commandMetadata)
             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;
diff --git a/src/System.Management.Automation/engine/ScriptCommandProcessor.cs b/src/System.Management.Automation/engine/ScriptCommandProcessor.cs
index 99b685e07d2..54d4f45849b 100644
--- a/src/System.Management.Automation/engine/ScriptCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/ScriptCommandProcessor.cs
@@ -6,6 +6,7 @@
 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;
@@ -47,7 +48,7 @@ protected ScriptCommandProcessorBase(IScriptCommandInfo commandInfo, ExecutionCo
         protected bool _dontUseScopeCommandOrigin;
 
         /// <summary>
-        /// If true, then an exit exception will be rethrown to instead of caught and processed...
+        /// If true, then an exit exception will be rethrown instead of caught and processed...
         /// </summary>
         protected bool _rethrowExitException;
 
@@ -237,6 +238,7 @@ internal sealed class DlrScriptCommandProcessor : ScriptCommandProcessorBase
         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)
@@ -327,8 +329,7 @@ internal override void DoBegin()
 
                 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
@@ -410,6 +411,7 @@ internal override void Complete()
                 if (_scriptBlock.HasEndBlock)
                 {
                     var endBlock = _runOptimizedCode ? _scriptBlock.EndBlock : _scriptBlock.UnoptimizedEndBlock;
+
                     if (this.CommandRuntime.InputPipe.ExternalReader == null)
                     {
                         if (IsPipelineInputExpected())
@@ -433,7 +435,33 @@ internal override void Complete()
             }
             finally
             {
-                ScriptBlock.LogScriptBlockEnd(_scriptBlock, Context.CurrentRunspace.InstanceId);
+                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);
+                }
             }
         }
 
@@ -459,6 +487,7 @@ private void RunClause(Action<FunctionContext> clause, object dollarUnderbar, ob
         {
             ExecutionContext.CheckStackDepth();
 
+            _anyClauseExecuted = true;
             Pipe oldErrorOutputPipe = this.Context.ShellFunctionErrorOutputPipe;
 
             // If the script block has a different language mode than the current,
@@ -553,7 +582,7 @@ private void RunClause(Action<FunctionContext> clause, object dollarUnderbar, ob
                 }
                 finally
                 {
-                    this.Context.RestoreErrorPipe(oldErrorOutputPipe);
+                    Context.ShellFunctionErrorOutputPipe = oldErrorOutputPipe;
 
                     if (oldLanguageMode.HasValue)
                     {
@@ -584,15 +613,12 @@ private void RunClause(Action<FunctionContext> clause, object dollarUnderbar, ob
             }
             catch (RuntimeException e)
             {
-                ManageScriptException(e); // always throws
-                // This quiets the compiler which wants to see a return value
-                // in all codepaths.
-                throw;
+                // This method always throws.
+                ManageScriptException(e);
             }
             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);
             }
         }
diff --git a/src/System.Management.Automation/engine/debugger/Breakpoint.cs b/src/System.Management.Automation/engine/debugger/Breakpoint.cs
index 5daf3bdc18b..e51d79f4afa 100644
--- a/src/System.Management.Automation/engine/debugger/Breakpoint.cs
+++ b/src/System.Management.Automation/engine/debugger/Breakpoint.cs
@@ -531,15 +531,16 @@ internal bool TrySetBreakpoint(string scriptFile, FunctionContext functionContex
 
             // 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, or end block.)
+            // begin, process, end, or clean 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)))
+                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)))
                 {
                     SetBreakpoint(functionContext, 0);
                     return true;
diff --git a/src/System.Management.Automation/engine/hostifaces/Pipeline.cs b/src/System.Management.Automation/engine/hostifaces/Pipeline.cs
index 874691852cb..c7b962b7668 100644
--- a/src/System.Management.Automation/engine/hostifaces/Pipeline.cs
+++ b/src/System.Management.Automation/engine/hostifaces/Pipeline.cs
@@ -445,7 +445,7 @@ internal void SetHadErrors(bool status)
         ///
         /// 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 when invoking the Pipeline.
+        /// error output pipe is always set and $ErrorActionPreference is checked when invoking the Pipeline.
         /// </summary>
         internal bool RedirectShellErrorOutputPipe { get; set; } = false;
 
diff --git a/src/System.Management.Automation/engine/lang/scriptblock.cs b/src/System.Management.Automation/engine/lang/scriptblock.cs
index 0c6c1d5dff1..07f53c132ff 100644
--- a/src/System.Management.Automation/engine/lang/scriptblock.cs
+++ b/src/System.Management.Automation/engine/lang/scriptblock.cs
@@ -1280,7 +1280,42 @@ public Array End()
             {
                 // then pop this pipeline and dispose it...
                 _context.PopPipelineProcessor(true);
-                _pipeline.Dispose();
+                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();
             }
         }
 
@@ -1293,23 +1328,13 @@ public Array End()
         /// 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;
             }
 
-            if (disposing)
-            {
-                _pipeline.Dispose();
-            }
-
+            _pipeline.Dispose();
             _disposed = true;
         }
 
diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index bcddbee0b24..9956fb29e30 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -2026,6 +2026,7 @@ internal void Compile(CompiledScriptBlockData scriptBlock, bool optimize)
                 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;
@@ -2036,6 +2037,7 @@ internal void Compile(CompiledScriptBlockData scriptBlock, bool optimize)
                 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);
             }
@@ -2221,6 +2223,7 @@ internal LoopGotoTargets(string label, LabelTarget breakLabel, LabelTarget conti
         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;
@@ -2463,6 +2466,13 @@ public object VisitScriptBlock(ScriptBlockAst scriptBlockAst)
                 }
 
                 _endBlockLambda = CompileNamedBlock(scriptBlockAst.EndBlock, funcName, rootForDefiningTypesAndUsings);
+                rootForDefiningTypesAndUsings = null;
+            }
+
+            if (scriptBlockAst.CleanBlock != null)
+            {
+                _cleanBlockLambda = CompileNamedBlock(scriptBlockAst.CleanBlock, funcName + "<Clean>", rootForDefiningTypesAndUsings);
+                rootForDefiningTypesAndUsings = null;
             }
 
             return null;
diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
index 3afc55e9861..c5f9d81f4b8 100644
--- a/src/System.Management.Automation/engine/parser/Parser.cs
+++ b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -724,12 +724,13 @@ internal static bool TryParseAsConstantHashtable(string input, out Hashtable res
             ParseError[] parseErrors;
             var ast = Parser.ParseInput(input, out throwAwayTokens, out parseErrors);
 
-            if ((ast == null) ||
-                parseErrors.Length > 0 ||
-                ast.BeginBlock != null ||
-                ast.ProcessBlock != null ||
-                ast.DynamicParamBlock != null ||
-                ast.EndBlock.Traps != null)
+            if (ast == null
+                || parseErrors.Length > 0
+                || ast.BeginBlock != null
+                || ast.ProcessBlock != null
+                || ast.CleanBlock != null
+                || ast.DynamicParamBlock != null
+                || ast.EndBlock.Traps != null)
             {
                 return false;
             }
@@ -1713,9 +1714,9 @@ private ScriptBlockAst NamedBlockListRule(Token lCurly, List<UsingStatementAst>
             NamedBlockAst beginBlock = null;
             NamedBlockAst processBlock = null;
             NamedBlockAst endBlock = null;
-            IScriptExtent startExtent = lCurly != null
-                                            ? lCurly.Extent
-                                            : paramBlockAst?.Extent;
+            NamedBlockAst cleanBlock = null;
+
+            IScriptExtent startExtent = lCurly?.Extent ?? paramBlockAst?.Extent;
             IScriptExtent endExtent = null;
             IScriptExtent extent = null;
             IScriptExtent scriptBlockExtent = null;
@@ -1757,6 +1758,7 @@ private ScriptBlockAst NamedBlockListRule(Token lCurly, List<UsingStatementAst>
                     case TokenKind.Begin:
                     case TokenKind.Process:
                     case TokenKind.End:
+                    case TokenKind.Clean:
                         break;
                 }
 
@@ -1797,6 +1799,10 @@ private ScriptBlockAst NamedBlockListRule(Token lCurly, List<UsingStatementAst>
                 {
                     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);
@@ -1818,7 +1824,14 @@ private ScriptBlockAst NamedBlockListRule(Token lCurly, List<UsingStatementAst>
             CompleteScriptBlockBody(lCurly, ref extent, out scriptBlockExtent);
 
         return_script_block_ast:
-            return new ScriptBlockAst(scriptBlockExtent, usingStatements, paramBlockAst, beginBlock, processBlock, endBlock,
+            return new ScriptBlockAst(
+                scriptBlockExtent,
+                usingStatements,
+                paramBlockAst,
+                beginBlock,
+                processBlock,
+                endBlock,
+                cleanBlock,
                 dynamicParamBlock);
         }
 
diff --git a/src/System.Management.Automation/engine/parser/SemanticChecks.cs b/src/System.Management.Automation/engine/parser/SemanticChecks.cs
index 927b2c33ae8..b792530193b 100644
--- a/src/System.Management.Automation/engine/parser/SemanticChecks.cs
+++ b/src/System.Management.Automation/engine/parser/SemanticChecks.cs
@@ -406,10 +406,11 @@ public override AstVisitAction VisitFunctionMember(FunctionMemberAst functionMem
                     ParserStrings.ParamBlockNotAllowedInMethod);
             }
 
-            if (body.BeginBlock != null ||
-                body.ProcessBlock != null ||
-                body.DynamicParamBlock != null ||
-                !body.EndBlock.Unnamed)
+            if (body.BeginBlock != null
+                || body.ProcessBlock != null
+                || body.CleanBlock != null
+                || body.DynamicParamBlock != null
+                || !body.EndBlock.Unnamed)
             {
                 _parser.ReportError(Parser.ExtentFromFirstOf(body.DynamicParamBlock, body.BeginBlock, body.ProcessBlock, body.EndBlock),
                     nameof(ParserStrings.NamedBlockNotAllowedInMethod),
diff --git a/src/System.Management.Automation/engine/parser/VariableAnalysis.cs b/src/System.Management.Automation/engine/parser/VariableAnalysis.cs
index b38954ebfc6..09b336099cb 100644
--- a/src/System.Management.Automation/engine/parser/VariableAnalysis.cs
+++ b/src/System.Management.Automation/engine/parser/VariableAnalysis.cs
@@ -945,25 +945,11 @@ public object VisitScriptBlock(ScriptBlockAst scriptBlockAst)
         {
             _currentBlock = _entryBlock;
 
-            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);
-            }
+            scriptBlockAst.DynamicParamBlock?.Accept(this);
+            scriptBlockAst.BeginBlock?.Accept(this);
+            scriptBlockAst.ProcessBlock?.Accept(this);
+            scriptBlockAst.EndBlock?.Accept(this);
+            scriptBlockAst.CleanBlock?.Accept(this);
 
             _currentBlock.FlowsTo(_exitBlock);
 
diff --git a/src/System.Management.Automation/engine/parser/ast.cs b/src/System.Management.Automation/engine/parser/ast.cs
index 1f03eb68df5..b40a8e66a1e 100644
--- a/src/System.Management.Automation/engine/parser/ast.cs
+++ b/src/System.Management.Automation/engine/parser/ast.cs
@@ -818,6 +818,46 @@ public ScriptBlockAst(IScriptExtent extent,
                               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);
@@ -856,6 +896,12 @@ public ScriptBlockAst(IScriptExtent extent,
                 SetParent(endBlock);
             }
 
+            if (cleanBlock != null)
+            {
+                this.CleanBlock = cleanBlock;
+                SetParent(cleanBlock);
+            }
+
             if (dynamicParamBlock != null)
             {
                 this.DynamicParamBlock = dynamicParamBlock;
@@ -888,6 +934,35 @@ public ScriptBlockAst(IScriptExtent extent,
         {
         }
 
+        /// <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>
@@ -911,6 +986,33 @@ public ScriptBlockAst(IScriptExtent extent,
         {
         }
 
+        /// <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>
@@ -1115,6 +1217,11 @@ private void SetUsingStatements(IEnumerable<UsingStatementAst> usingStatements)
         /// </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>
@@ -1194,17 +1301,25 @@ public override Ast Copy()
             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);
 
-            var scriptBlockAst = new ScriptBlockAst(this.Extent, newUsingStatements, newAttributes, newParamBlock, newBeginBlock, newProcessBlock,
-                                                    newEndBlock, newDynamicParamBlock)
+            return new ScriptBlockAst(
+                this.Extent,
+                newUsingStatements,
+                newAttributes,
+                newParamBlock,
+                newBeginBlock,
+                newProcessBlock,
+                newEndBlock,
+                newCleanBlock,
+                newDynamicParamBlock)
             {
                 IsConfiguration = this.IsConfiguration,
                 ScriptRequirements = this.ScriptRequirements
             };
-            return scriptBlockAst;
         }
 
         internal string ToStringForSerialization()
@@ -1367,17 +1482,27 @@ internal override AstVisitAction InternalVisit(AstVisitor visitor)
                 }
             }
 
-            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);
+            if (action == AstVisitAction.Continue)
+            {
+                _ = VisitAndShallContinue(ParamBlock) &&
+                    VisitAndShallContinue(DynamicParamBlock) &&
+                    VisitAndShallContinue(BeginBlock) &&
+                    VisitAndShallContinue(ProcessBlock) &&
+                    VisitAndShallContinue(EndBlock) &&
+                    VisitAndShallContinue(CleanBlock);
+            }
+
             return visitor.CheckForPostAction(this, action);
+
+            bool VisitAndShallContinue(Ast ast)
+            {
+                if (ast is not null)
+                {
+                    action = ast.InternalVisit(visitor);
+                }
+
+                return action == AstVisitAction.Continue;
+            }
         }
 
         #endregion Visitors
@@ -1581,9 +1706,12 @@ bool IParameterMetadataProvider.UsesCmdletBinding()
 
         internal PipelineAst GetSimplePipeline(bool allowMultiplePipelines, out string errorId, out string errorMsg)
         {
-            if (BeginBlock != null || ProcessBlock != null || DynamicParamBlock != null)
+            if (BeginBlock != null
+                || ProcessBlock != null
+                || CleanBlock != null
+                || DynamicParamBlock != null)
             {
-                errorId = "CanConvertOneClauseOnly";
+                errorId = nameof(AutomationExceptions.CanConvertOneClauseOnly);
                 errorMsg = AutomationExceptions.CanConvertOneClauseOnly;
                 return null;
             }
@@ -1749,7 +1877,7 @@ internal static bool UsesCmdletBinding(IEnumerable<ParameterAst> parameters)
     public class NamedBlockAst : Ast
     {
         /// <summary>
-        /// Construct the ast for a begin, process, end, or dynamic param block.
+        /// Construct the ast for a begin, process, end, clean, or dynamic param block.
         /// </summary>
         /// <param name="extent">
         /// The extent of the block.  If <paramref name="unnamed"/> is false, the extent includes
@@ -1761,6 +1889,7 @@ public class NamedBlockAst : Ast
         /// <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>
@@ -1779,8 +1908,7 @@ public NamedBlockAst(IScriptExtent extent, TokenKind blockName, StatementBlockAs
         {
             // 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 (!blockName.HasTrait(TokenFlags.ScriptBlockBlockName)
-                || (unnamed && (blockName == TokenKind.Begin || blockName == TokenKind.Dynamicparam)))
+            if (HasInvalidBlockName(blockName, unnamed))
             {
                 throw PSTraceSource.NewArgumentException(nameof(blockName));
             }
@@ -1838,6 +1966,7 @@ public NamedBlockAst(IScriptExtent extent, TokenKind blockName, StatementBlockAs
         /// <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>
@@ -1877,6 +2006,14 @@ public override Ast Copy()
             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; }
 
diff --git a/src/System.Management.Automation/engine/parser/token.cs b/src/System.Management.Automation/engine/parser/token.cs
index 893ec9fc8e0..43a3e86ebb7 100644
--- a/src/System.Management.Automation/engine/parser/token.cs
+++ b/src/System.Management.Automation/engine/parser/token.cs
@@ -588,6 +588,9 @@ public enum TokenKind
         /// <summary>The 'default' keyword</summary>
         Default = 169,
 
+        /// <summary>The 'clean' keyword.</summary>
+        Clean = 170,
+
         #endregion Keywords
     }
 
@@ -659,7 +662,7 @@ public enum TokenFlags
         Keyword = 0x00000010,
 
         /// <summary>
-        /// The token one of the keywords that is a part of a script block: 'begin', 'process', 'end', or 'dynamicparam'.
+        /// The token is one of the keywords that is a part of a script block: 'begin', 'process', 'end', 'clean', or 'dynamicparam'.
         /// </summary>
         ScriptBlockBlockName = 0x00000020,
 
@@ -948,6 +951,7 @@ public static class TokenTraits
             /*               Hidden */ TokenFlags.Keyword,
             /*                 Base */ TokenFlags.Keyword,
             /*              Default */ TokenFlags.Keyword,
+            /*                Clean */ TokenFlags.Keyword | TokenFlags.ScriptBlockBlockName,
 
             #endregion Flags for keywords
         };
@@ -1147,6 +1151,7 @@ public static class TokenTraits
             /*               Hidden */ "hidden",
             /*                 Base */ "base",
             /*              Default */ "default",
+            /*                Clean */ "clean",
 
             #endregion Text for keywords
         };
@@ -1154,10 +1159,12 @@ public static class TokenTraits
 #if DEBUG
         static TokenTraits()
         {
-            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");
+            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");
             // 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");
diff --git a/src/System.Management.Automation/engine/parser/tokenizer.cs b/src/System.Management.Automation/engine/parser/tokenizer.cs
index 161e53cef0c..43046c9d29e 100644
--- a/src/System.Management.Automation/engine/parser/tokenizer.cs
+++ b/src/System.Management.Automation/engine/parser/tokenizer.cs
@@ -635,23 +635,23 @@ private static readonly Dictionary<string, TokenKind> s_operatorTable
         /*A*/    "configuration",           "public",           "private",          "static",                     /*A*/
         /*B*/    "interface",               "enum",             "namespace",        "module",                     /*B*/
         /*C*/    "type",                    "assembly",         "command",          "hidden",                     /*C*/
-        /*D*/    "base",                    "default",                                                            /*D*/
+        /*D*/    "base",                    "default",          "clean",                                          /*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,                                                    /*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,  TokenKind.Clean,                                   /*D*/
         };
 
         internal static readonly string[] _operatorText = new string[] {
@@ -699,8 +699,16 @@ static Tokenizer()
             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]);
             }
 
diff --git a/src/System.Management.Automation/engine/pipeline.cs b/src/System.Management.Automation/engine/pipeline.cs
index 78fb19dbc65..185e60e072f 100644
--- a/src/System.Management.Automation/engine/pipeline.cs
+++ b/src/System.Management.Automation/engine/pipeline.cs
@@ -66,7 +66,6 @@ internal class PipelineProcessor : IDisposable
         public void Dispose()
         {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         private void Dispose(bool disposing)
@@ -267,9 +266,12 @@ internal int Add(CommandProcessorBase commandProcessor)
 
         internal void AddRedirectionPipe(PipelineProcessor pipelineProcessor)
         {
-            if (pipelineProcessor == null) throw PSTraceSource.NewArgumentNullException(nameof(pipelineProcessor));
-            if (_redirectionPipes == null)
-                _redirectionPipes = new List<PipelineProcessor>();
+            if (pipelineProcessor is null)
+            {
+                throw PSTraceSource.NewArgumentNullException(nameof(pipelineProcessor));
+            }
+
+            _redirectionPipes ??= new List<PipelineProcessor>();
             _redirectionPipes.Add(pipelineProcessor);
         }
 
@@ -347,18 +349,15 @@ private int AddCommand(CommandProcessorBase commandProcessor, int readFromComman
             }
             else
             {
-                CommandProcessorBase prevcommandProcessor = _commands[readFromCommand - 1] as CommandProcessorBase;
-                if (prevcommandProcessor == null || prevcommandProcessor.CommandRuntime == null)
-                {
-                    // "PipelineProcessor.AddCommand(): previous request object == null"
-                    throw PSTraceSource.NewInvalidOperationException();
-                }
+                var prevcommandProcessor = _commands[readFromCommand - 1] as CommandProcessorBase;
+                ValidateCommandProcessorNotNull(prevcommandProcessor, errorMessage: null);
+
+                Pipe UpstreamPipe = (readErrorQueue)
+                    ? prevcommandProcessor.CommandRuntime.ErrorOutputPipe
+                    : prevcommandProcessor.CommandRuntime.OutputPipe;
 
-                Pipe UpstreamPipe = (readErrorQueue) ?
-                    prevcommandProcessor.CommandRuntime.ErrorOutputPipe : prevcommandProcessor.CommandRuntime.OutputPipe;
                 if (UpstreamPipe == null)
                 {
-                    // "PipelineProcessor.AddCommand(): UpstreamPipe == null"
                     throw PSTraceSource.NewInvalidOperationException();
                 }
 
@@ -381,11 +380,8 @@ private int AddCommand(CommandProcessorBase commandProcessor, int readFromComman
                     for (int i = 0; i < _commands.Count; i++)
                     {
                         prevcommandProcessor = _commands[i];
-                        if (prevcommandProcessor == null || prevcommandProcessor.CommandRuntime == null)
-                        {
-                            // "PipelineProcessor.AddCommand(): previous request object == null"
-                            throw PSTraceSource.NewInvalidOperationException();
-                        }
+                        ValidateCommandProcessorNotNull(prevcommandProcessor, errorMessage: null);
+
                         // check whether the error output is already claimed
                         if (prevcommandProcessor.CommandRuntime.ErrorOutputPipe.DownstreamCmdlet != null)
                             continue;
@@ -470,194 +466,305 @@ internal Array SynchronousExecuteEnumerate(object input)
                 throw new PipelineStoppedException();
             }
 
-            ExceptionDispatchInfo toRethrowInfo;
+            bool pipelineSucceeded = false;
+            ExceptionDispatchInfo toRethrowInfo = null;
+            CommandProcessorBase commandRequestingUpstreamCommandsToStop = null;
+
             try
             {
-                CommandProcessorBase commandRequestingUpstreamCommandsToStop = null;
                 try
                 {
-                    // If the caller specified an input object array,
-                    // we run assuming there is an incoming "stream"
-                    // of objects. This will prevent the one default call
-                    // to ProcessRecord on the first command.
-                    Start(input != AutomationNull.Value);
+                    try
+                    {
+                        // If the caller specified an input object array, we run assuming there is an incoming "stream"
+                        // of objects. This will prevent the one default call to ProcessRecord on the first command.
+                        Start(incomingStream: input != AutomationNull.Value);
 
-                    // Start has already validated firstcommandProcessor
-                    CommandProcessorBase firstCommandProcessor = _commands[0];
+                        // Start has already validated firstcommandProcessor
+                        CommandProcessorBase firstCommandProcessor = _commands[0];
 
-                    // Add any input to the first command.
-                    if (ExternalInput != null)
+                        // Add any input to the first command.
+                        if (ExternalInput is not null)
+                        {
+                            firstCommandProcessor.CommandRuntime.InputPipe.ExternalReader = ExternalInput;
+                        }
+
+                        Inject(input, enumerate: true);
+                    }
+                    catch (PipelineStoppedException)
                     {
-                        firstCommandProcessor.CommandRuntime.InputPipe.ExternalReader
-                            = ExternalInput;
+                        if (_firstTerminatingError?.SourceException is StopUpstreamCommandsException exception)
+                        {
+                            _firstTerminatingError = null;
+                            commandRequestingUpstreamCommandsToStop = exception.RequestingCommandProcessor;
+                        }
+                        else
+                        {
+                            throw;
+                        }
                     }
 
-                    Inject(input, enumerate: true);
+                    DoCompleteCore(commandRequestingUpstreamCommandsToStop);
+                    pipelineSucceeded = true;
                 }
-                catch (PipelineStoppedException)
+                finally
                 {
-                    StopUpstreamCommandsException stopUpstreamCommandsException =
-                        _firstTerminatingError != null
-                            ? _firstTerminatingError.SourceException as StopUpstreamCommandsException
-                            : null;
-                    if (stopUpstreamCommandsException == null)
-                    {
-                        throw;
-                    }
-                    else
-                    {
-                        _firstTerminatingError = null;
-                        commandRequestingUpstreamCommandsToStop = stopUpstreamCommandsException.RequestingCommandProcessor;
-                    }
+                    // Clean up resources for script commands, no matter the pipeline succeeded or not.
+                    // This method catches and handles all exceptions inside, so it will never throw.
+                    Clean();
                 }
 
-                DoCompleteCore(commandRequestingUpstreamCommandsToStop);
-
-                // By this point, we are sure all commandProcessors hosted by the current pipelineProcess are done execution,
-                // so if there are any redirection pipelineProcessors associated with any of those commandProcessors, we should
-                // call DoComplete on them.
-                if (_redirectionPipes != null)
+                if (pipelineSucceeded)
                 {
-                    foreach (PipelineProcessor redirectPipelineProcessor in _redirectionPipes)
+                    // Now, we are sure all 'commandProcessors' hosted by the current 'pipelineProcessor' are done execution,
+                    // so if there are any redirection 'pipelineProcessors' associated with any of those 'commandProcessors',
+                    // they must have successfully executed 'StartStepping' and 'Step', and thus we should call 'DoComplete'
+                    // on them for completeness.
+                    if (_redirectionPipes is not null)
                     {
-                        redirectPipelineProcessor.DoCompleteCore(null);
+                        foreach (PipelineProcessor redirectPipelineProcessor in _redirectionPipes)
+                        {
+                            // The 'Clean' block for each 'commandProcessor' might still write to a pipe that is associated
+                            // with the redirection 'pipelineProcessor' (e.g. a redirected error pipe), which would trigger
+                            // the call to 'pipelineProcessor.Step'.
+                            // It's possible (though very unlikely) that the call to 'pipelineProcessor.Step' failed with an
+                            // exception, and in such case, the 'pipelineProcessor' would have been disposed, and therefore
+                            // the call to 'DoComplete' will simply return, because '_commands' was already set to null.
+                            redirectPipelineProcessor.DoCompleteCore(null);
+                        }
                     }
-                }
 
-                return RetrieveResults();
+                    // The 'Clean' blocks write nothing to the output pipe, so the results won't be affected by them.
+                    return RetrieveResults();
+                }
             }
             catch (RuntimeException e)
             {
-                // The error we want to report is the first terminating error
-                // which occurred during pipeline execution, regardless
-                // of whether other errors occurred afterward.
-                toRethrowInfo = _firstTerminatingError ?? ExceptionDispatchInfo.Capture(e);
-                this.LogExecutionException(toRethrowInfo.SourceException);
-            }
-            // NTRAID#Windows Out Of Band Releases-929020-2006/03/14-JonN
-            catch (System.Runtime.InteropServices.InvalidComObjectException comException)
-            {
-                // The error we want to report is the first terminating error
-                // which occurred during pipeline execution, regardless
-                // of whether other errors occurred afterward.
-                if (_firstTerminatingError != null)
-                {
-                    toRethrowInfo = _firstTerminatingError;
-                }
-                else
-                {
-                    string message = StringUtil.Format(ParserStrings.InvalidComObjectException, comException.Message);
-                    var rte = new RuntimeException(message, comException);
-                    rte.SetErrorId("InvalidComObjectException");
-                    toRethrowInfo = ExceptionDispatchInfo.Capture(rte);
-                }
-
-                this.LogExecutionException(toRethrowInfo.SourceException);
+                toRethrowInfo = GetFirstError(e);
             }
             finally
             {
                 DisposeCommands();
             }
 
-            // By rethrowing the exception outside of the handler,
-            // we allow the CLR on X64/IA64 to free from the stack
-            // the exception records related to this exception.
+            // By rethrowing the exception outside of the handler, we allow the CLR on X64/IA64 to free from
+            // the stack the exception records related to this exception.
 
-            // The only reason we should get here is if
-            // an exception should be rethrown.
+            // The only reason we should get here is if an exception should be rethrown.
             Diagnostics.Assert(toRethrowInfo != null, "Alternate protocol path failure");
             toRethrowInfo.Throw();
-            return null; // UNREACHABLE
+
+            // UNREACHABLE
+            return null;
+        }
+
+        private ExceptionDispatchInfo GetFirstError(RuntimeException e)
+        {
+            // The error we want to report is the first terminating error which occurred during pipeline execution,
+            // regardless of whether other errors occurred afterward.
+            var firstError = _firstTerminatingError ?? ExceptionDispatchInfo.Capture(e);
+            LogExecutionException(firstError.SourceException);
+            return firstError;
+        }
+
+        private void ThrowFirstErrorIfExisting(bool logException)
+        {
+            if (_firstTerminatingError != null)
+            {
+                if (logException)
+                {
+                    LogExecutionException(_firstTerminatingError.SourceException);
+                }
+
+                _firstTerminatingError.Throw();
+            }
         }
 
         private void DoCompleteCore(CommandProcessorBase commandRequestingUpstreamCommandsToStop)
         {
-            // Call DoComplete() for all the commands. DoComplete() will internally call Complete()
+            if (_commands is null)
+            {
+                // This could happen to a redirection pipeline, either for an expression (e.g. 1 > a.txt)
+                // or for a command (e.g. command > a.txt).
+                // An exception may be thrown from the call to 'StartStepping' or 'Step' on the pipeline,
+                // which causes the pipeline commands to be disposed.
+                return;
+            }
+
+            // Call DoComplete() for all the commands, which will internally call Complete()
             MshCommandRuntime lastCommandRuntime = null;
 
-            if (_commands != null)
+            for (int i = 0; i < _commands.Count; i++)
             {
-                for (int i = 0; i < _commands.Count; i++)
-                {
-                    CommandProcessorBase commandProcessor = _commands[i];
+                CommandProcessorBase commandProcessor = _commands[i];
 
-                    if (commandProcessor == null)
-                    {
-                        // "null command " + i
-                        throw PSTraceSource.NewInvalidOperationException();
-                    }
+                if (commandProcessor is null)
+                {
+                    // An internal error that should not happen.
+                    throw PSTraceSource.NewInvalidOperationException();
+                }
 
-                    if (object.ReferenceEquals(commandRequestingUpstreamCommandsToStop, commandProcessor))
-                    {
-                        commandRequestingUpstreamCommandsToStop = null;
-                        continue; // do not call DoComplete/EndProcessing on the command that initiated stopping
-                    }
+                if (object.ReferenceEquals(commandRequestingUpstreamCommandsToStop, commandProcessor))
+                {
+                    // Do not call DoComplete/EndProcessing on the command that initiated stopping.
+                    commandRequestingUpstreamCommandsToStop = null;
+                    continue;
+                }
 
-                    if (commandRequestingUpstreamCommandsToStop != null)
-                    {
-                        continue; // do not call DoComplete/EndProcessing on commands that were stopped upstream
-                    }
+                if (commandRequestingUpstreamCommandsToStop is not null)
+                {
+                    // Do not call DoComplete/EndProcessing on commands that were stopped upstream.
+                    continue;
+                }
 
-                    try
+                try
+                {
+                    commandProcessor.DoComplete();
+                }
+                catch (PipelineStoppedException)
+                {
+                    if (_firstTerminatingError?.SourceException is StopUpstreamCommandsException exception)
                     {
-                        commandProcessor.DoComplete();
+                        _firstTerminatingError = null;
+                        commandRequestingUpstreamCommandsToStop = exception.RequestingCommandProcessor;
                     }
-                    catch (PipelineStoppedException)
+                    else
                     {
-                        StopUpstreamCommandsException stopUpstreamCommandsException =
-                            _firstTerminatingError != null
-                                ? _firstTerminatingError.SourceException as StopUpstreamCommandsException
-                                : null;
-                        if (stopUpstreamCommandsException == null)
-                        {
-                            throw;
-                        }
-                        else
-                        {
-                            _firstTerminatingError = null;
-                            commandRequestingUpstreamCommandsToStop = stopUpstreamCommandsException.RequestingCommandProcessor;
-                        }
+                        throw;
                     }
+                }
 
-                    EtwActivity.SetActivityId(commandProcessor.PipelineActivityId);
-
-                    // Log a command stopped event
-                    MshLog.LogCommandLifecycleEvent(
-                        commandProcessor.Command.Context,
-                        CommandState.Stopped,
-                        commandProcessor.Command.MyInvocation);
+                EtwActivity.SetActivityId(commandProcessor.PipelineActivityId);
 
-                    // Log the execution of a command (not script chunks, as they
-                    // are not commands in and of themselves)
-                    if (commandProcessor.CommandInfo.CommandType != CommandTypes.Script)
-                    {
-                        commandProcessor.CommandRuntime.PipelineProcessor.LogExecutionComplete(
-                            commandProcessor.Command.MyInvocation, commandProcessor.CommandInfo.Name);
-                    }
+                // Log a command stopped event
+                MshLog.LogCommandLifecycleEvent(
+                    commandProcessor.Command.Context,
+                    CommandState.Stopped,
+                    commandProcessor.Command.MyInvocation);
 
-                    lastCommandRuntime = commandProcessor.CommandRuntime;
+                // Log the execution of a command (not script chunks, as they are not commands in and of themselves).
+                if (commandProcessor.CommandInfo.CommandType != CommandTypes.Script)
+                {
+                    LogExecutionComplete(commandProcessor.Command.MyInvocation, commandProcessor.CommandInfo.Name);
                 }
+
+                lastCommandRuntime = commandProcessor.CommandRuntime;
             }
 
             // Log the pipeline completion.
-            if (lastCommandRuntime != null)
+            if (lastCommandRuntime is not null)
             {
                 // Only log the pipeline completion if this wasn't a nested pipeline, as
                 // pipeline state in transcription is associated with the toplevel pipeline
-                if ((this.LocalPipeline == null) || (!this.LocalPipeline.IsNested))
+                if (LocalPipeline is null || !LocalPipeline.IsNested)
                 {
                     lastCommandRuntime.PipelineProcessor.LogPipelineComplete();
                 }
             }
 
             // If a terminating error occurred, report it now.
-            if (_firstTerminatingError != null)
+            // This pipeline could have been stopped asynchronously, by 'Ctrl+c' manually or
+            // 'PowerShell.Stop' programatically. We need to check and see if that's the case.
+            // An example:
+            // - 'Start-Sleep' is running in this pipeline, and 'pipelineProcessor.Stop' gets
+            //   called on a different thread, which sets a 'PipelineStoppedException' object
+            //   to '_firstTerminatingError' and runs 'StopProcessing' on 'Start-Sleep'.
+            // - The 'StopProcessing' will cause 'Start-Sleep' to return from 'ProcessRecord'
+            //   call, and thus the pipeline execution will move forward to run 'DoComplete'
+            //   for the 'Start-Sleep' command and thus the code flow will reach here.
+            // For this given example, we need to check '_firstTerminatingError' and throw out
+            // the 'PipelineStoppedException' if the pipeline was indeed being stopped.
+            ThrowFirstErrorIfExisting(logException: true);
+        }
+
+        /// <summary>
+        /// Clean up resources for script commands in this pipeline processor.
+        /// </summary>
+        /// <remarks>
+        /// Exception from a 'Clean' block is not allowed to propagate up and terminate the pipeline
+        /// so that other 'Clean' blocks can run without being affected. Therefore, this method will
+        /// catch and handle all exceptions inside, and it will never throw.
+        /// </remarks>
+        private void Clean()
+        {
+            if (!_executionStarted || _commands is null)
             {
-                this.LogExecutionException(_firstTerminatingError.SourceException);
-                _firstTerminatingError.Throw();
+                // Simply return if the pipeline execution wasn't even started, or the commands of
+                // the pipeline have already been disposed.
+                return;
+            }
+
+            // So far, if '_firstTerminatingError' is not null, then it must be a terminating error
+            // thrown from one of 'Begin/Process/End' blocks. There can be terminating error thrown
+            // from 'Clean' block as well, which needs to be handled in this method.
+            // In order to capture the subsequent first terminating error thrown from 'Clean', we
+            // need to forget the previous '_firstTerminatingError' value before calling 'DoClean'
+            // on each command processor, so we have to save the old value here and restore later.
+            ExceptionDispatchInfo oldFirstTerminatingError = _firstTerminatingError;
+
+            // Suspend a stopping pipeline by setting 'IsStopping' to false and restore it afterwards.
+            bool oldIsStopping = ExceptionHandlingOps.SuspendStoppingPipelineImpl(LocalPipeline);
+
+            try
+            {
+                foreach (CommandProcessorBase commandProcessor in _commands)
+                {
+                    if (commandProcessor is null || !commandProcessor.HasCleanBlock)
+                    {
+                        continue;
+                    }
+
+                    try
+                    {
+                        // Forget the terminating error we saw before, so a terminating error thrown
+                        // from the subsequent 'Clean' block can be recorded and handled properly.
+                        _firstTerminatingError = null;
+                        commandProcessor.DoCleanup();
+                    }
+                    catch (RuntimeException e)
+                    {
+                        // Retrieve and report the terminating error that was thrown in the 'Clean' block.
+                        ExceptionDispatchInfo firstError = GetFirstError(e);
+                        commandProcessor.ReportCleanupError(firstError.SourceException);
+                    }
+                    catch (Exception ex)
+                    {
+                        // Theoretically, only 'RuntimeException' could be thrown out, but we catch
+                        // all and log them here just to be safe.
+                        // Skip special flow control exceptions and log others.
+                        if (ex is not FlowControlException && ex is not HaltCommandException)
+                        {
+                            MshLog.LogCommandHealthEvent(commandProcessor.Context, ex, Severity.Warning);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                _firstTerminatingError = oldFirstTerminatingError;
+                ExceptionHandlingOps.RestoreStoppingPipelineImpl(LocalPipeline, oldIsStopping);
             }
         }
 
+        /// <summary>
+        /// Clean up resources for the script commands of a steppable pipeline.
+        /// </summary>
+        /// <remarks>
+        /// The way we handle 'Clean' blocks in 'StartStepping', 'Step', and 'DoComplete' makes sure that:
+        ///  1. The 'Clean' blocks get to run if any exception is thrown from the pipeline execution.
+        ///  2. The 'Clean' blocks get to run if the pipeline runs to the end 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 is how we will expose this functionality to 'SteppablePipeline'.
+        /// </remarks>
+        internal void DoCleanup()
+        {
+            Clean();
+            DisposeCommands();
+        }
+
         /// <summary>
         /// Implements DoComplete as a stand-alone function for completing
         /// the execution of a steppable pipeline.
@@ -665,98 +772,79 @@ private void DoCompleteCore(CommandProcessorBase commandRequestingUpstreamComman
         /// <returns>The results of the execution.</returns>
         internal Array DoComplete()
         {
-            if (Stopping)
-            {
-                throw new PipelineStoppedException();
-            }
-
             if (!_executionStarted)
             {
                 throw PSTraceSource.NewInvalidOperationException(
                     PipelineStrings.PipelineNotStarted);
             }
 
-            ExceptionDispatchInfo toRethrowInfo;
             try
             {
-                DoCompleteCore(null);
+                if (Stopping)
+                {
+                    throw new PipelineStoppedException();
+                }
 
-                return RetrieveResults();
-            }
-            catch (RuntimeException e)
-            {
-                // The error we want to report is the first terminating error
-                // which occurred during pipeline execution, regardless
-                // of whether other errors occurred afterward.
-                toRethrowInfo = _firstTerminatingError ?? ExceptionDispatchInfo.Capture(e);
-                this.LogExecutionException(toRethrowInfo.SourceException);
-            }
-            // NTRAID#Windows Out Of Band Releases-929020-2006/03/14-JonN
-            catch (System.Runtime.InteropServices.InvalidComObjectException comException)
-            {
-                // The error we want to report is the first terminating error
-                // which occurred during pipeline execution, regardless
-                // of whether other errors occurred afterward.
-                if (_firstTerminatingError != null)
+                ExceptionDispatchInfo toRethrowInfo;
+                try
                 {
-                    toRethrowInfo = _firstTerminatingError;
+                    DoCompleteCore(null);
+                    return RetrieveResults();
                 }
-                else
+                catch (RuntimeException e)
                 {
-                    string message = StringUtil.Format(ParserStrings.InvalidComObjectException, comException.Message);
-                    var rte = new RuntimeException(message, comException);
-                    rte.SetErrorId("InvalidComObjectException");
-                    toRethrowInfo = ExceptionDispatchInfo.Capture(rte);
+                    toRethrowInfo = GetFirstError(e);
                 }
 
-                this.LogExecutionException(toRethrowInfo.SourceException);
+                // By rethrowing the exception outside of the handler, we allow the CLR on X64/IA64 to free from the stack
+                // the exception records related to this exception.
+
+                // The only reason we should get here is an exception should be rethrown.
+                Diagnostics.Assert(toRethrowInfo != null, "Alternate protocol path failure");
+                toRethrowInfo.Throw();
+
+                // UNREACHABLE
+                return null;
             }
             finally
             {
+                Clean();
                 DisposeCommands();
             }
-
-            // By rethrowing the exception outside of the handler,
-            // we allow the CLR on X64/IA64 to free from the stack
-            // the exception records related to this exception.
-
-            // The only reason we should get here is if
-            // an exception should be rethrown.
-            Diagnostics.Assert(toRethrowInfo != null, "Alternate protocol path failure");
-            toRethrowInfo.Throw();
-            return null; // UNREACHABLE
         }
 
         /// <summary>
-        /// This routine starts the stepping process. It is optional to
-        /// call this but can be useful if you want the begin clauses
-        /// of the pipeline to be run even when there may not be any input
-        /// to process as is the case for I/O redirection into a file. We
-        /// still want the file opened, even if there was nothing to write to it.
+        /// This routine starts the stepping process. It is optional to call this but can be useful
+        /// if you want the begin clauses of the pipeline to be run even when there may not be any
+        /// input to process as is the case for I/O redirection into a file. We still want the file
+        /// opened, even if there was nothing to write to it.
         /// </summary>
         /// <param name="expectInput">True if you want to write to this pipeline.</param>
         internal void StartStepping(bool expectInput)
         {
+            bool startSucceeded = false;
             try
             {
                 Start(expectInput);
+                startSucceeded = true;
 
-                // If a terminating error occurred, report it now.
-                if (_firstTerminatingError != null)
-                {
-                    _firstTerminatingError.Throw();
-                }
+                // Check if this pipeline is being stopped asynchronously.
+                ThrowFirstErrorIfExisting(logException: false);
             }
-            catch (PipelineStoppedException)
+            catch (Exception e)
             {
+                Clean();
                 DisposeCommands();
 
-                // The error we want to report is the first terminating error
-                // which occurred during pipeline execution, regardless
-                // of whether other errors occurred afterward.
-                if (_firstTerminatingError != null)
+                if (!startSucceeded && e is PipelineStoppedException)
                 {
-                    _firstTerminatingError.Throw();
+                    // When a terminating error happens during command execution, PowerShell will first save it
+                    // to '_firstTerminatingError', and then throw a 'PipelineStoppedException' to tear down the
+                    // pipeline. So when the caught exception here is 'PipelineStoppedException', it may not be
+                    // the actual original terminating error.
+                    // In this case, we want to report the first terminating error which occurred during pipeline
+                    // execution, regardless of whether other errors occurred afterward.
+                    ThrowFirstErrorIfExisting(logException: false);
                 }
 
                 throw;
@@ -773,35 +861,35 @@ internal void Stop()
             // Only call StopProcessing if the pipeline is being stopped
             // for the first time
 
-            if (!RecordFailure(new PipelineStoppedException(), null))
+            if (!RecordFailure(new PipelineStoppedException(), command: null))
+            {
                 return;
+            }
 
             // Retain copy of _commands in case Dispose() is called
             List<CommandProcessorBase> commands = _commands;
-            if (commands == null)
+            if (commands is null)
+            {
                 return;
+            }
 
             // Call StopProcessing() for all the commands.
-            for (int i = 0; i < commands.Count; i++)
+            foreach (CommandProcessorBase commandProcessor in commands)
             {
-                CommandProcessorBase commandProcessor = commands[i];
-
                 if (commandProcessor == null)
                 {
                     throw PSTraceSource.NewInvalidOperationException();
                 }
-#pragma warning disable 56500
+
                 try
                 {
                     commandProcessor.Command.DoStopProcessing();
                 }
                 catch (Exception)
                 {
-                    // 2004/04/26-JonN We swallow exceptions
-                    // which occur during StopProcessing.
+                    // We swallow exceptions which occur during StopProcessing.
                     continue;
                 }
-#pragma warning restore 56500
             }
         }
 
@@ -844,43 +932,35 @@ internal void Stop()
         /// </exception>
         internal Array Step(object input)
         {
-            if (Stopping)
-            {
-                throw new PipelineStoppedException();
-            }
-
+            bool injectSucceeded = false;
             try
             {
                 Start(true);
                 Inject(input, enumerate: false);
+                injectSucceeded = true;
 
-                // If a terminating error occurred, report it now.
-                if (_firstTerminatingError != null)
-                {
-                    _firstTerminatingError.Throw();
-                }
-
+                // Check if this pipeline is being stopped asynchronously.
+                ThrowFirstErrorIfExisting(logException: false);
                 return RetrieveResults();
             }
-            catch (PipelineStoppedException)
+            catch (Exception e)
             {
+                Clean();
                 DisposeCommands();
 
-                // The error we want to report is the first terminating error
-                // which occurred during pipeline execution, regardless
-                // of whether other errors occurred afterward.
-                if (_firstTerminatingError != null)
+                if (!injectSucceeded && e is PipelineStoppedException)
                 {
-                    _firstTerminatingError.Throw();
+                    // When a terminating error happens during command execution, PowerShell will first save it
+                    // to '_firstTerminatingError', and then throw a 'PipelineStoppedException' to tear down the
+                    // pipeline. So when the caught exception here is 'PipelineStoppedException', it may not be
+                    // the actual original terminating error.
+                    // In this case, we want to report the first terminating error which occurred during pipeline
+                    // execution, regardless of whether other errors occurred afterward.
+                    ThrowFirstErrorIfExisting(logException: false);
                 }
 
                 throw;
             }
-            catch (Exception)
-            {
-                DisposeCommands();
-                throw;
-            }
         }
 
         /// <summary>
@@ -927,7 +1007,9 @@ private void Start(bool incomingStream)
             }
 
             if (_executionStarted)
+            {
                 return;
+            }
 
             if (_commands == null || _commands.Count == 0)
             {
@@ -936,12 +1018,7 @@ private void Start(bool incomingStream)
             }
 
             CommandProcessorBase firstcommandProcessor = _commands[0];
-            if (firstcommandProcessor == null
-                || firstcommandProcessor.CommandRuntime == null)
-            {
-                throw PSTraceSource.NewInvalidOperationException(
-                    PipelineStrings.PipelineExecuteRequiresAtLeastOneCommand);
-            }
+            ValidateCommandProcessorNotNull(firstcommandProcessor, PipelineStrings.PipelineExecuteRequiresAtLeastOneCommand);
 
             // Set the execution scope using the current scope
             if (_executionScope == null)
@@ -951,17 +1028,11 @@ private void Start(bool incomingStream)
 
             // add ExternalSuccessOutput to the last command
             CommandProcessorBase LastCommandProcessor = _commands[_commands.Count - 1];
-            if (LastCommandProcessor == null
-                || LastCommandProcessor.CommandRuntime == null)
-            {
-                // "PipelineProcessor.Start(): LastCommandProcessor == null"
-                throw PSTraceSource.NewInvalidOperationException();
-            }
+            ValidateCommandProcessorNotNull(LastCommandProcessor, errorMessage: null);
 
             if (ExternalSuccessOutput != null)
             {
-                LastCommandProcessor.CommandRuntime.OutputPipe.ExternalWriter
-                    = ExternalSuccessOutput;
+                LastCommandProcessor.CommandRuntime.OutputPipe.ExternalWriter = ExternalSuccessOutput;
             }
 
             // add ExternalErrorOutput to all commands whose error
@@ -981,14 +1052,11 @@ private void Start(bool incomingStream)
 
             _executionStarted = true;
 
-            //
             // Allocate the pipeline iteration array; note that the pipeline position for
             // each command starts at 1 so we need to allocate _commands.Count + 1 items.
-            //
             int[] pipelineIterationInfo = new int[_commands.Count + 1];
 
-            // Prepare all commands from Engine's side,
-            // and make sure they are all valid
+            // Prepare all commands from Engine's side, and make sure they are all valid
             for (int i = 0; i < _commands.Count; i++)
             {
                 CommandProcessorBase commandProcessor = _commands[i];
@@ -1000,8 +1068,6 @@ private void Start(bool incomingStream)
 
                 // Generate new Activity Id for the thread
                 Guid pipelineActivityId = EtwActivity.CreateActivityId();
-
-                // commandProcess.PipelineActivityId = new Activity id
                 EtwActivity.SetActivityId(pipelineActivityId);
                 commandProcessor.PipelineActivityId = pipelineActivityId;
 
@@ -1011,20 +1077,16 @@ private void Start(bool incomingStream)
                     CommandState.Started,
                     commandProcessor.Command.MyInvocation);
 
-                // Telemetry here
-                // the type of command should be sent along
-                // commandProcessor.CommandInfo.CommandType
+                // Send telemetry that includes the type of command.
                 ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.ApplicationType, commandProcessor.Command.CommandInfo.CommandType.ToString());
 #if LEGACYTELEMETRY
                 Microsoft.PowerShell.Telemetry.Internal.TelemetryAPI.TraceExecutedCommand(commandProcessor.Command.CommandInfo, commandProcessor.Command.CommandOrigin);
 #endif
 
-                // Log the execution of a command (not script chunks, as they
-                // are not commands in and of themselves)
+                // Log the execution of a command (not script chunks, as they are not commands in and of themselves)
                 if (commandProcessor.CommandInfo.CommandType != CommandTypes.Script)
                 {
-                    commandProcessor.CommandRuntime.PipelineProcessor.LogExecutionInfo(
-                        commandProcessor.Command.MyInvocation, commandProcessor.CommandInfo.Name);
+                    LogExecutionInfo(commandProcessor.Command.MyInvocation, commandProcessor.CommandInfo.Name);
                 }
 
                 InvocationInfo myInfo = commandProcessor.Command.MyInvocation;
@@ -1057,8 +1119,7 @@ private void Start(bool incomingStream)
         }
 
         /// <summary>
-        /// Add ExternalErrorOutput to all commands whose error
-        /// output is not yet claimed.
+        /// Add ExternalErrorOutput to all commands whose error output is not yet claimed.
         /// </summary>
         private void SetExternalErrorOutput()
         {
@@ -1067,14 +1128,12 @@ private void SetExternalErrorOutput()
                 for (int i = 0; i < _commands.Count; i++)
                 {
                     CommandProcessorBase commandProcessor = _commands[i];
-                    Pipe UpstreamPipe =
-                        commandProcessor.CommandRuntime.ErrorOutputPipe;
+                    Pipe errorPipe = commandProcessor.CommandRuntime.ErrorOutputPipe;
 
                     // check whether a cmdlet is consuming the error pipe
-                    if (!UpstreamPipe.IsRedirected)
+                    if (!errorPipe.IsRedirected)
                     {
-                        UpstreamPipe.ExternalWriter =
-                            ExternalErrorOutput;
+                        errorPipe.ExternalWriter = ExternalErrorOutput;
                     }
                 }
             }
@@ -1085,14 +1144,9 @@ private void SetExternalErrorOutput()
         /// </summary>
         private void SetupParameterVariables()
         {
-            for (int i = 0; i < _commands.Count; i++)
+            foreach (CommandProcessorBase commandProcessor in _commands)
             {
-                CommandProcessorBase commandProcessor = _commands[i];
-                if (commandProcessor == null || commandProcessor.CommandRuntime == null)
-                {
-                    // "null command " + i
-                    throw PSTraceSource.NewInvalidOperationException();
-                }
+                ValidateCommandProcessorNotNull(commandProcessor, errorMessage: null);
 
                 commandProcessor.CommandRuntime.SetupOutVariable();
                 commandProcessor.CommandRuntime.SetupErrorVariable();
@@ -1102,6 +1156,16 @@ private void SetupParameterVariables()
             }
         }
 
+        private static void ValidateCommandProcessorNotNull(CommandProcessorBase commandProcessor, string errorMessage)
+        {
+            if (commandProcessor?.CommandRuntime is null)
+            {
+                throw errorMessage is null
+                    ? PSTraceSource.NewInvalidOperationException()
+                    : PSTraceSource.NewInvalidOperationException(errorMessage, Array.Empty<object>());
+            }
+        }
+
         /// <summary>
         /// Partially execute the pipeline.  The output remains in
         /// the pipes.
@@ -1131,12 +1195,7 @@ private void Inject(object input, bool enumerate)
         {
             // Add any input to the first command.
             CommandProcessorBase firstcommandProcessor = _commands[0];
-            if (firstcommandProcessor == null
-                || firstcommandProcessor.CommandRuntime == null)
-            {
-                throw PSTraceSource.NewInvalidOperationException(
-                    PipelineStrings.PipelineExecuteRequiresAtLeastOneCommand);
-            }
+            ValidateCommandProcessorNotNull(firstcommandProcessor, PipelineStrings.PipelineExecuteRequiresAtLeastOneCommand);
 
             if (input != AutomationNull.Value)
             {
@@ -1174,27 +1233,26 @@ private void Inject(object input, bool enumerate)
         /// </returns>
         private Array RetrieveResults()
         {
+            if (_commands is null)
+            {
+                // This could happen to an expression redirection pipeline (e.g. 1 > a.txt).
+                // An exception may be thrown from the call to 'StartStepping' or 'Step' on the pipeline,
+                // which causes the pipeline commands to be disposed.
+                return MshCommandRuntime.StaticEmptyArray;
+            }
+
             // If the error queue has been linked, it's up to the link to
             // deal with the output. Don't do anything here...
             if (!_linkedErrorOutput)
             {
-                // Retrieve any accumulated error objects from each of the pipes
-                // and add them to the error results hash table.
-                for (int i = 0; i < _commands.Count; i++)
+                foreach (CommandProcessorBase commandProcessor in _commands)
                 {
-                    CommandProcessorBase commandProcessor = _commands[i];
-                    if (commandProcessor == null
-                        || commandProcessor.CommandRuntime == null)
-                    {
-                        // "null command or request or ErrorOutputPipe " + i
-                        throw PSTraceSource.NewInvalidOperationException();
-                    }
+                    ValidateCommandProcessorNotNull(commandProcessor, errorMessage: null);
 
                     Pipe ErrorPipe = commandProcessor.CommandRuntime.ErrorOutputPipe;
                     if (ErrorPipe.DownstreamCmdlet == null && !ErrorPipe.Empty)
                     {
-                        // 2003/10/02-JonN
-                        // Do not return the same error results more than once
+                        // Clear the error pipe if it's not empty and will not be consumed.
                         ErrorPipe.Clear();
                     }
                 }
@@ -1203,26 +1261,18 @@ private Array RetrieveResults()
             // If the success queue has been linked, it's up to the link to
             // deal with the output. Don't do anything here...
             if (_linkedSuccessOutput)
+            {
                 return MshCommandRuntime.StaticEmptyArray;
+            }
 
             CommandProcessorBase LastCommandProcessor = _commands[_commands.Count - 1];
-            if (LastCommandProcessor == null
-                || LastCommandProcessor.CommandRuntime == null)
-            {
-                // "PipelineProcessor.RetrieveResults(): LastCommandProcessor == null"
-                throw PSTraceSource.NewInvalidOperationException();
-            }
+            ValidateCommandProcessorNotNull(LastCommandProcessor, errorMessage: null);
 
-            Array results =
-                LastCommandProcessor.CommandRuntime.GetResultsAsArray();
+            Array results = LastCommandProcessor.CommandRuntime.GetResultsAsArray();
 
-            // 2003/10/02-JonN
             // Do not return the same results more than once
             LastCommandProcessor.CommandRuntime.OutputPipe.Clear();
-
-            if (results == null)
-                return MshCommandRuntime.StaticEmptyArray;
-            return results;
+            return results is null ? MshCommandRuntime.StaticEmptyArray : results;
         }
 
         /// <summary>
@@ -1236,12 +1286,7 @@ internal void LinkPipelineSuccessOutput(Pipe pipeToUse)
             Dbg.Assert(pipeToUse != null, "Caller should verify pipeToUse != null");
 
             CommandProcessorBase LastCommandProcessor = _commands[_commands.Count - 1];
-            if (LastCommandProcessor == null
-                || LastCommandProcessor.CommandRuntime == null)
-            {
-                // "PipelineProcessor.RetrieveResults(): LastCommandProcessor == null"
-                throw PSTraceSource.NewInvalidOperationException();
-            }
+            ValidateCommandProcessorNotNull(LastCommandProcessor, errorMessage: null);
 
             LastCommandProcessor.CommandRuntime.OutputPipe = pipeToUse;
             _linkedSuccessOutput = true;
@@ -1251,15 +1296,9 @@ internal void LinkPipelineErrorOutput(Pipe pipeToUse)
         {
             Dbg.Assert(pipeToUse != null, "Caller should verify pipeToUse != null");
 
-            for (int i = 0; i < _commands.Count; i++)
+            foreach (CommandProcessorBase commandProcessor in _commands)
             {
-                CommandProcessorBase commandProcessor = _commands[i];
-                if (commandProcessor == null
-                    || commandProcessor.CommandRuntime == null)
-                {
-                    // "null command or request or ErrorOutputPipe " + i
-                    throw PSTraceSource.NewInvalidOperationException();
-                }
+                ValidateCommandProcessorNotNull(commandProcessor, errorMessage: null);
 
                 if (commandProcessor.CommandRuntime.ErrorOutputPipe.DownstreamCmdlet == null)
                 {
@@ -1280,76 +1319,65 @@ internal void LinkPipelineErrorOutput(Pipe pipeToUse)
         private void DisposeCommands()
         {
             // Note that this is not in a lock.
-            // We do not make Dispose() wait until StopProcessing()
-            // has completed.
+            // We do not make Dispose() wait until StopProcessing() has completed.
             _stopping = true;
 
+            if (_commands is null && _redirectionPipes is null)
+            {
+                // Commands were already disposed.
+                return;
+            }
+
             LogToEventLog();
 
-            if (_commands != null)
+            if (_commands is not null)
             {
-                for (int i = 0; i < _commands.Count; i++)
+                foreach (CommandProcessorBase commandProcessor in _commands)
                 {
-                    CommandProcessorBase commandProcessor = _commands[i];
-                    if (commandProcessor != null)
+                    if (commandProcessor is null)
                     {
-#pragma warning disable 56500
-                        // If Dispose throws an exception, record it as a
-                        // pipeline failure and continue disposing cmdlets.
-                        try
+                        continue;
+                    }
+
+                    // If Dispose throws an exception, record it as a pipeline failure and continue disposing cmdlets.
+                    try
+                    {
+                        // Only cmdlets can have variables defined via the common parameters.
+                        // We handle the cleanup of those variables only if we need to.
+                        if (commandProcessor is CommandProcessor)
                         {
-                            // Only cmdlets can have variables defined via the common parameters.
-                            // We handle the cleanup of those variables only if we need to.
-                            if (commandProcessor is CommandProcessor)
+                            if (commandProcessor.Command is not PSScriptCmdlet)
                             {
-                                if (commandProcessor.Command is not PSScriptCmdlet)
-                                {
-                                    // For script cmdlets, the variable lists were already removed when exiting a scope.
-                                    // So we only need to take care of binary cmdlets here.
-                                    commandProcessor.CommandRuntime.RemoveVariableListsInPipe();
-                                }
-
-                                // Remove the pipeline variable if we need to.
-                                commandProcessor.CommandRuntime.RemovePipelineVariable();
+                                // For script cmdlets, the variable lists were already removed when exiting a scope.
+                                // So we only need to take care of binary cmdlets here.
+                                commandProcessor.CommandRuntime.RemoveVariableListsInPipe();
                             }
 
-                            commandProcessor.Dispose();
+                            // Remove the pipeline variable if we need to.
+                            commandProcessor.CommandRuntime.RemovePipelineVariable();
                         }
-                        // 2005/04/13-JonN: The only vaguely plausible reason
-                        // for a failure here is an exception in Command.Dispose.
-                        // As such, this should be covered by the overall
-                        // exemption.
-                        catch (Exception e) // Catch-all OK, 3rd party callout.
-                        {
-                            InvocationInfo myInvocation = null;
-                            if (commandProcessor.Command != null)
-                                myInvocation = commandProcessor.Command.MyInvocation;
 
-                            ProviderInvocationException pie =
-                                e as ProviderInvocationException;
-                            if (pie != null)
-                            {
-                                e = new CmdletProviderInvocationException(
-                                    pie,
-                                    myInvocation);
-                            }
-                            else
-                            {
-                                e = new CmdletInvocationException(
-                                    e,
-                                    myInvocation);
-
-                                // Log a command health event
+                        commandProcessor.Dispose();
+                    }
+                    catch (Exception e)
+                    {
+                        // The only vaguely plausible reason for a failure here is an exception in 'Command.Dispose'.
+                        // As such, this should be covered by the overall exemption.
+                        InvocationInfo myInvocation = commandProcessor.Command?.MyInvocation;
 
-                                MshLog.LogCommandHealthEvent(
-                                    commandProcessor.Command.Context,
-                                    e,
-                                    Severity.Warning);
-                            }
+                        if (e is ProviderInvocationException pie)
+                        {
+                            e = new CmdletProviderInvocationException(pie, myInvocation);
+                        }
+                        else
+                        {
+                            e = new CmdletInvocationException(e, myInvocation);
 
-                            RecordFailure(e, commandProcessor.Command);
+                            // Log a command health event
+                            MshLog.LogCommandHealthEvent(commandProcessor.Command.Context, e, Severity.Warning);
                         }
-#pragma warning restore 56500
+
+                        RecordFailure(e, commandProcessor.Command);
                     }
                 }
             }
@@ -1357,25 +1385,31 @@ private void DisposeCommands()
             _commands = null;
 
             // Now dispose any pipes that were used for redirection...
-            if (_redirectionPipes != null)
+            if (_redirectionPipes is not null)
             {
                 foreach (PipelineProcessor redirPipe in _redirectionPipes)
                 {
-#pragma warning disable 56500
+                    if (redirPipe is null)
+                    {
+                        continue;
+                    }
+
+                    // Clean resources for script commands.
+                    // It is possible (though very unlikely) that the call to 'Step' on the redirection pipeline failed.
+                    // In such a case, 'Clean' would have run and the 'pipelineProcessor' would have been disposed.
+                    // Therefore, calling 'Clean' again will simply return, because '_commands' was already set to null.
+                    redirPipe.Clean();
+
                     // The complicated logic of disposing the commands is taken care
                     // of through recursion, this routine should not be getting any
                     // exceptions...
                     try
                     {
-                        if (redirPipe != null)
-                        {
-                            redirPipe.Dispose();
-                        }
+                        redirPipe.Dispose();
                     }
                     catch (Exception)
                     {
                     }
-#pragma warning restore 56500
                 }
             }
 
@@ -1399,11 +1433,9 @@ internal bool RecordFailure(Exception e, InternalCommand command)
                 {
                     _firstTerminatingError = ExceptionDispatchInfo.Capture(e);
                 }
-                // 905900-2005/05/12
-                // Drop5: Error Architecture: Log/trace second and subsequent RecordFailure
-                // Note that the pipeline could have been stopped asynchronously
-                // before hitting the error, therefore we check whether
-                // firstTerminatingError is PipelineStoppedException.
+                // Error Architecture: Log/trace second and subsequent RecordFailure.
+                // Note that the pipeline could have been stopped asynchronously before hitting the error,
+                // therefore we check whether '_firstTerminatingError' is 'PipelineStoppedException'.
                 else if (_firstTerminatingError.SourceException is not PipelineStoppedException
                     && command?.Context != null)
                 {
@@ -1422,11 +1454,10 @@ internal bool RecordFailure(Exception e, InternalCommand command)
                             ex.GetType().Name,
                             ex.StackTrace
                         );
-                        InvalidOperationException ioe
-                            = new InvalidOperationException(message, ex);
+
                         MshLog.LogCommandHealthEvent(
                             command.Context,
-                            ioe,
+                            new InvalidOperationException(message, ex),
                             Severity.Warning);
                     }
                 }
diff --git a/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs b/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
index 2e6db041126..79881796cad 100644
--- a/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
+++ b/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
@@ -12,11 +12,9 @@
 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
@@ -35,6 +33,7 @@ internal enum ScriptBlockClauseToInvoke
         Begin,
         Process,
         End,
+        Clean,
         ProcessBlockOnly,
     }
 
@@ -247,6 +246,7 @@ bool IsScriptBlockInFactASafeHashtable()
 
                 if (scriptBlockAst.BeginBlock != null
                     || scriptBlockAst.ProcessBlock != null
+                    || scriptBlockAst.CleanBlock != null
                     || scriptBlockAst.ParamBlock != null
                     || scriptBlockAst.DynamicParamBlock != null
                     || scriptBlockAst.ScriptRequirements != null
@@ -316,6 +316,8 @@ private IParameterMetadataProvider DelayParseScriptText()
 
         internal Dictionary<string, int> NameToIndexMap { get; set; }
 
+        #region Named Blocks
+
         internal Action<FunctionContext> DynamicParamBlock { get; set; }
 
         internal Action<FunctionContext> UnoptimizedDynamicParamBlock { get; set; }
@@ -332,6 +334,12 @@ private IParameterMetadataProvider DelayParseScriptText()
 
         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;
@@ -753,7 +761,7 @@ private PipelineAst GetSimplePipeline(Func<string, PipelineAst> errorHandler)
         {
             errorHandler ??= (static _ => null);
 
-            if (HasBeginBlock || HasProcessBlock)
+            if (HasBeginBlock || HasProcessBlock || HasCleanBlock)
             {
                 return errorHandler(AutomationExceptions.CanConvertOneClauseOnly);
             }
@@ -891,7 +899,10 @@ public void CheckRestrictedLanguage(
             Parser parser = new Parser();
 
             var ast = AstInternal;
-            if (HasBeginBlock || HasProcessBlock || ast.Body.ParamBlock != null)
+            if (HasBeginBlock
+                || HasProcessBlock
+                || HasCleanBlock
+                || ast.Body.ParamBlock is not null)
             {
                 Ast errorAst = ast.Body.BeginBlock ?? (Ast)ast.Body.ProcessBlock ?? ast.Body.ParamBlock;
                 parser.ReportError(
@@ -974,6 +985,11 @@ internal void InvokeWithPipeImpl(
             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))
@@ -991,7 +1007,7 @@ internal void InvokeWithPipeImpl(
                 throw new PipelineStoppedException();
             }
 
-            // Validate at the arguments are consistent. The only public API that gets you here never sets createLocalScope to false...
+            // Validate that 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");
@@ -1195,7 +1211,7 @@ internal void InvokeWithPipeImpl(
                     _sequencePoints = SequencePoints,
                 };
 
-                ScriptBlock.LogScriptBlockStart(this, context.CurrentRunspace.InstanceId);
+                LogScriptBlockStart(this, context.CurrentRunspace.InstanceId);
 
                 try
                 {
@@ -1203,7 +1219,7 @@ internal void InvokeWithPipeImpl(
                 }
                 finally
                 {
-                    ScriptBlock.LogScriptBlockEnd(this, context.CurrentRunspace.InstanceId);
+                    LogScriptBlockEnd(this, context.CurrentRunspace.InstanceId);
                 }
             }
             catch (TargetInvocationException tie)
@@ -1362,7 +1378,7 @@ internal static void SetAutomaticVariable(AutomaticVariable variable, object val
         private Action<FunctionContext> GetCodeToInvoke(ref bool optimized, ScriptBlockClauseToInvoke clauseToInvoke)
         {
             if (clauseToInvoke == ScriptBlockClauseToInvoke.ProcessBlockOnly
-                && (HasBeginBlock || (HasEndBlock && HasProcessBlock)))
+                && (HasBeginBlock || HasCleanBlock || (HasEndBlock && HasProcessBlock)))
             {
                 throw PSTraceSource.NewInvalidOperationException(AutomationExceptions.ScriptBlockInvokeOnOneClauseOnly);
             }
@@ -1379,6 +1395,8 @@ private Action<FunctionContext> GetCodeToInvoke(ref bool optimized, ScriptBlockC
                         return _scriptBlockData.ProcessBlock;
                     case ScriptBlockClauseToInvoke.End:
                         return _scriptBlockData.EndBlock;
+                    case ScriptBlockClauseToInvoke.Clean:
+                        return _scriptBlockData.CleanBlock;
                     default:
                         return HasProcessBlock ? _scriptBlockData.ProcessBlock : _scriptBlockData.EndBlock;
                 }
@@ -1392,6 +1410,8 @@ private Action<FunctionContext> GetCodeToInvoke(ref bool optimized, ScriptBlockC
                     return _scriptBlockData.UnoptimizedProcessBlock;
                 case ScriptBlockClauseToInvoke.End:
                     return _scriptBlockData.UnoptimizedEndBlock;
+                case ScriptBlockClauseToInvoke.Clean:
+                    return _scriptBlockData.UnoptimizedCleanBlock;
                 default:
                     return HasProcessBlock ? _scriptBlockData.UnoptimizedProcessBlock : _scriptBlockData.UnoptimizedEndBlock;
             }
@@ -2147,11 +2167,17 @@ internal static void LogScriptBlockEnd(ScriptBlock scriptBlock, Guid runspaceId)
 
         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]
@@ -2197,11 +2223,13 @@ internal sealed class PSScriptCmdlet : PSCmdlet, IDynamicParameters, IDisposable
         private readonly bool _useLocalScope;
         private readonly bool _runOptimized;
         private readonly bool _rethrowExitException;
-        private MshCommandRuntime _commandRuntime;
         private readonly MutableTuple _localsTuple;
-        private bool _exitWasCalled;
         private readonly FunctionContext _functionContext;
 
+        private MshCommandRuntime _commandRuntime;
+        private bool _exitWasCalled;
+        private bool _anyClauseExecuted;
+
         public PSScriptCmdlet(ScriptBlock scriptBlock, bool useNewScope, bool fromScriptFile, ExecutionContext context)
         {
             _scriptBlock = scriptBlock;
@@ -2291,6 +2319,34 @@ internal override void DoEndProcessing()
             }
         }
 
+        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();
@@ -2303,6 +2359,7 @@ private void ExitScope()
 
         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,
@@ -2356,9 +2413,9 @@ private void RunClause(Action<FunctionContext> clause, object dollarUnderbar, ob
                 }
                 finally
                 {
-                    this.Context.RestoreErrorPipe(oldErrorOutputPipe);
+                    Context.ShellFunctionErrorOutputPipe = oldErrorOutputPipe;
 
-                    // Set the language mode
+                    // Restore the language mode
                     if (oldLanguageMode.HasValue)
                     {
                         Context.LanguageMode = oldLanguageMode.Value;
@@ -2518,9 +2575,6 @@ public void Dispose()
             commandRuntime = null;
             currentObjectInPipeline = null;
             _input.Clear();
-            // _scriptBlock = null;
-            // _localsTuple = null;
-            // _functionContext = null;
 
             base.InternalDispose(true);
             _disposed = true;
diff --git a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
index de9ef697fc6..8d50fcf5f1a 100644
--- a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
+++ b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
@@ -1578,23 +1578,33 @@ private static int FindMatchingHandlerByType(Type exceptionType, Type[] types)
 
         internal static bool SuspendStoppingPipeline(ExecutionContext context)
         {
-            LocalPipeline lpl = (LocalPipeline)context.CurrentRunspace.GetCurrentlyRunningPipeline();
-            if (lpl != null)
+            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)
             {
-                bool oldIsStopping = lpl.Stopper.IsStopping;
-                lpl.Stopper.IsStopping = false;
+                bool oldIsStopping = localPipeline.Stopper.IsStopping;
+                localPipeline.Stopper.IsStopping = false;
                 return oldIsStopping;
             }
 
             return false;
         }
 
-        internal static void RestoreStoppingPipeline(ExecutionContext context, bool oldIsStopping)
+        internal static void RestoreStoppingPipelineImpl(LocalPipeline localPipeline, bool oldIsStopping)
         {
-            LocalPipeline lpl = (LocalPipeline)context.CurrentRunspace.GetCurrentlyRunningPipeline();
-            if (lpl != null)
+            if (localPipeline is not null)
             {
-                lpl.Stopper.IsStopping = oldIsStopping;
+                localPipeline.Stopper.IsStopping = oldIsStopping;
             }
         }
 
@@ -2855,6 +2865,11 @@ internal static object ForEach(IEnumerator enumerator, object expression, object
             ScriptBlock sb = expression as ScriptBlock;
             if (sb != null)
             {
+                if (sb.HasCleanBlock)
+                {
+                    throw new PSNotSupportedException(ParserStrings.ForEachNotSupportCleanBlock);
+                }
+
                 Pipe outputPipe = new Pipe(result);
                 if (sb.HasBeginBlock)
                 {
diff --git a/src/System.Management.Automation/resources/ParserStrings.resx b/src/System.Management.Automation/resources/ParserStrings.resx
index d21719157ac..a0569a6f4e4 100644
--- a/src/System.Management.Automation/resources/ParserStrings.resx
+++ b/src/System.Management.Automation/resources/ParserStrings.resx
@@ -497,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', or 'dynamicparam'.</value>
+    <value>unexpected token '{0}', expected 'begin', 'process', 'end', 'clean', or 'dynamicparam'.</value>
   </data>
   <data name="MissingEndCurlyBrace" xml:space="preserve">
     <value>Missing closing '}' in statement block or type definition.</value>
@@ -1126,6 +1126,9 @@ 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>
@@ -1479,4 +1482,7 @@ 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>
diff --git a/test/powershell/Language/Parser/Parser.Tests.ps1 b/test/powershell/Language/Parser/Parser.Tests.ps1
index 0f8a6c74726..0368dfe9c49 100644
--- a/test/powershell/Language/Parser/Parser.Tests.ps1
+++ b/test/powershell/Language/Parser/Parser.Tests.ps1
@@ -67,6 +67,8 @@ Describe "ParserTests (admin\monad\tests\monad\src\engine\core\ParserTests.cs)"
             }
 
             end {}
+
+            clean {}
         }
 '@
         $functionDefinition>$functionDefinitionFile
diff --git a/test/powershell/Language/Parser/Parsing.Tests.ps1 b/test/powershell/Language/Parser/Parsing.Tests.ps1
index c764830954b..97e46bcbe3c 100644
--- a/test/powershell/Language/Parser/Parsing.Tests.ps1
+++ b/test/powershell/Language/Parser/Parsing.Tests.ps1
@@ -148,17 +148,21 @@ Describe 'named blocks parsing' -Tags "CI" {
     ShouldBeParseError 'begin' MissingNamedStatementBlock 5
     ShouldBeParseError 'process' MissingNamedStatementBlock 7
     ShouldBeParseError 'end' MissingNamedStatementBlock 3
+    ShouldBeParseError 'clean' MissingNamedStatementBlock 5
     ShouldBeParseError 'dynamicparam' MissingNamedStatementBlock 12
     ShouldBeParseError 'begin process {}' MissingNamedStatementBlock 6 -CheckColumnNumber
     ShouldBeParseError 'end process {}' MissingNamedStatementBlock 4 -CheckColumnNumber
+    ShouldBeParseError 'clean process {}' MissingNamedStatementBlock 6 -CheckColumnNumber
     ShouldBeParseError 'dynamicparam process {}' MissingNamedStatementBlock 13 -CheckColumnNumber
     ShouldBeParseError 'process begin {}' MissingNamedStatementBlock 8 -CheckColumnNumber
-    ShouldBeParseError 'begin process end' MissingNamedStatementBlock,MissingNamedStatementBlock,MissingNamedStatementBlock 6,14,18 -CheckColumnNumber
+    ShouldBeParseError 'begin process end clean' MissingNamedStatementBlock, MissingNamedStatementBlock, MissingNamedStatementBlock, MissingNamedStatementBlock 6, 14, 18, 24 -CheckColumnNumber
 
     Test-Ast 'begin' 'begin' 'begin'
     Test-Ast 'begin end' 'begin end' 'begin' 'end'
     Test-Ast 'begin end process' 'begin end process' 'begin' 'end' 'process'
     Test-Ast 'begin {} end' 'begin {} end' 'begin {}' 'end'
+    Test-Ast 'begin process end clean' 'begin process end clean' 'begin' 'clean' 'end' 'process'
+    Test-Ast 'begin {} process end clean {}' 'begin {} process end clean {}' 'begin {}' 'clean {}' 'end' 'process'
 }
 
 #
diff --git a/test/powershell/Language/Scripting/CleanBlockErrorHandling.Tests.ps1 b/test/powershell/Language/Scripting/CleanBlockErrorHandling.Tests.ps1
new file mode 100644
index 00000000000..68904d4c79f
--- /dev/null
+++ b/test/powershell/Language/Scripting/CleanBlockErrorHandling.Tests.ps1
@@ -0,0 +1,1374 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe "Error handling within a single 'Clean' block" -Tag 'CI' {
+
+    BeforeAll {
+        function ErrorInClean {
+            [CmdletBinding()]
+            param(
+                [switch] $ThrowTerminatingError,
+                [switch] $ErrorActionStop,
+                [switch] $ThrowException,
+                [switch] $WriteErrorAPI,
+                [switch] $WriteErrorCmdlet,
+                [switch] $MethodInvocationThrowException,
+                [switch] $ExpressionThrowException
+            )
+
+            End { <# use an empty end block to allow the clean block to actually run #> }
+
+            clean {
+                if ($ThrowTerminatingError) {
+                    $ex = [System.ArgumentException]::new('terminating-exception')
+                    $er = [System.Management.Automation.ErrorRecord]::new($ex, 'ThrowTerminatingError:error', 'InvalidArgument', $null)
+                    $PSCmdlet.ThrowTerminatingError($er)
+                    Write-Verbose -Verbose "verbose-message"
+                }
+                elseif ($ErrorActionStop) {
+                    Get-Command NonExist -ErrorAction Stop
+                    Write-Verbose -Verbose "verbose-message"
+                }
+                elseif ($ThrowException) {
+                    throw 'throw-exception'
+                    Write-Verbose -Verbose "verbose-message"
+                }
+                elseif ($WriteErrorAPI) {
+                    $ex = [System.ArgumentException]::new('arg-exception')
+                    $er = [System.Management.Automation.ErrorRecord]::new($ex, 'WriteErrorAPI:error', 'InvalidArgument', $null)
+                    $PSCmdlet.WriteError($er)
+                    Write-Verbose -Verbose "verbose-message"
+                }
+                elseif ($WriteErrorCmdlet) {
+                    Write-Error 'write-error-cmdlet'
+                    Write-Verbose -Verbose "verbose-message"
+                }
+                elseif ($MethodInvocationThrowException) {
+                    ## This method call throws exception.
+                    $iss = [initialsessionstate]::Create()
+                    $iss.ImportPSModule($null)
+                    Write-Verbose -Verbose "verbose-message"
+                }
+                elseif ($ExpressionThrowException) {
+                    1/0 ## throw exception.
+                    Write-Verbose -Verbose "verbose-message"
+                }
+            }
+        }
+
+        function ErrorInEnd {
+            [CmdletBinding()]
+            param(
+                [switch] $ThrowTerminatingError,
+                [switch] $ErrorActionStop,
+                [switch] $ThrowException,
+                [switch] $WriteErrorAPI,
+                [switch] $WriteErrorCmdlet,
+                [switch] $MethodInvocationThrowException,
+                [switch] $ExpressionThrowException
+            )
+
+            if ($ThrowTerminatingError) {
+                $ex = [System.ArgumentException]::new('terminating-exception')
+                $er = [System.Management.Automation.ErrorRecord]::new($ex, 'ThrowTerminatingError:error', 'InvalidArgument', $null)
+                $PSCmdlet.ThrowTerminatingError($er)
+                Write-Verbose -Verbose "verbose-message"
+            }
+            elseif ($ErrorActionStop) {
+                Get-Command NonExist -ErrorAction Stop
+                Write-Verbose -Verbose "verbose-message"
+            }
+            elseif ($ThrowException) {
+                throw 'throw-exception'
+                Write-Verbose -Verbose "verbose-message"
+            }
+            elseif ($WriteErrorAPI) {
+                $ex = [System.ArgumentException]::new('arg-exception')
+                $er = [System.Management.Automation.ErrorRecord]::new($ex, 'WriteErrorAPI:error', 'InvalidArgument', $null)
+                $PSCmdlet.WriteError($er)
+                Write-Verbose -Verbose "verbose-message"
+            }
+            elseif ($WriteErrorCmdlet) {
+                Write-Error 'write-error-cmdlet'
+                Write-Verbose -Verbose "verbose-message"
+            }
+            elseif ($MethodInvocationThrowException) {
+                ## This method call throws exception.
+                $iss = [initialsessionstate]::Create()
+                $iss.ImportPSModule($null)
+                Write-Verbose -Verbose "verbose-message"
+            }
+            elseif ($ExpressionThrowException) {
+                1/0 ## throw exception.
+                Write-Verbose -Verbose "verbose-message"
+            }
+        }
+
+        function DivideByZeroWrappedInTry {
+            [CmdletBinding()]
+            param()
+
+            end {}
+            clean {
+                try {
+                    1/0
+                    Write-Verbose -Verbose 'clean'
+                }
+                catch { Write-Verbose -Verbose $_.Exception.InnerException.GetType().FullName }
+            }
+        }
+
+        function ArgumentNullWrappedInTry {
+            [CmdletBinding()]
+            param()
+
+            end {}
+            clean {
+                try {
+                    $iss = [initialsessionstate]::Create()
+                    $iss.ImportPSModule($null)
+                    Write-Verbose -Verbose 'clean'
+                }
+                catch { Write-Verbose -Verbose $_.Exception.InnerException.GetType().FullName }
+            }
+        }
+
+        function DivideByZeroWithTrap {
+            [CmdletBinding()]
+            param()
+
+            end {}
+            clean {
+                trap {
+                    Write-Verbose -Verbose $_.Exception.GetType().FullName
+                    continue
+                }
+
+                1/0
+                Write-Verbose -Verbose 'clean'
+            }
+        }
+
+        function ArgumentNullWithTrap {
+            [CmdletBinding()]
+            param()
+
+            end {}
+            clean {
+                trap {
+                    Write-Verbose -Verbose $_.Exception.GetType().FullName
+                    continue
+                }
+
+                $iss = [initialsessionstate]::Create()
+                $iss.ImportPSModule($null)
+                Write-Verbose -Verbose 'clean'
+            }
+        }
+
+        #region Helper
+
+        $pwsh = [PowerShell]::Create()
+        $text = (Get-Command ErrorInClean).ScriptBlock.Ast.Extent.Text
+        $pwsh.AddScript($text).Invoke()
+
+        $pwsh.Commands.Clear()
+        $text = (Get-Command ErrorInEnd).ScriptBlock.Ast.Extent.Text
+        $pwsh.AddScript($text).Invoke()
+
+        function RunCommand {
+            param(
+                [ValidateSet('ErrorInClean', 'ErrorInEnd')]
+                [string] $Command,
+
+                [ValidateSet('ThrowTerminatingError', 'ErrorActionStop', 'ThrowException', 'WriteErrorAPI', 
+                             'WriteErrorCmdlet', 'MethodInvocationThrowException', 'ExpressionThrowException')]
+                [string] $ParamNameToUse,
+
+                [ValidateSet('Continue', 'Ignore', 'SilentlyContinue', 'Stop')]
+                [string] $ErrorAction
+            )
+
+            $pwsh.Commands.Clear()
+            $pwsh.Streams.ClearStreams()
+            $pwsh.AddCommand($Command).AddParameter($ParamNameToUse, $true) > $null
+            if ($ErrorAction) { $pwsh.AddParameter('ErrorAction', $ErrorAction) > $null }
+            $pwsh.Invoke()
+        }
+
+        function RunScript {
+            param([string] $Script)
+
+            $pwsh.Commands.Clear()
+            $pwsh.Streams.ClearStreams()
+            $pwsh.AddScript($Script).Invoke()
+        }
+
+        function GetLastError {
+            $pwsh.Commands.Clear()
+            $pwsh.AddCommand('Get-Error').Invoke()
+        }
+
+        function ClearDollarError {
+            $pwsh.Commands.Clear()
+            $pwsh.AddScript('$Error.Clear()').Invoke()
+        }
+
+        #endregion
+    }
+
+    AfterAll {
+        $pwsh.Dispose()
+    }
+
+    It "Terminating error should stop the 'Clean' block execution but should not be propagated up" {
+        ## 'ThrowTerminatingException' stops the execution within the 'Clean' block, but the error doesn't get
+        ## propagated out of the 'Clean' block. Instead, the error is written to the 'ErrorOutput' pipe.
+        RunCommand -Command 'ErrorInClean' -ParamNameToUse 'ThrowTerminatingError'
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'terminating-exception'
+
+        ## 'throw' statement stops the execution within the 'Clean' block by default, but the error doesn't get
+        ## propagated out of the 'Clean' block. Instead, the error is written to the 'ErrorOutput' pipe.
+        RunCommand -Command 'ErrorInClean' -ParamNameToUse 'ThrowException'
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'throw-exception'
+
+        ## '-ErrorAction Stop' stops the execution within the 'Clean' block, but the error doesn't get propagated
+        ## out of the 'Clean' block. Instead, the error is written to the 'ErrorOutput' pipe.
+        RunCommand -Command 'ErrorInClean' -ParamNameToUse 'ErrorActionStop'
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].FullyQualifiedErrorId | Should -BeExactly 'CommandNotFoundException,Microsoft.PowerShell.Commands.GetCommandCommand'
+
+        ## Turn non-terminating errors into terminating by '-ErrorAction Stop' explicitly.
+        ## Execution within the 'Clean' block should be stopped. The resulted terminating error should not get
+        ## propagated, but instead should be written to 'ErrorOutput' pipe.
+        RunCommand -Command 'ErrorInClean' -ParamNameToUse 'WriteErrorAPI' -ErrorAction Stop
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'arg-exception'
+
+        RunCommand -Command 'ErrorInClean' -ParamNameToUse 'WriteErrorCmdlet' -ErrorAction Stop
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'write-error-cmdlet'
+
+        RunCommand -Command 'ErrorInClean' -ParamNameToUse 'MethodInvocationThrowException' -ErrorAction Stop
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.ArgumentNullException'
+
+        RunCommand -Command 'ErrorInClean' -ParamNameToUse 'ExpressionThrowException' -ErrorAction Stop
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.DivideByZeroException'
+    }
+
+    It "Terminating error should set `$? correctly" {
+        RunScript -Script 'ErrorInClean -ThrowTerminatingError; $?' | Should -BeFalse
+        RunScript -Script 'ErrorInClean -ThrowException; $?' | Should -BeFalse
+        RunScript -Script 'ErrorInClean -ErrorActionStop; $?' | Should -BeFalse
+        RunScript -Script 'ErrorInClean -WriteErrorAPI -ErrorAction Stop; $?' | Should -BeFalse
+        RunScript -Script 'ErrorInClean -WriteErrorCmdlet -ErrorAction Stop; $?' | Should -BeFalse
+        RunScript -Script 'ErrorInClean -MethodInvocationThrowException -ErrorAction Stop; $?' | Should -BeFalse
+        RunScript -Script 'ErrorInClean -ExpressionThrowException -ErrorAction Stop; $?' | Should -BeFalse
+    }
+
+    It "Track the `$? behavior for non-terminating errors within 'Clean' and 'End' blocks" {
+        RunScript -Script 'ErrorInClean -WriteErrorAPI; $?' | Should -BeFalse
+        RunScript -Script 'ErrorInEnd -WriteErrorAPI; $?' | Should -BeFalse
+
+        ## The 'Write-Error' is specially weird, in that when a command emits error because of 'Write-Error' within it,
+        ## the following '$?' won't reflect '$false', but will be '$true'.
+        ## Frankly, this is counter-intuitive, but it's the existing behavior. The tests below just keeps track of this
+        ## behavior. Feel free to change this test if someone is fixing this seemingly wrong behavior.
+        RunScript -Script 'ErrorInClean -WriteErrorCmdlet; $?' | Should -BeTrue
+        RunScript -Script 'ErrorInEnd -WriteErrorCmdlet; $?' | Should -BeTrue
+
+        ## Similarly, when a command emits error because of a method invocation within it throws an exception,
+        ## the following '$?' won't reflect '$false', but will be '$true'.
+        ## Again, this seems wrong, but it's the existing behavior. The tests below just keeps track of this
+        ## behavior. Feel free to change this test if someone is fixing this seemingly wrong behavior.
+        RunScript -Script 'ErrorInClean -MethodInvocationThrowException; $?' | Should -BeTrue
+        RunScript -Script 'ErrorInEnd -MethodInvocationThrowException; $?' | Should -BeTrue
+
+        ## Again, when a command emits error because of an expression within it throws an exception,
+        ## the following '$?' won't reflect '$false', but will be '$true'.
+        ## This seems wrong, but it's the existing behavior. The tests below just keeps track of this
+        ## behavior. Feel free to change this test if someone is fixing this seemingly wrong behavior.
+        RunScript -Script 'ErrorInClean -ExpressionThrowException; $?' | Should -BeTrue
+        RunScript -Script 'ErrorInEnd -ExpressionThrowException; $?' | Should -BeTrue
+    }
+
+    It "Non-terminating error within 'Clean' block should act based on ErrorActionPreference: <ParamName> - Continue" -TestCases @(
+        @{ ParamName = 'WriteErrorAPI';    AssertScript = { param($err) $err.Exception.Message | Should -BeExactly 'arg-exception' } }
+        @{ ParamName = 'WriteErrorCmdlet'; AssertScript = { param($err) $err.Exception.Message | Should -BeExactly 'write-error-cmdlet' } }
+        @{ ParamName = 'MethodInvocationThrowException'; AssertScript = { param($err) $err.Exception.InnerException | Should -BeOfType 'System.ArgumentNullException' } }
+        @{ ParamName = 'ExpressionThrowException';       AssertScript = { param($err) $err.Exception.InnerException | Should -BeOfType 'System.DivideByZeroException' } }
+    ) {
+        param($ParamName, $AssertScript)
+
+        RunCommand -Command 'ErrorInClean' -ParamNameToUse $ParamName
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'verbose-message'
+        $pwsh.Streams.Error.Count | Should -Be 1
+        & $AssertScript $pwsh.Streams.Error[0]
+    }
+
+    It "Non-terminating error within 'End' block should act based on ErrorActionPreference: <ParamName> - Continue" -TestCases @(
+        @{ ParamName = 'WriteErrorAPI';    AssertScript = { param($err) $err.Exception.Message | Should -BeExactly 'arg-exception' } }
+        @{ ParamName = 'WriteErrorCmdlet'; AssertScript = { param($err) $err.Exception.Message | Should -BeExactly 'write-error-cmdlet' } }
+        @{ ParamName = 'MethodInvocationThrowException'; AssertScript = { param($err) $err.Exception.InnerException | Should -BeOfType 'System.ArgumentNullException' } }
+        @{ ParamName = 'ExpressionThrowException';       AssertScript = { param($err) $err.Exception.InnerException | Should -BeOfType 'System.DivideByZeroException' } }
+    ) {
+        param($ParamName, $AssertScript)
+
+        RunCommand -Command 'ErrorInEnd' -ParamNameToUse $ParamName
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'verbose-message'
+        $pwsh.Streams.Error.Count | Should -Be 1
+        & $AssertScript $pwsh.Streams.Error[0]
+    }
+
+    It "Non-terminating error within 'Clean' block should act based on ErrorActionPreference: <ParamName> - <Action>" -TestCases @(
+        ### When error action is 'Ignore', non-terminating errors emitted by 'WriteErrorAPI' and 'WriteErrorCmdlet' are not captured in $Error,
+        ### but non-terminating errors emitted by method exception or expression exception are captured in $Error.
+        ### This inconsistency is surprising, but it's the existing behavior -- same in other named blocks.
+        @{ ParamName = 'WriteErrorAPI'; Action = 'Ignore'; AssertScript = $null }
+        @{ ParamName = 'WriteErrorCmdlet'; Action = 'Ignore'; AssertScript = $null }
+        @{ ParamName = 'MethodInvocationThrowException'; Action = 'Ignore'; AssertScript = { param($err) $err.Exception.InnerException | Should -BeOfType 'System.ArgumentNullException' } }
+        @{ ParamName = 'ExpressionThrowException'; Action = 'Ignore'; AssertScript = { param($err) $err.Exception.InnerException | Should -BeOfType 'System.DivideByZeroException' } }
+
+        @{ ParamName = 'WriteErrorAPI'; Action = 'SilentlyContinue'; AssertScript = { param($err) $err.Exception.Message | Should -BeExactly 'arg-exception' } }
+        @{ ParamName = 'WriteErrorCmdlet'; Action = 'SilentlyContinue'; AssertScript = { param($err) $err.Exception.Message | Should -BeExactly 'write-error-cmdlet' } }
+        @{ ParamName = 'MethodInvocationThrowException'; Action = 'SilentlyContinue'; AssertScript = { param($err) $err.Exception.InnerException | Should -BeOfType 'System.ArgumentNullException' } }
+        @{ ParamName = 'ExpressionThrowException'; Action = 'SilentlyContinue'; AssertScript = { param($err) $err.Exception.InnerException | Should -BeOfType 'System.DivideByZeroException' } }
+    ) {
+        param($ParamName, $Action, $AssertScript)
+
+        ClearDollarError
+        RunCommand -Command 'ErrorInClean' -ParamNameToUse $ParamName -ErrorAction $Action
+
+        $pwsh.Streams.Error.Count | Should -Be 0
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'verbose-message'
+
+        $lastErr = GetLastError
+        if ($null -eq $AssertScript) {
+            $lastErr | Should -BeNullOrEmpty
+        } else {
+            $lastErr | Should -Not -BeNullOrEmpty
+            & $AssertScript $lastErr
+        }
+    }
+
+    ### These tests are targeting 'End' block but with the same settings as the ones right above.
+    ### They are used as a comparison to prove the consistent behavior in 'End' and 'Clean'.
+    It "Non-terminating error within 'End' block should act based on ErrorActionPreference: <ParamName> - <Action>" -TestCases @(
+        @{ ParamName = 'WriteErrorAPI'; Action = 'Ignore'; AssertScript = $null }
+        @{ ParamName = 'WriteErrorCmdlet'; Action = 'Ignore'; AssertScript = $null }
+        @{ ParamName = 'MethodInvocationThrowException'; Action = 'Ignore'; AssertScript = { param($err) $err.Exception.InnerException | Should -BeOfType 'System.ArgumentNullException' } }
+        @{ ParamName = 'ExpressionThrowException'; Action = 'Ignore'; AssertScript = { param($err) $err.Exception.InnerException | Should -BeOfType 'System.DivideByZeroException' } }
+
+        @{ ParamName = 'WriteErrorAPI'; Action = 'SilentlyContinue'; AssertScript = { param($err) $err.Exception.Message | Should -BeExactly 'arg-exception' } }
+        @{ ParamName = 'WriteErrorCmdlet'; Action = 'SilentlyContinue'; AssertScript = { param($err) $err.Exception.Message | Should -BeExactly 'write-error-cmdlet' } }
+        @{ ParamName = 'MethodInvocationThrowException'; Action = 'SilentlyContinue'; AssertScript = { param($err) $err.Exception.InnerException | Should -BeOfType 'System.ArgumentNullException' } }
+        @{ ParamName = 'ExpressionThrowException'; Action = 'SilentlyContinue'; AssertScript = { param($err) $err.Exception.InnerException | Should -BeOfType 'System.DivideByZeroException' } }
+    ) {
+        param($ParamName, $Action, $AssertScript)
+
+        ClearDollarError
+        RunCommand -Command 'ErrorInEnd' -ParamNameToUse $ParamName -ErrorAction $Action
+
+        $pwsh.Streams.Error.Count | Should -Be 0
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'verbose-message'
+
+        $lastErr = GetLastError
+        if ($null -eq $AssertScript) {
+            $lastErr | Should -BeNullOrEmpty
+        } else {
+            $lastErr | Should -Not -BeNullOrEmpty
+            & $AssertScript $lastErr
+        }
+    }
+
+    It "'try/catch' and 'trap' should turn general exception thrown from method/expression into terminating error within 'Clean' block. ErrorAction: <ErrorAction>" -TestCases @(
+        @{ ErrorAction = 'Continue' }
+        @{ ErrorAction = 'Ignore' }
+        @{ ErrorAction = 'SilentlyContinue' }
+    ) {
+        param($ErrorAction)
+
+        $verbose = DivideByZeroWrappedInTry -ErrorAction $ErrorAction 4>&1
+        $verbose.Count | Should -Be 1
+        $verbose.Message | Should -BeExactly 'System.DivideByZeroException'
+
+        $verbose = ArgumentNullWrappedInTry -ErrorAction $ErrorAction 4>&1
+        $verbose.Count | Should -Be 1
+        $verbose.Message | Should -BeExactly 'System.ArgumentNullException'
+
+        $verbose = DivideByZeroWithTrap -ErrorAction $ErrorAction 4>&1
+        $verbose.Count | Should -Be 2
+        $verbose[0].Message | Should -BeExactly 'System.DivideByZeroException'
+        $verbose[1].Message | Should -BeExactly 'clean'
+
+        $verbose = ArgumentNullWithTrap -ErrorAction $ErrorAction 4>&1
+        $verbose.Count | Should -Be 2
+        $verbose[0].Message | Should -BeExactly 'System.ArgumentNullException'
+        $verbose[1].Message | Should -BeExactly 'clean'
+    }
+
+    It "'try/catch' and 'trap' outside the command should NOT affect general exception thrown from method/expression in the 'Clean' block" {
+        ## The catch block should not run
+        RunScript -Script "try { ErrorInClean -MethodInvocationThrowException } catch { Write-Debug -Debug 'caught-something' }"
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'verbose-message'
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.ArgumentNullException'
+        $pwsh.Streams.Debug.Count | Should -Be 0
+
+        ## The catch block should not run
+        RunScript -Script "try { ErrorInClean -ExpressionThrowException } catch { Write-Debug -Debug 'caught-something' }"
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'verbose-message'
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.DivideByZeroException'
+        $pwsh.Streams.Debug.Count | Should -Be 0
+
+        ## The trap block should not run
+        RunScript -Script "trap { Write-Debug -Debug 'caught-something'; continue } ErrorInClean -MethodInvocationThrowException"
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'verbose-message'
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.ArgumentNullException'
+        $pwsh.Streams.Debug.Count | Should -Be 0
+
+        ## The trap block should not run
+        RunScript -Script "trap { Write-Debug -Debug 'caught-something'; continue } ErrorInClean -ExpressionThrowException"
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'verbose-message'
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.DivideByZeroException'
+        $pwsh.Streams.Debug.Count | Should -Be 0
+    }
+
+    It "'try/catch' and 'trap' outside the command should NOT affect 'throw' statement in the 'Clean' block. ErrorAction: <ErrorAction>" -TestCases @(
+        @{ ErrorAction = 'Ignore' }
+        @{ ErrorAction = 'SilentlyContinue' }
+    ) {
+        param ($ErrorAction)
+
+        ## 'throw' statement should be suppressed by 'Ignore' or 'SilentlyContinue' within a 'Clean' block,
+        ## even if the command is wrapped in try/catch.
+        RunScript -Script "try { ErrorInClean -ThrowException -ErrorAction $ErrorAction } catch { Write-Debug -Debug 'caught-something' }"
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'verbose-message'
+
+        ## Nothing written to error stream
+        $pwsh.Streams.Error.Count | Should -Be 0
+        ## Nothing written to debug stream
+        $pwsh.Streams.Debug.Count | Should -Be 0
+
+        ## The suppressed 'throw' exception is kept in '$Error'
+        $err = GetLastError
+        $err | Should -Not -BeNullOrEmpty
+        $err.FullyQualifiedErrorId | Should -BeExactly 'throw-exception'
+
+
+        ## 'throw' statement should be suppressed by 'Ignore' or 'SilentlyContinue' within a 'Clean' block,
+        ## even if the command is accompanied by 'trap'.
+        RunScript -Script "trap { Write-Debug -Debug 'caught-something'; continue } ErrorInClean -ThrowException -ErrorAction $ErrorAction"
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'verbose-message'
+
+        ## Nothing written to error stream
+        $pwsh.Streams.Error.Count | Should -Be 0
+        ## Nothing written to debug stream
+        $pwsh.Streams.Debug.Count | Should -Be 0
+
+        ## The suppressed 'throw' exception is kept in '$Error'
+        $err = GetLastError
+        $err | Should -Not -BeNullOrEmpty
+        $err.FullyQualifiedErrorId | Should -BeExactly 'throw-exception'
+    }
+
+    It "Error out-variable should work for the 'Clean' block" {
+        ## Terminating errors thrown from 'Clean' block are captured and written to the error pipe.
+        ## Here we redirect the error pipe to discard the error stream, so the error doesn't pollute
+        ## the test output.
+        ErrorInClean -ThrowTerminatingError -ErrorVariable err 2>&1 > $null
+        $err.Count | Should -Be 1
+        $err[0].Message | Should -BeExactly 'terminating-exception'
+
+        ## $err.Count is 3 in this case. It's the same for other named blocks too.
+        ## This looks like an existing bug because $err.Count should be 1 since only 1 error happened.
+        ## Opened issue https://github.com/PowerShell/PowerShell/issues/15739
+        ErrorInClean -ErrorActionStop -ErrorVariable err 2>&1 > $null
+        $err[0] | Should -BeOfType 'System.Management.Automation.ActionPreferenceStopException'
+
+        ## $err.Count is 2 in this case. It's the same for other named blocks too.
+        ## Similarly, this looks like an existing bug and $err.Count should be 1.
+        ## This is tracked by the same issue above.
+        ErrorInClean -ThrowException -ErrorVariable err 2>&1 > $null
+        $err[0].Exception.Message | Should -BeExactly 'throw-exception'
+
+        ErrorInClean -WriteErrorAPI -ErrorVariable err *>&1 > $null
+        $err.Count | Should -Be 1
+        $err[0].Exception.Message | Should -BeExactly 'arg-exception'
+
+        ErrorInClean -WriteErrorCmdlet -ErrorVariable err *>&1 > $null
+        $err.Count | Should -Be 1
+        $err[0].Exception.Message | Should -BeExactly 'write-error-cmdlet'
+
+        ErrorInClean -MethodInvocationThrowException -ErrorVariable err *>&1 > $null
+        $err.Count | Should -Be 1
+        $err[0].Exception.InnerException | Should -BeOfType 'System.ArgumentNullException'
+
+        ErrorInClean -ExpressionThrowException -ErrorVariable err *>&1 > $null
+        $err.Count | Should -Be 1
+        $err[0].Exception.InnerException | Should -BeOfType 'System.DivideByZeroException'
+    }
+}
+
+Describe "Multiple errors from 'Clean' and another named block" {
+
+    BeforeAll {
+        function MultipleErrors {
+            [CmdletBinding()]
+            param(
+                [ValidateSet('ThrowTerminatingError', 'ErrorActionStop', 'ThrowException', 'WriteErrorAPI',
+                             'WriteErrorCmdlet', 'MethodInvocationThrowException', 'ExpressionThrowException')]
+                [Parameter(Mandatory)]
+                [string] $ErrorFromEndBlock,
+
+                [ValidateSet('ThrowTerminatingError', 'ErrorActionStop', 'ThrowException', 'WriteErrorAPI',
+                             'WriteErrorCmdlet', 'MethodInvocationThrowException', 'ExpressionThrowException')]
+                [Parameter(Mandatory)]
+                [string] $ErrorFromCleanBlock
+            )
+
+            End {
+                switch ($ErrorFromEndBlock) {
+                    'ThrowTerminatingError' {
+                        $ex = [System.ArgumentException]::new('end-terminating-exception')
+                        $er = [System.Management.Automation.ErrorRecord]::new($ex, 'ThrowTerminatingError:end-error', 'InvalidArgument', $null)
+                        $PSCmdlet.ThrowTerminatingError($er)
+                        Write-Verbose -Verbose "end-verbose-message"
+                    }
+
+                    'ErrorActionStop' {
+                        Get-Command NonExistEnd -ErrorAction Stop
+                        Write-Verbose -Verbose "end-verbose-message"
+                    }
+
+                    'ThrowException' {
+                        throw 'end-throw-exception'
+                        Write-Verbose -Verbose "end-verbose-message"
+                    }
+
+                    'WriteErrorAPI' {
+                        $ex = [System.ArgumentException]::new('end-arg-exception')
+                        $er = [System.Management.Automation.ErrorRecord]::new($ex, 'WriteErrorAPI:end-error', 'InvalidArgument', $null)
+                        $PSCmdlet.WriteError($er)
+                        Write-Verbose -Verbose "end-verbose-message"
+                    }
+
+                    'WriteErrorCmdlet' {
+                        Write-Error 'end-write-error-cmdlet'
+                        Write-Verbose -Verbose "end-verbose-message"
+                    }
+
+                    'MethodInvocationThrowException' {
+                        ## This method call throws exception.
+                        $iss = [initialsessionstate]::Create()
+                        $iss.ImportPSModule($null)
+                        Write-Verbose -Verbose "end-verbose-message"
+                    }
+
+                    'ExpressionThrowException' {
+                        1/0 ## throw exception.
+                        Write-Verbose -Verbose "end-verbose-message"
+                    }
+                }
+            }
+
+            clean {
+                switch ($ErrorFromCleanBlock) {
+                    'ThrowTerminatingError' {
+                        $ex = [System.ArgumentException]::new('clean-terminating-exception')
+                        $er = [System.Management.Automation.ErrorRecord]::new($ex, 'ThrowTerminatingError:clean-error', 'InvalidArgument', $null)
+                        $PSCmdlet.ThrowTerminatingError($er)
+                        Write-Verbose -Verbose "clean-verbose-message"
+                    }
+
+                    'ErrorActionStop' {
+                        Get-Command NonExistClean -ErrorAction Stop
+                        Write-Verbose -Verbose "clean-verbose-message"
+                    }
+
+                    'ThrowException' {
+                        throw 'clean-throw-exception'
+                        Write-Verbose -Verbose "clean-verbose-message"
+                    }
+
+                    'WriteErrorAPI' {
+                        $ex = [System.ArgumentException]::new('clean-arg-exception')
+                        $er = [System.Management.Automation.ErrorRecord]::new($ex, 'WriteErrorAPI:clean-error', 'InvalidArgument', $null)
+                        $PSCmdlet.WriteError($er)
+                        Write-Verbose -Verbose "clean-verbose-message"
+                    }
+
+                    'WriteErrorCmdlet' {
+                        Write-Error 'clean-write-error-cmdlet'
+                        Write-Verbose -Verbose "clean-verbose-message"
+                    }
+
+                    'MethodInvocationThrowException' {
+                        ## This method call throws exception.
+                        $iss = [initialsessionstate]::Create()
+                        $iss.ImportPSModule($null)
+                        Write-Verbose -Verbose "clean-verbose-message"
+                    }
+
+                    'ExpressionThrowException' {
+                        1/0 ## throw exception.
+                        Write-Verbose -Verbose "clean-verbose-message"
+                    }
+                }
+            }
+        }
+
+        #region Helper
+
+        $pwsh = [PowerShell]::Create()
+        $text = (Get-Command MultipleErrors).ScriptBlock.Ast.Extent.Text
+        $pwsh.AddScript($text).Invoke()
+
+        function RunCommand {
+            param(
+                [ValidateSet('MultipleErrors')]
+                [string] $Command,
+
+                [ValidateSet('ThrowTerminatingError', 'ErrorActionStop', 'ThrowException', 'WriteErrorAPI', 
+                             'WriteErrorCmdlet', 'MethodInvocationThrowException', 'ExpressionThrowException')]
+                [string] $ErrorFromEndBlock,
+
+                [ValidateSet('ThrowTerminatingError', 'ErrorActionStop', 'ThrowException', 'WriteErrorAPI', 
+                             'WriteErrorCmdlet', 'MethodInvocationThrowException', 'ExpressionThrowException')]
+                [string] $ErrorFromCleanBlock,
+
+                [ValidateSet('Continue', 'Ignore', 'SilentlyContinue', 'Stop')]
+                [string] $ErrorAction
+            )
+
+            $pwsh.Commands.Clear()
+            $pwsh.Streams.ClearStreams()
+            $pwsh.AddCommand($Command) > $null
+            $pwsh.AddParameter('ErrorFromEndBlock', $ErrorFromEndBlock) > $null
+            $pwsh.AddParameter('ErrorFromCleanBlock', $ErrorFromCleanBlock) > $null
+            if ($ErrorAction) { $pwsh.AddParameter('ErrorAction', $ErrorAction) > $null }
+            $pwsh.Invoke()
+        }
+
+        function RunScript {
+            param([string] $Script)
+
+            $pwsh.Commands.Clear()
+            $pwsh.Streams.ClearStreams()
+            $pwsh.AddScript($Script).Invoke()
+        }
+
+        function GetLastError {
+            $pwsh.Commands.Clear()
+            $pwsh.AddCommand('Get-Error').Invoke()
+        }
+
+        function GetAllErrors {
+            $pwsh.Commands.Clear()
+            $pwsh.AddScript('$Error').Invoke()
+        }
+
+        function ClearDollarError {
+            $pwsh.Commands.Clear()
+            $pwsh.AddScript('$Error.Clear()').Invoke()
+        }
+
+        #endregion
+    }
+
+    AfterAll {
+        $pwsh.Dispose()
+    }
+
+    It "Terminating errors from both 'End' (ThrowTerminatingError) and 'Clean' (ThrowTerminatingError) should work properly" {
+        $failure = $null
+        try {
+            RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ThrowTerminatingError' -ErrorFromCleanBlock 'ThrowTerminatingError'
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException | Should -BeOfType 'System.Management.Automation.CmdletInvocationException'
+        $failure.Exception.InnerException.InnerException | Should -BeOfType 'System.ArgumentException'
+        $failure.Exception.InnerException.InnerException.Message | Should -BeExactly 'end-terminating-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception | Should -BeOfType 'System.ArgumentException'
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'clean-terminating-exception'
+    }
+
+    It "Terminating errors from both 'End' (ErrorActionStop) and 'Clean' (ThrowTerminatingError) should work properly" {
+        $failure = $null
+        try {
+            RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ErrorActionStop' -ErrorFromCleanBlock 'ThrowTerminatingError'
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException | Should -BeOfType 'System.Management.Automation.ActionPreferenceStopException'
+        $failure.Exception.InnerException.Message | should -BeLike "*'NonExistEnd'*"
+
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception | Should -BeOfType 'System.ArgumentException'
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'clean-terminating-exception'
+    }
+
+    It "Terminating errors from both 'End' (ThrowException) and 'Clean' (ThrowTerminatingError) should work properly" {
+        $failure = $null
+        try {
+            RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ThrowException' -ErrorFromCleanBlock 'ThrowTerminatingError'
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException.Message | should -BeExactly 'end-throw-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception | Should -BeOfType 'System.ArgumentException'
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'clean-terminating-exception'
+    }
+
+    It "Terminating errors from both 'End' (ThrowTerminatingError) and 'Clean' (ErrorActionStop) should work properly" {
+        $failure = $null
+        try {
+            RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ThrowTerminatingError' -ErrorFromCleanBlock 'ErrorActionStop'
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException | Should -BeOfType 'System.Management.Automation.CmdletInvocationException'
+        $failure.Exception.InnerException.InnerException | Should -BeOfType 'System.ArgumentException'
+        $failure.Exception.InnerException.InnerException.Message | Should -BeExactly 'end-terminating-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].FullyQualifiedErrorId | Should -BeExactly 'CommandNotFoundException,Microsoft.PowerShell.Commands.GetCommandCommand'
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeLike "*'NonExistClean'*"
+    }
+
+    It "Terminating errors from both 'End' (ErrorActionStop) and 'Clean' (ErrorActionStop) should work properly" {
+        $failure = $null
+        try {
+            RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ErrorActionStop' -ErrorFromCleanBlock 'ErrorActionStop'
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException | Should -BeOfType 'System.Management.Automation.ActionPreferenceStopException'
+        $failure.Exception.InnerException.Message | should -BeLike "*'NonExistEnd'*"
+
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].FullyQualifiedErrorId | Should -BeExactly 'CommandNotFoundException,Microsoft.PowerShell.Commands.GetCommandCommand'
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeLike "*'NonExistClean'*"
+    }
+
+    It "Terminating errors from both 'End' (ThrowException) and 'Clean' (ErrorActionStop) should work properly" {
+        $failure = $null
+        try {
+            RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ThrowException' -ErrorFromCleanBlock 'ErrorActionStop'
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException.Message | should -BeExactly 'end-throw-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].FullyQualifiedErrorId | Should -BeExactly 'CommandNotFoundException,Microsoft.PowerShell.Commands.GetCommandCommand'
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeLike "*'NonExistClean'*"
+    }
+
+    It "Terminating errors from both 'End' (ThrowTerminatingError) and 'Clean' (ThrowException) should work properly" {
+        $failure = $null
+        try {
+            RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ThrowTerminatingError' -ErrorFromCleanBlock 'ThrowException'
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException | Should -BeOfType 'System.Management.Automation.CmdletInvocationException'
+        $failure.Exception.InnerException.InnerException | Should -BeOfType 'System.ArgumentException'
+        $failure.Exception.InnerException.InnerException.Message | Should -BeExactly 'end-terminating-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'clean-throw-exception'
+    }
+
+    It "Terminating errors from both 'End' (ErrorActionStop) and 'Clean' (ThrowException) should work properly" {
+        $failure = $null
+        try {
+            RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ErrorActionStop' -ErrorFromCleanBlock 'ThrowException'
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException | Should -BeOfType 'System.Management.Automation.ActionPreferenceStopException'
+        $failure.Exception.InnerException.Message | should -BeLike "*'NonExistEnd'*"
+
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'clean-throw-exception'
+    }
+
+    It "Terminating errors from both 'End' (ThrowException) and 'Clean' (ThrowException) should work properly" {
+        $failure = $null
+        try {
+            RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ThrowException' -ErrorFromCleanBlock 'ThrowException'
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException.Message | should -BeExactly 'end-throw-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'clean-throw-exception'
+    }
+
+    It "Terminating errors from both 'End' (ThrowException) and 'Clean' (ThrowException) with ErrorAction '<ErrorAction>' should work properly" -TestCases @(
+        @{ ErrorAction = 'Ignore' }
+        @{ ErrorAction = 'SilentlyContinue' }
+    ) {
+        param($ErrorAction)
+
+        ClearDollarError
+
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ThrowException' -ErrorFromCleanBlock 'ThrowException' -ErrorAction $ErrorAction
+
+        $pwsh.Streams.Error.Count | Should -Be 0
+        $pwsh.Streams.Verbose.Count | Should -Be 2
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'end-verbose-message'
+        $pwsh.Streams.Verbose[1] | Should -BeExactly 'clean-verbose-message'
+
+        $ers = GetAllErrors
+        $ers.Count | Should -Be 2
+        $ers[0].Exception.Message | Should -BeExactly 'clean-throw-exception'
+        $ers[1].Exception.Message | Should -BeExactly 'end-throw-exception'
+    }
+
+    It "Non-terminating error from 'End' (WriteErrorAPI) and terminating error from 'Clean' (ThrowTerminatingError) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'WriteErrorAPI' -ErrorFromCleanBlock 'ThrowTerminatingError'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'end-arg-exception'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'clean-terminating-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'end-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (WriteErrorAPI) and terminating error from 'Clean' (ErrorActionStop) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'WriteErrorAPI' -ErrorFromCleanBlock 'ErrorActionStop'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'end-arg-exception'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeLike "*'NonExistClean'*"
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'end-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (WriteErrorAPI) and terminating error from 'Clean' (ThrowException) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'WriteErrorAPI' -ErrorFromCleanBlock 'ThrowException'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'end-arg-exception'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'clean-throw-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'end-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (WriteErrorCmdlet) and terminating error from 'Clean' (ThrowTerminatingError) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'WriteErrorCmdlet' -ErrorFromCleanBlock 'ThrowTerminatingError'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'end-write-error-cmdlet'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'clean-terminating-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'end-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (WriteErrorCmdlet) and terminating error from 'Clean' (ErrorActionStop) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'WriteErrorCmdlet' -ErrorFromCleanBlock 'ErrorActionStop'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'end-write-error-cmdlet'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeLike "*'NonExistClean'*"
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'end-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (WriteErrorCmdlet) and terminating error from 'Clean' (ThrowException) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'WriteErrorCmdlet' -ErrorFromCleanBlock 'ThrowException'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'end-write-error-cmdlet'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'clean-throw-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'end-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (MethodInvocationThrowException) and terminating error from 'Clean' (ThrowTerminatingError) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'MethodInvocationThrowException' -ErrorFromCleanBlock 'ThrowTerminatingError'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.ArgumentNullException'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'clean-terminating-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'end-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (MethodInvocationThrowException) and terminating error from 'Clean' (ErrorActionStop) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'MethodInvocationThrowException' -ErrorFromCleanBlock 'ErrorActionStop'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.ArgumentNullException'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeLike "*'NonExistClean'*"
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'end-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (MethodInvocationThrowException) and terminating error from 'Clean' (ThrowException) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'MethodInvocationThrowException' -ErrorFromCleanBlock 'ThrowException'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.ArgumentNullException'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'clean-throw-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'end-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (ExpressionThrowException) and terminating error from 'Clean' (ThrowTerminatingError) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ExpressionThrowException' -ErrorFromCleanBlock 'ThrowTerminatingError'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.DivideByZeroException'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'clean-terminating-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'end-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (ExpressionThrowException) and terminating error from 'Clean' (ErrorActionStop) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ExpressionThrowException' -ErrorFromCleanBlock 'ErrorActionStop'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.DivideByZeroException'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeLike "*'NonExistClean'*"
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'end-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (ExpressionThrowException) and terminating error from 'Clean' (ThrowException) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ExpressionThrowException' -ErrorFromCleanBlock 'ThrowException'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.DivideByZeroException'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'clean-throw-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'end-verbose-message'
+    }
+
+    It "Terminating error from 'End' (ThrowException) and non-terminating error from 'Clean' (WriteErrorAPI) should work properly" {
+        $failure = $null
+        try {
+            RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ThrowException' -ErrorFromCleanBlock 'WriteErrorAPI'
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException.Message | should -BeExactly 'end-throw-exception'
+
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'clean-arg-exception'
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'clean-verbose-message'
+    }
+
+    It "Terminating error from 'End' (ThrowException) and non-terminating error from 'Clean' (WriteErrorCmdlet) should work properly" {
+        $failure = $null
+        try {
+            RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ThrowException' -ErrorFromCleanBlock 'WriteErrorCmdlet'
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException.Message | should -BeExactly 'end-throw-exception'
+
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'clean-write-error-cmdlet'
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'clean-verbose-message'
+    }
+
+    It "Terminating error from 'End' (ThrowException) and non-terminating error from 'Clean' (MethodInvocationThrowException) should work properly" {
+        $failure = $null
+        try {
+            RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ThrowException' -ErrorFromCleanBlock 'MethodInvocationThrowException'
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException.Message | should -BeExactly 'end-throw-exception'
+
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.ArgumentNullException'
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'clean-verbose-message'
+    }
+
+    It "Terminating error from 'End' (ThrowException) and non-terminating error from 'Clean' (ExpressionThrowException) should work properly" {
+        $failure = $null
+        try {
+            RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'ThrowException' -ErrorFromCleanBlock 'ExpressionThrowException'
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException.Message | should -BeExactly 'end-throw-exception'
+
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.DivideByZeroException'
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Verbose[0] | Should -BeExactly 'clean-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (WriteErrorAPI) and non-terminating error from 'Clean' (WriteErrorCmdlet) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'WriteErrorAPI' -ErrorFromCleanBlock 'WriteErrorCmdlet'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'end-arg-exception'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'clean-write-error-cmdlet'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 2
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'end-verbose-message'
+        $pwsh.Streams.Verbose[1].Message | Should -BeExactly 'clean-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (WriteErrorAPI) and non-terminating error from 'Clean' (MethodInvocationThrowException) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'WriteErrorAPI' -ErrorFromCleanBlock 'MethodInvocationThrowException'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'end-arg-exception'
+        $pwsh.Streams.Error[1].Exception.InnerException | Should -BeOfType 'System.ArgumentNullException'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 2
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'end-verbose-message'
+        $pwsh.Streams.Verbose[1].Message | Should -BeExactly 'clean-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (WriteErrorCmdlet) and non-terminating error from 'Clean' (WriteErrorAPI) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'WriteErrorCmdlet' -ErrorFromCleanBlock 'WriteErrorAPI'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'end-write-error-cmdlet'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'clean-arg-exception'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 2
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'end-verbose-message'
+        $pwsh.Streams.Verbose[1].Message | Should -BeExactly 'clean-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (WriteErrorCmdlet) and non-terminating error from 'Clean' (ExpressionThrowException) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'WriteErrorCmdlet' -ErrorFromCleanBlock 'ExpressionThrowException'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'end-write-error-cmdlet'
+        $pwsh.Streams.Error[1].Exception.InnerException | Should -BeOfType 'System.DivideByZeroException'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 2
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'end-verbose-message'
+        $pwsh.Streams.Verbose[1].Message | Should -BeExactly 'clean-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (MethodInvocationThrowException) and non-terminating error from 'Clean' (WriteErrorCmdlet) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'MethodInvocationThrowException' -ErrorFromCleanBlock 'WriteErrorCmdlet'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.ArgumentNullException'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'clean-write-error-cmdlet'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 2
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'end-verbose-message'
+        $pwsh.Streams.Verbose[1].Message | Should -BeExactly 'clean-verbose-message'
+    }
+
+    It "Non-terminating error from 'End' (MethodInvocationThrowException) and non-terminating error from 'Clean' (ExpressionThrowException) should work properly" {
+        ## No exception should be thrown
+        RunCommand -Command 'MultipleErrors' -ErrorFromEndBlock 'MethodInvocationThrowException' -ErrorFromCleanBlock 'ExpressionThrowException'
+
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.InnerException | Should -BeOfType 'System.ArgumentNullException'
+        $pwsh.Streams.Error[1].Exception.InnerException | Should -BeOfType 'System.DivideByZeroException'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 2
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'end-verbose-message'
+        $pwsh.Streams.Verbose[1].Message | Should -BeExactly 'clean-verbose-message'
+    }
+}
+
+Describe "Error handling within a pipeline (multiple commands with 'Clean' block)" -Tag 'CI' {
+    BeforeAll {
+        function test1 {
+            param([switch] $EmitErrorInProcess)
+            process {
+                if ($EmitErrorInProcess) {
+                    throw 'test1-process'
+                }
+                Write-Output 'process-obj'
+            }
+            clean {
+                throw 'test1-clean'
+                Write-Verbose -Verbose 'test1-clean-verbose'
+            }
+        }
+
+        function test2 {
+            param([switch] $EmitErrorInProcess)
+            process {
+                if ($EmitErrorInProcess) {
+                    throw 'test2-process'
+                }
+                Write-Verbose -Verbose $_
+            }
+            clean {
+                throw 'test2-clean'
+                Write-Verbose -Verbose 'test2-clean-verbose'
+            }
+        }
+
+        function test-1 {
+            param([switch] $EmitException)
+            process { 'output' }
+            clean {
+                if ($EmitException) {
+                    throw 'test-1-clean-exception'
+                }
+                Write-Verbose -Verbose 'test-1-clean'
+            }
+        }
+
+        function test-2 {
+            param([switch] $EmitException)
+            process { $_ }
+            clean {
+                if ($EmitException) {
+                    throw 'test-2-clean-exception'
+                }
+                Write-Verbose -Verbose 'test-2-clean'
+            }
+        }
+
+        function test-3 {
+            param([switch] $EmitException)
+            process { Write-Warning $_ }
+            clean {
+                if ($EmitException) {
+                    throw 'test-3-clean-exception'
+                }
+                Write-Verbose -Verbose 'test-3-clean'
+            }
+        }
+
+        #region Helper
+
+        $pwsh = [PowerShell]::Create()
+        $text = (Get-Command test1, test2, test-1, test-2, test-3).ScriptBlock.Ast.Extent.Text
+        $pwsh.AddScript($text -join "`n").Invoke()
+
+        function RunScript {
+            param([string] $Script)
+
+            $pwsh.Commands.Clear()
+            $pwsh.Streams.ClearStreams()
+            $pwsh.AddScript($Script).Invoke()
+        }
+
+        #endregion
+    }
+
+    It "Errors from multiple 'Clean' blocks should work properly" {
+        ## No exception should be thrown
+        RunScript -Script "test1 | test2"
+
+        ## Exceptions thrown from 'throw' statement are not propagated up, but instead written to the error stream.
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'test1-clean'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'test2-clean'
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'process-obj'
+    }
+
+    It "ErrorAction should be honored by 'Clean' blocks" {
+        try {
+            RunScript -Script '$ErrorActionPreference = "SilentlyContinue"'
+            ## No exception should be thrown.
+            RunScript -Script "test1 | test2"
+
+            ## The exception from 'throw' statement should be suppressed by 'SilentlyContinue'.
+            $pwsh.Streams.Error.Count | Should -Be 0
+            $pwsh.Streams.Verbose.Count | Should -Be 3
+            $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'process-obj'
+            $pwsh.Streams.Verbose[1].Message | Should -BeExactly 'test1-clean-verbose'
+            $pwsh.Streams.Verbose[2].Message | Should -BeExactly 'test2-clean-verbose'
+        }
+        finally {
+            ## Revert error action back to 'Continue'
+            RunScript -Script '$ErrorActionPreference = "Continue"'
+        }
+    }
+
+    It "Errors from 'Clean' blocks should work properly when another named block emits error" {
+        $failure = $null
+        try {
+            RunScript -Script "test1 | test2 -EmitErrorInProcess"
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException.Message | Should -BeExactly 'test2-process'
+
+        $pwsh.Streams.Verbose.Count | Should -Be 0
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'test1-clean'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'test2-clean'
+    }
+
+    It "The 'Clean' block should not run when the none of other named blocks from the same command get to run" {
+        $failure = $null
+        try {
+            RunScript -Script "test1 -EmitErrorInProcess | test2"
+        } catch {
+            $failure = $_
+        }
+
+        $failure | Should -Not -BeNullOrEmpty
+        $failure.Exception | Should -BeOfType 'System.Management.Automation.MethodInvocationException'
+        $failure.Exception.InnerException.Message | Should -BeExactly 'test1-process'
+
+        ## Only the 'Clean' block from 'test1' will run.
+        ## The 'Clean' block from 'test2' won't run because none of the other blocks from 'test2' gets to run
+        ## due to the terminating exception thrown from 'test1.Process'.
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'test1-clean'
+    }
+
+    It "Exception from the 'Clean' block at <Position> should not affect other 'Clean' blocks" -TestCases @(
+        @{ Position = 'beginning-of-pipeline'; Script = 'test-1 -EmitException | test-2 | test-3'; ExceptionMessage = 'test-1-clean-exception'; VerboseMessages = @('test-2-clean', 'test-3-clean') }
+        @{ Position = 'middle-of-pipeline';    Script = 'test-1 | test-2 -EmitException | test-3'; ExceptionMessage = 'test-2-clean-exception'; VerboseMessages = @('test-1-clean', 'test-3-clean') }
+        @{ Position = 'end-of-pipeline';       Script = 'test-1 | test-2 | test-3 -EmitException'; ExceptionMessage = 'test-3-clean-exception'; VerboseMessages = @('test-1-clean', 'test-2-clean') }
+    ) {
+        param($Script, $ExceptionMessage, $VerboseMessages)
+
+        RunScript -Script $Script
+        $pwsh.Streams.Error.Count | Should -Be 1
+        $pwsh.Streams.Verbose.Count | Should -Be 2
+        $pwsh.Streams.Warning.Count | Should -Be 1
+
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly $ExceptionMessage
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly $VerboseMessages[0]
+        $pwsh.Streams.Verbose[1].Message | Should -BeExactly $VerboseMessages[1]
+        $pwsh.Streams.Warning[0].Message | Should -BeExactly 'output'
+    }
+
+    It "Multiple exceptions from 'Clean' blocks should not affect other 'Clean' blocks" {
+        RunScript -Script 'test-1 -EmitException | test-2 | test-3 -EmitException'
+        $pwsh.Streams.Error.Count | Should -Be 2
+        $pwsh.Streams.Verbose.Count | Should -Be 1
+        $pwsh.Streams.Warning.Count | Should -Be 1
+
+        $pwsh.Streams.Error[0].Exception.Message | Should -BeExactly 'test-1-clean-exception'
+        $pwsh.Streams.Error[1].Exception.Message | Should -BeExactly 'test-3-clean-exception'
+        $pwsh.Streams.Verbose[0].Message | Should -BeExactly 'test-2-clean'
+        $pwsh.Streams.Warning[0].Message | Should -BeExactly 'output'
+    }
+}
diff --git a/test/powershell/Language/Scripting/PipelineBehaviour.Tests.ps1 b/test/powershell/Language/Scripting/PipelineBehaviour.Tests.ps1
new file mode 100644
index 00000000000..9551343da85
--- /dev/null
+++ b/test/powershell/Language/Scripting/PipelineBehaviour.Tests.ps1
@@ -0,0 +1,591 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe 'Function Pipeline Behaviour' -Tag 'CI' {
+
+    BeforeAll {
+        $filePath = "$TestDrive\output.txt"
+        if (Test-Path $filePath) {
+            Remove-Item $filePath -Force
+        }
+    }
+
+    Context "'Clean' block runs when any other named blocks run" {
+
+        AfterEach {
+            if (Test-Path $filePath) {
+                Remove-Item $filePath -Force
+            }
+        }
+
+        It "'Clean' block executes only if at least one of the other named blocks executed" {
+            ## The 'Clean' block is for cleanup purpose. When none of other named blocks execute,
+            ## there is no point to execute the 'Clean' block, so it will be skipped in this case.
+            function test-1 {
+                clean { 'clean-redirected-output' > $filePath }
+            }
+
+            function test-2 {
+                End { 'end' }
+                clean { 'clean-redirected-output' > $filePath }
+            }
+
+            ## The 'Clean' block is skipped.
+            test-1 | Should -BeNullOrEmpty
+            Test-Path -Path $filePath | Should -BeFalse
+
+            ## The 'Clean' block runs.
+            test-2 | Should -BeExactly 'end'
+            Test-Path -Path $filePath | Should -BeTrue
+            Get-Content $filePath | Should -BeExactly 'clean-redirected-output'
+        }
+
+        It "'Clean' block is skipped when the command doesn't run due to no input from upstream command" {
+            function test-1 ([switch] $WriteOutput) {
+                Process {
+                    if ($WriteOutput) {
+                        Write-Output 'process'
+                    } else {
+                        Write-Verbose -Verbose 'process'
+                    }
+                }
+            }
+
+            function test-2 {
+                Process { Write-Output "test-2: $_" }
+                clean { Write-Warning 'test-2-clean-warning' }
+            }
+
+            ## No output from 'test-1.Process', so 'test-2.Process' didn't run, and thus 'test-2.Clean' was skipped.
+            test-1 | test-2 *>&1 | Should -BeNullOrEmpty
+
+            ## Output from 'test-1.Process' would trigger 'test-2.Process' to run, and thus 'test-2.Clean' would run.
+            $output = test-1 -WriteOutput | test-2 *>&1
+            $output | Should -Be @('test-2: process', 'test-2-clean-warning')
+        }
+
+        It "'Clean' block is skipped when the command doesn't run due to terminating error from upstream Process block" {
+            function test-1 ([switch] $ThrowException) {
+                Process {
+                    if ($ThrowException) {
+                        throw 'process'
+                    } else {
+                        Write-Output 'process'
+                    }
+                }
+            }
+
+            function test-2 {
+                Process { Write-Output "test-2: $_" }
+                clean { 'clean-redirected-output' > $filePath }
+            }
+
+            $failure = $null
+            try { test-1 -ThrowException | test-2 } catch { $failure = $_ }
+            $failure | Should -Not -BeNullOrEmpty
+            $failure.Exception.Message | Should -BeExactly 'process'
+            ## 'test-2' didn't run because 'test-1' throws terminating exception, so 'test-2.Clean' didn't run either.
+            Test-Path -Path $filePath | Should -BeFalse
+
+            test-1 | test-2 | Should -BeExactly 'test-2: process'
+            Test-Path -Path $filePath | Should -BeTrue
+            Get-Content $filePath | Should -BeExactly 'clean-redirected-output'
+        }
+
+        It "'Clean' block is skipped when the command doesn't run due to terminating error from upstream Begin block" {
+            function test-1 {
+                Begin { throw 'begin' }
+                End { 'end' }
+            }
+
+            function test-2 {
+                Begin { 'begin' }
+                Process { Write-Output "test-2: $_" }
+                clean { 'clean-redirected-output' > $filePath }
+            }
+
+            $failure = $null
+            try { test-1 | test-2 } catch { $failure = $_ }
+            $failure | Should -Not -BeNullOrEmpty
+            $failure.Exception.Message | Should -BeExactly 'begin'
+            ## 'test-2' didn't run because 'test-1' throws terminating exception, so 'test-2.Clean' didn't run either.
+            Test-Path -Path $filePath | Should -BeFalse
+        }
+
+        It "'Clean' block runs when '<BlockName>' runs" -TestCases @(
+            @{ Script = { [CmdletBinding()]param() begin { 'output' }  clean { Write-Warning 'clean-warning' } }; BlockName = 'Begin' }
+            @{ Script = { [CmdletBinding()]param() process { 'output' }  clean { Write-Warning 'clean-warning' } }; BlockName = 'Process' }
+            @{ Script = { [CmdletBinding()]param() end { 'output' }  clean { Write-Warning 'clean-warning' } }; BlockName = 'End' }
+        ) {
+            param($Script, $BlockName)
+
+            & $Script -WarningVariable wv | Should -BeExactly 'output'
+            $wv | Should -BeExactly 'clean-warning'
+        }
+
+        It "'Clean' block runs when '<BlockName>' throws terminating error" -TestCases @(
+            @{ Script = { [CmdletBinding()]param() begin { throw 'failure' }  clean { Write-Warning 'clean-warning' } }; BlockName = 'Begin' }
+            @{ Script = { [CmdletBinding()]param() process { throw 'failure' }  clean { Write-Warning 'clean-warning' } }; BlockName = 'Process' }
+            @{ Script = { [CmdletBinding()]param() end { throw 'failure' }  clean { Write-Warning 'clean-warning' } }; BlockName = 'End' }
+        ) {
+            param($Script, $BlockName)
+
+            $failure = $null
+            try { & $Script -WarningVariable wv } catch { $failure = $_ }
+            $failure | Should -Not -BeNullOrEmpty
+            $failure.Exception.Message | Should -BeExactly 'failure'
+            $wv | Should -BeExactly 'clean-warning'
+        }
+
+        It "'Clean' block runs in pipeline - simple function" {
+            function test-1 {
+                param([switch] $EmitError)
+                process {
+                    if ($EmitError) {
+                        throw 'test-1-process-error'
+                    } else {
+                        Write-Output 'test-1'
+                    }
+                }
+
+                clean { 'test-1-clean' >> $filePath }
+            }
+
+            function test-2 {
+                begin { Write-Verbose -Verbose 'test-2-begin' }
+                process { $_ }
+                clean { 'test-2-clean' >> $filePath }
+            }
+
+            function test-3 {
+                end { Write-Verbose -Verbose 'test-3-end' }
+                clean { 'test-3-clean' >> $filePath }
+            }
+
+            ## All command will run, so all 'Clean' blocks will run
+            test-1 | test-2 | test-3
+            Test-Path $filePath | Should -BeTrue
+            $content = Get-Content $filePath
+            $content | Should -Be @('test-1-clean', 'test-2-clean', 'test-3-clean')
+
+            $failure = $null
+            Remove-Item $filePath -Force
+            try {
+                test-1 -EmitError | test-2 | test-3
+            } catch {
+                $failure = $_
+            }
+
+            ## Exception is thrown from 'test-1.Process'. By that time, the 'test-2.Begin' has run,
+            ## so 'test-2.Clean' will run. However, 'test-3.End' won't run, so 'test-3.Clean' won't run.
+            $failure | Should -Not -BeNullOrEmpty
+            $failure.Exception.Message | Should -BeExactly 'test-1-process-error'
+            Test-Path $filePath | Should -BeTrue
+            $content = Get-Content $filePath
+            $content | Should -Be @('test-1-clean', 'test-2-clean')
+        }
+
+        It "'Clean' block runs in pipeline - advanced function" {
+            function test-1 {
+                [CmdletBinding()]
+                param([switch] $EmitError)
+                process {
+                    if ($EmitError) {
+                        throw 'test-1-process-error'
+                    } else {
+                        Write-Output 'test-1'
+                    }
+                }
+
+                clean { 'test-1-clean' >> $filePath }
+            }
+
+            function test-2 {
+                [CmdletBinding()]
+                param(
+                    [Parameter(ValueFromPipeline)]
+                    $pipeInput
+                )
+
+                begin { Write-Verbose -Verbose 'test-2-begin' }
+                process { $pipeInput }
+                clean { 'test-2-clean' >> $filePath }
+            }
+
+            function test-3 {
+                [CmdletBinding()]
+                param(
+                    [Parameter(ValueFromPipeline)]
+                    $pipeInput
+                )
+
+                end { Write-Verbose -Verbose 'test-3-end' }
+                clean { 'test-3-clean' >> $filePath }
+            }
+
+            ## All command will run, so all 'Clean' blocks will run
+            test-1 | test-2 | test-3
+            Test-Path $filePath | Should -BeTrue
+            $content = Get-Content $filePath
+            $content | Should -Be @('test-1-clean', 'test-2-clean', 'test-3-clean')
+
+
+            $failure = $null
+            Remove-Item $filePath -Force
+            ## Exception will be thrown from 'test-1.Process'. By that time, the 'test-2.Begin' has run,
+            ## so 'test-2.Clean' will run. However, 'test-3.End' won't run, so 'test-3.Clean' won't run.
+            try {
+                test-1 -EmitError | test-2 | test-3
+            } catch {
+                $failure = $_
+            }
+            $failure | Should -Not -BeNullOrEmpty
+            $failure.Exception.Message | Should -BeExactly 'test-1-process-error'
+            Test-Path $filePath | Should -BeTrue
+            $content = Get-Content $filePath
+            $content | Should -Be @('test-1-clean', 'test-2-clean')
+        }
+
+        It 'does not execute End {} if the pipeline is halted during Process {}' {
+            # We don't need Should -Not -Throw as if this reaches end{} and throws the test will fail anyway.
+            1..10 |
+                & {
+                    begin { "BEGIN" }
+                    process { "PROCESS $_" }
+                    end { "END"; throw "This should not be reached." }
+                } |
+                Select-Object -First 3 |
+                Should -Be @( "BEGIN", "PROCESS 1", "PROCESS 2" )
+        }
+
+        It "still executes 'Clean' block if the pipeline is halted" {
+            1..10 |
+                & {
+                    process { $_ }
+                    clean { "Clean block hit" > $filePath }
+                } |
+                Select-Object -First 1 |
+                Should -Be 1
+
+            Test-Path $filePath | Should -BeTrue
+            Get-Content $filePath | Should -BeExactly 'Clean block hit'
+        }
+
+        It "Select-Object in pipeline" {
+            function bar {
+                process { 'bar_' + $_ } end { 'bar_end' } clean { 'bar_clean' > $filePath }
+            }
+
+            function zoo {
+                process { 'zoo_' + $_ } end { 'zoo_end' } clean { 'zoo_clean' >> $filePath }
+            }
+
+            1..10 | bar | Select-Object -First 2 | zoo | Should -Be @('zoo_bar_1', 'zoo_bar_2', 'zoo_end')
+            Test-Path $filePath | Should -BeTrue
+            $content = Get-Content $filePath
+            $content | Should -Be @('bar_clean', 'zoo_clean')
+        }
+    }
+
+    Context 'Streams from Named Blocks' {
+
+        It 'Permits output from named block: <Script>' -TestCases @(
+            @{ Script = { begin { 10 } }; ExpectedResult = 10 }
+            @{ Script = { process { 15 } }; ExpectedResult = 15 }
+            @{ Script = { end { 22 } }; ExpectedResult = 22 }
+        ) {
+            param($Script, $ExpectedResult)
+            & $Script | Should -Be $ExpectedResult
+        }
+
+        It "Does not allow output from 'Clean' block" {
+            & { end { } clean { 11 } } | Should -BeNullOrEmpty
+        }
+
+        It "OutVariable should not capture anything from 'Clean' block" {
+            function test {
+                [CmdletBinding()]
+                param()
+
+                Begin { 'begin' }
+                Process { 'process' }
+                End { 'end' }
+                clean { 'clean' }
+            }
+
+            test -OutVariable ov | Should -Be @( 'begin', 'process', 'end' )
+            $ov | Should -Be @( 'begin', 'process', 'end' )
+        }
+
+        It "Other streams can be captured from 'Clean' block" {
+            function test {
+                [CmdletBinding()]
+                param()
+
+                End { }
+                clean {
+                    Write-Output 'clean-output'
+                    Write-Warning 'clean-warning'
+                    Write-Verbose -Verbose 'clean-verbose'
+                    Write-Debug -Debug 'clean-debug'
+                    Write-Information 'clean-information'
+                }
+            }
+
+            test -OutVariable ov -WarningVariable wv -InformationVariable iv
+            $ov.Count | Should -Be 0
+            $wv | Should -BeExactly 'clean-warning'
+            $iv | Should -BeExactly 'clean-information'
+
+            $allStreams = test *>&1
+            $allStreams | Should -Be @('clean-warning', 'clean-verbose', 'clean-debug', 'clean-information')
+        }
+
+        It 'passes output for begin, then process, then end, then clean' {
+            $Script = {
+                clean { Write-Warning 'clean-warning' }
+                process { "PROCESS" }
+                begin { "BEGIN" }
+                end { "END" }
+            }
+
+            $results = & $Script 3>&1
+            $results | Should -Be @( "BEGIN", "PROCESS", "END", "clean-warning" )
+        }
+    }
+
+    Context "Steppable pipeline" {
+
+        AfterEach {
+            if (Test-Path $filePath) {
+                Remove-Item $filePath -Force
+            }
+        }
+
+        It "'Clean' runs when steppable pipeline runs to the end successfully (<Block> block)" -TestCases @(
+            @{ Script = { begin { 'BEGIN' } clean { 'clean is hit' > $filePath } }; Block = 'Begin'; ProcessResult = @('BEGIN'); EndResult = $null }
+            @{ Script = { process { 'PROCESS' } clean { 'clean is hit' > $filePath } }; Block = 'Process'; ProcessResult = @('PROCESS'); EndResult = $null }
+            @{ Script = { end { 'END' } clean { 'clean is hit' > $filePath } }; Block = 'End'; ProcessResult = $null; EndResult = @('END') }
+            @{ Script = { begin { 'BEGIN' } process { 'PROCESS' } end { 'END' } clean { 'clean is hit' > $filePath } }; Block = 'All'; ProcessResult = @('BEGIN', 'PROCESS'); EndResult = @('END') }
+        ) {
+            param($Script, $ProcessResult, $EndResult)
+
+            try {
+                $step = { & $Script }.GetSteppablePipeline()
+                $step.Begin($false)
+                $step.Process() | Should -Be $ProcessResult
+                $step.End() | Should -Be $EndResult
+            }
+            finally {
+                $step.Dispose()
+            }
+
+            Test-Path $filePath | Should -BeTrue
+            Get-Content $filePath | Should -BeExactly 'clean is hit'
+        }
+
+        It "'Clean' runs when exception thrown from '<Block>' block" -TestCases @(
+            @{ Script = { begin { throw 'begin-error' } clean { 'clean is hit' > $filePath } }; Block = 'Process'; ErrorMessage = 'begin-error' }
+            @{ Script = { process { throw 'process-error' } clean { 'clean is hit' > $filePath } }; Block = 'Process'; ErrorMessage = 'process-error' }
+            @{ Script = { end { throw 'end-error' } clean { 'clean is hit' > $filePath } }; Block = 'End'; ErrorMessage = 'end-error' }
+        ) {
+            param($Script, $ErrorMessage)
+
+            $failure = $null
+            $step = { & $Script }.GetSteppablePipeline()
+
+            try {
+                $step.Begin($false)
+                $step.Process()
+                $step.End()
+            } catch {
+                $failure = $_
+            }
+            finally {
+                $step.Dispose()
+            }
+
+            $failure | Should -Not -BeNullOrEmpty
+            $failure.Exception.Message | Should -BeExactly $ErrorMessage
+
+            Test-Path $filePath | Should -BeTrue
+            Get-Content $filePath | Should -BeExactly 'clean is hit'
+        }
+
+        It "'Clean' runs when we explicitly call it on a steppable pipeline" {
+            $script = { begin { 'begin' > $filePath } clean { 'clean is hit' >> $filePath } }
+            $step = { & $script }.GetSteppablePipeline()
+
+            try {
+                $step.Begin($false)
+                $step.Clean()
+            }
+            finally {
+                $step.Dispose()
+            }
+
+            Test-Path $filePath | Should -BeTrue
+            Get-Content $filePath | Should -BeExactly @('begin', 'clean is hit')
+        }
+
+        It "Calling 'Clean' on steppable pipeline after it has run automatically upon Exception won't trigger the 'Clean' block to run again" {
+            $script = { begin { throw 'begin-error' } clean { 'clean is hit' > $filePath } }
+            $step = { & $script }.GetSteppablePipeline()
+            $failure = $null
+
+            try {
+                $step.Begin($false)
+                $step.Process()
+                $step.End()
+            }
+            catch {
+                $failure = $_
+            }
+
+            $failure | Should -Not -BeNullOrEmpty
+            $failure.Exception.Message | Should -BeExactly 'begin-error'
+
+            Test-Path $filePath | Should -BeTrue
+            Get-Content $filePath | Should -BeExactly 'clean is hit'
+
+            Remove-Item $filePath -Force -ErrorAction Stop
+            ## The 'Clean' block has already run automatically after the exception was thrown from 'Begin',
+            ## and it won't run again when calling it explicitly.
+            $step.Clean()
+            Test-Path $filePath | Should -BeFalse
+
+            ## Dispose the steppable pipeline.
+            $step.Dispose()
+        }
+
+        It "Calling 'Clean' on steppable pipeline after it has run automatically upon success won't trigger the 'Clean' block to run again" {
+            $script = { end { 'END' } clean { 'clean is hit' > $filePath } }
+            $step = { & $script }.GetSteppablePipeline()
+
+            $step.Begin($false)
+            $step.Process()
+            $step.End()
+
+            Test-Path $filePath | Should -BeTrue
+            Get-Content $filePath | Should -BeExactly 'clean is hit'
+
+            Remove-Item $filePath -Force -ErrorAction Stop
+            ## The 'Clean' block has already run automatically after the exception was thrown from 'Begin',
+            ## and it won't run again when calling it explicitly.
+            $step.Clean()
+            Test-Path $filePath | Should -BeFalse
+
+            ## Dispose the steppable pipeline.
+            $step.Dispose()
+        }
+    }
+
+    Context "'exit' statement in command" {
+
+        AfterEach {
+            if (Test-Path $filePath) {
+                Remove-Item $filePath -Force
+            }
+        }
+
+        It "'Clean' block runs when 'exit' is used in other named blocks" {
+            pwsh -c "& { process { exit 122 } clean { 'Clean block is hit' > $filePath } }"
+
+            $LASTEXITCODE | Should -BeExactly 122
+            Test-Path $filePath | Should -BeTrue
+            Get-Content $filePath | Should -BeExactly 'Clean block is hit'
+        }
+
+        It "ExitException within 'Clean' block will not be propagated up" {
+            function test {
+                end {}
+                clean {
+                    'Clean block is hit' > $filePath
+                    exit
+                    'more text' >> $filePath
+                }
+            }
+
+            test
+            Test-Path $filePath | Should -BeTrue
+            Get-Content $filePath | Should -BeExactly 'Clean block is hit'
+        }
+
+        It "Exit from a script file works the same in 'Clean' block" {
+            $scriptFile = "$TestDrive\script.ps1"
+            "exit 122" > $scriptFile
+
+            function test {
+                end {}
+                clean {
+                    & $scriptFile
+                    $LASTEXITCODE > $filePath
+                }
+            }
+
+            test
+            Test-Path $filePath | Should -BeTrue
+            Get-Content $filePath | Should -BeExactly '122'
+        }
+    }
+
+    Context 'Ctrl-C behavior' {
+
+        AfterEach {
+            if ($pwsh) {
+                $pwsh.Dispose()
+                $pwsh = $null
+            }
+        }
+
+        It 'still executes clean {} when StopProcessing() is triggered mid-pipeline' {
+            $script = @"
+    function test {
+        process { Start-Sleep -Seconds 10 }
+        clean { Write-Information "CLEAN" }
+    }
+"@
+            $pwsh = [powershell]::Create()
+            $pwsh.AddScript($script).Invoke()
+            $pwsh.Commands.Clear()
+            $pwsh.AddCommand('test') > $null
+
+            $asyncResult = $pwsh.BeginInvoke()
+            Start-Sleep -Seconds 2
+            $pwsh.Stop()
+
+            { $pwsh.EndInvoke($asyncResult) } | Should -Throw -ErrorId 'PipelineStoppedException'
+            $pwsh.Streams.Information[0].MessageData | Should -BeExactly "CLEAN"
+        }
+
+        <#
+        It 'still completes clean {} execution when StopProcessing() is triggered mid-clean {}' {
+            $script = @"
+                function test {
+                    begin {}
+                    process {
+                        "PROCESS"
+                    }
+                    end {}
+                    clean {
+                        Start-Sleep -Seconds 10
+                        Write-Information "CLEAN"
+                    }
+
+                }
+"@
+            $pwsh = [powershell]::Create()
+            $pwsh.AddScript($script).AddStatement().AddCommand('test') > $null
+
+            $asyncResult = $pwsh.BeginInvoke()
+            Start-Sleep -Seconds 2
+            $pwsh.Stop()
+
+            $output = $pwsh.EndInvoke($asyncResult)
+
+            $output | Should -Be "PROCESS"
+            $pwsh.Streams.Information[0].MessageData | Should -BeExactly "CLEAN"
+        }
+        #>
+    }
+}

From c8984c0517938852a91e3633ee4793e4e14ea05a Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 11 Oct 2021 14:58:51 -0700
Subject: [PATCH 067/645] Make property names for the color VT sequences
 consistent with documentations (#16212)

---
 .../PowerShellCore_format_ps1xml.cs           |  66 +++++-----
 .../FormatAndOutput/common/PSStyle.cs         | 120 +++++++++---------
 .../engine/Formatting/PSStyle.Tests.ps1       |  32 ++---
 3 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
index 4e359c3acf9..ef7c40fd37b 100644
--- a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
+++ b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
@@ -2082,37 +2082,37 @@ private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Autom
                         .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.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.BrightWhite)$($_.Foreground.BrightWhite.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightWhite")
                         .AddItemScriptBlock(@"""$($_.Foreground.Red)$($_.Foreground.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Red")
-                        .AddItemScriptBlock(@"""$($_.Foreground.LightRed)$($_.Foreground.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightRed")
+                        .AddItemScriptBlock(@"""$($_.Foreground.BrightRed)$($_.Foreground.BrightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightRed")
                         .AddItemScriptBlock(@"""$($_.Foreground.Magenta)$($_.Foreground.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Magenta")
-                        .AddItemScriptBlock(@"""$($_.Foreground.LightMagenta)$($_.Foreground.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightMagenta")
+                        .AddItemScriptBlock(@"""$($_.Foreground.BrightMagenta)$($_.Foreground.BrightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightMagenta")
                         .AddItemScriptBlock(@"""$($_.Foreground.Blue)$($_.Foreground.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Blue")
-                        .AddItemScriptBlock(@"""$($_.Foreground.LightBlue)$($_.Foreground.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightBlue")
+                        .AddItemScriptBlock(@"""$($_.Foreground.BrightBlue)$($_.Foreground.BrightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightBlue")
                         .AddItemScriptBlock(@"""$($_.Foreground.Cyan)$($_.Foreground.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Cyan")
-                        .AddItemScriptBlock(@"""$($_.Foreground.LightCyan)$($_.Foreground.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightCyan")
+                        .AddItemScriptBlock(@"""$($_.Foreground.BrightCyan)$($_.Foreground.BrightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightCyan")
                         .AddItemScriptBlock(@"""$($_.Foreground.Green)$($_.Foreground.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Green")
-                        .AddItemScriptBlock(@"""$($_.Foreground.LightGreen)$($_.Foreground.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightGreen")
+                        .AddItemScriptBlock(@"""$($_.Foreground.BrightGreen)$($_.Foreground.BrightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightGreen")
                         .AddItemScriptBlock(@"""$($_.Foreground.Yellow)$($_.Foreground.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Yellow")
-                        .AddItemScriptBlock(@"""$($_.Foreground.LightYellow)$($_.Foreground.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightYellow")
+                        .AddItemScriptBlock(@"""$($_.Foreground.BrightYellow)$($_.Foreground.BrightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightYellow")
                         .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.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.BrightWhite)$($_.Background.BrightWhite.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightWhite")
                         .AddItemScriptBlock(@"""$($_.Background.Red)$($_.Background.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Red")
-                        .AddItemScriptBlock(@"""$($_.Background.LightRed)$($_.Background.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightRed")
+                        .AddItemScriptBlock(@"""$($_.Background.BrightRed)$($_.Background.BrightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightRed")
                         .AddItemScriptBlock(@"""$($_.Background.Magenta)$($_.Background.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Magenta")
-                        .AddItemScriptBlock(@"""$($_.Background.LightMagenta)$($_.Background.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightMagenta")
+                        .AddItemScriptBlock(@"""$($_.Background.BrightMagenta)$($_.Background.BrightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightMagenta")
                         .AddItemScriptBlock(@"""$($_.Background.Blue)$($_.Background.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Blue")
-                        .AddItemScriptBlock(@"""$($_.Background.LightBlue)$($_.Background.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightBlue")
+                        .AddItemScriptBlock(@"""$($_.Background.BrightBlue)$($_.Background.BrightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightBlue")
                         .AddItemScriptBlock(@"""$($_.Background.Cyan)$($_.Background.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Cyan")
-                        .AddItemScriptBlock(@"""$($_.Background.LightCyan)$($_.Background.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightCyan")
+                        .AddItemScriptBlock(@"""$($_.Background.BrightCyan)$($_.Background.BrightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightCyan")
                         .AddItemScriptBlock(@"""$($_.Background.Green)$($_.Background.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Green")
-                        .AddItemScriptBlock(@"""$($_.Background.LightGreen)$($_.Background.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightGreen")
+                        .AddItemScriptBlock(@"""$($_.Background.BrightGreen)$($_.Background.BrightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightGreen")
                         .AddItemScriptBlock(@"""$($_.Background.Yellow)$($_.Background.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Yellow")
-                        .AddItemScriptBlock(@"""$($_.Background.LightYellow)$($_.Background.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightYellow")
+                        .AddItemScriptBlock(@"""$($_.Background.BrightYellow)$($_.Background.BrightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightYellow")
                         .EndEntry()
                 .EndList());
         }
@@ -2185,46 +2185,46 @@ private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Autom
                 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(@"""$($_.DarkGray)$($_.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "DarkGray")
-                        .AddItemScriptBlock(@"""$($_.LightGray)$($_.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGray")
+                        .AddItemScriptBlock(@"""$($_.BrightWhite)$($_.BrightWhite.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightWhite")
                         .AddItemScriptBlock(@"""$($_.Red)$($_.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Red")
-                        .AddItemScriptBlock(@"""$($_.LightRed)$($_.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightRed")
+                        .AddItemScriptBlock(@"""$($_.BrightRed)$($_.BrightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightRed")
                         .AddItemScriptBlock(@"""$($_.Magenta)$($_.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Magenta")
-                        .AddItemScriptBlock(@"""$($_.LightMagenta)$($_.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightMagenta")
+                        .AddItemScriptBlock(@"""$($_.BrightMagenta)$($_.BrightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightMagenta")
                         .AddItemScriptBlock(@"""$($_.Blue)$($_.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Blue")
-                        .AddItemScriptBlock(@"""$($_.LightBlue)$($_.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightBlue")
+                        .AddItemScriptBlock(@"""$($_.BrightBlue)$($_.BrightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightBlue")
                         .AddItemScriptBlock(@"""$($_.Cyan)$($_.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Cyan")
-                        .AddItemScriptBlock(@"""$($_.LightCyan)$($_.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightCyan")
+                        .AddItemScriptBlock(@"""$($_.BrightCyan)$($_.BrightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightCyan")
                         .AddItemScriptBlock(@"""$($_.Green)$($_.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Green")
-                        .AddItemScriptBlock(@"""$($_.LightGreen)$($_.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGreen")
+                        .AddItemScriptBlock(@"""$($_.BrightGreen)$($_.BrightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightGreen")
                         .AddItemScriptBlock(@"""$($_.Yellow)$($_.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Yellow")
-                        .AddItemScriptBlock(@"""$($_.LightYellow)$($_.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightYellow")
+                        .AddItemScriptBlock(@"""$($_.BrightYellow)$($_.BrightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightYellow")
                     .EndEntry()
                 .EndList());
         }
 
         private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Automation_PSStyleBackgroundColor()
         {
-            yield return new FormatViewDefinition("System.Management.Automation.PSStyle+ForegroundColor",
+            yield return new FormatViewDefinition("System.Management.Automation.PSStyle+BackgroundColor",
                 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(@"""$($_.DarkGray)$($_.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "DarkGray")
-                        .AddItemScriptBlock(@"""$($_.LightGray)$($_.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGray")
+                        .AddItemScriptBlock(@"""$($_.BrightWhite)$($_.BrightWhite.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightWhite")
                         .AddItemScriptBlock(@"""$($_.Red)$($_.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Red")
-                        .AddItemScriptBlock(@"""$($_.LightRed)$($_.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightRed")
+                        .AddItemScriptBlock(@"""$($_.BrightRed)$($_.BrightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightRed")
                         .AddItemScriptBlock(@"""$($_.Magenta)$($_.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Magenta")
-                        .AddItemScriptBlock(@"""$($_.LightMagenta)$($_.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightMagenta")
+                        .AddItemScriptBlock(@"""$($_.BrightMagenta)$($_.BrightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightMagenta")
                         .AddItemScriptBlock(@"""$($_.Blue)$($_.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Blue")
-                        .AddItemScriptBlock(@"""$($_.LightBlue)$($_.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightBlue")
+                        .AddItemScriptBlock(@"""$($_.BrightBlue)$($_.BrightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightBlue")
                         .AddItemScriptBlock(@"""$($_.Cyan)$($_.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Cyan")
-                        .AddItemScriptBlock(@"""$($_.LightCyan)$($_.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightCyan")
+                        .AddItemScriptBlock(@"""$($_.BrightCyan)$($_.BrightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightCyan")
                         .AddItemScriptBlock(@"""$($_.Green)$($_.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Green")
-                        .AddItemScriptBlock(@"""$($_.LightGreen)$($_.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGreen")
+                        .AddItemScriptBlock(@"""$($_.BrightGreen)$($_.BrightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightGreen")
                         .AddItemScriptBlock(@"""$($_.Yellow)$($_.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Yellow")
-                        .AddItemScriptBlock(@"""$($_.LightYellow)$($_.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightYellow")
+                        .AddItemScriptBlock(@"""$($_.BrightYellow)$($_.BrightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightYellow")
                     .EndEntry()
                 .EndList());
         }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
index 9f6b74bdc1d..52ca35dff4b 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
@@ -53,79 +53,79 @@ public sealed class ForegroundColor
             public string Black { get; } = "\x1b[30m";
 
             /// <summary>
-            /// Gets the color blue.
+            /// Gets the color red.
             /// </summary>
-            public string Blue { get; } = "\x1b[34m";
+            public string Red { get; } = "\x1b[31m";
 
             /// <summary>
-            /// Gets the color cyan.
+            /// Gets the color green.
             /// </summary>
-            public string Cyan { get; } = "\x1b[36m";
+            public string Green { get; } = "\x1b[32m";
 
             /// <summary>
-            /// Gets the color dark gray.
+            /// Gets the color yellow.
             /// </summary>
-            public string DarkGray { get; } = "\x1b[90m";
+            public string Yellow { get; } = "\x1b[33m";
 
             /// <summary>
-            /// Gets the color green.
+            /// Gets the color blue.
             /// </summary>
-            public string Green { get; } = "\x1b[32m";
+            public string Blue { get; } = "\x1b[34m";
 
             /// <summary>
-            /// Gets the color light blue.
+            /// Gets the color magenta.
             /// </summary>
-            public string LightBlue { get; } = "\x1b[94m";
+            public string Magenta { get; } = "\x1b[35m";
 
             /// <summary>
-            /// Gets the color light cyan.
+            /// Gets the color cyan.
             /// </summary>
-            public string LightCyan { get; } = "\x1b[96m";
+            public string Cyan { get; } = "\x1b[36m";
 
             /// <summary>
-            /// Gets the color light gray.
+            /// Gets the color white.
             /// </summary>
-            public string LightGray { get; } = "\x1b[97m";
+            public string White { get; } = "\x1b[37m";
 
             /// <summary>
-            /// Gets the color light green.
+            /// Gets the color bright black.
             /// </summary>
-            public string LightGreen { get; } = "\x1b[92m";
+            public string BrightBlack { get; } = "\x1b[90m";
 
             /// <summary>
-            /// Gets the color light magenta.
+            /// Gets the color bright red.
             /// </summary>
-            public string LightMagenta { get; } = "\x1b[95m";
+            public string BrightRed { get; } = "\x1b[91m";
 
             /// <summary>
-            /// Gets the color light red.
+            /// Gets the color bright green.
             /// </summary>
-            public string LightRed { get; } = "\x1b[91m";
+            public string BrightGreen { get; } = "\x1b[92m";
 
             /// <summary>
-            /// Gets the color light yellow.
+            /// Gets the color bright yellow.
             /// </summary>
-            public string LightYellow { get; } = "\x1b[93m";
+            public string BrightYellow { get; } = "\x1b[93m";
 
             /// <summary>
-            /// Gets the color magenta.
+            /// Gets the color bright blue.
             /// </summary>
-            public string Magenta { get; } = "\x1b[35m";
+            public string BrightBlue { get; } = "\x1b[94m";
 
             /// <summary>
-            /// Gets the color read.
+            /// Gets the color bright magenta.
             /// </summary>
-            public string Red { get; } = "\x1b[31m";
+            public string BrightMagenta { get; } = "\x1b[95m";
 
             /// <summary>
-            /// Gets the color white.
+            /// Gets the color bright cyan.
             /// </summary>
-            public string White { get; } = "\x1b[37m";
+            public string BrightCyan { get; } = "\x1b[96m";
 
             /// <summary>
-            /// Gets the color yellow.
+            /// Gets the color bright white.
             /// </summary>
-            public string Yellow { get; } = "\x1b[33m";
+            public string BrightWhite { get; } = "\x1b[97m";
 
             /// <summary>
             /// Set as RGB (Red, Green, Blue).
@@ -168,79 +168,79 @@ public sealed class BackgroundColor
             public string Black { get; } = "\x1b[40m";
 
             /// <summary>
-            /// Gets the color blue.
+            /// Gets the color red.
             /// </summary>
-            public string Blue { get; } = "\x1b[44m";
+            public string Red { get; } = "\x1b[41m";
 
             /// <summary>
-            /// Gets the color cyan.
+            /// Gets the color green.
             /// </summary>
-            public string Cyan { get; } = "\x1b[46m";
+            public string Green { get; } = "\x1b[42m";
 
             /// <summary>
-            /// Gets the color dark gray.
+            /// Gets the color yellow.
             /// </summary>
-            public string DarkGray { get; } = "\x1b[100m";
+            public string Yellow { get; } = "\x1b[43m";
 
             /// <summary>
-            /// Gets the color green.
+            /// Gets the color blue.
             /// </summary>
-            public string Green { get; } = "\x1b[42m";
+            public string Blue { get; } = "\x1b[44m";
 
             /// <summary>
-            /// Gets the color light blue.
+            /// Gets the color magenta.
             /// </summary>
-            public string LightBlue { get; } = "\x1b[104m";
+            public string Magenta { get; } = "\x1b[45m";
 
             /// <summary>
-            /// Gets the color light cyan.
+            /// Gets the color cyan.
             /// </summary>
-            public string LightCyan { get; } = "\x1b[106m";
+            public string Cyan { get; } = "\x1b[46m";
 
             /// <summary>
-            /// Gets the color light gray.
+            /// Gets the color white.
             /// </summary>
-            public string LightGray { get; } = "\x1b[107m";
+            public string White { get; } = "\x1b[47m";
 
             /// <summary>
-            /// Gets the color light green.
+            /// Gets the color bright black.
             /// </summary>
-            public string LightGreen { get; } = "\x1b[102m";
+            public string BrightBlack { get; } = "\x1b[100m";
 
             /// <summary>
-            /// Gets the color light magenta.
+            /// Gets the color bright red.
             /// </summary>
-            public string LightMagenta { get; } = "\x1b[105m";
+            public string BrightRed { get; } = "\x1b[101m";
 
             /// <summary>
-            /// Gets the color light red.
+            /// Gets the color bright green.
             /// </summary>
-            public string LightRed { get; } = "\x1b[101m";
+            public string BrightGreen { get; } = "\x1b[102m";
 
             /// <summary>
-            /// Gets the color light yellow.
+            /// Gets the color bright yellow.
             /// </summary>
-            public string LightYellow { get; } = "\x1b[103m";
+            public string BrightYellow { get; } = "\x1b[103m";
 
             /// <summary>
-            /// Gets the color magenta.
+            /// Gets the color bright blue.
             /// </summary>
-            public string Magenta { get; } = "\x1b[45m";
+            public string BrightBlue { get; } = "\x1b[104m";
 
             /// <summary>
-            /// Gets the color read.
+            /// Gets the color bright magenta.
             /// </summary>
-            public string Red { get; } = "\x1b[41m";
+            public string BrightMagenta { get; } = "\x1b[105m";
 
             /// <summary>
-            /// Gets the color white.
+            /// Gets the color bright cyan.
             /// </summary>
-            public string White { get; } = "\x1b[47m";
+            public string BrightCyan { get; } = "\x1b[106m";
 
             /// <summary>
-            /// Gets the color yellow.
+            /// Gets the color bright white.
             /// </summary>
-            public string Yellow { get; } = "\x1b[43m";
+            public string BrightWhite { get; } = "\x1b[107m";
 
             /// <summary>
             /// The color set as RGB (Red, Green, Blue).
diff --git a/test/powershell/engine/Formatting/PSStyle.Tests.ps1 b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
index 2dd984453cb..04c13c5e04e 100644
--- a/test/powershell/engine/Formatting/PSStyle.Tests.ps1
+++ b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
@@ -34,39 +34,39 @@ Describe 'Tests for $PSStyle automatic variable' {
         $foregroundDefaults = @{
             Black = "`e[30m"
             White = "`e[37m"
-            DarkGray = "`e[90m"
-            LightGray = "`e[97m"
+            BrightBlack = "`e[90m"
+            BrightWhite = "`e[97m"
             Red = "`e[31m"
-            LightRed = "`e[91m"
+            BrightRed = "`e[91m"
             Magenta = "`e[35m"
-            LightMagenta = "`e[95m"
+            BrightMagenta = "`e[95m"
             Blue = "`e[34m"
-            LightBlue = "`e[94m"
+            BrightBlue = "`e[94m"
             Cyan = "`e[36m"
-            LightCyan = "`e[96m"
+            BrightCyan = "`e[96m"
             Green = "`e[32m"
-            LightGreen = "`e[92m"
+            BrightGreen = "`e[92m"
             Yellow = "`e[33m"
-            LightYellow = "`e[93m"
+            BrightYellow = "`e[93m"
         }
 
         $backgroundDefaults = @{
             Black = "`e[40m"
             White = "`e[47m"
-            DarkGray = "`e[100m"
-            LightGray = "`e[107m"
+            BrightBlack = "`e[100m"
+            BrightWhite = "`e[107m"
             Red = "`e[41m"
-            LightRed = "`e[101m"
+            BrightRed = "`e[101m"
             Magenta = "`e[45m"
-            LightMagenta = "`e[105m"
+            BrightMagenta = "`e[105m"
             Blue = "`e[44m"
-            LightBlue = "`e[104m"
+            BrightBlue = "`e[104m"
             Cyan = "`e[46m"
-            LightCyan = "`e[106m"
+            BrightCyan = "`e[106m"
             Green = "`e[42m"
-            LightGreen = "`e[102m"
+            BrightGreen = "`e[102m"
             Yellow = "`e[43m"
-            LightYellow = "`e[103m"
+            BrightYellow = "`e[103m"
         }
 
         function Get-TestCases($hashtable) {

From 329250c9748e74beb324bdb39d76d3f76dfb09aa Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 12 Oct 2021 14:14:39 -0700
Subject: [PATCH 068/645] Upgrade `set-value` package for markdown test
 (#16196)

---
 test/common/markdown/package.json |  3 ++-
 test/common/markdown/yarn.lock    | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/test/common/markdown/package.json b/test/common/markdown/package.json
index 7ce4cd73500..416b07882b2 100644
--- a/test/common/markdown/package.json
+++ b/test/common/markdown/package.json
@@ -15,7 +15,8 @@
         "ini": "^1.3.6",
         "copy-props":"^2.0.5",
         "glob-parent":"^5.1.2",
-        "hosted-git-info":"^3.0.8"
+        "hosted-git-info":"^3.0.8",
+        "set-value":"^4.0.1"
     },
     "devDependencies": {
         "gulp-concat": "^2.6.1",
diff --git a/test/common/markdown/yarn.lock b/test/common/markdown/yarn.lock
index 2402a0450ec..b3af62fe76e 100644
--- a/test/common/markdown/yarn.lock
+++ b/test/common/markdown/yarn.lock
@@ -1180,6 +1180,11 @@ is-plain-object@^5.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
   integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
 
+is-primitive@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-3.0.1.tgz#98c4db1abff185485a657fc2905052b940524d05"
+  integrity sha512-GljRxhWvlCNRfZyORiH77FwdFwGcMO620o37EOYC0ORWdq+WYNVqW0w2Juzew4M+L81l6/QS3t5gkkihyRqv9w==
+
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz"
@@ -1896,15 +1901,13 @@ set-blocking@^2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-value@^2.0.0, set-value@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"
-  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+set-value@^2.0.0, set-value@^2.0.1, set-value@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-4.1.0.tgz#aa433662d87081b75ad88a4743bd450f044e7d09"
+  integrity sha512-zTEg4HL0RwVrqcWs3ztF+x1vkxfm0lP+MQQFPiMJTKVceBwEV0A569Ou8l9IYQG8jOZdMVI1hGsc0tmeD2o/Lw==
   dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
+    is-plain-object "^2.0.4"
+    is-primitive "^3.0.1"
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
@@ -1993,7 +1996,7 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"
   integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
 
-split-string@^3.0.1, split-string@^3.0.2:
+split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"
   integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==

From d0e823797f1bbac8c256a4f607bc97812ca0fdb6 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Tue, 12 Oct 2021 14:16:32 -0700
Subject: [PATCH 069/645] Don't allow `Move-Item` with FileSystemProvider to
 move a directory into itself (#16198)

---
 .../namespaces/FileSystemProvider.cs               |  9 +++++++++
 .../resources/FileSystemProviderStrings.resx       |  3 +++
 .../FileSystem.Tests.ps1                           | 14 ++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index 7e6d302b22a..37229a18db4 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -5851,6 +5851,15 @@ protected override void MoveItem(
                         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;
 
diff --git a/src/System.Management.Automation/resources/FileSystemProviderStrings.resx b/src/System.Management.Automation/resources/FileSystemProviderStrings.resx
index 1b4d1159e59..9c232ae836e 100644
--- a/src/System.Management.Automation/resources/FileSystemProviderStrings.resx
+++ b/src/System.Management.Automation/resources/FileSystemProviderStrings.resx
@@ -345,4 +345,7 @@
   <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>
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
index 10ec92b6be6..bec4ad83b80 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
@@ -187,6 +187,20 @@ Describe "Basic FileSystem Provider Tests" -Tags "CI" {
             $e.Exception | Should -BeOfType System.IO.IOException
         }
 
+        It 'Verify Move-Item fails for destination that is subdir of source with trailing: <trailingChar>' -TestCases @(
+            @{ trailingChar = [System.IO.Path]::DirectorySeparatorChar }
+            @{ trailingChar = [System.IO.Path]::AltDirectorySeparatorChar }
+            @{ trailingChar = '' }
+        ) {
+            param($trailingChar)
+
+            $dest = Join-Path -Path $TestDrive -ChildPath dest
+            $null = New-item -ItemType Directory -Path $dest -Force -ErrorAction Stop
+            $src = "$TestDrive$trailingChar"
+
+            { Move-Item -Path $src -Destination $dest -ErrorAction Stop } | Should -Throw -ErrorId 'MoveItemArgumentError,Microsoft.PowerShell.Commands.MoveItemCommand'
+        }
+
         It "Verify Move-Item throws correct error for non-existent source" {
             { Move-Item -Path /does/not/exist -Destination $testFile -ErrorAction Stop } | Should -Throw -ErrorId 'PathNotFound,Microsoft.PowerShell.Commands.MoveItemCommand'
         }

From e4367386b3abd754b7f79789cb7de277e9586892 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 12 Oct 2021 14:32:10 -0700
Subject: [PATCH 070/645] Sign third party exes (#16229)

---
 tools/releaseBuild/azureDevOps/templates/windows-packaging.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index 5ce2c90a8e3..4063ee307ab 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -175,7 +175,7 @@ jobs:
       $BuildPath = '$(System.ArtifactsDirectory)\$(SymbolsFolder)'
 
       Update-PSSignedBuildFolder -BuildPath $BuildPath -SignedFilesPath $SignedFilesPath
-      $dlls = Get-ChildItem $BuildPath\*.dll -Recurse
+      $dlls = Get-ChildItem $BuildPath\*.dll, $BuildPath\*.exe -Recurse
       $signatures = $dlls | Get-AuthenticodeSignature
       $missingSignatures = $signatures | Where-Object { $_.status -eq 'notsigned'}| select-object -ExpandProperty Path
 

From bd5dc970874314f3e69b2efe601d791a99e5e10f Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 12 Oct 2021 15:40:43 -0700
Subject: [PATCH 071/645] Add Software Bill of Materials to the main packages
 (#16202)

---
 .../windows/templates/windows-packaging.yml   |  53 +++-
 .vsts-ci/windows/windows-packaging.yml        |  11 +-
 assets/wix/files.wxs                          |  12 +
 build.psm1                                    |  12 +-
 tools/WindowsCI.psm1                          |   5 -
 tools/ci.psm1                                 | 201 ++++++++-----
 tools/packaging/packaging.psd1                |   5 +-
 tools/packaging/packaging.psm1                | 273 ++++++++++++++++--
 tools/packaging/releaseTests/sbom.tests.ps1   | 110 +++++++
 .../releaseBuild/azureDevOps/releaseBuild.yml |   8 +
 .../azureDevOps/releasePipeline.yml           |  17 +-
 .../azureDevOps/templates/linux.yml           | 101 +++++--
 .../templates/mac-package-build.yml           |   5 +
 .../release-SetReleaseTagAndContainerName.yml |   4 +-
 .../templates/release-ValidatePackageBOM.yml  |  43 +++
 .../templates/windows-packaging.yml           |   5 +
 16 files changed, 726 insertions(+), 139 deletions(-)
 create mode 100644 tools/packaging/releaseTests/sbom.tests.ps1
 create mode 100644 tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml

diff --git a/.vsts-ci/windows/templates/windows-packaging.yml b/.vsts-ci/windows/templates/windows-packaging.yml
index 19d2be32618..efef35f240e 100644
--- a/.vsts-ci/windows/templates/windows-packaging.yml
+++ b/.vsts-ci/windows/templates/windows-packaging.yml
@@ -1,20 +1,40 @@
 parameters:
-  pool: 'Hosted VS2017'
-  jobName: 'win_packaging'
-  architecture: 'x64'
-  channel: 'preview'
-  parentJobs: []
+  - name: pool
+    default: 'Hosted VS2017'
+  - name: jobName
+    default: 'win_packaging'
+  - name: architecture
+    default: 'x64'
+  - name: channel
+    default: 'preview'
 
 jobs:
 - job: ${{ parameters.jobName }}_${{ parameters.channel }}_${{ parameters.architecture }}
-  dependsOn:
-      ${{ parameters.parentJobs }}
+
+  variables:
+    - name: repoFolder
+      value: PowerShell
+    - name: repoPath
+      value: $(Agent.BuildDirectory)\$(repoFolder)
+    - name: complianceRepoFolder
+      value: compliance
+    - name: complianceRepoPath
+      value: $(Agent.BuildDirectory)\$(complianceRepoFolder)
+
   pool:
     name: ${{ parameters.pool }}
 
   displayName: Windows Packaging - ${{ parameters.architecture }} - ${{ parameters.channel }}
 
   steps:
+  - checkout: self
+    clean: true
+    path: $(repoFolder)
+
+  - checkout: ComplianceRepo
+    clean: true
+    path: $(complianceRepoFolder)
+
   - powershell: |
       Get-ChildItem -Path env:
     displayName: Capture environment
@@ -27,9 +47,24 @@ jobs:
       Invoke-CIInstall -SkipUser
     displayName: Bootstrap
     condition: succeeded()
+    workingDirectory: $(repoPath)
+
+  - pwsh: |
+      Import-Module .\tools\ci.psm1
+      New-CodeCoverageAndTestPackage
+      Invoke-CIFinish -Runtime win7-${{ parameters.architecture }} -channel ${{ parameters.channel }} -Stage Build
+    displayName: Build
+    workingDirectory: $(repoPath)
+
+  - template: Sbom.yml@ComplianceRepo
+    parameters:
+      BuildDropPath: '$(System.ArtifactsDirectory)/mainBuild'
+      Build_Repository_Uri: $(build.repository.uri)
+      displayName: SBOM
 
   - pwsh: |
       Import-Module .\tools\ci.psm1
       New-CodeCoverageAndTestPackage
-      Invoke-CIFinish -Runtime win7-${{ parameters.architecture }} -channel ${{ parameters.channel }}
-    displayName: Build and Test Package
+      Invoke-CIFinish -Runtime win7-${{ parameters.architecture }} -channel ${{ parameters.channel }} -Stage Package
+    displayName: Package and Test
+    workingDirectory: $(repoPath)
diff --git a/.vsts-ci/windows/windows-packaging.yml b/.vsts-ci/windows/windows-packaging.yml
index f471196d963..60bbaedf7b9 100644
--- a/.vsts-ci/windows/windows-packaging.yml
+++ b/.vsts-ci/windows/windows-packaging.yml
@@ -67,10 +67,17 @@ variables:
   - name: __SuppressAnsiEscapeSequences
     value: 1
   - group: fakeNugetKey
+  - name: SBOMGenerator_Formats
+    value: spdx:2.2
 
 resources:
-- repo: self
-  clean: true
+  repositories:
+    - repository: ComplianceRepo
+      type: github
+      endpoint: PowerShell
+      name: PowerShell/compliance
+      ref: master
+
 stages:
 - stage: PackagingWin
   displayName: Packaging for Windows
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 8e821f1c6fc..555536fbbaf 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3057,6 +3057,16 @@
       <Component Id="cmp2EB55EB6B44F4CF186F0BAFD6B33BCD6">
         <File Id="filC629C6EFCF314F9BB78C56E0876C08EB" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.45113.dll" />
       </Component>
+      <Directory Name="_manifest" Id="dir81094D6B916B4BC8B1BA0E1DADB93A02">
+        <Directory Name="spdx_2.2" Id="dirA36413FB3A534FDF8657D62728080E9F">
+          <Component Id="cmp408A3AF905EB47ADA35FBC5A6B1465A0">
+            <File Id="fil2146848B6ACB45FCA8E9C8FEE3BECDD8" KeyPath="yes" Source="$(var.ProductSourcePath)\_manifest\spdx_2.2\manifest.spdx.json" />
+          </Component>
+        </Directory>
+      </Directory>
+      <Component Id="cmpA6276F9EAB41411AAAEC496E67A3DBAE">
+        <File Id="filC840646CDE814D33B16DA3A5BBDDC88D" KeyPath="yes" Source="$(var.ProductSourcePath)\psoptions.json" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -4042,6 +4052,8 @@
       <ComponentRef Id="cmpA75DEF5617C54DA1937CB37D5824BF79" />
       <ComponentRef Id="cmp957498053E01454DA1E21E6D7317DCD6" />
       <ComponentRef Id="cmp2EB55EB6B44F4CF186F0BAFD6B33BCD6" />
+      <ComponentRef Id="cmp408A3AF905EB47ADA35FBC5A6B1465A0" />
+      <ComponentRef Id="cmpA6276F9EAB41411AAAEC496E67A3DBAE" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/build.psm1 b/build.psm1
index bbb98110d2a..e278ff39b24 100644
--- a/build.psm1
+++ b/build.psm1
@@ -321,7 +321,8 @@ function Start-PSBuild {
         [string]$ReleaseTag,
         [switch]$Detailed,
         [switch]$InteractiveAuth,
-        [switch]$SkipRoslynAnalyzers
+        [switch]$SkipRoslynAnalyzers,
+        [string]$PSOptionsPath
     )
 
     if ($ReleaseTag -and $ReleaseTag -notmatch "^v\d+\.\d+\.\d+(-(preview|rc)(\.\d{1,2})?)?$") {
@@ -668,6 +669,15 @@ Fix steps:
     if ($CI) {
         Restore-PSPester -Destination (Join-Path $publishPath "Modules")
     }
+
+    if ($PSOptionsPath) {
+        $resolvedPSOptionsPath = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($PSOptionsPath)
+        $parent = Split-Path -Path $resolvedPSOptionsPath
+        if (!(Test-Path $parent)) {
+            $null = New-Item -ItemType Directory -Path $parent
+        }
+        Save-PSOptions -PSOptionsPath $PSOptionsPath -Options $Options
+    }
 }
 
 function Restore-PSPackage
diff --git a/tools/WindowsCI.psm1 b/tools/WindowsCI.psm1
index 37b866cebd0..57d506bda8b 100644
--- a/tools/WindowsCI.psm1
+++ b/tools/WindowsCI.psm1
@@ -1,11 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-if($PSVersionTable.PSEdition -ne 'Desktop')
-{
-    throw 'Must be run from Windows PowerShell'
-}
-
 function New-LocalUser
 {
   <#
diff --git a/tools/ci.psm1 b/tools/ci.psm1
index f53c9271c01..1adc4d3ebf2 100644
--- a/tools/ci.psm1
+++ b/tools/ci.psm1
@@ -442,111 +442,156 @@ function Invoke-CIFinish
 {
     param(
         [string] $Runtime = 'win7-x64',
-        [string] $Channel = 'preview'
+        [string] $Channel = 'preview',
+        [Validateset('Build','Package')]
+        [string[]] $Stage = ('Build','Package')
     )
 
-    if($PSEdition -eq 'Core' -and ($IsLinux -or $IsMacOS))
-    {
+    if ($PSEdition -eq 'Core' -and ($IsLinux -or $IsMacOS) -and $Stage -contains 'Build') {
         return New-LinuxPackage
     }
 
+    $artifacts = New-Object System.Collections.ArrayList
     try {
-
-        if($Channel -eq 'preview')
-        {
-            $releaseTag = Get-ReleaseTag
-
-            $previewVersion = $releaseTag.Split('-')
-            $previewPrefix = $previewVersion[0]
-            $previewLabel = $previewVersion[1].replace('.','')
-
-            if(Test-DailyBuild)
-            {
-                $previewLabel= "daily{0}" -f $previewLabel
+        $buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/mainBuild"
+
+        if ($Stage -contains "Build") {
+            if ($Channel -eq 'preview') {
+                $releaseTag = Get-ReleaseTag
+
+                $previewVersion = $releaseTag.Split('-')
+                $previewPrefix = $previewVersion[0]
+                $previewLabel = $previewVersion[1].replace('.','')
+
+                if(Test-DailyBuild)
+                {
+                    $previewLabel= "daily{0}" -f $previewLabel
+                }
+
+                $prereleaseIteration = (get-date).Day
+                $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration"
+                # Build clean before backing to remove files from testing
+                Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime -output $buildFolder -PSOptionsPath "${buildFolder}/psoptions.json"
+                $options = Get-PSOptions
+                # Remove symbol files.
+                $filter = Join-Path -Path (Split-Path $options.Output) -ChildPath '*.pdb'
+                Write-Verbose "Removing symbol files from $filter" -Verbose
+                Remove-Item $filter -Force -Recurse
+            }
+            else {
+                $releaseTag = Get-ReleaseTag
+                $releaseTagParts = $releaseTag.split('.')
+                $preReleaseVersion = $releaseTagParts[0]+ ".9.9"
+                Write-Verbose "newPSReleaseTag: $preReleaseVersion" -Verbose
+                Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime -output $buildFolder -PSOptionsPath "${buildFolder}/psoptions.json"
+                $options = Get-PSOptions
+                # Remove symbol files.
+                $filter = Join-Path -Path (Split-Path $options.Output) -ChildPath '*.pdb'
+                Write-Verbose "Removing symbol files from $filter" -Verbose
+                Remove-Item $filter -Force -Recurse
             }
 
-            $prereleaseIteration = (get-date).Day
-            $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration"
-            # Build clean before backing to remove files from testing
-            Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime
-        }
-        else {
-            $releaseTag = Get-ReleaseTag
-            $releaseTagParts = $releaseTag.split('.')
-            $preReleaseVersion = $releaseTagParts[0]+ ".9.9"
-            Write-Verbose "newPSReleaseTag: $preReleaseVersion" -Verbose
-            Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime
+            # Set a variable, both in the current process and in AzDevOps for the packaging stage to get the release tag
+            $env:CI_FINISH_RELASETAG=$preReleaseVersion
+            $vstsCommandString = "vso[task.setvariable variable=CI_FINISH_RELASETAG]$preReleaseVersion"
+            Write-Verbose -Message "$vstsCommandString" -Verbose
+            Write-Host -Object "##$vstsCommandString"
+
+            $armBuildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/releaseArm32"
+
+            # produce win-arm and win-arm64 packages if it is a daily build
+            Start-PSBuild -Restore -Runtime win-arm -PSModuleRestore -Configuration 'Release' -ReleaseTag $releaseTag -output $armBuildFolder -PSOptionsPath "${armBuildFolder}-meta/psoptions.json" -Crossgen
+            $options = Get-PSOptions
+            # Remove symbol files.
+            $filter = Join-Path -Path (Split-Path $options.Output) -ChildPath '*.pdb'
+            Write-Verbose "Removing symbol files from $filter" -Verbose
+            Remove-Item $filter -Force -Recurse
+
+            $armBuildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/releaseArm64"
+            Start-PSBuild -Restore -Runtime win-arm64 -PSModuleRestore -Configuration 'Release' -ReleaseTag $releaseTag -output $armBuildFolder -PSOptionsPath "${armBuildFolder}-meta/psoptions.json" -Crossgen
+            $options = Get-PSOptions
+            # Remove symbol files.
+            $filter = Join-Path -Path (Split-Path $options.Output) -ChildPath '*.pdb'
+            Write-Verbose "Removing symbol files from $filter" -Verbose
+            Remove-Item $filter -Force -Recurse
         }
 
-        # Build packages	            $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration"
-        $packages = Start-PSPackage -Type msi,nupkg,zip,zip-pdb -ReleaseTag $preReleaseVersion -SkipReleaseChecks -WindowsRuntime $Runtime
-
-        $artifacts = New-Object System.Collections.ArrayList
-        foreach ($package in $packages) {
-            if (Test-Path $package -ErrorAction Ignore)
-            {
-                Write-Log "Package found: $package"
-            }
-            else
-            {
-                Write-Warning -Message "Package NOT found: $package"
-            }
 
-            if($package -is [string])
-            {
-                $null = $artifacts.Add($package)
+        if ($Stage -contains "Package") {
+            Restore-PSOptions -PSOptionsPath "${buildFolder}-meta/psoptions.json"
+            $preReleaseVersion = $env:CI_FINISH_RELASETAG
+
+            # Build packages	            $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration"
+            $packages = Start-PSPackage -Type msi, nupkg, zip, zip-pdb -ReleaseTag $preReleaseVersion -SkipReleaseChecks -WindowsRuntime $Runtime
+
+            foreach ($package in $packages) {
+                if (Test-Path $package -ErrorAction Ignore)
+                {
+                    Write-Log "Package found: $package"
+                }
+                else
+                {
+                    Write-Warning -Message "Package NOT found: $package"
+                }
+
+                if($package -is [string])
+                {
+                    $null = $artifacts.Add($package)
+                }
+                elseif($package -is [pscustomobject] -and $package.psobject.Properties['msi'])
+                {
+                    $null = $artifacts.Add($package.msi)
+                    $null = $artifacts.Add($package.wixpdb)
+                }
             }
-            elseif($package -is [pscustomobject] -and $package.psobject.Properties['msi'])
-            {
-                $null = $artifacts.Add($package.msi)
-                $null = $artifacts.Add($package.wixpdb)
-            }
-        }
 
-        # the packaging tests find the MSI package using env:PSMsiX64Path
-        $env:PSMsiX64Path = $artifacts | Where-Object { $_.EndsWith(".msi")}
-        $architechture = $Runtime.Split('-')[1]
-        $exePath = New-ExePackage -ProductVersion ($preReleaseVersion -replace '^v') -ProductTargetArchitecture $architechture -MsiLocationPath $env:PSMsiX64Path
-        Write-Verbose "exe Path: $exePath" -Verbose
-        $artifacts.Add($exePath)
-        $env:PSExePath = $exePath
-        $env:PSMsiChannel = $Channel
-        $env:PSMsiRuntime = $Runtime
+            # the packaging tests find the MSI package using env:PSMsiX64Path
+            $env:PSMsiX64Path = $artifacts | Where-Object { $_.EndsWith(".msi")}
+            $architechture = $Runtime.Split('-')[1]
+            $exePath = New-ExePackage -ProductVersion ($preReleaseVersion -replace '^v') -ProductTargetArchitecture $architechture -MsiLocationPath $env:PSMsiX64Path
+            Write-Verbose "exe Path: $exePath" -Verbose
+            $artifacts.Add($exePath)
+            $env:PSExePath = $exePath
+            $env:PSMsiChannel = $Channel
+            $env:PSMsiRuntime = $Runtime
 
-        # Install the latest Pester and import it
-        $maximumPesterVersion = '4.99'
-        Install-Module Pester -Force -SkipPublisherCheck -MaximumVersion $maximumPesterVersion
-        Import-Module Pester -Force -MaximumVersion $maximumPesterVersion
+            # Install the latest Pester and import it
+            $maximumPesterVersion = '4.99'
+            Install-Module Pester -Force -SkipPublisherCheck -MaximumVersion $maximumPesterVersion
+            Import-Module Pester -Force -MaximumVersion $maximumPesterVersion
 
-        $testResultPath = Join-Path -Path $env:TEMP -ChildPath "win-package-$channel-$runtime.xml"
+            $testResultPath = Join-Path -Path $env:TEMP -ChildPath "win-package-$channel-$runtime.xml"
 
-        # start the packaging tests and get the results
-        $packagingTestResult = Invoke-Pester -Script (Join-Path $repoRoot '.\test\packaging\windows\') -PassThru -OutputFormat NUnitXml -OutputFile $testResultPath
+            # start the packaging tests and get the results
+            $packagingTestResult = Invoke-Pester -Script (Join-Path $repoRoot '.\test\packaging\windows\') -PassThru -OutputFormat NUnitXml -OutputFile $testResultPath
 
-        Publish-TestResults -Title "win-package-$channel-$runtime" -Path $testResultPath
+            Publish-TestResults -Title "win-package-$channel-$runtime" -Path $testResultPath
 
-        # fail the CI job if the tests failed, or nothing passed
-        if(-not $packagingTestResult -is [pscustomobject] -or $packagingTestResult.FailedCount -ne 0 -or $packagingTestResult.PassedCount -eq 0)
-        {
-            throw "Packaging tests failed ($($packagingTestResult.FailedCount) failed/$($packagingTestResult.PassedCount) passed)"
-        }
+            # fail the CI job if the tests failed, or nothing passed
+            if(-not $packagingTestResult -is [pscustomobject] -or $packagingTestResult.FailedCount -ne 0 -or $packagingTestResult.PassedCount -eq 0)
+            {
+                throw "Packaging tests failed ($($packagingTestResult.FailedCount) failed/$($packagingTestResult.PassedCount) passed)"
+            }
 
-        # only publish assembly nuget packages if it is a daily build and tests passed
-        if(Test-DailyBuild)
-        {
-            $nugetArtifacts = Get-ChildItem $PSScriptRoot\packaging\nugetOutput -ErrorAction SilentlyContinue -Filter *.nupkg | Select-Object -ExpandProperty FullName
-            if($nugetArtifacts)
+            # only publish assembly nuget packages if it is a daily build and tests passed
+            if(Test-DailyBuild)
             {
-                $artifacts.AddRange(@($nugetArtifacts))
+                $nugetArtifacts = Get-ChildItem $PSScriptRoot\packaging\nugetOutput -ErrorAction SilentlyContinue -Filter *.nupkg | Select-Object -ExpandProperty FullName
+                if($nugetArtifacts)
+                {
+                    $artifacts.AddRange(@($nugetArtifacts))
+                }
             }
         }
 
         # produce win-arm and win-arm64 packages if it is a daily build
-        Start-PSBuild -Restore -Runtime win-arm -PSModuleRestore -Configuration 'Release' -ReleaseTag $releaseTag
+        $armBuildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/releaseArm32"
+        Restore-PSOptions -PSOptionsPath "${armBuildFolder}-meta/psoptions.json"
         $arm32Package = Start-PSPackage -Type zip -WindowsRuntime win-arm -ReleaseTag $releaseTag -SkipReleaseChecks
         $artifacts.Add($arm32Package)
 
-        Start-PSBuild -Restore -Runtime win-arm64 -PSModuleRestore -Configuration 'Release' -ReleaseTag $releaseTag
+        $armBuildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/releaseArm64"
+        Restore-PSOptions -PSOptionsPath "${armBuildFolder}-meta/psoptions.json"
         $arm64Package = Start-PSPackage -Type zip -WindowsRuntime win-arm64 -ReleaseTag $releaseTag -SkipReleaseChecks
         $artifacts.Add($arm64Package)
     }
diff --git a/tools/packaging/packaging.psd1 b/tools/packaging/packaging.psd1
index 00f4bc90d95..8de303ef45c 100644
--- a/tools/packaging/packaging.psd1
+++ b/tools/packaging/packaging.psd1
@@ -7,9 +7,11 @@
     PowerShellVersion = "5.0"
     CmdletsToExport   = @()
     FunctionsToExport = @(
+        'Compress-ExePackageEngine'
         'Expand-ExePackageEngine'
         'Expand-PSSignedBuild'
-        'Compress-ExePackageEngine'
+        'Invoke-AzDevOpsLinuxPackageBuild'
+        'Invoke-AzDevOpsLinuxPackageCreation'
         'New-DotnetSdkContainerFxdPackage'
         'New-ExePackage'
         'New-GlobalToolNupkg'
@@ -19,6 +21,7 @@
         'New-PSSignedBuildZip'
         'Publish-NugetToMyGet'
         'Start-PSPackage'
+        'Test-PackageManifest'
         'Update-PSSignedBuildFolder'
     )
     RootModule        = "packaging.psm1"
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 7b652f9b3bf..6af481a3e64 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -77,11 +77,11 @@ function Start-PSPackage {
             $WindowsRuntime, "Release"
         } elseif ($MacOSRuntime) {
            $MacOSRuntime, "Release"
-        } elseif ($Type -eq "tar-alpine") {
+        } elseif ($Type.Count -eq 1 -and $Type[0] -eq "tar-alpine") {
             New-PSOptions -Configuration "Release" -Runtime "alpine-x64" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
-        } elseif ($Type -eq "tar-arm") {
+        } elseif ($Type.Count -eq 1 -and $Type[0] -eq "tar-arm") {
             New-PSOptions -Configuration "Release" -Runtime "Linux-ARM" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
-        } elseif ($Type -eq "tar-arm64") {
+        } elseif ($Type.Count -eq 1 -and $Type[0] -eq "tar-arm64") {
             if ($IsMacOS) {
                 New-PSOptions -Configuration "Release" -Runtime "osx-arm64" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
             } else {
@@ -103,12 +103,13 @@ function Start-PSPackage {
 
         if ($Type -eq 'fxdependent') {
             $NameSuffix = "win-fxdependent"
-            Write-Log "Packaging : '$Type'; Packaging Configuration: '$Configuration'"
+            Write-Log "Packaging : '$Type'; Packaging Configuration: '$Configuration', Runtime: '$Runtime'"
         } elseif ($Type -eq 'fxdependent-win-desktop') {
             $NameSuffix = "win-fxdependentWinDesktop"
-            Write-Log "Packaging : '$Type'; Packaging Configuration: '$Configuration'"
+            Write-Log "Packaging : '$Type'; Packaging Configuration: '$Configuration', Runtime: '$Runtime'"
         } elseif ($MacOSRuntime) {
             $NameSuffix = $MacOSRuntime
+            Write-Log "Packaging : '$Type'; Packaging Configuration: '$Configuration', Runtime: '$Runtime'"
         } else {
             Write-Log "Packaging RID: '$Runtime'; Packaging Configuration: '$Configuration'"
         }
@@ -313,9 +314,6 @@ function Start-PSPackage {
                 }
             }
             "min-size" {
-                # Remove symbol files, xml document files.
-                Remove-Item "$Source\*.pdb", "$Source\*.xml" -Force
-
                 # Add suffix '-gc' because this package is for the Guest Config team.
                 if ($Environment.IsWindows) {
                     $Arguments = @{
@@ -344,11 +342,6 @@ function Start-PSPackage {
                 }
             }
             { $_ -like "fxdependent*" } {
-                ## Remove PDBs from package to reduce size.
-                if(-not $IncludeSymbols.IsPresent) {
-                    Get-ChildItem $Source -Filter *.pdb | Remove-Item -Force
-                }
-
                 if ($Environment.IsWindows) {
                     $Arguments = @{
                         PackageNameSuffix = $NameSuffix
@@ -690,7 +683,8 @@ function Update-PSSignedBuildFolder
         [Parameter(Mandatory)]
         [string]$BuildPath,
         [Parameter(Mandatory)]
-        [string]$SignedFilesPath
+        [string]$SignedFilesPath,
+        [string[]] $RemoveFilter = ('*.pdb', '*.zip')
     )
 
     # Replace unsigned binaries with signed
@@ -701,6 +695,11 @@ function Update-PSSignedBuildFolder
         Write-Log "replacing $destination with $_"
         Copy-Item -Path $_ -Destination $destination -Force
     }
+
+    foreach($filter in $RemoveFilter) {
+        $removePath = Join-Path -Path $BuildPath -ChildPath $filter
+        Remove-Item -Path $removePath -Recurse -Force
+    }
 }
 
 
@@ -735,7 +734,7 @@ function Expand-PSSignedBuild
     Restore-PSModuleToBuild -PublishPath $buildPath
 
     $psOptionsPath = Join-Path $buildPath -ChildPath 'psoptions.json'
-    Restore-PSOptions -PSOptionsPath $psOptionsPath -Remove
+    Restore-PSOptions -PSOptionsPath $psOptionsPath
 
     $options = Get-PSOptions
 
@@ -1606,8 +1605,6 @@ function New-ZipPackage
             $staging = "$PSScriptRoot/staging"
             New-StagingFolder -StagingPath $staging -PackageSourcePath $PackageSourcePath
 
-            Get-ChildItem $staging -Filter *.pdb -Recurse | Remove-Item -Force
-
             Compress-Archive -Path $staging\* -DestinationPath $zipLocationPath
         }
 
@@ -1621,7 +1618,6 @@ function New-ZipPackage
             throw "Failed to create $zipLocationPath"
         }
     }
-    #TODO: Use .NET Api to do compresss-archive equivalent if the pscmdlet is not present
     else
     {
         Write-Error -Message "Compress-Archive cmdlet is missing in this PowerShell version"
@@ -1693,7 +1689,6 @@ function New-PdbZipPackage
             throw "Failed to create $zipLocationPath"
         }
     }
-    #TODO: Use .NET Api to do compresss-archive equivalent if the pscmdlet is not present
     else
     {
         Write-Error -Message "Compress-Archive cmdlet is missing in this PowerShell version"
@@ -3001,8 +2996,6 @@ function New-MSIPackage
     $staging = "$PSScriptRoot/staging"
     New-StagingFolder -StagingPath $staging -PackageSourcePath $ProductSourcePath
 
-    Get-ChildItem $staging -Filter *.pdb -Recurse | Remove-Item -Force
-
     $assetsInSourcePath = Join-Path $staging 'assets'
 
     New-Item $assetsInSourcePath -type directory -Force | Write-Verbose
@@ -4023,3 +4016,241 @@ function New-GlobalToolNupkg
         New-NugetPackage -NuSpecPath $_.RootFolder -PackageDestinationPath $DestinationPath
     }
 }
+
+${mainLinuxBuildFolder} = 'pwshLinuxBuild'
+${minSizeLinuxBuildFolder} = 'pwshLinuxBuildMinSize'
+${arm32LinuxBuildFolder} = 'pwshLinuxBuildArm32'
+${arm64LinuxBuildFolder} = 'pwshLinuxBuildArm64'
+
+<#
+    Used in Azure DevOps Yaml to package all the linux packages for a channel.
+#>
+function Invoke-AzDevOpsLinuxPackageCreation {
+    param(
+        [switch]
+        $LTS,
+
+        [Parameter(Mandatory)]
+        [ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d{1,2})?)?$")]
+        [ValidateNotNullOrEmpty()]
+        [string]$ReleaseTag,
+
+        [Parameter(Mandatory)]
+        [ValidateSet('fxdependent', 'alpine', 'deb', 'rpm')]
+        [String]$BuildType
+    )
+
+    if (!${env:SYSTEM_ARTIFACTSDIRECTORY}) {
+        throw "Must be run in Azure DevOps"
+    }
+
+    try {
+        Write-Verbose "Packaging '$BuildType'-LTS:$LTS for $ReleaseTag ..." -Verbose
+
+        Restore-PSOptions -PSOptionsPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${mainLinuxBuildFolder}-meta\psoptions.json"
+
+        $releaseTagParam = @{ 'ReleaseTag' = $ReleaseTag }
+
+        switch ($BuildType) {
+            'fxdependent' {
+                Start-PSPackage -Type 'fxdependent' @releaseTagParam -LTS:$LTS
+            }
+            'alpine' {
+                Start-PSPackage -Type 'tar-alpine' @releaseTagParam -LTS:$LTS
+            }
+            'rpm' {
+                Start-PSPackage -Type 'rpm' @releaseTagParam -LTS:$LTS
+            }
+            default {
+                Start-PSPackage @releaseTagParam -LTS:$LTS -Type 'deb', 'tar'
+            }
+        }
+
+        if ($BuildType -eq 'deb') {
+            Start-PSPackage -Type tar @releaseTagParam -LTS:$LTS
+
+            Restore-PSOptions -PSOptionsPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${minSizeLinuxBuildFolder}-meta\psoptions.json"
+
+            Write-Verbose -Verbose "---- Min-Size ----"
+            Write-Verbose -Verbose "options.Output: $($options.Output)"
+            Write-Verbose -Verbose "options.Top $($options.Top)"
+
+            Start-PSPackage -Type min-size @releaseTagParam -LTS:$LTS
+
+            ## Create 'linux-arm' 'tar.gz' package.
+            ## Note that 'linux-arm' can only be built on Ubuntu environment.
+            Restore-PSOptions -PSOptionsPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${arm32LinuxBuildFolder}-meta\psoptions.json"
+            Start-PSPackage -Type tar-arm @releaseTagParam -LTS:$LTS
+
+            ## Create 'linux-arm64' 'tar.gz' package.
+            ## Note that 'linux-arm64' can only be built on Ubuntu environment.
+            Restore-PSOptions -PSOptionsPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${arm64LinuxBuildFolder}-meta\psoptions.json"
+            Start-PSPackage -Type tar-arm64 @releaseTagParam -LTS:$LTS
+        }
+    }
+    catch {
+        Get-Error
+        throw
+    }
+}
+
+<#
+    Used in Azure DevOps Yaml to do all the builds needed for all Linux packages for a channel.
+#>
+function Invoke-AzDevOpsLinuxPackageBuild {
+    param (
+        [Parameter(Mandatory)]
+        [ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d{1,2})?)?$")]
+        [ValidateNotNullOrEmpty()]
+        [string]$ReleaseTag,
+
+        [Parameter(Mandatory)]
+        [ValidateSet('fxdependent', 'alpine', 'deb', 'rpm')]
+        [String]$BuildType
+    )
+
+    if (!${env:SYSTEM_ARTIFACTSDIRECTORY}) {
+        throw "Must be run in Azure DevOps"
+    }
+
+    try {
+
+        Write-Verbose "Building '$BuildType' for $ReleaseTag ..." -Verbose
+
+        $releaseTagParam = @{ 'ReleaseTag' = $ReleaseTag }
+
+        $buildParams = @{ Configuration = 'Release'; PSModuleRestore = $true; Restore = $true }
+
+        switch ($BuildType) {
+            'fxdependent' {
+                $buildParams.Add("Runtime", "fxdependent")
+            }
+            'alpine' {
+                $buildParams.Add("Runtime", 'alpine-x64')
+                # We are cross compiling, so we can't generate experimental features
+                $buildParams.Add("SkipExperimentalFeatureGeneration", $true)
+            }
+            default {
+                $buildParams.Add("Crossgen", $true)
+            }
+        }
+
+        $buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${mainLinuxBuildFolder}"
+        Start-PSBuild @buildParams @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
+        # Remove symbol files.
+        Remove-Item "${buildFolder}\*.pdb" -Force
+
+        if ($BuildType -eq 'deb') {
+            ## Build 'min-size'
+            $options = Get-PSOptions
+            Write-Verbose -Verbose "---- Min-Size ----"
+            Write-Verbose -Verbose "options.Output: $($options.Output)"
+            Write-Verbose -Verbose "options.Top $($options.Top)"
+            $binDir = Join-Path -Path $options.Top -ChildPath 'bin'
+            if (Test-Path -Path $binDir) {
+                Write-Verbose -Verbose "Remove $binDir, to get a clean build for min-size package"
+                Remove-Item -Path $binDir -Recurse -Force
+            }
+
+            $buildParams['Crossgen'] = $false
+            $buildParams['ForMinimalSize'] = $true
+            $buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${minSizeLinuxBuildFolder}"
+            Start-PSBuild -Clean @buildParams @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
+            # Remove symbol files, xml document files.
+            Remove-Item "${buildFolder}\*.pdb", "${buildFolder}\*.xml" -Force
+
+
+            ## Build 'linux-arm' and create 'tar.gz' package for it.
+            ## Note that 'linux-arm' can only be built on Ubuntu environment.
+            $buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${arm32LinuxBuildFolder}"
+            Start-PSBuild -Configuration Release -Restore -Runtime linux-arm -PSModuleRestore @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
+            # Remove symbol files.
+            Remove-Item "${buildFolder}\*.pdb" -Force
+
+            $buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${arm64LinuxBuildFolder}"
+            Start-PSBuild -Configuration Release -Restore -Runtime linux-arm64 -PSModuleRestore @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
+            # Remove symbol files.
+            Remove-Item "${buildFolder}\*.pdb" -Force
+        }
+    }
+    catch {
+        Get-Error
+        throw
+    }
+}
+
+enum PackageManifestResultStatus {
+    Mismatch
+    Match
+    MissingFromManifest
+    MissingFromPackage
+}
+
+class PackageManifestResult {
+    [string] $File
+    [string] $ExpectedHash
+    [string] $ActualHash
+    [PackageManifestResultStatus] $Status
+}
+
+function Test-PackageManifest {
+    param (
+        [Parameter(Mandatory)]
+        [string]
+        $PackagePath
+    )
+
+    Begin {
+        $spdxManifestPath = Join-Path $PackagePath -ChildPath "/_manifest/spdx_2.2/manifest.spdx.json"
+        $man = Get-Content $spdxManifestPath -ErrorAction Stop | convertfrom-json
+        $inManifest = @()
+    }
+
+    Process {
+        Write-Verbose "Processing $($man.files) files..." -verbose
+        $man.files | ForEach-Object {
+            $filePath = Join-Path $PackagePath -childPath $_.fileName
+            $checksumObj = $_.checksums | Where-Object {$_.algorithm -eq 'sha256'}
+            $sha256 = $checksumObj.checksumValue
+            $actualHash = $null
+            $actualHash = (Get-FileHash -Path $filePath -Algorithm sha256 -ErrorAction SilentlyContinue).Hash
+            $inManifest += $filePath
+            if($actualHash -ne $sha256) {
+                $status = [PackageManifestResultStatus]::Mismatch
+                if (!$actualHash) {
+                    $status = [PackageManifestResultStatus]::MissingFromPackage
+                }
+                [PackageManifestResult] $result = @{
+                    File         = $filePath
+                    ExpectedHash = $sha256
+                    ActualHash   = $actualHash
+                    Status       = $status
+                }
+                Write-Output $result
+            }
+            else {
+                [PackageManifestResult] $result = @{
+                    File         = $filePath
+                    ExpectedHash = $sha256
+                    ActualHash   = $actualHash
+                    Status       = [PackageManifestResultStatus]::Match
+                }
+                Write-Output $result
+            }
+        }
+
+
+        Get-ChildItem $PackagePath -recurse | Select-Object -ExpandProperty FullName | foreach-object {
+            if(!$inManifest -contains $_) {
+                $actualHash = (get-filehash -Path $_ -algorithm sha256 -erroraction silentlycontinue).Hash
+                [PackageManifestResult] $result = @{
+                    File         = $_
+                    ExpectedHash = $null
+                    ActualHash   = $actualHash
+                    Status       = [PackageManifestResultStatus]::MissingFromManifest
+                }
+                Write-Output $result
+            }
+        }
+    }
+}
diff --git a/tools/packaging/releaseTests/sbom.tests.ps1 b/tools/packaging/releaseTests/sbom.tests.ps1
new file mode 100644
index 00000000000..0e64e6c5042
--- /dev/null
+++ b/tools/packaging/releaseTests/sbom.tests.ps1
@@ -0,0 +1,110 @@
+Describe "Verify SBOMs" {
+    BeforeAll {
+        Write-Verbose "In Describe BeforeAll" -Verbose
+        Import-Module $PSScriptRoot/../../../build.psm1
+        Import-Module $PSScriptRoot/../packaging.psd1 -Force
+        $matchCases = @()
+        $testCases = @()
+        $missingFromPackageCases = @()
+        $missingFromManifestCases = @()
+        Write-Verbose "${env:PACKAGE_FOLDER}" -Verbose
+        Get-ChildItem $env:PACKAGE_FOLDER -Filter *.zip | ForEach-Object {
+            Write-Verbose "Found $($_.Name)..." -Verbose
+            $testCases += @{
+                FilePath = $_.FullName
+                Name = $_.Name
+            }
+        }
+
+        foreach($case in $testCases) {
+            $name = $case.Name
+            Write-Verbose "Testing $name..." -Verbose
+            $extractedPath = Join-Path Testdrive:\ -ChildPath ([System.io.path]::GetRandomFileName())
+            $null = New-Item -Path $extractedPath -ItemType Directory -Force
+            Expand-Archive -Path $case.FilePath -DestinationPath $extractedPath
+            $manifestPath = Join-Path $extractedPath -ChildPath '/_manifest/spdx_2.2/manifest.spdx.json'
+            It "$name has a BOM" {
+                $manifestPath | Should -Exist
+            }
+            Test-PackageManifest -PackagePath $extractedPath | ForEach-Object {
+                $status = $_.Status
+                $expectedHash = $_.ExpectedHash
+                $actual = $_.ActualHash
+                $file = $_.File
+
+                switch($status) {
+                    # cover match and mismatch
+                    default {
+                        $matchCases += @{
+                            Name = $name
+                            File = $file
+                            ActualHash = $actual
+                            ExpectedHash = $ExpectedHash
+                            Status = $status
+                        }
+                    }
+                    "MissingFromPackage" {
+                        $missingFromPackageCases = @{
+                            Name = $name
+                            File = $file
+                            ActualHash = $actual
+                            ExpectedHash = $ExpectedHash
+                            Status = $status
+                        }
+                    }
+                    "MissingFromManifest" {
+                        $missingFromManifestCases = @{
+                            Name = $name
+                            File = $file
+                            ActualHash = $actual
+                            ExpectedHash = $ExpectedHash
+                            Status = $status
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Context "Zip files" {
+        BeforeAll {
+            Write-Verbose "In Context BeforeAll" -Verbose
+        }
+
+        It "<name> should have <file> with matching hash" -TestCases $matchCases {
+            param(
+                $Name,
+                $File,
+                $ActualHash,
+                $ExpectedHash,
+                $Status
+            )
+
+            $status | Should -Be "Match" -Because  "$actualHash should be $expectedHash"
+        }
+
+        It "<name> should have <file> with matching hash" -TestCases $missingFromPackageCases -Skip:($missingFromPackageCases.Count -eq 0)  {
+            param(
+                $Name,
+                $File,
+                $ActualHash,
+                $ExpectedHash,
+                $Status
+            )
+
+            $status | Should -Be "Match" -Because "All files in manifest should exist in package"
+        }
+
+        It "Manifest for <name> should have <file>" -TestCases $missingFromManifestCases -Skip:($missingFromManifestCases.Count -eq 0) {
+            param(
+                $Name,
+                $File,
+                $ActualHash,
+                $ExpectedHash,
+                $Status
+            )
+
+            $status | Should -Be "Match" -Because "All files in package should exist in manifest"
+        }
+    }
+}
diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index 4ffa04fe3f2..53dbe9ac31b 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -13,6 +13,10 @@ pr:
 parameters:
   - name: ForceAzureBlobDelete
     displayName: Delete Azure Blob
+    type: string
+    values:
+      - true
+      - false
     default: false
 
 resources:
@@ -36,6 +40,10 @@ variables:
     value: $[counter(variables['branchCounterKey'], 1)]
   - name: ForceAzureBlobDelete
     value:  ${{ parameters.ForceAzureBlobDelete }}
+  - name: Github_Build_Repository_Uri
+    value: https://github.com/powershell/powershell
+  - name: SBOMGenerator_Formats
+    value: spdx:2.2
 
 stages:
   - stage: prep
diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index 64f3f6d1f77..25448d0f2e6 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -17,6 +17,8 @@ variables:
     value : false
   - name: NugetSecurityAnalysisWarningLevel
     value: none
+  - name: skipComponentGovernanceDetection
+    value: true
 
 stages:
 - stage: MSIXBundle
@@ -76,17 +78,26 @@ stages:
       globalToolExeName: 'pwsh'
       globalToolPackageName: 'PowerShell.Linux.x64'
 
-- stage: ValidatePkgNames
+- stage: StaticPkgValidation
   dependsOn: []
-  displayName: Package Names validation
+  displayName: Static package validation
   jobs:
   - job: ValidatePkgNames
+    displayName: Validate Package Names
     pool:
       vmImage: windows-latest
     variables:
     - group: 'Azure Blob variable group'
     steps:
       - template: templates/release-ValidatePackageNames.yml
+  - job: ValidatePkgBOM
+    displayName: Validate Package BOM
+    pool:
+      vmImage: windows-latest
+    variables:
+    - group: 'Azure Blob variable group'
+    steps:
+      - template: templates/release-ValidatePackageBOM.yml
 
 - stage: StartDocker
   dependsOn: []
@@ -127,7 +138,7 @@ stages:
   - MSIXBundle
   - ValidateSDK
   - PRCreation
-  - ValidatePkgNames
+  - StaticPkgValidation
   - StartDocker
   - ManualValidation
   - ReleaseAutomation
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index bf7662a9711..19248b18910 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -32,36 +32,103 @@ jobs:
     parameters:
       ReleaseTagVar: $(ReleaseTagVar)
 
-  - powershell: |
-      Write-Verbose -Verbose "$(build)"
+  - pwsh: |
+      # create folder
+      sudo mkdir /PowerShell
 
-      if ('$(build)' -in 'alpine', 'fxdependent' -and '$(ReleaseTagVar)' -match '6.0.*')
-      {
-          $vstsCommandString = "vso[task.setvariable variable=SkipBuild]true"
-      }
-      else
-      {
-          $vstsCommandString = "vso[task.setvariable variable=SkipBuild]false"
-      }
-    displayName: 'Skip Alpine or fxdependent for PS v6.0.*'
+      # make the current user the owner
+      sudo chown $env:USER /PowerShell
+    displayName: 'Create /PowerShell'
+
+  - template: cloneToOfficialPath.yml
 
   - template: insert-nuget-config-azfeed.yml
     parameters:
-      repoRoot: $(REPOROOT)
+      repoRoot: $(PowerShellRoot)
 
   - powershell: |
-      import-module "$env:REPOROOT/build.psm1"
+      import-module "$env:POWERSHELLROOT/build.psm1"
       Sync-PSTags -AddRemoteIfMissing
     displayName: SyncTags
     condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
+    workingDirectory: $(PowerShellRoot)
 
   - powershell: |
-      $env:AzDevOpsFeedPAT2 = '$(AzDevOpsFeedPAT2)'
-      & "$env:REPOROOT/tools/releaseBuild/vstsbuild.ps1" -ReleaseTag $(ReleaseTagVar) -Name '$(build)'
-      $env:AzDevOpsFeedPAT2 = $null
+      Import-Module "$env:POWERSHELLROOT/build.psm1"
+
+      Start-PSBootstrap -Package
+    displayName: 'Bootstrap'
+    condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
+    workingDirectory: $(PowerShellRoot)
 
-    displayName: 'Build and package'
+  - powershell: |
+
+      Import-Module "$env:POWERSHELLROOT/build.psm1"
+      Import-Module "$env:POWERSHELLROOT/tools/packaging"
+
+      Invoke-AzDevOpsLinuxPackageBuild -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
+    displayName: 'Build'
+    condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
+    workingDirectory: $(PowerShellRoot)
+
+  - template: Sbom.yml@ComplianceRepo
+    parameters:
+      BuildDropPath: '$(System.ArtifactsDirectory)/pwshLinuxBuild'
+      Build_Repository_Uri: $(Github_Build_Repository_Uri)
+      displayName: ${{ parameters.buildName }} SBOM
+
+  - ${{ if eq(variables.build,'deb') }} :
+    - template: Sbom.yml@ComplianceRepo
+      parameters:
+        BuildDropPath: '$(System.ArtifactsDirectory)/pwshLinuxBuildMinSize'
+        Build_Repository_Uri: $(Github_Build_Repository_Uri)
+        displayName: MinSize SBOM
+
+  - ${{ if eq(variables.build,'deb') }} :
+    - template: Sbom.yml@ComplianceRepo
+      parameters:
+        BuildDropPath: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm32'
+        Build_Repository_Uri: $(Github_Build_Repository_Uri)
+        displayName: Arm32 SBOM
+
+  - ${{ if eq(variables.build,'deb') }} :
+    - template: Sbom.yml@ComplianceRepo
+      parameters:
+        BuildDropPath: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm64'
+        Build_Repository_Uri: $(Github_Build_Repository_Uri)
+        displayName: Arm64 SBOM
+
+  - powershell: |
+      Import-Module "$env:POWERSHELLROOT/build.psm1"
+      Import-Module "$env:POWERSHELLROOT/tools/packaging"
+
+      $metadata = Get-Content "$env:POWERSHELLROOT/tools/metadata.json" -Raw | ConvertFrom-Json
+      $LTS = $metadata.LTSRelease
+      Write-Verbose -Verbose -Message "LTS is set to: $LTS"
+
+      Invoke-AzDevOpsLinuxPackageCreation -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
+
+      if ($LTS) {
+          Write-Verbose -Verbose "Packaging LTS"
+          Invoke-AzDevOpsLinuxPackageCreation -LTS  -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
+      }
+    displayName: 'Package'
+    condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
+    workingDirectory: $(PowerShellRoot)
+
+  - powershell: |
+      $linuxPackages = Get-ChildItem "$env:POWERSHELLROOT/powershell*" -Include *.deb,*.rpm,*.tar.gz
+
+      $bucket = 'release'
+      foreach ($linuxPackage in $linuxPackages)
+      {
+          $filePath = $linuxPackage.FullName
+          Write-Verbose "Publishing $filePath to $bucket" -Verbose
+          Write-Host "##vso[artifact.upload containerfolder=$bucket;artifactname=$bucket]$filePath"
+      }
+    displayName: Publish artifacts
     condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
+    workingDirectory: $(PowerShellRoot)
 
 - job: upload_${{ parameters.buildName }}
   displayName: ${{ parameters.uploadDisplayName }} ${{ parameters.buildName }}
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
index 34437b295a1..989cdbda039 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
@@ -79,6 +79,11 @@ jobs:
     displayName: Merge signed files with Build
     condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
 
+  - template: Sbom.yml@ComplianceRepo
+    parameters:
+      BuildDropPath: '$(System.ArtifactsDirectory)/$(SymbolsFolder)'
+      Build_Repository_Uri: $(Github_Build_Repository_Uri)
+
   - pwsh: |
       Import-Module $(PowerShellRoot)/build.psm1 -Force
       Import-Module $(PowerShellRoot)/tools/packaging -Force
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SetReleaseTagAndContainerName.yml b/tools/releaseBuild/azureDevOps/templates/release-SetReleaseTagAndContainerName.yml
index 9646cbf6b3b..26229325b82 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SetReleaseTagAndContainerName.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SetReleaseTagAndContainerName.yml
@@ -2,12 +2,12 @@ steps:
 - pwsh: |
     $variable = 'releaseTag'
     $branch = $ENV:BUILD_SOURCEBRANCH
-    if($branch -notmatch  '^.*(release[-/])')
+    if($branch -notmatch  '^.*((release/|rebuild/.*rebuild))')
     {
         throw "Branch name is not in release format: '$branch'"
     }
 
-    $releaseTag = $Branch -replace '^.*(release[-/])'
+    $releaseTag = $Branch -replace '^.*((release|rebuild)/)'
     $vstsCommandString = "vso[task.setvariable variable=$Variable]$releaseTag"
     Write-Verbose -Message "setting $Variable to $releaseTag" -Verbose
     Write-Host -Object "##$vstsCommandString"
diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml
new file mode 100644
index 00000000000..65eed1ef9e0
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml
@@ -0,0 +1,43 @@
+steps:
+- checkout: self
+  clean: true
+
+- pwsh: |
+    Get-ChildItem ENV:
+  displayName: Capture environment
+
+- template: release-SetReleaseTagAndContainerName.yml
+
+- pwsh: |
+    $name = "{0}_{1:x}" -f '$(releaseTag)', (Get-Date).Ticks
+    Write-Host $name
+    Write-Host "##vso[build.updatebuildnumber]$name"
+  displayName: Set Release Name
+
+- pwsh: |
+    $azcopy = "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe"
+
+    & $azcopy /Source:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) /Dest:$(System.ArtifactsDirectory) /S /SourceKey:$(StorageAccountKey)
+  displayName: Download Azure Artifacts
+
+- pwsh: |
+    Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty Name
+  displayName: Capture Artifact Listing
+
+- pwsh: |
+    Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
+  displayName: Install Pester
+  condition: succeededOrFailed()
+
+- pwsh: |
+    Import-module './build.psm1'
+    Import-module './tools/packaging'
+    $env:PACKAGE_FOLDER = '$(System.ArtifactsDirectory)'
+    $path = Join-Path -Path $pwd -ChildPath './packageReleaseTests.xml'
+    $results = invoke-pester -Script './tools/packaging/releaseTests' -OutputFile $path -OutputFormat NUnitXml -PassThru
+    Write-Host "##vso[results.publish type=NUnit;mergeResults=true;runTitle=Package Release Tests;publishRunAttachments=true;resultFiles=$path;]"
+    if($results.TotalCount -eq 0 -or $results.FailedCount -gt 0)
+    {
+      throw "Package Release Tests failed"
+    }
+  displayName: Run packaging release tests
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index 4063ee307ab..07063f07121 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -227,6 +227,11 @@ jobs:
     displayName: Merge ThirdParty signed files with Build
     condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
 
+  - template: Sbom.yml@ComplianceRepo
+    parameters:
+      BuildDropPath: '$(System.ArtifactsDirectory)\$(SymbolsFolder)'
+      Build_Repository_Uri: $(Github_Build_Repository_Uri)
+
   - powershell: |
       Import-Module $(PowerShellRoot)/build.psm1 -Force
       Import-Module $(PowerShellRoot)/tools/packaging -Force

From 080b754cb9b97b0c9e31c3fbdfcd6031c8212e18 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 14 Oct 2021 14:13:24 -0700
Subject: [PATCH 072/645] Remove unneeded `NuGetConfigFile` resource string
 (#16232)

---
 tools/packaging/packaging.psm1         |  1 -
 tools/packaging/packaging.strings.psd1 | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 6af481a3e64..71c5f4dcbe5 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -2174,7 +2174,6 @@ function New-ReferenceAssembly
     Write-Log "GenAPI nuget package saved and expanded."
 
     $genAPIFolder = New-TempFolder
-    $packagingStrings.NugetConfigFile | Out-File -FilePath "$genAPIFolder/Nuget.config" -Force
     Write-Log "Working directory: $genAPIFolder."
 
     $SMAReferenceAssembly = $null
diff --git a/tools/packaging/packaging.strings.psd1 b/tools/packaging/packaging.strings.psd1
index 7a06855442d..75068371efa 100644
--- a/tools/packaging/packaging.strings.psd1
+++ b/tools/packaging/packaging.strings.psd1
@@ -170,16 +170,6 @@ open {0}
         </dependencies>
     </metadata>
 </package>
-'@
-
-    NuGetConfigFile = @'
-<configuration>
-  <packageSources>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
-  </packageSources>
-</configuration>
 '@
 
     GlobalToolNuSpec = @'

From c784dde5a2fdf9c776730db3699ed46e60cdc8c7 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 14 Oct 2021 14:14:05 -0700
Subject: [PATCH 073/645] Remove the unused `FollowSymLink` function (#16231)

---
 src/System.Management.Automation/CoreCLR/CorePsPlatform.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
index ce37ae12d17..859aa8ecfe3 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
@@ -1134,10 +1134,6 @@ internal static extern int CreateSymLink([MarshalAs(UnmanagedType.LPStr)] string
                 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);

From 9a63f412ef8ca2f64c89819667b393d0f9afef84 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 14 Oct 2021 14:31:49 -0700
Subject: [PATCH 074/645] Update `README.md` and `metadata.json` for 7.0.8 and
 7.1.5 releases (#16144)

---
 README.md           | 56 ++++++++++++++++++++++-----------------------
 tools/metadata.json |  8 +++----
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index d0e918001a8..0297a87a015 100644
--- a/README.md
+++ b/README.md
@@ -64,34 +64,34 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 | 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.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.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
+[lts-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/PowerShell-7.0.8-win-x86.msi
+[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/PowerShell-7.0.8-win-x64.msi
+[lts-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts_7.0.8-1.ubuntu.18.04_amd64.deb
+[lts-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts_7.0.8-1.ubuntu.16.04_amd64.deb
+[lts-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts_7.0.8-1.debian.9_amd64.deb
+[lts-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts_7.0.8-1.debian.10_amd64.deb
+[lts-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts-7.0.8-1.rhel.7.x86_64.rpm
+[lts-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts-7.0.8-1.centos.8.x86_64.rpm
+[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts-7.0.8-osx-x64.pkg
+
+[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/PowerShell-7.1.5-win-x64.msi
+[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/PowerShell-7.1.5-win-x86.msi
+[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell_7.1.5-1.ubuntu.20.04_amd64.deb
+[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell_7.1.5-1.ubuntu.18.04_amd64.deb
+[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell_7.1.5-1.ubuntu.16.04_amd64.deb
+[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell_7.1.5-1.debian.9_amd64.deb
+[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell_7.1.5-1.debian.10_amd64.deb
+[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell_7.1.5-1.debian.11_amd64.deb
+[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-1.rhel.7.x86_64.rpm
+[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-1.centos.8.x86_64.rpm
+[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-osx-x64.pkg
+[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/PowerShell-7.1.5-win-arm64.zip
+[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/PowerShell-7.1.5-win-x86.zip
+[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/PowerShell-7.1.5-win-x64.zip
+[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-osx-x64.tar.gz
+[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-linux-x64.tar.gz
+[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-linux-arm32.tar.gz
+[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-linux-arm64.tar.gz
 [rl-snap]: https://snapcraft.io/powershell
 
 [pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.10/PowerShell-7.2.0-preview.10-win-x64.msi
diff --git a/tools/metadata.json b/tools/metadata.json
index 52b88af8a37..e09909679dd 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,9 +1,9 @@
 {
-  "StableReleaseTag": "v7.1.4",
+  "StableReleaseTag": "v7.1.5",
   "PreviewReleaseTag": "v7.2.0-preview.10",
-  "ServicingReleaseTag": "v7.0.7",
-  "ReleaseTag": "v7.1.4",
-  "LTSReleaseTag" : ["v7.0.7"],
+  "ServicingReleaseTag": "v7.0.8",
+  "ReleaseTag": "v7.1.5",
+  "LTSReleaseTag" : ["v7.0.8"],
   "NextReleaseTag": "v7.2.0-preview.11",
   "LTSRelease": false
 }

From b94dd91e740e68e8ddac30da53c1839eacbf52a1 Mon Sep 17 00:00:00 2001
From: Keith Hill <r_keith_hill@hotmail.com>
Date: Thu, 14 Oct 2021 15:47:54 -0600
Subject: [PATCH 075/645] Specify exe path as TargetObect for non-zero exit
 code ErrorRecord (#16108)

---
 .../engine/NativeCommandProcessor.cs                     | 2 +-
 .../engine/Basic/NativeCommandErrorHandling.Tests.ps1    | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index 2c5efb35668..ca38b337b8a 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -884,7 +884,7 @@ internal override void Complete()
                         errorMsg,
                         errorId);
 
-                    var errorRecord = new ErrorRecord(exception, errorId, ErrorCategory.NotSpecified, targetObject: NativeCommandName);
+                    var errorRecord = new ErrorRecord(exception, errorId, ErrorCategory.NotSpecified, targetObject: Path);
                     this.commandRuntime._WriteErrorSkipAllowCheck(errorRecord);
                 }
             }
diff --git a/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1 b/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1
index b8d6b20e126..055382bb5e1 100644
--- a/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1
+++ b/test/powershell/engine/Basic/NativeCommandErrorHandling.Tests.ps1
@@ -14,6 +14,7 @@ Describe 'Native command error handling tests' -Tags 'CI' {
         }
 
         $exeName = $IsWindows ? 'testexe.exe' : 'testexe'
+        $exePath = @(Get-Command $exeName -Type Application)[0].Path
 
         $errorActionPrefTestCases = @(
             @{ ErrorActionPref = 'Stop' }
@@ -43,7 +44,7 @@ Describe 'Native command error handling tests' -Tags 'CI' {
 
             $error.Count | Should -Be 1
             $error[0].FullyQualifiedErrorId | Should -BeExactly 'ProgramExitedWithNonZeroCode'
-            $error[0].TargetObject | Should -BeExactly $exeName
+            $error[0].TargetObject | Should -BeExactly $exePath
         }
 
         It 'Non-zero exit code outputs a non-teminating error for $ErrorActionPreference = ''Continue''' {
@@ -52,7 +53,7 @@ Describe 'Native command error handling tests' -Tags 'CI' {
             $stderr = testexe -returncode 1 2>&1
 
             $error[0].FullyQualifiedErrorId | Should -BeExactly 'ProgramExitedWithNonZeroCode'
-            $error[0].TargetObject | Should -BeExactly $exeName
+            $error[0].TargetObject | Should -BeExactly $exePath
             $stderr[1].Exception.Message | Should -BeExactly "Program `"$exeName`" ended with non-zero exit code: 1."
         }
 
@@ -65,7 +66,7 @@ Describe 'Native command error handling tests' -Tags 'CI' {
             $stderr = testexe -returncode 1 2>&1
 
             $error[0].FullyQualifiedErrorId | Should -BeExactly 'ProgramExitedWithNonZeroCode'
-            $error[0].TargetObject | Should -BeExactly $exeName
+            $error[0].TargetObject | Should -BeExactly $exePath
             $stderr[1].Exception.Message | Should -BeExactly "Program `"$exeName`" ended with non-zero exit code: 1."
         }
 
@@ -76,7 +77,7 @@ Describe 'Native command error handling tests' -Tags 'CI' {
 
             $error.Count | Should -Be 1
             $error[0].FullyQualifiedErrorId | Should -BeExactly 'ProgramExitedWithNonZeroCode'
-            $error[0].TargetObject | Should -BeExactly $exeName
+            $error[0].TargetObject | Should -BeExactly $exePath
         }
 
         It 'Non-zero exit code does not generates an error record for $ErrorActionPreference = ''Ignore''' {

From cd6eccb1ac5f137fd882b454fdadbbf42ffc1af2 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 14 Oct 2021 14:51:25 -0700
Subject: [PATCH 076/645] Update the change logs for v7.0.8 and v7.1.5 releases
 (#16248)

---
 .spelling        |  4 ++++
 CHANGELOG/7.0.md | 40 ++++++++++++++++++++++++++++++++++++++++
 CHANGELOG/7.1.md | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/.spelling b/.spelling
index c62416ad9e4..4b188971e76 100644
--- a/.spelling
+++ b/.spelling
@@ -1389,6 +1389,10 @@ release-BuildJson
 yml
 centos-7
 PSDesiredStateConfiguration
+NoLanguage
+createdump
+vPack
+PkgES
  - test/perf/benchmarks/README.md
 benchmarked
 BenchmarkDotNet
diff --git a/CHANGELOG/7.0.md b/CHANGELOG/7.0.md
index 9b7c0a9f45b..ddb2f558b0a 100644
--- a/CHANGELOG/7.0.md
+++ b/CHANGELOG/7.0.md
@@ -1,5 +1,45 @@
 # 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
diff --git a/CHANGELOG/7.1.md b/CHANGELOG/7.1.md
index 91d00b70a49..84872d552a0 100644
--- a/CHANGELOG/7.1.md
+++ b/CHANGELOG/7.1.md
@@ -1,5 +1,45 @@
 # 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

From 3893c4d55be2fc562e1d7c11653e2de5006c4257 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 14 Oct 2021 14:53:41 -0700
Subject: [PATCH 077/645] Disallow Add-Type in NoLanguage mode on a locked down
 machine (#16245)

---
 .../commands/utility/AddType.cs               |  7 ++--
 .../ConstrainedLanguageRestriction.Tests.ps1  | 35 +++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
index 48ee839e99a..5ce91a36a48 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
@@ -11,6 +11,7 @@
 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;
@@ -549,8 +550,10 @@ private string GetUsingSet(Language language)
         /// </summary>
         protected override void BeginProcessing()
         {
-            // Prevent code compilation in ConstrainedLanguage mode
-            if (SessionState.LanguageMode == PSLanguageMode.ConstrainedLanguage)
+            // 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))
             {
                 ThrowTerminatingError(
                     new ErrorRecord(
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageRestriction.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageRestriction.Tests.ps1
index 047fcf9582a..e9397f86ec9 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageRestriction.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageRestriction.Tests.ps1
@@ -672,6 +672,41 @@ try
         }
     }
 
+    Describe "Add-Type in no language mode on locked down system" -Tags 'Feature','RequireAdminOnWindows' {
+
+        It "Verifies Add-Type fails in no language mode when in system lock down" {
+
+            # Create No-Language session, that allows Add-Type cmdlet
+            $entry = [System.Management.Automation.Runspaces.SessionStateCmdletEntry]::new('Add-Type', [Microsoft.PowerShell.Commands.AddTypeCommand], $null)
+            $iss = [initialsessionstate]::CreateRestricted([System.Management.Automation.SessionCapabilities]::Language)
+            $iss.Commands.Add($entry)
+            $rs = [runspacefactory]::CreateRunspace($iss)
+            $rs.Open()
+
+            # Try to use Add-Type in No-Language session
+            $ps = [powershell]::Create($rs)
+            $ps.AddCommand('Add-Type').AddParameter('TypeDefinition', 'public class C1 { }')
+            $expectedError = $null
+            try
+            {
+                Invoke-LanguageModeTestingSupportCmdlet -SetLockdownMode
+                $ps.Invoke()
+            }
+            catch
+            {
+                $expectedError = $_
+            }
+            finally
+            {
+                Invoke-LanguageModeTestingSupportCmdlet -RevertLockdownMode -EnableFullLanguageMode
+                $rs.Dispose()
+                $ps.Dispose()
+            }
+
+            $expectedError.Exception.InnerException.ErrorRecord.FullyQualifiedErrorId | Should -BeExactly 'CannotDefineNewType,Microsoft.PowerShell.Commands.AddTypeCommand'
+        }
+    }
+
     Describe "Import-LocalizedData additional commands in constrained language" -Tags 'Feature','RequireAdminOnWindows' {
 
         It "Verifies Import-LocalizedData disallows Add-Type in constrained language" {

From d74c6bfb7bc2ff84ae15cceeba2fb7dc5c3ccd17 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 14 Oct 2021 15:12:37 -0700
Subject: [PATCH 078/645] Configure ApplicationInsights to not send cloud role
 name (#16246)

Configure ApplicationInsights to not send cloud role name

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
---
 src/System.Management.Automation/utils/Telemetry.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/System.Management.Automation/utils/Telemetry.cs b/src/System.Management.Automation/utils/Telemetry.cs
index 0ebdfc06e12..105feef73e1 100644
--- a/src/System.Management.Automation/utils/Telemetry.cs
+++ b/src/System.Management.Automation/utils/Telemetry.cs
@@ -10,6 +10,7 @@
 
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Extensibility;
+using Microsoft.ApplicationInsights.Extensibility.Implementation;
 
 namespace Microsoft.PowerShell.Telemetry
 {
@@ -118,6 +119,9 @@ static ApplicationInsightsTelemetry()
                 configuration.TelemetryChannel.DeveloperMode = false;
 
                 s_telemetryClient = new TelemetryClient(configuration);
+                // Be sure to obscure any information about the client node.
+                s_telemetryClient.Context.Cloud.RoleInstance = string.Empty;
+                s_telemetryClient.Context.GetInternalContext().NodeName = string.Empty;
                 s_sessionId = Guid.NewGuid().ToString();
 
                 // use a hashset when looking for module names, it should be quicker than a string comparison

From 3ecf4b3a1dba03a9c118420b81fc19e5cafde571 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 14 Oct 2021 17:24:10 -0700
Subject: [PATCH 079/645] Update to vPack task version to 12 (#16250)

---
 .../azureDevOps/templates/vpackReleaseJob.yml             | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
index 8cc31ab8df9..e6f07d55ce5 100644
--- a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+++ b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@@ -3,6 +3,9 @@ parameters:
 
 jobs:
 - job: vpack_${{ parameters.architecture }}
+  variables:
+    - group: vPack
+
   displayName: Build and Publish VPack - ${{ parameters.architecture }}
   condition: succeeded()
   pool: PowerShell1ES
@@ -71,10 +74,8 @@ jobs:
     displayName: Capture Environment
     condition: succeededOrFailed()
 
-  - task: PkgESVPack@10
+  - task: PkgESVPack@12
     displayName: 'Package ES - VPack '
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     inputs:
       sourceDirectory: '$(vpackDir)'
       description: PowerShell ${{ parameters.architecture }} $(version)
@@ -85,4 +86,5 @@ jobs:
       owner: tplunk
       provData: false
       version: '$(vpackVersion)'
+      vpackToken: $(vPackPat)
     condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'))

From a5f283537a7e11e708108843a2c7a9a445f9cefb Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Fri, 15 Oct 2021 10:46:36 -0700
Subject: [PATCH 080/645] Removed old not-used-anymore docker-based tests for
 PS release packages (#16224)

---
 docker/tests/README.md                        |  25 --
 docker/tests/Templates/centos7/Dockerfile     |  23 --
 docker/tests/Templates/debian.9/Dockerfile    |  29 --
 docker/tests/Templates/fedora28/Dockerfile    |  26 --
 .../Templates/fxdependent-centos7/Dockerfile  |  31 --
 .../Templates/fxdependent-debian.9/Dockerfile |  31 --
 .../fxdependent-dotnetsdk-latest/Dockerfile   |  31 --
 .../Templates/fxdependent-fedora28/Dockerfile |  38 --
 .../fxdependent-opensuse42.3/Dockerfile       |  41 --
 .../fxdependent-ubuntu16.04/Dockerfile        |  39 --
 .../fxdependent-ubuntu18.04/Dockerfile        |  31 --
 .../tests/Templates/opensuse42.3/Dockerfile   |  39 --
 docker/tests/Templates/ubuntu16.04/Dockerfile |  29 --
 docker/tests/Templates/ubuntu18.04/Dockerfile |  29 --
 docker/tests/containerTestCommon.psm1         | 370 ------------------
 15 files changed, 812 deletions(-)
 delete mode 100644 docker/tests/README.md
 delete mode 100644 docker/tests/Templates/centos7/Dockerfile
 delete mode 100644 docker/tests/Templates/debian.9/Dockerfile
 delete mode 100644 docker/tests/Templates/fedora28/Dockerfile
 delete mode 100644 docker/tests/Templates/fxdependent-centos7/Dockerfile
 delete mode 100644 docker/tests/Templates/fxdependent-debian.9/Dockerfile
 delete mode 100644 docker/tests/Templates/fxdependent-dotnetsdk-latest/Dockerfile
 delete mode 100644 docker/tests/Templates/fxdependent-fedora28/Dockerfile
 delete mode 100644 docker/tests/Templates/fxdependent-opensuse42.3/Dockerfile
 delete mode 100644 docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile
 delete mode 100644 docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile
 delete mode 100644 docker/tests/Templates/opensuse42.3/Dockerfile
 delete mode 100644 docker/tests/Templates/ubuntu16.04/Dockerfile
 delete mode 100644 docker/tests/Templates/ubuntu18.04/Dockerfile
 delete mode 100644 docker/tests/containerTestCommon.psm1

diff --git a/docker/tests/README.md b/docker/tests/README.md
deleted file mode 100644
index 716a7d6f62e..00000000000
--- a/docker/tests/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
-```
diff --git a/docker/tests/Templates/centos7/Dockerfile b/docker/tests/Templates/centos7/Dockerfile
deleted file mode 100644
index dddf2439445..00000000000
--- a/docker/tests/Templates/centos7/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-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"
diff --git a/docker/tests/Templates/debian.9/Dockerfile b/docker/tests/Templates/debian.9/Dockerfile
deleted file mode 100644
index f2de0f8d61f..00000000000
--- a/docker/tests/Templates/debian.9/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-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"
diff --git a/docker/tests/Templates/fedora28/Dockerfile b/docker/tests/Templates/fedora28/Dockerfile
deleted file mode 100644
index 9c9f958f54d..00000000000
--- a/docker/tests/Templates/fedora28/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-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"
diff --git a/docker/tests/Templates/fxdependent-centos7/Dockerfile b/docker/tests/Templates/fxdependent-centos7/Dockerfile
deleted file mode 100644
index 10cde0cd125..00000000000
--- a/docker/tests/Templates/fxdependent-centos7/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-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"
diff --git a/docker/tests/Templates/fxdependent-debian.9/Dockerfile b/docker/tests/Templates/fxdependent-debian.9/Dockerfile
deleted file mode 100644
index 2d7beff913b..00000000000
--- a/docker/tests/Templates/fxdependent-debian.9/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-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"
diff --git a/docker/tests/Templates/fxdependent-dotnetsdk-latest/Dockerfile b/docker/tests/Templates/fxdependent-dotnetsdk-latest/Dockerfile
deleted file mode 100644
index cf56e4ec074..00000000000
--- a/docker/tests/Templates/fxdependent-dotnetsdk-latest/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-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"
diff --git a/docker/tests/Templates/fxdependent-fedora28/Dockerfile b/docker/tests/Templates/fxdependent-fedora28/Dockerfile
deleted file mode 100644
index 6acb7452446..00000000000
--- a/docker/tests/Templates/fxdependent-fedora28/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-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"
diff --git a/docker/tests/Templates/fxdependent-opensuse42.3/Dockerfile b/docker/tests/Templates/fxdependent-opensuse42.3/Dockerfile
deleted file mode 100644
index 74b4bc98256..00000000000
--- a/docker/tests/Templates/fxdependent-opensuse42.3/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-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"
diff --git a/docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile b/docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile
deleted file mode 100644
index aa976ddb19e..00000000000
--- a/docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-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"
diff --git a/docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile b/docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile
deleted file mode 100644
index adc9219a07d..00000000000
--- a/docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-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"
diff --git a/docker/tests/Templates/opensuse42.3/Dockerfile b/docker/tests/Templates/opensuse42.3/Dockerfile
deleted file mode 100644
index d401e611382..00000000000
--- a/docker/tests/Templates/opensuse42.3/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-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"
diff --git a/docker/tests/Templates/ubuntu16.04/Dockerfile b/docker/tests/Templates/ubuntu16.04/Dockerfile
deleted file mode 100644
index 7439eda5a7d..00000000000
--- a/docker/tests/Templates/ubuntu16.04/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-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"
diff --git a/docker/tests/Templates/ubuntu18.04/Dockerfile b/docker/tests/Templates/ubuntu18.04/Dockerfile
deleted file mode 100644
index 6c7a960130d..00000000000
--- a/docker/tests/Templates/ubuntu18.04/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-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"
diff --git a/docker/tests/containerTestCommon.psm1 b/docker/tests/containerTestCommon.psm1
deleted file mode 100644
index c6b540abd77..00000000000
--- a/docker/tests/containerTestCommon.psm1
+++ /dev/null
@@ -1,370 +0,0 @@
-# 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
-}

From 52e82d0d7f385a99c7c1530478d857830da443fb Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 15 Oct 2021 11:29:19 -0700
Subject: [PATCH 081/645] Ensure `psoptions.json` and `manifest.spdx.json`
 files always exist in packages (#16258)

---
 tools/packaging/packaging.psm1 | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 71c5f4dcbe5..e20fb0d0147 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -225,6 +225,20 @@ function Start-PSPackage {
         # Copy the default.help.txt so it's part of the package
         Copy-Item "$RepoRoot/assets/default.help.txt" -Destination "$Source/en-US" -Force
 
+        # Make sure psoptions.json file exists so appropriate files.wsx is generated
+        $psOptionsPath = (Join-Path -Path $Source "psoptions.json")
+        if (-not (Test-Path -Path $psOptionsPath)) {
+            $createdOptionsFile = New-Item -Path $psOptionsPath -Force
+            Write-Verbose -Verbose "Created psoptions file: $createdOptionsFile"
+        }
+
+        # Make sure _manifest\spdx_2.2\manifest.spdx.json file exists so appropriate files.wxs is generated
+        $manifestSpdxPath = (Join-Path -Path $Source "_manifest\spdx_2.2\manifest.spdx.json")
+        if (-not (Test-Path -Path $manifestSpdxPath)) {
+            $createdSpdxPath = New-Item -Path $manifestSpdxPath -Force
+            Write-Verbose -Verbose "Created manifest.spdx.json file: $createdSpdxPath"
+        }
+
         # If building a symbols package, we add a zip of the parent to publish
         if ($IncludeSymbols.IsPresent)
         {

From 1be0c92486edc201d08026c19b7b322b1ccf8abf Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 15 Oct 2021 11:43:18 -0700
Subject: [PATCH 082/645] change order of try-catch-finally and split out arm
 runs (#16252)

---
 .../windows/templates/windows-packaging.yml   |  12 +-
 .vsts-ci/windows/windows-packaging.yml        |  10 ++
 tools/ci.psm1                                 | 127 +++++++-----------
 3 files changed, 67 insertions(+), 82 deletions(-)

diff --git a/.vsts-ci/windows/templates/windows-packaging.yml b/.vsts-ci/windows/templates/windows-packaging.yml
index efef35f240e..353d722bb92 100644
--- a/.vsts-ci/windows/templates/windows-packaging.yml
+++ b/.vsts-ci/windows/templates/windows-packaging.yml
@@ -3,6 +3,8 @@ parameters:
     default: 'Hosted VS2017'
   - name: jobName
     default: 'win_packaging'
+  - name: runtimePrefix
+    default: 'win7'
   - name: architecture
     default: 'x64'
   - name: channel
@@ -40,6 +42,12 @@ jobs:
     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: |
@@ -52,7 +60,7 @@ jobs:
   - pwsh: |
       Import-Module .\tools\ci.psm1
       New-CodeCoverageAndTestPackage
-      Invoke-CIFinish -Runtime win7-${{ parameters.architecture }} -channel ${{ parameters.channel }} -Stage Build
+      Invoke-CIFinish -Runtime ${{ parameters.runtimePrefix }}-${{ parameters.architecture }} -channel ${{ parameters.channel }} -Stage Build
     displayName: Build
     workingDirectory: $(repoPath)
 
@@ -65,6 +73,6 @@ jobs:
   - pwsh: |
       Import-Module .\tools\ci.psm1
       New-CodeCoverageAndTestPackage
-      Invoke-CIFinish -Runtime win7-${{ parameters.architecture }} -channel ${{ parameters.channel }} -Stage Package
+      Invoke-CIFinish -Runtime ${{ parameters.runtimePrefix }}-${{ parameters.architecture }} -channel ${{ parameters.channel }} -Stage Package
     displayName: Package and Test
     workingDirectory: $(repoPath)
diff --git a/.vsts-ci/windows/windows-packaging.yml b/.vsts-ci/windows/windows-packaging.yml
index 60bbaedf7b9..b8aa2c22950 100644
--- a/.vsts-ci/windows/windows-packaging.yml
+++ b/.vsts-ci/windows/windows-packaging.yml
@@ -93,3 +93,13 @@ 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
diff --git a/tools/ci.psm1 b/tools/ci.psm1
index 1adc4d3ebf2..ee181f16893 100644
--- a/tools/ci.psm1
+++ b/tools/ci.psm1
@@ -463,9 +463,8 @@ function Invoke-CIFinish
                 $previewPrefix = $previewVersion[0]
                 $previewLabel = $previewVersion[1].replace('.','')
 
-                if(Test-DailyBuild)
-                {
-                    $previewLabel= "daily{0}" -f $previewLabel
+                if (Test-DailyBuild) {
+                    $previewLabel = "daily{0}" -f $previewLabel
                 }
 
                 $prereleaseIteration = (get-date).Day
@@ -477,8 +476,7 @@ function Invoke-CIFinish
                 $filter = Join-Path -Path (Split-Path $options.Output) -ChildPath '*.pdb'
                 Write-Verbose "Removing symbol files from $filter" -Verbose
                 Remove-Item $filter -Force -Recurse
-            }
-            else {
+            } else {
                 $releaseTag = Get-ReleaseTag
                 $releaseTagParts = $releaseTag.split('.')
                 $preReleaseVersion = $releaseTagParts[0]+ ".9.9"
@@ -496,106 +494,81 @@ function Invoke-CIFinish
             $vstsCommandString = "vso[task.setvariable variable=CI_FINISH_RELASETAG]$preReleaseVersion"
             Write-Verbose -Message "$vstsCommandString" -Verbose
             Write-Host -Object "##$vstsCommandString"
-
-            $armBuildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/releaseArm32"
-
-            # produce win-arm and win-arm64 packages if it is a daily build
-            Start-PSBuild -Restore -Runtime win-arm -PSModuleRestore -Configuration 'Release' -ReleaseTag $releaseTag -output $armBuildFolder -PSOptionsPath "${armBuildFolder}-meta/psoptions.json" -Crossgen
-            $options = Get-PSOptions
-            # Remove symbol files.
-            $filter = Join-Path -Path (Split-Path $options.Output) -ChildPath '*.pdb'
-            Write-Verbose "Removing symbol files from $filter" -Verbose
-            Remove-Item $filter -Force -Recurse
-
-            $armBuildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/releaseArm64"
-            Start-PSBuild -Restore -Runtime win-arm64 -PSModuleRestore -Configuration 'Release' -ReleaseTag $releaseTag -output $armBuildFolder -PSOptionsPath "${armBuildFolder}-meta/psoptions.json" -Crossgen
-            $options = Get-PSOptions
-            # Remove symbol files.
-            $filter = Join-Path -Path (Split-Path $options.Output) -ChildPath '*.pdb'
-            Write-Verbose "Removing symbol files from $filter" -Verbose
-            Remove-Item $filter -Force -Recurse
         }
 
-
         if ($Stage -contains "Package") {
-            Restore-PSOptions -PSOptionsPath "${buildFolder}-meta/psoptions.json"
+            Restore-PSOptions -PSOptionsPath "${buildFolder}/psoptions.json"
             $preReleaseVersion = $env:CI_FINISH_RELASETAG
 
             # Build packages	            $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration"
-            $packages = Start-PSPackage -Type msi, nupkg, zip, zip-pdb -ReleaseTag $preReleaseVersion -SkipReleaseChecks -WindowsRuntime $Runtime
+            switch -regex ($Runtime){
+                default {
+                    $runPackageTest = $true
+                    $packageTypes = 'msi', 'nupkg', 'zip', 'zip-pdb', 'msix'
+                }
+                'win-arm.*' {
+                    $runPackageTest = $false
+                    $packageTypes = 'zip', 'zip-pdb', 'msix'
+                }
+            }
+            $packages = Start-PSPackage -Type $packageTypes -ReleaseTag $preReleaseVersion -SkipReleaseChecks -WindowsRuntime $Runtime
 
             foreach ($package in $packages) {
-                if (Test-Path $package -ErrorAction Ignore)
-                {
+                if (Test-Path $package -ErrorAction Ignore) {
                     Write-Log "Package found: $package"
-                }
-                else
-                {
+                } else {
                     Write-Warning -Message "Package NOT found: $package"
                 }
 
-                if($package -is [string])
-                {
+                if ($package -is [string]) {
                     $null = $artifacts.Add($package)
-                }
-                elseif($package -is [pscustomobject] -and $package.psobject.Properties['msi'])
-                {
+                } elseif ($package -is [pscustomobject] -and $package.psobject.Properties['msi']) {
                     $null = $artifacts.Add($package.msi)
                     $null = $artifacts.Add($package.wixpdb)
                 }
             }
 
-            # the packaging tests find the MSI package using env:PSMsiX64Path
-            $env:PSMsiX64Path = $artifacts | Where-Object { $_.EndsWith(".msi")}
-            $architechture = $Runtime.Split('-')[1]
-            $exePath = New-ExePackage -ProductVersion ($preReleaseVersion -replace '^v') -ProductTargetArchitecture $architechture -MsiLocationPath $env:PSMsiX64Path
-            Write-Verbose "exe Path: $exePath" -Verbose
-            $artifacts.Add($exePath)
-            $env:PSExePath = $exePath
-            $env:PSMsiChannel = $Channel
-            $env:PSMsiRuntime = $Runtime
+            if ($runPackageTest) {
+                # the packaging tests find the MSI package using env:PSMsiX64Path
+                $env:PSMsiX64Path = $artifacts | Where-Object { $_.EndsWith(".msi")}
+                $architechture = $Runtime.Split('-')[1]
+                $exePath = New-ExePackage -ProductVersion ($preReleaseVersion -replace '^v') -ProductTargetArchitecture $architechture -MsiLocationPath $env:PSMsiX64Path
+                Write-Verbose "exe Path: $exePath" -Verbose
+                $artifacts.Add($exePath)
+                $env:PSExePath = $exePath
+                $env:PSMsiChannel = $Channel
+                $env:PSMsiRuntime = $Runtime
 
-            # Install the latest Pester and import it
-            $maximumPesterVersion = '4.99'
-            Install-Module Pester -Force -SkipPublisherCheck -MaximumVersion $maximumPesterVersion
-            Import-Module Pester -Force -MaximumVersion $maximumPesterVersion
+                # Install the latest Pester and import it
+                $maximumPesterVersion = '4.99'
+                Install-Module Pester -Force -SkipPublisherCheck -MaximumVersion $maximumPesterVersion
+                Import-Module Pester -Force -MaximumVersion $maximumPesterVersion
 
-            $testResultPath = Join-Path -Path $env:TEMP -ChildPath "win-package-$channel-$runtime.xml"
+                $testResultPath = Join-Path -Path $env:TEMP -ChildPath "win-package-$channel-$runtime.xml"
 
-            # start the packaging tests and get the results
-            $packagingTestResult = Invoke-Pester -Script (Join-Path $repoRoot '.\test\packaging\windows\') -PassThru -OutputFormat NUnitXml -OutputFile $testResultPath
+                # start the packaging tests and get the results
+                $packagingTestResult = Invoke-Pester -Script (Join-Path $repoRoot '.\test\packaging\windows\') -PassThru -OutputFormat NUnitXml -OutputFile $testResultPath
 
-            Publish-TestResults -Title "win-package-$channel-$runtime" -Path $testResultPath
+                Publish-TestResults -Title "win-package-$channel-$runtime" -Path $testResultPath
 
-            # fail the CI job if the tests failed, or nothing passed
-            if(-not $packagingTestResult -is [pscustomobject] -or $packagingTestResult.FailedCount -ne 0 -or $packagingTestResult.PassedCount -eq 0)
-            {
-                throw "Packaging tests failed ($($packagingTestResult.FailedCount) failed/$($packagingTestResult.PassedCount) passed)"
+                # fail the CI job if the tests failed, or nothing passed
+                if (-not $packagingTestResult -is [pscustomobject] -or $packagingTestResult.FailedCount -ne 0 -or $packagingTestResult.PassedCount -eq 0) {
+                    throw "Packaging tests failed ($($packagingTestResult.FailedCount) failed/$($packagingTestResult.PassedCount) passed)"
+                }
             }
 
             # only publish assembly nuget packages if it is a daily build and tests passed
-            if(Test-DailyBuild)
-            {
+            if (Test-DailyBuild) {
                 $nugetArtifacts = Get-ChildItem $PSScriptRoot\packaging\nugetOutput -ErrorAction SilentlyContinue -Filter *.nupkg | Select-Object -ExpandProperty FullName
-                if($nugetArtifacts)
-                {
+                if ($nugetArtifacts) {
                     $artifacts.AddRange(@($nugetArtifacts))
                 }
             }
         }
-
-        # produce win-arm and win-arm64 packages if it is a daily build
-        $armBuildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/releaseArm32"
-        Restore-PSOptions -PSOptionsPath "${armBuildFolder}-meta/psoptions.json"
-        $arm32Package = Start-PSPackage -Type zip -WindowsRuntime win-arm -ReleaseTag $releaseTag -SkipReleaseChecks
-        $artifacts.Add($arm32Package)
-
-        $armBuildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/releaseArm64"
-        Restore-PSOptions -PSOptionsPath "${armBuildFolder}-meta/psoptions.json"
-        $arm64Package = Start-PSPackage -Type zip -WindowsRuntime win-arm64 -ReleaseTag $releaseTag -SkipReleaseChecks
-        $artifacts.Add($arm64Package)
-    }
-    finally {
+    } catch {
+        Get-Error -InputObject $_
+        throw
+    } finally {
         $pushedAllArtifacts = $true
 
         $artifacts | ForEach-Object {
@@ -612,12 +585,6 @@ function Invoke-CIFinish
             throw "Some artifacts did not exist!"
         }
     }
-    catch
-    {
-        Write-Host -Foreground Red $_
-        Write-Host -Foreground Red $_.ScriptStackTrace
-        throw $_
-    }
 }
 
 # Bootstrap script for Linux and macOS

From 45b80a555a8bb3433209a10365431f7d3ac4b86c Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 15 Oct 2021 13:51:26 -0700
Subject: [PATCH 083/645] Update .NET 6 to version 6.0.100-rc.2.21505.57
 (#16249)

---
 assets/wix/files.wxs                          | 68 +++++++++++++++++--
 global.json                                   |  2 +-
 nuget.config                                  |  1 -
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  6 +-
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           | 22 +++---
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 .../System.Management.Automation.csproj       | 18 ++---
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/WebListener.csproj     |  4 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  2 +-
 .../System.Management.Automation.csproj       |  2 +-
 13 files changed, 96 insertions(+), 37 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 555536fbbaf..8fcd2f987aa 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1987,6 +1987,9 @@
         <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>
       </Directory>
       <Directory Id="dirEA0127D6607E68B508B9DB9CE315A2CE" Name="de">
         <Component Id="cmpF2941A91B17EEA22CD6DAB34693D9AC0">
@@ -2046,6 +2049,9 @@
         <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>
       </Directory>
       <Directory Id="dir5B65D7353FBDCD17AB60A674B3FDF93B" Name="es">
         <Component Id="cmpBEB5F3CF75675537751F0D0B32125BF1">
@@ -2105,6 +2111,9 @@
         <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>
       </Directory>
       <Directory Id="dir23063512FA8C884E1B4F08FDF0A44516" Name="fr">
         <Component Id="cmp1DEB513A065956086898BCDACC5887B6">
@@ -2164,6 +2173,9 @@
         <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>
       </Directory>
       <Directory Id="dir42B03840AE19D1498CC524F2B6C0389D" Name="it">
         <Component Id="cmp3EC91B8BF4282E77113321E5D1ED27B2">
@@ -2223,6 +2235,9 @@
         <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>
       </Directory>
       <Directory Id="dir086D21BE309BE4C7081FC60E3524890F" Name="ja">
         <Component Id="cmp867E4E51FE7BC09AAD5D59FD76716FBC">
@@ -2282,6 +2297,9 @@
         <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>
       </Directory>
       <Directory Id="dir43D6CAD5F3ED1060009918D06D84FB18" Name="ko">
         <Component Id="cmpAA026CCA623F0E8FB5BAE9F201C5B89D">
@@ -2341,6 +2359,9 @@
         <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>
       </Directory>
       <Directory Id="dirE8201C74A7184D11233BAD63C6DB37BD" Name="pl">
         <Component Id="cmpA656A18FE14D3C8EB02C31AE474054E3">
@@ -2400,6 +2421,9 @@
         <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>
       </Directory>
       <Directory Id="dir47ED939BFA870848E0764E862CD6B4D7" Name="pt-BR">
         <Component Id="cmp3D20E940BDBF41630242C63011A80CE5">
@@ -2459,6 +2483,9 @@
         <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>
       </Directory>
       <Directory Id="dir37B8DFAE26D5F8E9948851F7D19F9E20" Name="ru">
         <Component Id="cmpFDCD51BD80926ABECCE27D0D66A47C8F">
@@ -2518,6 +2545,9 @@
         <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>
       </Directory>
       <Directory Id="dirA7E9CC01273A7FED89FC8D3A368E00CC" Name="tr">
         <Component Id="cmp286FCD0B19BF06446A7274672A2491CA">
@@ -2577,6 +2607,9 @@
         <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>
       </Directory>
       <Directory Id="dir47E993970F74AA9F393D23500827D12C" Name="zh-Hans">
         <Component Id="cmp34C4A21743AC68583599BF2B139F39F2">
@@ -2636,6 +2669,9 @@
         <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>
       </Directory>
       <Directory Id="dirB1FFB91EED6FD71EA866548CEA3A5298" Name="zh-Hant">
         <Component Id="cmpBC28FE8B65954B00AECA9C534639596D">
@@ -2695,6 +2731,9 @@
         <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>
       </Directory>
       <Directory Name="Schemas" Id="dir1DB5B24CC3494785974A51F28F128069">
         <Directory Name="PSMaml" Id="dirAC38B2C7629B42DC836E01F976A10EC9">
@@ -3054,9 +3093,6 @@
       <Component Id="cmp957498053E01454DA1E21E6D7317DCD6">
         <File Id="fil2AA6F0D8A51D4BB89F33F2B73AB12391" KeyPath="yes" Source="$(var.ProductSourcePath)\msquic.dll" />
       </Component>
-      <Component Id="cmp2EB55EB6B44F4CF186F0BAFD6B33BCD6">
-        <File Id="filC629C6EFCF314F9BB78C56E0876C08EB" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.45113.dll" />
-      </Component>
       <Directory Name="_manifest" Id="dir81094D6B916B4BC8B1BA0E1DADB93A02">
         <Directory Name="spdx_2.2" Id="dirA36413FB3A534FDF8657D62728080E9F">
           <Component Id="cmp408A3AF905EB47ADA35FBC5A6B1465A0">
@@ -3067,6 +3103,15 @@
       <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="cmpDAFCD776C56B4CF78A4534704588E38B">
+        <File Id="fil0734B55E8FC6480B97679A249A892D54" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.48005.dll" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -4051,9 +4096,24 @@
       <ComponentRef Id="cmp708913639F7A46E784CC0FA862A1A2CE" />
       <ComponentRef Id="cmpA75DEF5617C54DA1937CB37D5824BF79" />
       <ComponentRef Id="cmp957498053E01454DA1E21E6D7317DCD6" />
-      <ComponentRef Id="cmp2EB55EB6B44F4CF186F0BAFD6B33BCD6" />
       <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="cmpDAFCD776C56B4CF78A4534704588E38B" />
+      <ComponentRef Id="cmp529A2B5343FD466884FAF627E37C648D" />
+      <ComponentRef Id="cmp4EE1633EE4864CE5B9015BF76BD31D14" />
+      <ComponentRef Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 5f03d7d7c48..3ebca84bcfe 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.100-rc.1.21458.32"
+    "version": "6.0.100-rc.2.21505.57"
   }
 }
diff --git a/nuget.config b/nuget.config
index ba38f1bad11..7700d4e098e 100644
--- a/nuget.config
+++ b/nuget.config
@@ -4,7 +4,6 @@
     <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 />
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 05b7b4e7472..fbf6e014569 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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-rc.1.21451.13" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index ca77b060e53..15ce98d57a8 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <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="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-5.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.2.21480.5" />
     <PackageReference Include="NJsonSchema" Version="10.5.2" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index e30019fac81..238d772473e 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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-rc.1.21451.13" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 4b8485ac58b..3cb21e8d889 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/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.2" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <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" />
+    <PackageReference Include="System.IO.Packaging" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rc.2.21480.5" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
-    <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" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0-rc2.21473.1" />
+    <PackageReference Include="System.ServiceModel.Http" Version="4.9.0-rc2.21473.1" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.9.0-rc2.21473.1" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1" />
+    <PackageReference Include="System.ServiceModel.Security" Version="4.9.0-rc2.21473.1" />
+    <PackageReference Include="System.Private.ServiceModel" Version="4.9.0-rc2.21473.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-rc.1.21451.13" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 56c0310e2a0..232a1ec3149 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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-rc.1.21451.13" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 2ebdabb9593..b2c6ef01e03 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <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-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="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.DirectoryServices" Version="6.0.0-rc.2.21480.5" />
     <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" />
+    <PackageReference Include="System.Management" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Security.Permissions" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.2.21480.5" />
     <!-- 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-preview.2" />
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index d0d4649878f..8ad3769503e 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21451.13" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index f59d5bc8d12..ca6c52c5629 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.1.21452.15" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21451.13" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.2.21480.10" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 189fab2c02e..4278aa7c229 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.5.21301.5" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
     <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0-preview.2" />
   </ItemGroup>
 </Project>
diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
index 406fea6d78b..036022f1c65 100644
--- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.5.21301.5" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
     <PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.5.21301.5" />
   </ItemGroup>
 </Project>

From 061a6440195ae60a1f5ab5aea1a500cf49d224aa Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 15 Oct 2021 16:42:23 -0700
Subject: [PATCH 084/645] Add condition to generate release files in local dev
 build only (#16259)

---
 tools/packaging/packaging.psm1 | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index e20fb0d0147..6ca0ef2fa35 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -225,18 +225,20 @@ function Start-PSPackage {
         # Copy the default.help.txt so it's part of the package
         Copy-Item "$RepoRoot/assets/default.help.txt" -Destination "$Source/en-US" -Force
 
-        # Make sure psoptions.json file exists so appropriate files.wsx is generated
-        $psOptionsPath = (Join-Path -Path $Source "psoptions.json")
-        if (-not (Test-Path -Path $psOptionsPath)) {
-            $createdOptionsFile = New-Item -Path $psOptionsPath -Force
-            Write-Verbose -Verbose "Created psoptions file: $createdOptionsFile"
-        }
+        if (-not $SkipGenerateReleaseFiles -and -not $env:TF_BUILD) {
+            # Make sure psoptions.json file exists so appropriate files.wsx is generated
+            $psOptionsPath = (Join-Path -Path $Source "psoptions.json")
+            if (-not (Test-Path -Path $psOptionsPath)) {
+                $createdOptionsFile = New-Item -Path $psOptionsPath -Force
+                Write-Verbose -Verbose "Created psoptions file: $createdOptionsFile"
+            }
 
-        # Make sure _manifest\spdx_2.2\manifest.spdx.json file exists so appropriate files.wxs is generated
-        $manifestSpdxPath = (Join-Path -Path $Source "_manifest\spdx_2.2\manifest.spdx.json")
-        if (-not (Test-Path -Path $manifestSpdxPath)) {
-            $createdSpdxPath = New-Item -Path $manifestSpdxPath -Force
-            Write-Verbose -Verbose "Created manifest.spdx.json file: $createdSpdxPath"
+            # Make sure _manifest\spdx_2.2\manifest.spdx.json file exists so appropriate files.wxs is generated
+            $manifestSpdxPath = (Join-Path -Path $Source "_manifest\spdx_2.2\manifest.spdx.json")
+            if (-not (Test-Path -Path $manifestSpdxPath)) {
+                $createdSpdxPath = New-Item -Path $manifestSpdxPath -Force
+                Write-Verbose -Verbose "Created manifest.spdx.json file: $createdSpdxPath"
+            }
         }
 
         # If building a symbols package, we add a zip of the parent to publish

From 240b3261b8b1da68e65dd4290e35e1470297f3e4 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 18 Oct 2021 13:07:20 -0700
Subject: [PATCH 085/645] Don't upload dep or tar.gz for RPM because there are
 none. (#16230)

---
 .../azureDevOps/templates/linux.yml             | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index 19248b18910..30d3ee49129 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -234,14 +234,15 @@ jobs:
           displayName: Sign RPM
 
   # requires windows
-  - task: AzureFileCopy@4
-    displayName: 'Upload to Azure - DEB and tar.gz'
-    inputs:
-      SourcePath: '$(System.ArtifactsDirectory)\finished\release\*'
-      azureSubscription: '$(AzureFileCopySubscription)'
-      Destination: AzureBlob
-      storage: '$(StorageAccount)'
-      ContainerName: '$(AzureVersion)'
+  - ${{ if ne(variables['buildName'], 'RPM') }}:
+    - task: AzureFileCopy@4
+      displayName: 'Upload to Azure - DEB and tar.gz'
+      inputs:
+        SourcePath: '$(System.ArtifactsDirectory)\finished\release\*'
+        azureSubscription: '$(AzureFileCopySubscription)'
+        Destination: AzureBlob
+        storage: '$(StorageAccount)'
+        ContainerName: '$(AzureVersion)'
 
   - template: upload-final-results.yml
     parameters:

From b413d63d146df119979356977a82cac6e2ff844c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 18 Oct 2021 13:07:41 -0700
Subject: [PATCH 086/645] Make RPM license recognized (#16189)

---
 tools/packaging/packaging.psm1 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 6ca0ef2fa35..777f70b163d 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -1242,7 +1242,6 @@ function Get-FpmArguments
         "--maintainer", "PowerShell Team <PowerShellTeam@hotmail.com>",
         "--vendor", "Microsoft Corporation",
         "--url", "https://microsoft.com/powershell",
-        "--license", "MIT License",
         "--description", $Description,
         "--category", "shells",
         "-t", $Type,
@@ -1251,6 +1250,10 @@ function Get-FpmArguments
     if ($Environment.IsRedHatFamily) {
         $Arguments += @("--rpm-dist", $Distribution)
         $Arguments += @("--rpm-os", "linux")
+        $Arguments += @("--rpm-os", "linux")
+        $Arguments += @("--license", "MIT")
+    } else {
+        $Arguments += @("--license", "MIT License")
     }
 
     if ($Environment.IsMacOS) {

From 0a80da013cf69b832ffece0867caa3eede28def1 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 18 Oct 2021 13:10:59 -0700
Subject: [PATCH 087/645] Only upload stable `buildinfo` for stable releases
 (#16251)

---
 tools/metadata.json                           |  3 ++-
 .../templates/release-BuildJson.yml           | 26 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/tools/metadata.json b/tools/metadata.json
index e09909679dd..e05b19878cb 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -5,5 +5,6 @@
   "ReleaseTag": "v7.1.5",
   "LTSReleaseTag" : ["v7.0.8"],
   "NextReleaseTag": "v7.2.0-preview.11",
-  "LTSRelease": false
+  "LTSRelease": false,
+  "StableRelease": false
 }
diff --git a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml b/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
index 643e7a0b604..5d51601625d 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
@@ -17,12 +17,20 @@ steps:
     $dateTime = [datetime]::UtcNow
     $dateTime = [datetime]::new($dateTime.Ticks - ($dateTime.Ticks % [timespan]::TicksPerSecond), $dateTime.Kind)
 
+    $metadata = Get-Content ./tools/metadata.json | ConvertFrom-Json
+    $stableRelease = $metadata.StableRelease
+    $ltsRelease = $metadata.LTSRelease
+
     $buildInfo = Get-Content $jsonFile | ConvertFrom-Json
     $buildInfo.ReleaseDate = $dateTime
 
     $targetFile = "$ENV:PIPELINE_WORKSPACE/$fileName"
     ConvertTo-Json -InputObject $buildInfo | Out-File $targetFile -Encoding ascii
 
+    if ($stableRelease) {
+      $vstsCommandCopyLTSBuildInfo = "vso[task.setvariable variable=CopyStableBuildInfo]YES"
+    }
+
     $vstsCommandString = "vso[task.setvariable variable=BuildInfoJsonFile]$targetFile"
     Write-Host "sending " + $vstsCommandString
     Write-Host "##$vstsCommandString"
@@ -32,19 +40,12 @@ steps:
 
     $vstsCommandCopyLTSBuildInfo = "vso[task.setvariable variable=CopyLTSBuildInfo]NO"
 
-    if ($fileName -eq "stable.json")
+    if ($fileName -eq "stable.json" -and $ltsRelease)
     {
-        $releaseTag = $buildInfo.ReleaseTag
-        $version = $releaseTag -replace '^v'
-        $semVersion = [System.Management.Automation.SemanticVersion] $version
-
-        if ($semVersion.PreReleaseLabel -eq $null -and $semVersion.Minor % 2 -eq 0 -and $semVersion.Major -ge 7)
-        {
-            $ltsFile = "$ENV:PIPELINE_WORKSPACE/lts.json"
-            Copy-Item -Path $targetFile -Destination $ltsFile -Force
-            $vstsCommandLtsJsonFile = "vso[task.setvariable variable=LtsBuildInfoJsonFile]$ltsFile"
-            $vstsCommandCopyLTSBuildInfo = "vso[task.setvariable variable=CopyLTSBuildInfo]YES"
-        }
+      $ltsFile = "$ENV:PIPELINE_WORKSPACE/lts.json"
+      Copy-Item -Path $targetFile -Destination $ltsFile -Force
+      $vstsCommandLtsJsonFile = "vso[task.setvariable variable=LtsBuildInfoJsonFile]$ltsFile"
+      $vstsCommandCopyLTSBuildInfo = "vso[task.setvariable variable=CopyLTSBuildInfo]YES"
     }
 
     Write-Host "sending " + $vstsCommandCopyLTSBuildInfo
@@ -65,6 +66,7 @@ steps:
     Destination: AzureBlob
     storage: '$(StorageAccount)'
     ContainerName: BuildInfo
+  condition: and(succeeded(), eq(variables['CopyStableBuildInfo'], 'YES'))
 
 - task: AzureFileCopy@2
   displayName: 'AzureBlob build info ''lts.json'' Copy when needed'

From b4c5c29dff70f4cf06e60aa0f343a47123f34b37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Oct 2021 15:16:49 -0700
Subject: [PATCH 088/645] Bump Microsoft.CodeAnalysis.NetAnalyzers from
 6.0.0-rtm.21504.2 to 6.0.0-rtm.21516.1 (#16264)

---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index 4ea5f3e0618..a19c935748b 100644
--- a/Analyzers.props
+++ b/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-rtm.21504.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rtm.21516.1" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From 89dd5b8127d40b455437f76c36d8cd8f312e3f9d Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 19 Oct 2021 01:45:36 -0700
Subject: [PATCH 089/645] Remove the outdated test (#16269)

---
 .../Enable-RunspaceDebug.Tests.ps1            | 77 -------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 test/powershell/Modules/Microsoft.PowerShell.Utility/Enable-RunspaceDebug.Tests.ps1

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Enable-RunspaceDebug.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Enable-RunspaceDebug.Tests.ps1
deleted file mode 100644
index 79a1cbdd510..00000000000
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Enable-RunspaceDebug.Tests.ps1
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-$FeatureEnabled = $EnabledExperimentalFeatures.Contains('Microsoft.PowerShell.Utility.PSDebugRunspaceWithBreakpoints')
-
-Describe "`Enable-RunspaceDebug -Breakpoint` Unit Tests - Feature-Enabled" -Tags "CI" {
-
-    BeforeAll {
-        if (!$FeatureEnabled) {
-            Write-Verbose "Test Suite Skipped. The test suite requires the experimental feature 'Microsoft.PowerShell.Utility.PSDebugRunspaceWithBreakpoints' to be enabled." -Verbose
-            $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-            $PSDefaultParameterValues["it:skip"] = $true
-            return
-        }
-
-        #Set up script file 1
-        $scriptFileName1 = Join-Path $TestDrive -ChildPath breakpointTestScript.ps1
-
-        $contents = @"
-function Hello
-{
-    `$greeting = 'Hello, world!'
-    write-host `$greeting
-}
-
-function Goodbye
-{
-    `$message = 'Good bye, cruel world!'
-    write-host `$message
-}
-
-Hello
-Goodbye
-"@
-
-        $contents > $scriptFileName1
-
-        # The breakpoints are created here because when the tests are run with the experimental feature off,
-        # this command does not exist and the Pester tests fail to work
-        $breakpointArr = @(
-            New-PSBreakpoint -Line 12 $scriptFileName1
-            New-PSBreakpoint -Line 13 $scriptFileName1
-        )
-
-        $iss = [initialsessionstate]::CreateDefault2();
-        $testRunspace1 = [runspacefactory]::CreateRunspace($iss)
-        $testRunspace1.Name = "TestRunspaceDebuggerReset"
-        $testRunspace1.Open()
-    }
-
-    AfterAll {
-        if (!$FeatureEnabled) {
-            $global:PSDefaultParameterValues = $originalDefaultParameterValues
-            return
-        }
-
-        # Clean up
-        $testRunspace1.Dispose()
-    }
-
-    It "Can set breakpoints in the runspace - <Name>" -TestCases @(
-        @{
-            Name = "Current runspace"
-            Runspace = [System.Management.Automation.Runspaces.Runspace]::DefaultRunspace
-            Breakpoints = $breakpointArr
-        },
-        @{
-            Name = $testRunspace1.Name
-            Runspace = $testRunspace1
-            Breakpoints = $breakpointArr
-        }
-    ) {
-        param($Runspace, $Breakpoints)
-        Enable-RunspaceDebug -Breakpoint $Breakpoints -Runspace $Runspace
-        $Runspace.Debugger.GetBreakpoints() | Should -Be @($Breakpoints)
-    }
-}

From a82630a17a9946ff8b6c820fd621d1aeb1260528 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 19 Oct 2021 11:17:46 -0700
Subject: [PATCH 090/645] Add `cgmanifest.json` for generating correct third
 party notice file (#16266)

---
 cgmanifest.json | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 cgmanifest.json

diff --git a/cgmanifest.json b/cgmanifest.json
new file mode 100644
index 00000000000..71929b2f91a
--- /dev/null
+++ b/cgmanifest.json
@@ -0,0 +1,84 @@
+{
+  "Registrations": [
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Management.Infrastructure.Runtime.Unix",
+          "Version": "2.0.0"
+        }
+      },
+      "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Management.Infrastructure",
+          "Version": "2.0.0"
+        }
+      },
+      "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "ThreadJob",
+          "Version": "2.0.3"
+        }
+      },
+      "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.PowerShell.Archive",
+          "Version": "1.2.5"
+        }
+      },
+      "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "PackageManagement",
+          "Version": "1.4.7"
+        }
+      },
+      "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "PowerShellGet",
+          "Version": "2.2.5"
+        }
+      },
+      "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "PSReadLine",
+          "Version": "2.1.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.CodeAnalysis.CSharp",
+          "Version": "4.0.0-5.final"
+        }
+      },
+      "DevelopmentDependency": true
+    }
+  ]
+}

From 5d447cb773a26d2cc092dbfaa1f0c1a74247c8b1 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 19 Oct 2021 11:18:37 -0700
Subject: [PATCH 091/645] Disallow all COM for AppLocker system lock down
 (#16268)

Co-authored-by: Paul Higinbotham <paulhi@microsoft.com>
---
 .../security/wldpNativeMethods.cs                         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/System.Management.Automation/security/wldpNativeMethods.cs b/src/System.Management.Automation/security/wldpNativeMethods.cs
index f8a78f12a9a..02cbf8f1815 100644
--- a/src/System.Management.Automation/security/wldpNativeMethods.cs
+++ b/src/System.Management.Automation/security/wldpNativeMethods.cs
@@ -391,6 +391,14 @@ private static SystemEnforcementMode GetDebugLockdownPolicy(string path)
         /// <returns>True if the COM object is allowed, False otherwise.</returns>
         internal static bool IsClassInApprovedList(Guid clsid)
         {
+            // This method is called only if there is an AppLocker and/or WLDP system wide lock down enforcement policy.
+            if (s_cachedWldpSystemPolicy.GetValueOrDefault(SystemEnforcementMode.None) != SystemEnforcementMode.Enforce)
+            {
+                // No WLDP policy implies only AppLocker policy enforcement. Disallow all COM object instantiation.
+                return false;
+            }
+
+            // WLDP policy must be in system wide enforcement, look up COM Id in WLDP approval list.
             try
             {
                 WLDP_HOST_INFORMATION hostInformation = new WLDP_HOST_INFORMATION();

From b08ab5afeac9770bb2cf30517373573223b4a874 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 19 Oct 2021 17:27:44 -0700
Subject: [PATCH 092/645] Add script to generate `cgmanifest.json` (#16278)

---
 ThirdPartyNotices.txt             | 1653 ++++++++++++-----------------
 assets/additionalAttributions.txt |  187 +++-
 cgmanifest.json                   |  578 +++++++++-
 tools/findMissingNotices.ps1      |  136 +++
 4 files changed, 1498 insertions(+), 1056 deletions(-)
 create mode 100644 tools/findMissingNotices.ps1

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 06747f655ca..b0b633a8f79 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -15,128 +15,23 @@ USA
 Notwithstanding any other terms, you may reverse engineer this software to the extent
 required to debug changes to any libraries licensed under the GNU Lesser General Public License.
 
+---------------------------------------------------------
 
--------------------------------------------------------------------
-
-Microsoft.CodeAnalysis.Common 3.3.1 - Apache-2.0
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      
-
-      "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-      
-
-      "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-      
-
-      "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-      
-
-      "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-      
-
-      "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-      
-
-      "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-      
-
-      "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-      
-
-      "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-      
-
-      "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-      
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-      (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-
-you may not use this file except in compliance with the License.
-
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-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.
-
--------------------------------------------------------------------
+Microsoft.Extensions.ObjectPool 5.0.9 - Apache-2.0
 
--------------------------------------------------------------------
 
-Microsoft.CodeAnalysis.CSharp 3.3.1 - Apache-2.0
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
+Copyright (c) Andrew Arnott
+Copyright (c) 2019 David Fowler
+Copyright (c) 2016 Richard Morris
+Copyright (c) 2017 Yoshifumi Kawai
 Copyright (c) Microsoft Corporation.
-9Copyright (c) Microsoft Corporation.
-ACopyright (c) Microsoft Corporation.
-BCopyright (c) Microsoft Corporation.
-CCopyright (c) Microsoft Corporation.
-DCopyright (c) Microsoft Corporation.
-OCopyright (c) Microsoft Corporation.
-Copyright (c) Microsoft Corporation. Alle Rechte
+Copyright (c) 2014-2018 Michael Daines
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2010-2019 Google LLC. http://angular.io/license
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 Apache License
 
@@ -236,11 +131,13 @@ See the License for the specific language governing permissions and
 
 limitations under the License.
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Markdig.Signed 0.22.0 - BSD-2-Clause
 
--------------------------------------------------------------------
 
-Markdig.Signed 0.17.1 - BSD-2-Clause
 (c) 2008 VeriSign, Inc.
 
 Copyright (c) <year> <owner> . All rights reserved.
@@ -253,11 +150,13 @@ Redistribution and use in source and binary forms, with or without modification,
 
 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 HOLDER 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.
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Microsoft.ApplicationInsights 2.18.0 - MIT
 
--------------------------------------------------------------------
 
-Microsoft.ApplicationInsights 2.11.0 - MIT
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 
@@ -271,32 +170,50 @@ 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.
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Microsoft.Bcl.AsyncInterfaces 5.0.0 - MIT
 
--------------------------------------------------------------------
 
-Microsoft.NETCore.Platforms 3.0.0 - MIT
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
 (c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 2012-2014, Yann Collet
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -323,14 +240,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Microsoft.PowerShell.MarkdownRender 7.2.0-preview.2 - MIT
 
--------------------------------------------------------------------
 
-Microsoft.PowerShell.Native 7.0.0-preview.2 - MIT
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
-Copyright (c) by P.J. Plauger
+(c) Microsoft Corporation. PowerShell's Markdown Rendering project 7.2.0-preview.2
 
 MIT License
 
@@ -342,84 +261,34 @@ 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.
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Microsoft.PowerShell.Native 7.2.0-preview.2 - MIT
 
--------------------------------------------------------------------
 
-Microsoft.Win32.Registry 4.6.0 - MIT
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright (c) by P.J. Plauger
 
-The MIT License (MIT)
+MIT License
 
-Copyright (c) .NET Foundation and Contributors
+Copyright (c) <year> <copyright holders>
 
-All rights reserved.
+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:
 
-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 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.
 
-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.
+---------------------------------------------------------
 
+---------------------------------------------------------
 
--------------------------------------------------------------------
+Microsoft.Win32.Registry.AccessControl 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-Microsoft.Win32.Registry.AccessControl 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -446,32 +315,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Microsoft.Win32.SystemEvents 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-Microsoft.Win32.SystemEvents 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -498,32 +348,51 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Microsoft.Windows.Compatibility 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-Microsoft.Windows.Compatibility 3.0.0 - MIT
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
 (c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 2012-2014, Yann Collet
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -550,11 +419,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Namotion.Reflection 2.0.3 - MIT
 
--------------------------------------------------------------------
 
-Namotion.Reflection 1.0.7 - MIT
 (c) 2008 VeriSign, Inc.
 
 MIT License
@@ -567,11 +438,13 @@ 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.
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Newtonsoft.Json 13.0.1 - MIT
 
--------------------------------------------------------------------
 
-Newtonsoft.Json 12.0.2 - MIT
 (c) 2008 VeriSign, Inc.
 Copyright James Newton-King 2008
 Copyright (c) 2007 James Newton-King
@@ -599,15 +472,16 @@ 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.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+NJsonSchema 10.5.2 - MIT
 
--------------------------------------------------------------------
 
-NJsonSchema 10.0.27 - MIT
+Copyright Rico Suter
 (c) 2008 VeriSign, Inc.
-Copyright Rico Suter, 2018
-Copyright (c) Rico Suter, 2018
-Copyright Rico Suter, 2018 4JSON Schema
+Copyright (c) Rico Suter
 
 MIT License
 
@@ -619,32 +493,51 @@ 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.
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+runtime.linux-arm.runtime.native.System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-runtime.linux-arm.runtime.native.System.IO.Ports 4.6.0-rc2.19462.14 - MIT
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
 (c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 2012-2014, Yann Collet
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -671,32 +564,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+runtime.linux-arm64.runtime.native.System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-runtime.linux-arm64.runtime.native.System.IO.Ports 4.6.0-rc2.19462.14 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -723,32 +597,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+runtime.linux-x64.runtime.native.System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-runtime.linux-x64.runtime.native.System.IO.Ports 4.6.0-rc2.19462.14 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -775,11 +630,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+runtime.native.System.Data.SqlClient.sni 4.7.0 - MIT
 
--------------------------------------------------------------------
 
-runtime.native.System.Data.SqlClient.sni 4.6.0 - MIT
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation.
@@ -827,32 +684,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+runtime.native.System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-runtime.native.System.IO.Ports 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -879,32 +717,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+runtime.osx-x64.runtime.native.System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-runtime.osx-x64.runtime.native.System.IO.Ports 4.6.0-rc2.19462.14 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -931,32 +750,51 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.CodeDom 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.CodeDom 4.6.0 - MIT
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
 (c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 2012-2014, Yann Collet
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -983,26 +821,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.ComponentModel.Composition 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Collections.Immutable 1.5.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 1991-2017 Unicode, Inc.
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1029,32 +854,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.ComponentModel.Composition.Registration 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.ComponentModel.Composition 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1081,32 +887,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Configuration.ConfigurationManager 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.ComponentModel.Composition.Registration 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1133,32 +920,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Data.Odbc 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Configuration.ConfigurationManager 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1185,11 +953,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Data.OleDb 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Data.DataSetExtensions 4.5.0 - MIT
 
 The MIT License (MIT)
 
@@ -1216,11 +986,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
 
--------------------------------------------------------------------
+---------------------------------------------------------
 
-System.Data.Odbc 4.6.0 - MIT
+System.Data.SqlClient 4.8.3 - MIT
+
+
+2008 SQL Server 2012
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation.
@@ -1268,32 +1041,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Diagnostics.EventLog 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Data.OleDb 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1320,33 +1074,51 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Diagnostics.PerformanceCounter 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Data.SqlClient 4.7.0 - MIT
-2008 SQL Server 2012
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
 (c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 2012-2014, Yann Collet
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1373,32 +1145,51 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.DirectoryServices 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Diagnostics.EventLog 4.6.0 - MIT
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
 (c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 2012-2014, Yann Collet
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1425,32 +1216,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.DirectoryServices.AccountManagement 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Diagnostics.PerformanceCounter 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1477,32 +1249,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.DirectoryServices.Protocols 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.DirectoryServices 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1529,32 +1282,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Drawing.Common 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.DirectoryServices.AccountManagement 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1581,32 +1315,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Formats.Asn1 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.DirectoryServices.Protocols 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1633,32 +1348,51 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.IO.FileSystem.AccessControl 6.0.0-preview.5.21301.5 - MIT
 
--------------------------------------------------------------------
 
-System.Drawing.Common 4.6.0 - MIT
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
 (c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 2012-2014, Yann Collet
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2002 Sun Microsystems, Inc.
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1685,32 +1419,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.IO.Packaging 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.IO.FileSystem.AccessControl 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1737,32 +1452,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.IO.Packaging 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1789,26 +1485,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Management 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.IO.Pipes.AccessControl 4.5.1 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 1991-2017 Unicode, Inc.
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1835,32 +1518,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Net.Http.WinHttpHandler 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.IO.Ports 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1887,32 +1551,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Private.ServiceModel 4.9.0-rc2.21473.1 - MIT
 
--------------------------------------------------------------------
 
-System.Management 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1939,25 +1584,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Reflection.Context 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Memory 4.5.3 - MIT
-(c) 2008 VeriSign, Inc.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 1991-2017 Unicode, Inc.
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1984,32 +1617,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Runtime.Caching 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Net.Http.WinHttpHandler 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -2036,15 +1650,51 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
 
--------------------------------------------------------------------
+---------------------------------------------------------
 
-System.Private.ServiceModel 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
+System.Runtime.CompilerServices.Unsafe 6.0.0-rc.2.21480.5 - MIT
+
+
+(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -2071,32 +1721,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Security.AccessControl 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Reflection.Context 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -2123,11 +1754,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Security.Cryptography.Pkcs 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Reflection.DispatchProxy 4.5.0 - MIT
 
 The MIT License (MIT)
 
@@ -2154,32 +1787,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Security.Cryptography.ProtectedData 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Reflection.Emit 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -2206,32 +1820,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Security.Cryptography.Xml 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Reflection.Emit.ILGeneration 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -2258,32 +1853,51 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Security.Permissions 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Reflection.Emit.Lightweight 4.6.0 - MIT
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
 (c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 2012-2014, Yann Collet
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -2310,11 +1924,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.ServiceModel.Duplex 4.9.0-rc2.21473.1 - MIT
 
--------------------------------------------------------------------
 
-System.Reflection.Metadata 1.6.0 - MIT
 
 The MIT License (MIT)
 
@@ -2341,32 +1957,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.ServiceModel.Http 4.9.0-rc2.21473.1 - MIT
 
--------------------------------------------------------------------
 
-System.Runtime.Caching 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -2393,15 +1990,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.ServiceModel.NetTcp 4.9.0-rc2.21473.1 - MIT
 
--------------------------------------------------------------------
 
-System.ServiceModel.Duplex 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -2428,15 +2023,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.ServiceModel.Primitives 4.9.0-rc2.21473.1 - MIT
 
--------------------------------------------------------------------
 
-System.ServiceModel.Http 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -2463,11 +2056,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.ServiceModel.Security 4.9.0-rc2.21473.1 - MIT
 
--------------------------------------------------------------------
 
-System.ServiceModel.NetTcp 4.6.0 - MIT
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation and Contributors
@@ -2498,15 +2093,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.ServiceModel.Syndication 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.ServiceModel.Primitives 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -2533,15 +2126,51 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.ServiceProcess.ServiceController 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.ServiceModel.Security 4.6.0 - MIT
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -2568,32 +2197,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Speech 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Threading.AccessControl 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -2620,26 +2230,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Text.Encodings.Web 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Threading.Tasks.Extensions 4.5.3 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 1991-2017 Unicode, Inc.
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -2666,32 +2263,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Threading.AccessControl 6.0.0-rc.2.21480.5 - MIT
 
--------------------------------------------------------------------
 
-System.Windows.Extensions 4.6.0 - MIT
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -2718,88 +2296,86 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
--------------------------------------------------------------------
-
--------------------------------------------------------------------
-
-Additional  - 
-
----------------------------------------------
-File:  PSReadLine
----------------------------------------------
-
-https://github.com/lzybkr/PSReadLine
-
-Copyright (c) 2013, Jason Shirk
+---------------------------------------------------------
 
-All rights reserved.
+---------------------------------------------------------
 
-BSD License
+System.Windows.Extensions 6.0.0-rc.2.21480.5 - MIT
 
-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.
+The MIT License (MIT)
 
-----------------------------------------------
-File:  Hashtables from ConvertFrom-json
-----------------------------------------------
+Copyright (c) .NET Foundation and Contributors
 
-https://stackoverflow.com/questions/22002748/hashtables-from-convertfrom-json-have-different-type-from-powershells-built-in-h
+All rights reserved.
 
-Copyright (c) 2015 Dave Wyatt.  All rights reserved.
+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:
 
-All rights reserved.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-MIT License
+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.
 
-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.
+Additional  - 
 
 -------------------------------------------------
-PackageManagement
+Microsoft.PowerShell.Archive
 -------------------------------------------------
 
-Copyright (c) Microsoft Corporation
-All rights reserved.
+Copyright (c) 2016 Microsoft Corporation.
 
-MIT License
+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
+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 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
+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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-------------------------------------------------
+Microsoft.Management.Infrastructure.Runtime.Unix
+Microsoft.Management.Infrastructure
+-------------------------------------------------
+
+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
@@ -2831,4 +2407,115 @@ 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.
diff --git a/assets/additionalAttributions.txt b/assets/additionalAttributions.txt
index d244bad6877..c43aba0ef65 100644
--- a/assets/additionalAttributions.txt
+++ b/assets/additionalAttributions.txt
@@ -2,11 +2,139 @@
 ## Copy this into the additional attributions fields
 ## Copy everything below here, but do not include this line
 
+-------------------------------------------------
+Microsoft.PowerShell.Archive
+-------------------------------------------------
+
+Copyright (c) 2016 Microsoft Corporation.
+
+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.
+
+-------------------------------------------------
+Microsoft.Management.Infrastructure.Runtime.Unix
+Microsoft.Management.Infrastructure
+-------------------------------------------------
+
+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
+•	NuGet.DependencyResolver.Core
+•	NuGet.Frameworks
+•	NuGet.LibraryModel
+•	NuGet.Packaging
+•	NuGet.Packaging.Core
+•	NuGet.Packaging.Core.Types
+•	NuGet.ProjectModel
+•	NuGet.Protocol.Core.Types
+•	NuGet.Protocol.Core.v3
+•	NuGet.Repositories
+•	NuGet.RuntimeModel
+•	NuGet.Versioning
+----------------------------------------------------------
+
+Copyright (c) .NET Foundation. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+these files except in compliance with the License. You may obtain a copy of the
+License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+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/lzybkr/PSReadLine
+https://github.com/PowerShell/PSReadLine
 
 Copyright (c) 2013, Jason Shirk
 
@@ -34,35 +162,16 @@ 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.
 
-----------------------------------------------
-File:  Hashtables from ConvertFrom-json
-----------------------------------------------
-
-https://stackoverflow.com/questions/22002748/hashtables-from-convertfrom-json-have-different-type-from-powershells-built-in-h
-
-Copyright (c) 2015 Dave Wyatt.  All rights reserved.
-
-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.
-
 -------------------------------------------------
-PackageManagement
+ThreadJob
 -------------------------------------------------
 
-Copyright (c) Microsoft Corporation
-All rights reserved.
+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
+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
@@ -71,40 +180,10 @@ 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
+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
-•	NuGet.DependencyResolver.Core
-•	NuGet.Frameworks
-•	NuGet.LibraryModel
-•	NuGet.Packaging
-•	NuGet.Packaging.Core
-•	NuGet.Packaging.Core.Types
-•	NuGet.ProjectModel
-•	NuGet.Protocol.Core.Types
-•	NuGet.Protocol.Core.v3
-•	NuGet.Repositories
-•	NuGet.RuntimeModel
-•	NuGet.Versioning
-----------------------------------------------------------
-
-Copyright (c) .NET Foundation. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-these files except in compliance with the License. You may obtain a copy of the
-License at
-
-https://www.apache.org/licenses/LICENSE-2.0
-
-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.
diff --git a/cgmanifest.json b/cgmanifest.json
index 71929b2f91a..1e5c311e16f 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -1,5 +1,35 @@
 {
   "Registrations": [
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.CodeAnalysis.Common",
+          "Version": "4.0.0-5.final"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.CodeAnalysis.CSharp",
+          "Version": "4.0.0-5.final"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.CSharp",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
     {
       "Component": {
         "Type": "nuget",
@@ -8,7 +38,17 @@
           "Version": "2.0.0"
         }
       },
-      "DevelopmentDependency": true
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Management.Infrastructure.Runtime.Win",
+          "Version": "2.0.0"
+        }
+      },
+      "DevelopmentDependency": false
     },
     {
       "Component": {
@@ -18,54 +58,64 @@
           "Version": "2.0.0"
         }
       },
-      "DevelopmentDependency": true
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.NETCore.Platforms",
+          "Version": "1.1.0"
+        }
+      },
+      "DevelopmentDependency": false
     },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "ThreadJob",
-          "Version": "2.0.3"
+          "Name": "Microsoft.NETCore.Targets",
+          "Version": "1.1.0"
         }
       },
-      "DevelopmentDependency": true
+      "DevelopmentDependency": false
     },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "Microsoft.PowerShell.Archive",
-          "Version": "1.2.5"
+          "Name": "Microsoft.NETCore.Windows.ApiSets",
+          "Version": "1.0.1"
         }
       },
-      "DevelopmentDependency": true
+      "DevelopmentDependency": false
     },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "PackageManagement",
-          "Version": "1.4.7"
+          "Name": "Microsoft.Win32.Registry",
+          "Version": "4.7.0"
         }
       },
-      "DevelopmentDependency": true
+      "DevelopmentDependency": false
     },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "PowerShellGet",
-          "Version": "2.2.5"
+          "Name": "runtime.any.System.Collections",
+          "Version": "4.3.0"
         }
       },
-      "DevelopmentDependency": true
+      "DevelopmentDependency": false
     },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "PSReadLine",
-          "Version": "2.1.0"
+          "Name": "runtime.any.System.Globalization",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -74,11 +124,501 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "Microsoft.CodeAnalysis.CSharp",
-          "Version": "4.0.0-5.final"
+          "Name": "runtime.any.System.IO",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.any.System.Reflection.Extensions",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.any.System.Reflection.Primitives",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.any.System.Reflection",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.any.System.Resources.ResourceManager",
+          "Version": "4.3.0"
         }
       },
-      "DevelopmentDependency": true
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.any.System.Runtime.Handles",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.any.System.Runtime.InteropServices",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.any.System.Runtime",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.any.System.Text.Encoding",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.any.System.Threading.Tasks",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.win.System.Diagnostics.Debug",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.win.System.Runtime.Extensions",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets",
+          "Version": "1.0.1"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.win7.System.Private.Uri",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Collections.Immutable",
+          "Version": "5.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Collections",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Diagnostics.Debug",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Diagnostics.DiagnosticSource",
+          "Version": "5.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Dynamic.Runtime",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Globalization",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.IO",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Linq.Expressions",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Linq",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Memory",
+          "Version": "4.5.4"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Numerics.Vectors",
+          "Version": "4.5.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ObjectModel",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Private.Uri",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.DispatchProxy",
+          "Version": "4.7.1"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Emit.ILGeneration",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Emit.Lightweight",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Emit",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Extensions",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Metadata",
+          "Version": "5.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Primitives",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.TypeExtensions",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Resources.ResourceManager",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Runtime.Extensions",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Runtime.Handles",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Runtime.InteropServices",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Runtime",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Security.Principal.Windows",
+          "Version": "6.0.0-preview.5.21301.5"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Text.Encoding.CodePages",
+          "Version": "6.0.0-rc.2.21480.5"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Text.Encoding",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Threading.Tasks.Extensions",
+          "Version": "4.5.4"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Threading.Tasks",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Threading",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
     }
   ]
 }
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
new file mode 100644
index 00000000000..7e802e4238a
--- /dev/null
+++ b/tools/findMissingNotices.ps1
@@ -0,0 +1,136 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Requires the module dotnet.project.assets from the PowerShell Gallery authored by @TravisEz13
+
+import-module dotnet.project.assets
+Class Registration {
+    [Component]$Component
+    [bool]$DevelopmentDependency
+}
+
+Class Component {
+    [ValidateSet("nuget")]
+    [String] $Type
+    [Nuget]$Nuget
+
+    [string]ToString() {
+        $message = "Type: $($this.Type)"
+        if ($this.Type -eq "nuget") {
+            $message += "; $($this.Nuget)"
+        }
+        return $message
+    }
+
+    [string]Name() {
+        switch ($this.Type) {
+            "nuget" {
+                return $($this.Nuget.Name)
+            }
+            default {
+                throw "Unknown component type: $($this.Type)"
+            }
+        }
+        throw "How did we get here?!?"
+    }
+
+    [string]Version() {
+        switch ($this.Type) {
+            "nuget" {
+                return $($this.Nuget.Version)
+            }
+            default {
+                throw "Unknown component type: $($this.Type)"
+            }
+        }
+        throw "How did we get here?!?"
+    }
+}
+
+Class Nuget {
+    [string]$Name
+    [string]$Version
+
+    [string]ToString() {
+        return "$($this.Name) - $($this.Version)"
+    }
+}
+
+function New-NugetComponent {
+    param(
+        [string]$name,
+        [string]$version
+    )
+
+    $nuget = [Nuget]@{
+        Name    = $name
+        Version = $version
+    }
+    $Component = [Component]@{
+        Type  = "nuget"
+        Nuget = $nuget
+    }
+
+    $registration = [Registration]@{
+        Component             = $Component
+        DevelopmentDependency = $false
+    }
+
+    return $registration
+}
+
+$existingRegistrationTable = @{}
+$newRegistrations = @()
+$existingRegistrationsJson = Get-Content $PSScriptRoot\..\cgmanifest.json | ConvertFrom-Json -AsHashtable
+$existingRegistrationsJson.Registrations | ForEach-Object {
+    $registration = [Registration]$_
+    $existingRegistrationTable.Add($registration.Component.Name(), $registration)
+    $newRegistrations += $registration
+}
+
+Get-PSDrive -Name pwsh-win-core -ErrorAction Ignore | Remove-PSDrive
+Push-Location $PSScriptRoot\..\src\powershell-win-core
+$null = dotnet restore
+$null = New-PADrive -Path $PSScriptRoot\..\src\powershell-win-core\obj\project.assets.json -Name pwsh-win-core
+$targets = Get-ChildItem -Path 'pwsh-win-core:/targets/net6.0-windows7.0|win7-x64' | Where-Object {
+    $_.Type -eq 'package' -and
+    $_.Name -notlike 'DotNetAnalyzers.DocumentationAnalyzers*' -and
+    $_.Name -notlike 'StyleCop*' -and
+    $_.Name -notlike 'Microsoft.CodeAnalysis.Analyzers*' -and
+    $_.Name -notlike 'Microsoft.CodeAnalysis.NetAnalyzers*'
+}  | select-object -ExpandProperty name
+Pop-Location
+Get-PSDrive -Name pwsh-win-core | Remove-PSDrive
+
+$updateRegistrations = @()
+$targets | ForEach-Object {
+    $target = $_
+    $parts = ($target -split '\|')
+    $name = $parts[0]
+    $targetVersion = $parts[1]
+    $pattern = [regex]::Escape($name) + " "
+    $tpnMatch = select-string -Path $PSScriptRoot\..\ThirdPartyNotices.txt -Pattern $pattern
+    if (!$tpnMatch) {
+        if ($existingRegistrationTable.ContainsKey($name)) {
+            $registrationVersion = $existingRegistrationTable.$name.Component.Version()
+            if ($registrationVersion -ne $targetVersion) {
+                $registration = New-NugetComponent -Name $name -Version $targetVersion
+                $updateRegistrations += $registration
+            } else {
+                Write-Verbose "$target already registered: $registrationVersion" -Verbose
+            }
+        } else {
+            $registration = New-NugetComponent -Name $name -Version $targetVersion
+            $newRegistrations += $registration
+        }
+    }
+}
+
+if ($updateRegistrations.count -gt 0) {
+    #TODO delete existing and add new registration
+    throw "updating registrations is not implemented"
+}
+
+$newCount = $newRegistrations.count - $existingRegistrationTable.count
+@{Registrations = $newRegistrations } | ConvertTo-Json -depth 99 | Set-Content $PSScriptRoot\..\cgmanifest.json
+Write-Verbose "$newCount registrations added" -Verbose

From 66508053f5b718e6e554ca10a39f58de910aefd0 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 19 Oct 2021 17:31:57 -0700
Subject: [PATCH 093/645] Update version of `Microsoft.PowerShell.Native` and
 `Microsoft.PowerShell.MarkdownRender` packages (#16277)

---
 .../Microsoft.PowerShell.Commands.Utility.csproj                | 2 +-
 .../System.Management.Automation.csproj                         | 2 +-
 .../Microsoft.PowerShell.Commands.Utility.csproj                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 15ce98d57a8..2dc75f7edd5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/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-preview.2" />
+    <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index b2c6ef01e03..df46277a11a 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.2.21480.5" />
     <!-- 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-preview.2" />
+    <PackageReference Include="Microsoft.PowerShell.Native" Version="7.2.0" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 4278aa7c229..3e50a220974 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -15,6 +15,6 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0-preview.2" />
+    <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
   </ItemGroup>
 </Project>

From 7ac276ac25272ac535214ee1c024697b93ada1c7 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 20 Oct 2021 11:51:58 -0700
Subject: [PATCH 094/645] Update `testartifacts.yml` to use `ubuntu-latest`
 image (#16279)

---
 tools/releaseBuild/azureDevOps/templates/testartifacts.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
index f77a1061da9..1bd715f1a46 100644
--- a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
+++ b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
@@ -7,12 +7,12 @@ jobs:
       value: none
   displayName: Build test artifacts
   condition: succeeded()
-  pool: 'Hosted Ubuntu 1604'
+  pool:
+    vmImage: ubuntu-latest
   steps:
   - checkout: self
     clean: true
 
-
   - pwsh: |
       Import-Module ./build.psm1
       Start-PSBootstrap

From 3253124f69963190ca12c723ac04671c86683045 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 20 Oct 2021 11:52:54 -0700
Subject: [PATCH 095/645] Update `ThirdPartyNotices.txt` (#16283)

---
 ThirdPartyNotices.txt | 1880 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 1767 insertions(+), 113 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index b0b633a8f79..0532acea64e 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -41,43 +41,43 @@ http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND
 
    1. Definitions.
 
-      
+
 
       "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
 
-      
+
 
       "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
 
-      
+
 
       "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
 
-      
+
 
       "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
 
-      
+
 
       "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
 
-      
+
 
       "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
 
-      
+
 
       "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
 
-      
+
 
       "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
 
-      
+
 
       "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
 
-      
+
 
       "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
 
@@ -244,12 +244,62 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.PowerShell.MarkdownRender 7.2.0-preview.2 - MIT
+Microsoft.CodeAnalysis.Common 4.0.0-5.final - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) .NET Foundation and Contributors
+
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+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.
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Microsoft.CodeAnalysis.CSharp 4.0.0-5.final - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Microsoft Corporation.
+9Copyright (c) Microsoft Corporation.
+ACopyright (c) Microsoft Corporation.
+BCopyright (c) Microsoft Corporation.
+CCopyright (c) Microsoft Corporation.
+DCopyright (c) Microsoft Corporation.
+OCopyright (c) Microsoft Corporation.
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) Microsoft Corporation. Alle Rechte
+
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+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.
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Microsoft.PowerShell.MarkdownRender 7.2.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
-(c) Microsoft Corporation. PowerShell's Markdown Rendering project 7.2.0-preview.2
+(c) Microsoft Corporation. PowerShell's Markdown Rendering project PowerShell Markdown Renderer
 
 MIT License
 
@@ -265,7 +315,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Microsoft.PowerShell.Native 7.2.0-preview.2 - MIT
+Microsoft.PowerShell.Native 7.2.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -282,6 +332,60 @@ 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.
 
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Microsoft.Win32.Registry 4.7.0 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2007 James Newton-King
+Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+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.
+
+
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -289,6 +393,44 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 Microsoft.Win32.Registry.AccessControl 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -322,6 +464,44 @@ SOFTWARE.
 Microsoft.Win32.SystemEvents 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -825,42 +1005,46 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ComponentModel.Composition 6.0.0-rc.2.21480.5 - MIT
-
+System.Collections.Immutable 5.0.0 - MIT
 
 
-The MIT License (MIT)
-
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
-
-All rights reserved.
-
-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.
-
-
----------------------------------------------------------
-
----------------------------------------------------------
-
-System.ComponentModel.Composition.Registration 6.0.0-rc.2.21480.5 - MIT
-
-
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -891,13 +1075,51 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Configuration.ConfigurationManager 6.0.0-rc.2.21480.5 - MIT
-
-
-
-The MIT License (MIT)
+System.ComponentModel.Composition 6.0.0-rc.2.21480.5 - MIT
 
-Copyright (c) .NET Foundation and Contributors
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
 
 All rights reserved.
 
@@ -924,9 +1146,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Data.Odbc 6.0.0-rc.2.21480.5 - MIT
+System.ComponentModel.Composition.Registration 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -957,9 +1217,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Data.OleDb 6.0.0-rc.2.21480.5 - MIT
+System.Configuration.ConfigurationManager 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -990,31 +1288,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Data.SqlClient 4.8.3 - MIT
+System.Data.Odbc 6.0.0-rc.2.21480.5 - MIT
 
 
-2008 SQL Server 2012
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
 (c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 2012-2014, Yann Collet
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1045,9 +1359,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Diagnostics.EventLog 6.0.0-rc.2.21480.5 - MIT
+System.Data.OleDb 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1078,47 +1430,31 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Diagnostics.PerformanceCounter 6.0.0-rc.2.21480.5 - MIT
+System.Data.SqlClient 4.8.3 - MIT
 
 
+2008 SQL Server 2012
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
-Copyright (c) Andrew Arnott
-Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
-Copyright (c) 1998 Microsoft. To
 (c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2017 Yoshifumi Kawai
-Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2017 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
-Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
-Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1149,7 +1485,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.DirectoryServices 6.0.0-rc.2.21480.5 - MIT
+System.Diagnostics.DiagnosticSource 5.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1178,7 +1514,6 @@ Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
 Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
@@ -1220,9 +1555,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.DirectoryServices.AccountManagement 6.0.0-rc.2.21480.5 - MIT
+System.Diagnostics.EventLog 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1253,13 +1626,581 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.DirectoryServices.Protocols 6.0.0-rc.2.21480.5 - MIT
-
-
-
-The MIT License (MIT)
+System.Diagnostics.PerformanceCounter 6.0.0-rc.2.21480.5 - MIT
 
-Copyright (c) .NET Foundation and Contributors
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+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.
+
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.DirectoryServices 6.0.0-rc.2.21480.5 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+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.
+
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.DirectoryServices.AccountManagement 6.0.0-rc.2.21480.5 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+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.
+
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.DirectoryServices.Protocols 6.0.0-rc.2.21480.5 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+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.
+
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Drawing.Common 6.0.0-rc.2.21480.5 - MIT
+
+
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+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.
+
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Formats.Asn1 6.0.0-rc.2.21480.5 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+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.
+
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.IO.FileSystem.AccessControl 6.0.0-preview.5.21301.5 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2002 Sun Microsystems, Inc.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+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.
+
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.IO.Packaging 6.0.0-rc.2.21480.5 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+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.
+
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
 
 All rights reserved.
 
@@ -1286,9 +2227,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Drawing.Common 6.0.0-rc.2.21480.5 - MIT
+System.Management 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1319,9 +2298,24 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Formats.Asn1 6.0.0-rc.2.21480.5 - MIT
+System.Memory 4.5.4 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) 2011, Google Inc.
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 1991-2017 Unicode, Inc.
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) .NET Foundation Contributors
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1352,7 +2346,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.IO.FileSystem.AccessControl 6.0.0-preview.5.21301.5 - MIT
+System.Net.Http.WinHttpHandler 6.0.0-rc.2.21480.5 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1375,13 +2369,13 @@ Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
 Copyright (c) The Internet Society 1997.
-Copyright (c) 2002 Sun Microsystems, Inc.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
 Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
@@ -1423,9 +2417,24 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.IO.Packaging 6.0.0-rc.2.21480.5 - MIT
+System.Numerics.Vectors 4.5.0 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) 2011, Google Inc.
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 1991-2017 Unicode, Inc.
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) .NET Foundation Contributors
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1456,9 +2465,13 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
+System.Private.ServiceModel 4.9.0-rc2.21473.1 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -1489,9 +2502,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Management 6.0.0-rc.2.21480.5 - MIT
+System.Reflection.Context 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1522,9 +2573,30 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Net.Http.WinHttpHandler 6.0.0-rc.2.21480.5 - MIT
+System.Reflection.DispatchProxy 4.7.1 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2007 James Newton-King
+Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -1555,9 +2627,46 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Private.ServiceModel 4.9.0-rc2.21473.1 - MIT
+System.Reflection.Metadata 5.0.0 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1588,9 +2697,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Reflection.Context 6.0.0-rc.2.21480.5 - MIT
+System.Runtime.Caching 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1621,9 +2768,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Runtime.Caching 6.0.0-rc.2.21480.5 - MIT
+System.Runtime.CompilerServices.Unsafe 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1654,7 +2839,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Runtime.CompilerServices.Unsafe 6.0.0-rc.2.21480.5 - MIT
+System.Security.AccessControl 6.0.0-rc.2.21480.5 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1725,9 +2910,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.AccessControl 6.0.0-rc.2.21480.5 - MIT
+System.Security.Cryptography.Pkcs 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1758,9 +2981,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.Pkcs 6.0.0-rc.2.21480.5 - MIT
+System.Security.Cryptography.ProtectedData 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1791,9 +3052,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.ProtectedData 6.0.0-rc.2.21480.5 - MIT
+System.Security.Cryptography.Xml 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1824,9 +3123,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.Xml 6.0.0-rc.2.21480.5 - MIT
+System.Security.Permissions 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1857,7 +3194,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Permissions 6.0.0-rc.2.21480.5 - MIT
+System.Security.Principal.Windows 6.0.0-preview.5.21301.5 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1880,13 +3217,13 @@ Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
 Copyright (c) The Internet Society 1997.
+Copyright (c) 2002 Sun Microsystems, Inc.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
 Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
@@ -1931,6 +3268,10 @@ SOFTWARE.
 System.ServiceModel.Duplex 4.9.0-rc2.21473.1 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -2027,9 +3368,121 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Primitives 4.9.0-rc2.21473.1 - MIT
+System.ServiceModel.Primitives 4.9.0-rc2.21473.1 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+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.
+
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.ServiceModel.Security 4.9.0-rc2.21473.1 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+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.
+
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.ServiceModel.Syndication 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -2060,13 +3513,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Security 4.9.0-rc2.21473.1 - MIT
+System.ServiceProcess.ServiceController 6.0.0-rc.2.21480.5 - MIT
 
 
 (c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -2097,9 +3584,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Syndication 6.0.0-rc.2.21480.5 - MIT
+System.Speech 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -2130,7 +3655,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceProcess.ServiceController 6.0.0-rc.2.21480.5 - MIT
+System.Text.Encoding.CodePages 6.0.0-rc.2.21480.5 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2201,9 +3726,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Speech 6.0.0-rc.2.21480.5 - MIT
+System.Text.Encodings.Web 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -2234,9 +3797,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Text.Encodings.Web 6.0.0-rc.2.21480.5 - MIT
+System.Threading.AccessControl 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -2267,9 +3868,24 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Threading.AccessControl 6.0.0-rc.2.21480.5 - MIT
+System.Threading.Tasks.Extensions 4.5.4 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) 2011, Google Inc.
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 1991-2017 Unicode, Inc.
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) .NET Foundation Contributors
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
 
 The MIT License (MIT)
 
@@ -2303,6 +3919,44 @@ SOFTWARE.
 System.Windows.Extensions 6.0.0-rc.2.21480.5 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -2332,7 +3986,7 @@ SOFTWARE.
 
 -------------------------------------------------------------------
 
-Additional  - 
+Additional  -
 
 -------------------------------------------------
 Microsoft.PowerShell.Archive

From 57f4ccd1fcbf15a2c143007102fb81a79decf3ea Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis@ez13.net>
Date: Wed, 20 Oct 2021 13:11:13 -0700
Subject: [PATCH 096/645] add GH workflow to keep the cgmanifest up to date.

---
 .github/workflows/update-cgmanifest.yml |  52 ++++++
 tools/findMissingNotices.ps1            | 216 +++++++++++++++++++-----
 2 files changed, 223 insertions(+), 45 deletions(-)
 create mode 100644 .github/workflows/update-cgmanifest.yml

diff --git a/.github/workflows/update-cgmanifest.yml b/.github/workflows/update-cgmanifest.yml
new file mode 100644
index 00000000000..14572aff2d6
--- /dev/null
+++ b/.github/workflows/update-cgmanifest.yml
@@ -0,0 +1,52 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+name: Update cgmanifest
+on:
+    workflow_dispatch:
+    schedule:
+    # At 13:00 UTC every day.
+    - cron:  '0 13 * * *'
+
+defaults:
+  run:
+    shell: pwsh
+
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+
+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: Execute script to update cgmanifest
+        run: |
+          Install-Module -Name dotnet.project.assets
+      - name: Execute script to update cgmanifest
+        run: |
+          ./tools/findMissingNotices.ps1
+      - name: Microsoft Teams Notifier
+        uses: skitionek/notify-microsoft-teams@master
+        if: failure()
+        with:
+          webhook_url: ${{ secrets.PS_BUILD_TEAMS_CHANNEL }}
+          overwrite: "{title: `Failure in updating cgmanifest. Look at ${workflow_link}`}"
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        id: cpr
+        if: env.CREATE_PR == 'true'
+        with:
+          commit-message: "Update the cgmanifest with missing or updated components"
+          committer: GitHub <noreply@github.com>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          title: "Update ${{ env.FORMULA_NAME }} formula to version ${{ env.NEW_FORMULA_VERSION }}"
+          reviewers: travisez13
+          base: master
+          draft: false
+          branch: update-cgmanifest
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index 7e802e4238a..9d42f270933 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -1,9 +1,59 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
+# This script is used to completely rebuild the
 # Requires the module dotnet.project.assets from the PowerShell Gallery authored by @TravisEz13
 
-import-module dotnet.project.assets
+Import-Module dotnet.project.assets
+
+$existingRegistrationTable = @{}
+$existingRegistrationsJson = Get-Content $PSScriptRoot\..\cgmanifest.json | ConvertFrom-Json -AsHashtable
+$existingRegistrationsJson.Registrations | ForEach-Object {
+    $registration = [Registration]$_
+    $existingRegistrationTable.Add($registration.Component.Name(), $registration)
+}
+
+# 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
+    }
+}
+
 Class Registration {
     [Component]$Component
     [bool]$DevelopmentDependency
@@ -79,58 +129,134 @@ function New-NugetComponent {
     return $registration
 }
 
-$existingRegistrationTable = @{}
-$newRegistrations = @()
-$existingRegistrationsJson = Get-Content $PSScriptRoot\..\cgmanifest.json | ConvertFrom-Json -AsHashtable
-$existingRegistrationsJson.Registrations | ForEach-Object {
-    $registration = [Registration]$_
-    $existingRegistrationTable.Add($registration.Component.Name(), $registration)
-    $newRegistrations += $registration
+$winDesktopSdk = 'Microsoft.NET.Sdk.WindowsDesktop'
+if (!$IsWindows) {
+    $winDesktopSdk = 'Microsoft.NET.Sdk'
+    Write-Warning "Always using $winDesktopSdk since this is not windows!!!"
 }
 
-Get-PSDrive -Name pwsh-win-core -ErrorAction Ignore | Remove-PSDrive
-Push-Location $PSScriptRoot\..\src\powershell-win-core
-$null = dotnet restore
-$null = New-PADrive -Path $PSScriptRoot\..\src\powershell-win-core\obj\project.assets.json -Name pwsh-win-core
-$targets = Get-ChildItem -Path 'pwsh-win-core:/targets/net6.0-windows7.0|win7-x64' | Where-Object {
-    $_.Type -eq 'package' -and
-    $_.Name -notlike 'DotNetAnalyzers.DocumentationAnalyzers*' -and
-    $_.Name -notlike 'StyleCop*' -and
-    $_.Name -notlike 'Microsoft.CodeAnalysis.Analyzers*' -and
-    $_.Name -notlike 'Microsoft.CodeAnalysis.NetAnalyzers*'
-}  | select-object -ExpandProperty name
-Pop-Location
-Get-PSDrive -Name pwsh-win-core | Remove-PSDrive
-
-$updateRegistrations = @()
-$targets | ForEach-Object {
-    $target = $_
-    $parts = ($target -split '\|')
-    $name = $parts[0]
-    $targetVersion = $parts[1]
-    $pattern = [regex]::Escape($name) + " "
-    $tpnMatch = select-string -Path $PSScriptRoot\..\ThirdPartyNotices.txt -Pattern $pattern
-    if (!$tpnMatch) {
-        if ($existingRegistrationTable.ContainsKey($name)) {
-            $registrationVersion = $existingRegistrationTable.$name.Component.Version()
-            if ($registrationVersion -ne $targetVersion) {
+Function Get-CGRegistrations {
+    param(
+        [Parameter(Mandatory)]
+        [ValidateSet(
+            "alpine-x64",
+            "linux-arm",
+            "linux-arm64",
+            "linux-x64",
+            "osx-arm64",
+            "osx-x64",
+            "win-arm",
+            "win-arm64",
+            "win7-x64",
+            "win7-x86",
+            "modules")]
+        [string]$Runtime,
+
+        [Parameter(Mandatory)]
+        [System.Collections.Generic.Dictionary[string, Registration]] $RegistrationTable
+    )
+
+    $newRegistrations = $Registrations
+
+    $dotnetTargetName = 'net6.0'
+    $dotnetTargetNameWin7 = 'net6.0-windows7.0'
+    $unixProjectName = 'powershell-unix'
+    $windowsProjectName = 'powershell-win-core'
+    $actualRuntime = $Runtime
+
+
+
+    switch -regex ($Runtime) {
+        "alpine-.*" {
+            $folder = $unixProjectName
+            $target = "$dotnetTargetName|$Runtime"
+        }
+        "linux-.*" {
+            $folder = $unixProjectName
+            $target = "$dotnetTargetName|$Runtime"
+        }
+        "osx-.*" {
+            $folder = $unixProjectName
+            $target = "$dotnetTargetName|$Runtime"
+        }
+        "win7-.*" {
+            $sdkToUse = $winDesktopSdk
+            $folder = $windowsProjectName
+            $target = "$dotnetTargetNameWin7|$Runtime"
+        }
+        "win-.*" {
+            $folder = $windowsProjectName
+            $target = "$dotnetTargetNameWin7|$Runtime"
+        }
+        "modules" {
+            $folder = "modules"
+            $actualRuntime = 'linux-x64'
+            $target = "$dotnetTargetName|$actualRuntime"
+        }
+        Default {
+            throw "Invalid runtime name: $Runtime"
+        }
+    }
+    Write-Verbose "Getting registrations for $folder - $actualRuntime ..." -Verbose
+    Get-PSDrive -Name $folder -ErrorAction Ignore | Remove-PSDrive
+    Push-Location $PSScriptRoot\..\src\$folder
+    try {
+        script:Start-NativeExecution -VerboseOutputOnError -sb {
+            dotnet restore --runtime $actualRuntime  "/property:SDKToUse=$sdkToUse"
+        }
+        $null = New-PADrive -Path $PSScriptRoot\..\src\$folder\obj\project.assets.json -Name $folder
+        try {
+            $targets = Get-ChildItem -Path "${folder}:/targets/$target" -ErrorAction Stop | Where-Object {
+                $_.Type -eq 'package' -and
+                $_.Name -notlike 'DotNetAnalyzers.DocumentationAnalyzers*' -and
+                $_.Name -notlike 'StyleCop*' -and
+                $_.Name -notlike 'Microsoft.CodeAnalysis.Analyzers*' -and
+                $_.Name -notlike 'Microsoft.CodeAnalysis.NetAnalyzers*'
+            }  | select-object -ExpandProperty name
+        } catch {
+            Get-ChildItem -Path "${folder}:/targets" | Out-String | Write-Verbose -Verbose
+            throw
+        }
+    } finally {
+        Pop-Location
+        Get-PSDrive -Name $folder -ErrorAction Ignore | Remove-PSDrive
+    }
+
+    $targets | ForEach-Object {
+        $target = $_
+        $parts = ($target -split '\|')
+        $name = $parts[0]
+        $targetVersion = $parts[1]
+        $pattern = [regex]::Escape($name) + " "
+        $tpnMatch = select-string -Path $PSScriptRoot\..\ThirdPartyNotices.txt -Pattern $pattern
+
+        # Add the registration to the cgmanifest if the TPN does not contain the name of the target OR
+        # the exisitng CG contains the registration, because if the existing CG contains the registration,
+        # that might be the only reason it is in the TPN.
+        if (!$tpnMatch -or $existingRegistrationTable.ContainsKey($name)) {
+            if (!$RegistrationTable.ContainsKey($target)) {
                 $registration = New-NugetComponent -Name $name -Version $targetVersion
-                $updateRegistrations += $registration
-            } else {
-                Write-Verbose "$target already registered: $registrationVersion" -Verbose
+                $RegistrationTable.Add($target, $registration)
             }
-        } else {
-            $registration = New-NugetComponent -Name $name -Version $targetVersion
-            $newRegistrations += $registration
         }
     }
 }
 
-if ($updateRegistrations.count -gt 0) {
-    #TODO delete existing and add new registration
-    throw "updating registrations is not implemented"
+[System.Collections.Generic.Dictionary[string, Registration]]$registrations = @{}
+$lastCount = 0
+foreach ($runtime in @("win7-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win7-x86")) {
+    Get-CGRegistrations -Runtime $runtime -RegistrationTable $registrations
+    $count = $registrations.Count
+    $newCount = $count - $lastCount
+    $lastCount = $count
+    Write-Verbose "$newCount new registrations, $count total..." -Verbose
+}
+
+$newRegistrations = @()
+foreach ($target in ($registrations.Keys | Sort-Object)) {
+    $newRegistrations += $registrations[$target]
 }
 
-$newCount = $newRegistrations.count - $existingRegistrationTable.count
+$count = $newRegistrations.Count
 @{Registrations = $newRegistrations } | ConvertTo-Json -depth 99 | Set-Content $PSScriptRoot\..\cgmanifest.json
-Write-Verbose "$newCount registrations added" -Verbose
+Write-Verbose "$count registrations created!" -Verbose

From 247bf620fc108843cf7be4a8c243a61f53aa47e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Oct 2021 12:33:26 -0700
Subject: [PATCH 097/645] Bump Microsoft.CodeAnalysis.NetAnalyzers (#16271)

Bumps [Microsoft.CodeAnalysis.NetAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 6.0.0-rtm.21516.1 to 6.0.0-rtm.21518.1.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/main/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/commits)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.NetAnalyzers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index a19c935748b..75459c6c9fe 100644
--- a/Analyzers.props
+++ b/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-rtm.21516.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rtm.21518.1" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From 7ce4e5a766b4ccc7bc5cde015042d4588e80e90c Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 21 Oct 2021 16:15:13 -0700
Subject: [PATCH 098/645] Update ChangeLog for 7.2.0-rc.1 and also fix RPM
 packaging (#16290)

---
 .spelling                      |  8 ++++++
 CHANGELOG/preview.md           | 49 ++++++++++++++++++++++++++++++++++
 tools/packaging/packaging.psm1 |  5 ++--
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/.spelling b/.spelling
index 4b188971e76..7af78c5bde5 100644
--- a/.spelling
+++ b/.spelling
@@ -1383,6 +1383,14 @@ lselden
 SethFalco
 CodeQL
 slowy07
+rc.2.21505.57
+ThirdPartyNotices.txt
+cgmanifest.json
+buildinfo
+tar.gz
+psoptions.json
+manifest.spdx.json
+vPack
  - CHANGELOG/7.0.md
 codesign
 release-BuildJson
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index a722a67c6e9..9086cdd5665 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,5 +1,54 @@
 # Current preview release
 
+## [7.2.0-rc.1] - 2021-10-21
+
+### General Cmdlet Updates and Fixes
+
+- Disallow COM calls for AppLocker system lockdown (#16268)
+- Configure `Microsoft.ApplicationInsights` to not send cloud role name (#16246)
+- Disallow `Add-Type` in NoLanguage mode on a locked down machine (#16245)
+- Make property names for color VT100 sequences consistent with documentation (#16212)
+- Make moving a directory into itself with `Move-Item` an error (#16198)
+- Change `FileSystemInfo.Target` from a `CodeProperty` to an `AliasProperty` that points to `FileSystemInfo.LinkTarget` (#16165)
+
+### Tests
+
+- Removed deprecated docker-based tests for PowerShell release packages (#16224)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+<p>Bump .NET SDK to 6.0.100-rc.2</p>
+</summary>
+
+<ul>
+<li>Update .NET 6 to version 6.0.100-rc.2.21505.57 (#16249)</li>
+<li>Fix RPM packaging (Internal 17704)</li>
+<li>Update <code>ThirdPartyNotices.txt</code> (#16283)</li>
+<li>Update pipeline yaml file to use <code>ubuntu-latest</code> image (#16279)</li>
+<li>Add script to generate <code>cgmanifest.json</code> (#16278)</li>
+<li>Update version of <code>Microsoft.PowerShell.Native</code> and <code>Microsoft.PowerShell.MarkdownRender</code> packages (#16277)</li>
+<li>Add <code>cgmanifest.json</code> for generating correct third party notice file (#16266)</li>
+<li>Only upload stable <code>buildinfo</code> for stable releases (#16251)</li>
+<li>Don't upload <code>.dep</code> or <code>.tar.gz</code> for RPM because there are none (#16230)</li>
+<li>Ensure RPM license is recognized (#16189)</li>
+<li>Add condition to only generate release files in local dev build only (#16259)</li>
+<li>Ensure <code>psoptions.json</code> and <code>manifest.spdx.json</code> files always exist in packages (#16258)</li>
+<li>Fix CI script and split out ARM runs (#16252)</li>
+<li>Update vPack task version to 12 (#16250)</li>
+<li>Sign third party executables (#16229)</li>
+<li>Add Software Bill of Materials to the main packages (#16202)</li>
+<li>Upgrade <code>set-value</code> package for markdown test (#16196)</li>
+<li>Fix Microsoft update spelling issue (#16178)</li>
+<li>Move vPack build to 1ES Pool (#16169)</li>
+</ul>
+
+</details>
+
+[7.2.0-rc.1]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.10...v7.2.0-rc.1
+
 ## [7.2.0-preview.10] - 2021-09-28
 
 ### Engine Updates and Fixes
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 777f70b163d..d7669e34346 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -1247,10 +1247,9 @@ function Get-FpmArguments
         "-t", $Type,
         "-s", "dir"
     )
-    if ($Environment.IsRedHatFamily) {
+    if ($Distribution -eq 'rh') {
         $Arguments += @("--rpm-dist", $Distribution)
         $Arguments += @("--rpm-os", "linux")
-        $Arguments += @("--rpm-os", "linux")
         $Arguments += @("--license", "MIT")
     } else {
         $Arguments += @("--license", "MIT License")
@@ -1368,7 +1367,7 @@ function New-AfterScripts
 
     Write-Verbose -Message "AfterScript Distribution: $Distribution" -Verbose
 
-    if ($Environment.IsRedHatFamily) {
+    if ($Distribution -eq 'rh') {
         $AfterInstallScript = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
         $AfterRemoveScript = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
         $packagingStrings.RedHatAfterInstallScript -f "$Link", $Destination  | Out-File -FilePath $AfterInstallScript -Encoding ascii

From 612aade35623f4a06c7f3448e5bb07673d8c1eeb Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 21 Oct 2021 17:03:47 -0700
Subject: [PATCH 099/645] Update `README.md` and `metadata.json` files for
 `v7.2.0-rc.1` release (#16285)

---
 README.md           | 28 ++++++++++++++--------------
 tools/metadata.json |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 0297a87a015..eb50d4a94d6 100644
--- a/README.md
+++ b/README.md
@@ -94,20 +94,20 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 [rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-linux-arm64.tar.gz
 [rl-snap]: https://snapcraft.io/powershell
 
-[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-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-snap]: https://snapcraft.io/powershell-preview
 
 [in-windows]: https://docs.microsoft.com/powershell/scripting/install/installing-powershell-core-on-windows
diff --git a/tools/metadata.json b/tools/metadata.json
index e05b19878cb..83e6c87fc53 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,6 +1,6 @@
 {
   "StableReleaseTag": "v7.1.5",
-  "PreviewReleaseTag": "v7.2.0-preview.10",
+  "PreviewReleaseTag": "v7.2.0-rc.1",
   "ServicingReleaseTag": "v7.0.8",
   "ReleaseTag": "v7.1.5",
   "LTSReleaseTag" : ["v7.0.8"],

From e5d27d139c59a94931bf7767b7e17a4b3bc65d00 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 22 Oct 2021 10:32:08 -0700
Subject: [PATCH 100/645] Revert "add GH workflow to keep the cgmanifest up to
 date." (#16294)

This reverts commit 57f4ccd1fcbf15a2c143007102fb81a79decf3ea.
---
 .github/workflows/update-cgmanifest.yml |  52 ------
 tools/findMissingNotices.ps1            | 216 +++++-------------------
 2 files changed, 45 insertions(+), 223 deletions(-)
 delete mode 100644 .github/workflows/update-cgmanifest.yml

diff --git a/.github/workflows/update-cgmanifest.yml b/.github/workflows/update-cgmanifest.yml
deleted file mode 100644
index 14572aff2d6..00000000000
--- a/.github/workflows/update-cgmanifest.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT license.
-
-name: Update cgmanifest
-on:
-    workflow_dispatch:
-    schedule:
-    # At 13:00 UTC every day.
-    - cron:  '0 13 * * *'
-
-defaults:
-  run:
-    shell: pwsh
-
-env:
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  POWERSHELL_TELEMETRY_OPTOUT: 1
-
-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: Execute script to update cgmanifest
-        run: |
-          Install-Module -Name dotnet.project.assets
-      - name: Execute script to update cgmanifest
-        run: |
-          ./tools/findMissingNotices.ps1
-      - name: Microsoft Teams Notifier
-        uses: skitionek/notify-microsoft-teams@master
-        if: failure()
-        with:
-          webhook_url: ${{ secrets.PS_BUILD_TEAMS_CHANNEL }}
-          overwrite: "{title: `Failure in updating cgmanifest. Look at ${workflow_link}`}"
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
-        id: cpr
-        if: env.CREATE_PR == 'true'
-        with:
-          commit-message: "Update the cgmanifest with missing or updated components"
-          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          title: "Update ${{ env.FORMULA_NAME }} formula to version ${{ env.NEW_FORMULA_VERSION }}"
-          reviewers: travisez13
-          base: master
-          draft: false
-          branch: update-cgmanifest
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index 9d42f270933..7e802e4238a 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -1,59 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-# This script is used to completely rebuild the
 # Requires the module dotnet.project.assets from the PowerShell Gallery authored by @TravisEz13
 
-Import-Module dotnet.project.assets
-
-$existingRegistrationTable = @{}
-$existingRegistrationsJson = Get-Content $PSScriptRoot\..\cgmanifest.json | ConvertFrom-Json -AsHashtable
-$existingRegistrationsJson.Registrations | ForEach-Object {
-    $registration = [Registration]$_
-    $existingRegistrationTable.Add($registration.Component.Name(), $registration)
-}
-
-# 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
-    }
-}
-
+import-module dotnet.project.assets
 Class Registration {
     [Component]$Component
     [bool]$DevelopmentDependency
@@ -129,134 +79,58 @@ function New-NugetComponent {
     return $registration
 }
 
-$winDesktopSdk = 'Microsoft.NET.Sdk.WindowsDesktop'
-if (!$IsWindows) {
-    $winDesktopSdk = 'Microsoft.NET.Sdk'
-    Write-Warning "Always using $winDesktopSdk since this is not windows!!!"
+$existingRegistrationTable = @{}
+$newRegistrations = @()
+$existingRegistrationsJson = Get-Content $PSScriptRoot\..\cgmanifest.json | ConvertFrom-Json -AsHashtable
+$existingRegistrationsJson.Registrations | ForEach-Object {
+    $registration = [Registration]$_
+    $existingRegistrationTable.Add($registration.Component.Name(), $registration)
+    $newRegistrations += $registration
 }
 
-Function Get-CGRegistrations {
-    param(
-        [Parameter(Mandatory)]
-        [ValidateSet(
-            "alpine-x64",
-            "linux-arm",
-            "linux-arm64",
-            "linux-x64",
-            "osx-arm64",
-            "osx-x64",
-            "win-arm",
-            "win-arm64",
-            "win7-x64",
-            "win7-x86",
-            "modules")]
-        [string]$Runtime,
-
-        [Parameter(Mandatory)]
-        [System.Collections.Generic.Dictionary[string, Registration]] $RegistrationTable
-    )
-
-    $newRegistrations = $Registrations
-
-    $dotnetTargetName = 'net6.0'
-    $dotnetTargetNameWin7 = 'net6.0-windows7.0'
-    $unixProjectName = 'powershell-unix'
-    $windowsProjectName = 'powershell-win-core'
-    $actualRuntime = $Runtime
-
-
-
-    switch -regex ($Runtime) {
-        "alpine-.*" {
-            $folder = $unixProjectName
-            $target = "$dotnetTargetName|$Runtime"
-        }
-        "linux-.*" {
-            $folder = $unixProjectName
-            $target = "$dotnetTargetName|$Runtime"
-        }
-        "osx-.*" {
-            $folder = $unixProjectName
-            $target = "$dotnetTargetName|$Runtime"
-        }
-        "win7-.*" {
-            $sdkToUse = $winDesktopSdk
-            $folder = $windowsProjectName
-            $target = "$dotnetTargetNameWin7|$Runtime"
-        }
-        "win-.*" {
-            $folder = $windowsProjectName
-            $target = "$dotnetTargetNameWin7|$Runtime"
-        }
-        "modules" {
-            $folder = "modules"
-            $actualRuntime = 'linux-x64'
-            $target = "$dotnetTargetName|$actualRuntime"
-        }
-        Default {
-            throw "Invalid runtime name: $Runtime"
-        }
-    }
-    Write-Verbose "Getting registrations for $folder - $actualRuntime ..." -Verbose
-    Get-PSDrive -Name $folder -ErrorAction Ignore | Remove-PSDrive
-    Push-Location $PSScriptRoot\..\src\$folder
-    try {
-        script:Start-NativeExecution -VerboseOutputOnError -sb {
-            dotnet restore --runtime $actualRuntime  "/property:SDKToUse=$sdkToUse"
-        }
-        $null = New-PADrive -Path $PSScriptRoot\..\src\$folder\obj\project.assets.json -Name $folder
-        try {
-            $targets = Get-ChildItem -Path "${folder}:/targets/$target" -ErrorAction Stop | Where-Object {
-                $_.Type -eq 'package' -and
-                $_.Name -notlike 'DotNetAnalyzers.DocumentationAnalyzers*' -and
-                $_.Name -notlike 'StyleCop*' -and
-                $_.Name -notlike 'Microsoft.CodeAnalysis.Analyzers*' -and
-                $_.Name -notlike 'Microsoft.CodeAnalysis.NetAnalyzers*'
-            }  | select-object -ExpandProperty name
-        } catch {
-            Get-ChildItem -Path "${folder}:/targets" | Out-String | Write-Verbose -Verbose
-            throw
-        }
-    } finally {
-        Pop-Location
-        Get-PSDrive -Name $folder -ErrorAction Ignore | Remove-PSDrive
-    }
-
-    $targets | ForEach-Object {
-        $target = $_
-        $parts = ($target -split '\|')
-        $name = $parts[0]
-        $targetVersion = $parts[1]
-        $pattern = [regex]::Escape($name) + " "
-        $tpnMatch = select-string -Path $PSScriptRoot\..\ThirdPartyNotices.txt -Pattern $pattern
-
-        # Add the registration to the cgmanifest if the TPN does not contain the name of the target OR
-        # the exisitng CG contains the registration, because if the existing CG contains the registration,
-        # that might be the only reason it is in the TPN.
-        if (!$tpnMatch -or $existingRegistrationTable.ContainsKey($name)) {
-            if (!$RegistrationTable.ContainsKey($target)) {
+Get-PSDrive -Name pwsh-win-core -ErrorAction Ignore | Remove-PSDrive
+Push-Location $PSScriptRoot\..\src\powershell-win-core
+$null = dotnet restore
+$null = New-PADrive -Path $PSScriptRoot\..\src\powershell-win-core\obj\project.assets.json -Name pwsh-win-core
+$targets = Get-ChildItem -Path 'pwsh-win-core:/targets/net6.0-windows7.0|win7-x64' | Where-Object {
+    $_.Type -eq 'package' -and
+    $_.Name -notlike 'DotNetAnalyzers.DocumentationAnalyzers*' -and
+    $_.Name -notlike 'StyleCop*' -and
+    $_.Name -notlike 'Microsoft.CodeAnalysis.Analyzers*' -and
+    $_.Name -notlike 'Microsoft.CodeAnalysis.NetAnalyzers*'
+}  | select-object -ExpandProperty name
+Pop-Location
+Get-PSDrive -Name pwsh-win-core | Remove-PSDrive
+
+$updateRegistrations = @()
+$targets | ForEach-Object {
+    $target = $_
+    $parts = ($target -split '\|')
+    $name = $parts[0]
+    $targetVersion = $parts[1]
+    $pattern = [regex]::Escape($name) + " "
+    $tpnMatch = select-string -Path $PSScriptRoot\..\ThirdPartyNotices.txt -Pattern $pattern
+    if (!$tpnMatch) {
+        if ($existingRegistrationTable.ContainsKey($name)) {
+            $registrationVersion = $existingRegistrationTable.$name.Component.Version()
+            if ($registrationVersion -ne $targetVersion) {
                 $registration = New-NugetComponent -Name $name -Version $targetVersion
-                $RegistrationTable.Add($target, $registration)
+                $updateRegistrations += $registration
+            } else {
+                Write-Verbose "$target already registered: $registrationVersion" -Verbose
             }
+        } else {
+            $registration = New-NugetComponent -Name $name -Version $targetVersion
+            $newRegistrations += $registration
         }
     }
 }
 
-[System.Collections.Generic.Dictionary[string, Registration]]$registrations = @{}
-$lastCount = 0
-foreach ($runtime in @("win7-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win7-x86")) {
-    Get-CGRegistrations -Runtime $runtime -RegistrationTable $registrations
-    $count = $registrations.Count
-    $newCount = $count - $lastCount
-    $lastCount = $count
-    Write-Verbose "$newCount new registrations, $count total..." -Verbose
-}
-
-$newRegistrations = @()
-foreach ($target in ($registrations.Keys | Sort-Object)) {
-    $newRegistrations += $registrations[$target]
+if ($updateRegistrations.count -gt 0) {
+    #TODO delete existing and add new registration
+    throw "updating registrations is not implemented"
 }
 
-$count = $newRegistrations.Count
+$newCount = $newRegistrations.count - $existingRegistrationTable.count
 @{Registrations = $newRegistrations } | ConvertTo-Json -depth 99 | Set-Content $PSScriptRoot\..\cgmanifest.json
-Write-Verbose "$count registrations created!" -Verbose
+Write-Verbose "$newCount registrations added" -Verbose

From 6302f4815a04c8b39921299a80703e3778dd8887 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 22 Oct 2021 16:12:00 -0700
Subject: [PATCH 101/645] Update to use .NET 6 GA build (#16296)

---
 DotnetRuntimeMetadata.json                    |  8 +--
 assets/wix/files.wxs                          | 62 ++++++++++++++++++-
 global.json                                   |  2 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  6 +-
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           |  8 +--
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 .../System.Management.Automation.csproj       | 18 +++---
 .../dotnet-tools/Reporting/Reporting.csproj   |  4 +-
 .../ResultsComparer/ResultsComparer.csproj    |  6 +-
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/WebListener.csproj     |  4 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  2 +-
 .../System.Management.Automation.csproj       |  2 +-
 .../templates/insert-nuget-config-azfeed.yml  |  2 +-
 16 files changed, 94 insertions(+), 38 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 7a24b57b192..af1c3f4df8e 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,13 +1,13 @@
 {
   "sdk": {
-    "channel": "6.0.1xx-rc1",
+    "channel": "6.0.1xx",
     "quality": "signed",
     "qualityFallback": "daily",
-    "packageVersionPattern": "6.0.0-rc.1",
+    "packageVersionPattern": "6.0.0",
     "sdkImageVersion": "6.0.100",
-    "nextChannel": "6.0.1xx-rc1"
+    "nextChannel": "6.0.1xx"
   },
   "internalfeed" : {
-    "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21458.32-shipping/nuget/v2"
+    "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rtm.21515.2-shipping/nuget/v2"
   }
 }
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 8fcd2f987aa..afa704126d1 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1990,6 +1990,9 @@
         <Component Id="cmp690BAC3241424F59B5D30DE0E846D03E">
           <File Id="filDBDCB9BFFF9F425B8CF7F7A5F05D42B1" KeyPath="yes" Source="$(var.ProductSourcePath)\cs\System.Private.ServiceModel.resources.dll" />
         </Component>
+        <Component Id="cmp9E908BEE2A0C4E388D536F08499298DE">
+          <File Id="filCEE4EEB730AD48A88769DF2F000700A2" KeyPath="yes" Source="$(var.ProductSourcePath)\cs\System.Web.Services.Description.resources.dll" />
+        </Component>
       </Directory>
       <Directory Id="dirEA0127D6607E68B508B9DB9CE315A2CE" Name="de">
         <Component Id="cmpF2941A91B17EEA22CD6DAB34693D9AC0">
@@ -2052,6 +2055,9 @@
         <Component Id="cmpB43ED7BA30C844E2B5C38F7B747EEFDC">
           <File Id="filE106C77258F047E8A384E1E75B7EF6B8" KeyPath="yes" Source="$(var.ProductSourcePath)\de\System.Private.ServiceModel.resources.dll" />
         </Component>
+        <Component Id="cmp3EFF8D009863427AADCCEAB9E87DBE5B">
+          <File Id="filA6E4E23BB4384EC9BBB8D955A538EFD1" KeyPath="yes" Source="$(var.ProductSourcePath)\de\System.Web.Services.Description.resources.dll" />
+        </Component>
       </Directory>
       <Directory Id="dir5B65D7353FBDCD17AB60A674B3FDF93B" Name="es">
         <Component Id="cmpBEB5F3CF75675537751F0D0B32125BF1">
@@ -2114,6 +2120,9 @@
         <Component Id="cmpCC4A42AA70EE4418926986F5A4B8D3FA">
           <File Id="fil186134FCB6984F1484A8308DF4F2B917" KeyPath="yes" Source="$(var.ProductSourcePath)\es\System.Private.ServiceModel.resources.dll" />
         </Component>
+        <Component Id="cmp0543A1DA92A9474084354B1BAD40631E">
+          <File Id="fil3D84429ED25241F0B63D59C847512034" KeyPath="yes" Source="$(var.ProductSourcePath)\es\System.Web.Services.Description.resources.dll" />
+        </Component>
       </Directory>
       <Directory Id="dir23063512FA8C884E1B4F08FDF0A44516" Name="fr">
         <Component Id="cmp1DEB513A065956086898BCDACC5887B6">
@@ -2176,6 +2185,9 @@
         <Component Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5">
           <File Id="fil93C038D9EED945F5A984CF3C98EDB72B" KeyPath="yes" Source="$(var.ProductSourcePath)\fr\System.Private.ServiceModel.resources.dll" />
         </Component>
+        <Component Id="cmp9B5EDBAD7A8946358A874885C55C70B0">
+          <File Id="filD4E71F0512E942C9B531A9D923AE929D" KeyPath="yes" Source="$(var.ProductSourcePath)\fr\System.Web.Services.Description.resources.dll" />
+        </Component>
       </Directory>
       <Directory Id="dir42B03840AE19D1498CC524F2B6C0389D" Name="it">
         <Component Id="cmp3EC91B8BF4282E77113321E5D1ED27B2">
@@ -2238,6 +2250,9 @@
         <Component Id="cmp166B17F72C954B0087DF991E560B399A">
           <File Id="fil528F0FBF10C246568FCE1F5B10E541D1" KeyPath="yes" Source="$(var.ProductSourcePath)\it\System.Private.ServiceModel.resources.dll" />
         </Component>
+        <Component Id="cmp04CCC1B8A47141999E07F6FF22CA41B4">
+          <File Id="filE58F819689E04EA69B54B41B09057F33" KeyPath="yes" Source="$(var.ProductSourcePath)\it\System.Web.Services.Description.resources.dll" />
+        </Component>
       </Directory>
       <Directory Id="dir086D21BE309BE4C7081FC60E3524890F" Name="ja">
         <Component Id="cmp867E4E51FE7BC09AAD5D59FD76716FBC">
@@ -2300,6 +2315,9 @@
         <Component Id="cmp529A2B5343FD466884FAF627E37C648D">
           <File Id="fil265B2A6A67EF4C6E8C17BDC3AAD8F729" KeyPath="yes" Source="$(var.ProductSourcePath)\ja\System.Private.ServiceModel.resources.dll" />
         </Component>
+        <Component Id="cmpB5C7A619973A4EFEA3D2B08832BD31F9">
+          <File Id="filC54551CD4A81499BAC1F4BB23C5E6DE5" KeyPath="yes" Source="$(var.ProductSourcePath)\ja\System.Web.Services.Description.resources.dll" />
+        </Component>
       </Directory>
       <Directory Id="dir43D6CAD5F3ED1060009918D06D84FB18" Name="ko">
         <Component Id="cmpAA026CCA623F0E8FB5BAE9F201C5B89D">
@@ -2362,6 +2380,9 @@
         <Component Id="cmp4EE1633EE4864CE5B9015BF76BD31D14">
           <File Id="fil688FE14A80204086A48DE1BDC6591EB0" KeyPath="yes" Source="$(var.ProductSourcePath)\ko\System.Private.ServiceModel.resources.dll" />
         </Component>
+        <Component Id="cmp145A39BC36CC45F982F5FE556EF8AD73">
+          <File Id="filBB1C0E2D53A14AFAA0B90B0D169405C9" KeyPath="yes" Source="$(var.ProductSourcePath)\ko\System.Web.Services.Description.resources.dll" />
+        </Component>
       </Directory>
       <Directory Id="dirE8201C74A7184D11233BAD63C6DB37BD" Name="pl">
         <Component Id="cmpA656A18FE14D3C8EB02C31AE474054E3">
@@ -2424,6 +2445,9 @@
         <Component Id="cmpC8C68DB0DEE44CF49D98532D2C26395E">
           <File Id="fil1959B05E9F214DCFA6670F1892EE2E7D" KeyPath="yes" Source="$(var.ProductSourcePath)\pl\System.Private.ServiceModel.resources.dll" />
         </Component>
+        <Component Id="cmp611C7B0DC08E4454826C0D1196913CF4">
+          <File Id="fil49AF244A5876422391DFF3CFFBC42031" KeyPath="yes" Source="$(var.ProductSourcePath)\pl\System.Web.Services.Description.resources.dll" />
+        </Component>
       </Directory>
       <Directory Id="dir47ED939BFA870848E0764E862CD6B4D7" Name="pt-BR">
         <Component Id="cmp3D20E940BDBF41630242C63011A80CE5">
@@ -2486,6 +2510,9 @@
         <Component Id="cmpF3C18F07C6A148638CBC858EB02E3A6D">
           <File Id="filE6672552F1EE45D3AC3021E02DB093CB" KeyPath="yes" Source="$(var.ProductSourcePath)\pt-BR\System.Private.ServiceModel.resources.dll" />
         </Component>
+        <Component Id="cmpE12B8800744A4C3794F4BC8EE33DE5FE">
+          <File Id="filFFB487AAEB4F463C9F0252FFA97342C6" KeyPath="yes" Source="$(var.ProductSourcePath)\pt-BR\System.Web.Services.Description.resources.dll" />
+        </Component>
       </Directory>
       <Directory Id="dir37B8DFAE26D5F8E9948851F7D19F9E20" Name="ru">
         <Component Id="cmpFDCD51BD80926ABECCE27D0D66A47C8F">
@@ -2548,6 +2575,9 @@
         <Component Id="cmpBD958F4B8F9146499DE2CA6321C65F96">
           <File Id="fil6A1EB9311FE546F69F28948794DC43BF" KeyPath="yes" Source="$(var.ProductSourcePath)\ru\System.Private.ServiceModel.resources.dll" />
         </Component>
+        <Component Id="cmp472CE35D99014E168ABDDA26D337D359">
+          <File Id="fil0317B9254BF24E74A4E5E7EDCDC0478E" KeyPath="yes" Source="$(var.ProductSourcePath)\ru\System.Web.Services.Description.resources.dll" />
+        </Component>
       </Directory>
       <Directory Id="dirA7E9CC01273A7FED89FC8D3A368E00CC" Name="tr">
         <Component Id="cmp286FCD0B19BF06446A7274672A2491CA">
@@ -2610,6 +2640,9 @@
         <Component Id="cmp2B8239B905B146A69CD5D55A353AC131">
           <File Id="fil618AA430D1794A45A1D2BAA2451BECB2" KeyPath="yes" Source="$(var.ProductSourcePath)\tr\System.Private.ServiceModel.resources.dll" />
         </Component>
+        <Component Id="cmpEC101E06C62142BB8BB9DBD59DAB3D7D">
+          <File Id="fil651FC8DE5CE1421CA791648EFE6DA584" KeyPath="yes" Source="$(var.ProductSourcePath)\tr\System.Web.Services.Description.resources.dll" />
+        </Component>
       </Directory>
       <Directory Id="dir47E993970F74AA9F393D23500827D12C" Name="zh-Hans">
         <Component Id="cmp34C4A21743AC68583599BF2B139F39F2">
@@ -2672,6 +2705,9 @@
         <Component Id="cmp582595AE8291444E837793472E0A259C">
           <File Id="fil7044506B31FA4130B2E375147032298D" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hans\System.Private.ServiceModel.resources.dll" />
         </Component>
+        <Component Id="cmp5F5236C855744C60AB9290A74E23D498">
+          <File Id="fil5410F7A1A3D347CFBF90324856B85DD9" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hans\System.Web.Services.Description.resources.dll" />
+        </Component>
       </Directory>
       <Directory Id="dirB1FFB91EED6FD71EA866548CEA3A5298" Name="zh-Hant">
         <Component Id="cmpBC28FE8B65954B00AECA9C534639596D">
@@ -2734,6 +2770,9 @@
         <Component Id="cmp91C27D1766E84B8BB0F0C70888F03C2E">
           <File Id="filC888727CE05A4A9FA0DB66EE0F15097C" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hant\System.Private.ServiceModel.resources.dll" />
         </Component>
+        <Component Id="cmp8270465B1B634BFF91B933889318C6D9">
+          <File Id="filC209F02DFEC542FDAB5E8B7CFF450A27" 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">
@@ -3109,8 +3148,11 @@
       <Component Id="cmp09155DA101E1424B98832A789E93E835">
         <File Id="fil7D748565EBF5423A84CFC6D25D21F43C" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Bcl.AsyncInterfaces.dll" />
       </Component>
-      <Component Id="cmpDAFCD776C56B4CF78A4534704588E38B">
-        <File Id="fil0734B55E8FC6480B97679A249A892D54" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.48005.dll" />
+      <Component Id="cmp6AA669F54C1F4675A8EA5E4BA331943F">
+        <File Id="fil2EA0B4C8BC434DA89E4D521F692BCE3C" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
+      </Component>
+      <Component Id="cmp6AAE145D9E884A0491826ABA6D54FAF6">
+        <File Id="filC52DF6FD7A0749FDAA47D64AD9713D8F" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.51407.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4110,10 +4152,24 @@
       <ComponentRef Id="cmp2B8239B905B146A69CD5D55A353AC131" />
       <ComponentRef Id="cmpBD958F4B8F9146499DE2CA6321C65F96" />
       <ComponentRef Id="cmp166B17F72C954B0087DF991E560B399A" />
-      <ComponentRef Id="cmpDAFCD776C56B4CF78A4534704588E38B" />
       <ComponentRef Id="cmp529A2B5343FD466884FAF627E37C648D" />
       <ComponentRef Id="cmp4EE1633EE4864CE5B9015BF76BD31D14" />
       <ComponentRef Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5" />
+      <ComponentRef Id="cmp04CCC1B8A47141999E07F6FF22CA41B4" />
+      <ComponentRef Id="cmp5F5236C855744C60AB9290A74E23D498" />
+      <ComponentRef Id="cmp6AA669F54C1F4675A8EA5E4BA331943F" />
+      <ComponentRef Id="cmp3EFF8D009863427AADCCEAB9E87DBE5B" />
+      <ComponentRef Id="cmp0543A1DA92A9474084354B1BAD40631E" />
+      <ComponentRef Id="cmp611C7B0DC08E4454826C0D1196913CF4" />
+      <ComponentRef Id="cmpB5C7A619973A4EFEA3D2B08832BD31F9" />
+      <ComponentRef Id="cmpE12B8800744A4C3794F4BC8EE33DE5FE" />
+      <ComponentRef Id="cmp9B5EDBAD7A8946358A874885C55C70B0" />
+      <ComponentRef Id="cmpEC101E06C62142BB8BB9DBD59DAB3D7D" />
+      <ComponentRef Id="cmp9E908BEE2A0C4E388D536F08499298DE" />
+      <ComponentRef Id="cmp472CE35D99014E168ABDDA26D337D359" />
+      <ComponentRef Id="cmp8270465B1B634BFF91B933889318C6D9" />
+      <ComponentRef Id="cmp6AAE145D9E884A0491826ABA6D54FAF6" />
+      <ComponentRef Id="cmp145A39BC36CC45F982F5FE556EF8AD73" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 3ebca84bcfe..ef0057ef2e3 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.100-rc.2.21505.57"
+    "version": "6.0.100-rtm.21515.2"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index fbf6e014569..3262a6a8af2 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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-rc.2.21480.5" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rtm.21514.7" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 2dc75f7edd5..1ec44e3ad7e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-5.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-6.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rtm.21514.7" />
     <PackageReference Include="NJsonSchema" Version="10.5.2" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 238d772473e..9313ff1644d 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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-rc.2.21480.5" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-rtm.21514.7" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 3cb21e8d889..41e05d8f8f6 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.IO.Packaging" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rtm.21514.7" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0-rc2.21473.1" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.9.0-rc2.21473.1" />
@@ -30,7 +30,7 @@
     <PackageReference Include="System.Private.ServiceModel" Version="4.9.0-rc2.21473.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-rc.2.21480.5" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rtm.21514.7" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 232a1ec3149..f968375d7d7 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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-rc.2.21480.5" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rtm.21514.7" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index df46277a11a..7a05d4f44c3 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <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-rc.2.21480.5" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.DirectoryServices" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.DirectoryServices" Version="6.0.0-rtm.21514.7" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" />
-    <PackageReference Include="System.Management" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Security.Permissions" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Management" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Security.Permissions" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rtm.21514.7" />
     <!-- 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" />
diff --git a/test/perf/dotnet-tools/Reporting/Reporting.csproj b/test/perf/dotnet-tools/Reporting/Reporting.csproj
index ca56fc51efc..e0d2f3b8249 100644
--- a/test/perf/dotnet-tools/Reporting/Reporting.csproj
+++ b/test/perf/dotnet-tools/Reporting/Reporting.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
+    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="5.0.0-preview.5.20278.1" />
   </ItemGroup>
 
 </Project>
diff --git a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
index 9934bd0df21..5274b08d613 100644
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>$(PERFLAB_TARGET_FRAMEWORKS)</TargetFrameworks>
@@ -6,10 +6,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.4.3" />
+    <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
     <PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
     <PackageReference Include="Perfolizer" Version="0.2.1" />
   </ItemGroup>
 </Project>
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 8ad3769503e..8315b9bea3d 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rtm.21514.7" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index ca6c52c5629..71f31eae61c 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.2.21480.10" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rtm.21514.23" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rtm.21514.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 3e50a220974..443ac51ac97 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rtm.21514.7" />
     <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
   </ItemGroup>
 </Project>
diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
index 036022f1c65..0fdc86f24ec 100644
--- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rtm.21514.7" />
     <PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.5.21301.5" />
   </ItemGroup>
 </Project>
diff --git a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
index 5fdb9f7d977..dbc018a1ae6 100644
--- a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+++ b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
@@ -5,7 +5,7 @@ parameters:
 steps:
 - pwsh: |
       Import-Module ${{ parameters.repoRoot }}/build.psm1 -Force
-      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT2) -FeedName AzDevOpsFeed -Destination '${{ parameters.repoRoot }}/src/Modules'
+      New-NugetConfigFile -NugetFeedUrl $(PSInternalNugetFeed) -UserName $(PSInternalNugetFeedUserName) -ClearTextPAT $(PSInternalNugetFeedPAT) -FeedName AzDevOpsFeed -Destination '${{ parameters.repoRoot }}/src/Modules'
 
       if(-not (Test-Path "${{ parameters.repoRoot }}/src/Modules/nuget.config"))
       {

From 15ac9485de282e39577e59744d5b153614a14924 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 22 Oct 2021 16:45:51 -0700
Subject: [PATCH 102/645] Fix issues reported by code signing verification tool
 (#16291)

---
 build.psm1                                                    | 4 ++++
 .../Microsoft.PowerShell.GlobalTool.Shim.csproj               | 1 +
 .../releaseBuild/azureDevOps/templates/windows-packaging.yml  | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index e278ff39b24..ab5060ad6d8 100644
--- a/build.psm1
+++ b/build.psm1
@@ -441,6 +441,10 @@ 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"
diff --git a/src/Microsoft.PowerShell.GlobalTool.Shim/Microsoft.PowerShell.GlobalTool.Shim.csproj b/src/Microsoft.PowerShell.GlobalTool.Shim/Microsoft.PowerShell.GlobalTool.Shim.csproj
index aa845a7817d..d0203344cc2 100644
--- a/src/Microsoft.PowerShell.GlobalTool.Shim/Microsoft.PowerShell.GlobalTool.Shim.csproj
+++ b/src/Microsoft.PowerShell.GlobalTool.Shim/Microsoft.PowerShell.GlobalTool.Shim.csproj
@@ -6,6 +6,7 @@
     <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' " />
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index 07063f07121..35da87bde69 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -177,7 +177,7 @@ jobs:
       Update-PSSignedBuildFolder -BuildPath $BuildPath -SignedFilesPath $SignedFilesPath
       $dlls = Get-ChildItem $BuildPath\*.dll, $BuildPath\*.exe -Recurse
       $signatures = $dlls | Get-AuthenticodeSignature
-      $missingSignatures = $signatures | Where-Object { $_.status -eq 'notsigned'}| select-object -ExpandProperty Path
+      $missingSignatures = $signatures | Where-Object { $_.status -eq 'notsigned' -or $_.SignerCertificate.Issuer -notmatch '^CN=Microsoft.*'}| select-object -ExpandProperty Path
 
       Write-Verbose -verbose "to be signed:`r`n $($missingSignatures | Out-String)"
 

From d391168ece22c9c3d596080e0f4d0ef01ca651c1 Mon Sep 17 00:00:00 2001
From: Nikolay Kondratyev <4085884+kondratyev-nv@users.noreply.github.com>
Date: Tue, 26 Oct 2021 19:50:57 +0100
Subject: [PATCH 103/645] Add `wget` as a dependency for Bootstrap script
 (#16303)

* Add wget as a dependency for installation script

* Add wget as a dependency for alpine
---
 build.psm1 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index ab5060ad6d8..97b89b1a02e 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1995,6 +1995,9 @@ function Start-PSBootstrap {
                 # Build tools
                 $Deps += "cmake"
 
+                # wget for downloading dotnet
+                $Deps += "wget"
+
                 # .NET Core required runtime libraries
                 $Deps += "openssl"
 
@@ -2002,7 +2005,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'
+                $Deps += 'libunwind', 'libcurl', 'bash', 'cmake', 'clang', 'build-base', 'git', 'curl', 'wget'
 
                 Start-NativeExecution {
                     Invoke-Expression "apk add $Deps"

From 14ea042cec3382f7be342db8aed284f76466cb76 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 26 Oct 2021 15:57:59 -0700
Subject: [PATCH 104/645] Revert "Update to use .NET 6 GA build (#16296)"
 (#16308)

This reverts commit 6302f4815a04c8b39921299a80703e3778dd8887.
---
 DotnetRuntimeMetadata.json                    |  8 +--
 assets/wix/files.wxs                          | 62 +------------------
 global.json                                   |  2 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  6 +-
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           |  8 +--
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 .../System.Management.Automation.csproj       | 18 +++---
 .../dotnet-tools/Reporting/Reporting.csproj   |  4 +-
 .../ResultsComparer/ResultsComparer.csproj    |  6 +-
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/WebListener.csproj     |  4 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  2 +-
 .../System.Management.Automation.csproj       |  2 +-
 .../templates/insert-nuget-config-azfeed.yml  |  2 +-
 16 files changed, 38 insertions(+), 94 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index af1c3f4df8e..7a24b57b192 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,13 +1,13 @@
 {
   "sdk": {
-    "channel": "6.0.1xx",
+    "channel": "6.0.1xx-rc1",
     "quality": "signed",
     "qualityFallback": "daily",
-    "packageVersionPattern": "6.0.0",
+    "packageVersionPattern": "6.0.0-rc.1",
     "sdkImageVersion": "6.0.100",
-    "nextChannel": "6.0.1xx"
+    "nextChannel": "6.0.1xx-rc1"
   },
   "internalfeed" : {
-    "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rtm.21515.2-shipping/nuget/v2"
+    "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21458.32-shipping/nuget/v2"
   }
 }
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index afa704126d1..8fcd2f987aa 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1990,9 +1990,6 @@
         <Component Id="cmp690BAC3241424F59B5D30DE0E846D03E">
           <File Id="filDBDCB9BFFF9F425B8CF7F7A5F05D42B1" KeyPath="yes" Source="$(var.ProductSourcePath)\cs\System.Private.ServiceModel.resources.dll" />
         </Component>
-        <Component Id="cmp9E908BEE2A0C4E388D536F08499298DE">
-          <File Id="filCEE4EEB730AD48A88769DF2F000700A2" KeyPath="yes" Source="$(var.ProductSourcePath)\cs\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dirEA0127D6607E68B508B9DB9CE315A2CE" Name="de">
         <Component Id="cmpF2941A91B17EEA22CD6DAB34693D9AC0">
@@ -2055,9 +2052,6 @@
         <Component Id="cmpB43ED7BA30C844E2B5C38F7B747EEFDC">
           <File Id="filE106C77258F047E8A384E1E75B7EF6B8" KeyPath="yes" Source="$(var.ProductSourcePath)\de\System.Private.ServiceModel.resources.dll" />
         </Component>
-        <Component Id="cmp3EFF8D009863427AADCCEAB9E87DBE5B">
-          <File Id="filA6E4E23BB4384EC9BBB8D955A538EFD1" KeyPath="yes" Source="$(var.ProductSourcePath)\de\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir5B65D7353FBDCD17AB60A674B3FDF93B" Name="es">
         <Component Id="cmpBEB5F3CF75675537751F0D0B32125BF1">
@@ -2120,9 +2114,6 @@
         <Component Id="cmpCC4A42AA70EE4418926986F5A4B8D3FA">
           <File Id="fil186134FCB6984F1484A8308DF4F2B917" KeyPath="yes" Source="$(var.ProductSourcePath)\es\System.Private.ServiceModel.resources.dll" />
         </Component>
-        <Component Id="cmp0543A1DA92A9474084354B1BAD40631E">
-          <File Id="fil3D84429ED25241F0B63D59C847512034" KeyPath="yes" Source="$(var.ProductSourcePath)\es\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir23063512FA8C884E1B4F08FDF0A44516" Name="fr">
         <Component Id="cmp1DEB513A065956086898BCDACC5887B6">
@@ -2185,9 +2176,6 @@
         <Component Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5">
           <File Id="fil93C038D9EED945F5A984CF3C98EDB72B" KeyPath="yes" Source="$(var.ProductSourcePath)\fr\System.Private.ServiceModel.resources.dll" />
         </Component>
-        <Component Id="cmp9B5EDBAD7A8946358A874885C55C70B0">
-          <File Id="filD4E71F0512E942C9B531A9D923AE929D" KeyPath="yes" Source="$(var.ProductSourcePath)\fr\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir42B03840AE19D1498CC524F2B6C0389D" Name="it">
         <Component Id="cmp3EC91B8BF4282E77113321E5D1ED27B2">
@@ -2250,9 +2238,6 @@
         <Component Id="cmp166B17F72C954B0087DF991E560B399A">
           <File Id="fil528F0FBF10C246568FCE1F5B10E541D1" KeyPath="yes" Source="$(var.ProductSourcePath)\it\System.Private.ServiceModel.resources.dll" />
         </Component>
-        <Component Id="cmp04CCC1B8A47141999E07F6FF22CA41B4">
-          <File Id="filE58F819689E04EA69B54B41B09057F33" KeyPath="yes" Source="$(var.ProductSourcePath)\it\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir086D21BE309BE4C7081FC60E3524890F" Name="ja">
         <Component Id="cmp867E4E51FE7BC09AAD5D59FD76716FBC">
@@ -2315,9 +2300,6 @@
         <Component Id="cmp529A2B5343FD466884FAF627E37C648D">
           <File Id="fil265B2A6A67EF4C6E8C17BDC3AAD8F729" KeyPath="yes" Source="$(var.ProductSourcePath)\ja\System.Private.ServiceModel.resources.dll" />
         </Component>
-        <Component Id="cmpB5C7A619973A4EFEA3D2B08832BD31F9">
-          <File Id="filC54551CD4A81499BAC1F4BB23C5E6DE5" KeyPath="yes" Source="$(var.ProductSourcePath)\ja\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir43D6CAD5F3ED1060009918D06D84FB18" Name="ko">
         <Component Id="cmpAA026CCA623F0E8FB5BAE9F201C5B89D">
@@ -2380,9 +2362,6 @@
         <Component Id="cmp4EE1633EE4864CE5B9015BF76BD31D14">
           <File Id="fil688FE14A80204086A48DE1BDC6591EB0" KeyPath="yes" Source="$(var.ProductSourcePath)\ko\System.Private.ServiceModel.resources.dll" />
         </Component>
-        <Component Id="cmp145A39BC36CC45F982F5FE556EF8AD73">
-          <File Id="filBB1C0E2D53A14AFAA0B90B0D169405C9" KeyPath="yes" Source="$(var.ProductSourcePath)\ko\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dirE8201C74A7184D11233BAD63C6DB37BD" Name="pl">
         <Component Id="cmpA656A18FE14D3C8EB02C31AE474054E3">
@@ -2445,9 +2424,6 @@
         <Component Id="cmpC8C68DB0DEE44CF49D98532D2C26395E">
           <File Id="fil1959B05E9F214DCFA6670F1892EE2E7D" KeyPath="yes" Source="$(var.ProductSourcePath)\pl\System.Private.ServiceModel.resources.dll" />
         </Component>
-        <Component Id="cmp611C7B0DC08E4454826C0D1196913CF4">
-          <File Id="fil49AF244A5876422391DFF3CFFBC42031" KeyPath="yes" Source="$(var.ProductSourcePath)\pl\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir47ED939BFA870848E0764E862CD6B4D7" Name="pt-BR">
         <Component Id="cmp3D20E940BDBF41630242C63011A80CE5">
@@ -2510,9 +2486,6 @@
         <Component Id="cmpF3C18F07C6A148638CBC858EB02E3A6D">
           <File Id="filE6672552F1EE45D3AC3021E02DB093CB" KeyPath="yes" Source="$(var.ProductSourcePath)\pt-BR\System.Private.ServiceModel.resources.dll" />
         </Component>
-        <Component Id="cmpE12B8800744A4C3794F4BC8EE33DE5FE">
-          <File Id="filFFB487AAEB4F463C9F0252FFA97342C6" KeyPath="yes" Source="$(var.ProductSourcePath)\pt-BR\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir37B8DFAE26D5F8E9948851F7D19F9E20" Name="ru">
         <Component Id="cmpFDCD51BD80926ABECCE27D0D66A47C8F">
@@ -2575,9 +2548,6 @@
         <Component Id="cmpBD958F4B8F9146499DE2CA6321C65F96">
           <File Id="fil6A1EB9311FE546F69F28948794DC43BF" KeyPath="yes" Source="$(var.ProductSourcePath)\ru\System.Private.ServiceModel.resources.dll" />
         </Component>
-        <Component Id="cmp472CE35D99014E168ABDDA26D337D359">
-          <File Id="fil0317B9254BF24E74A4E5E7EDCDC0478E" KeyPath="yes" Source="$(var.ProductSourcePath)\ru\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dirA7E9CC01273A7FED89FC8D3A368E00CC" Name="tr">
         <Component Id="cmp286FCD0B19BF06446A7274672A2491CA">
@@ -2640,9 +2610,6 @@
         <Component Id="cmp2B8239B905B146A69CD5D55A353AC131">
           <File Id="fil618AA430D1794A45A1D2BAA2451BECB2" KeyPath="yes" Source="$(var.ProductSourcePath)\tr\System.Private.ServiceModel.resources.dll" />
         </Component>
-        <Component Id="cmpEC101E06C62142BB8BB9DBD59DAB3D7D">
-          <File Id="fil651FC8DE5CE1421CA791648EFE6DA584" KeyPath="yes" Source="$(var.ProductSourcePath)\tr\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dir47E993970F74AA9F393D23500827D12C" Name="zh-Hans">
         <Component Id="cmp34C4A21743AC68583599BF2B139F39F2">
@@ -2705,9 +2672,6 @@
         <Component Id="cmp582595AE8291444E837793472E0A259C">
           <File Id="fil7044506B31FA4130B2E375147032298D" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hans\System.Private.ServiceModel.resources.dll" />
         </Component>
-        <Component Id="cmp5F5236C855744C60AB9290A74E23D498">
-          <File Id="fil5410F7A1A3D347CFBF90324856B85DD9" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hans\System.Web.Services.Description.resources.dll" />
-        </Component>
       </Directory>
       <Directory Id="dirB1FFB91EED6FD71EA866548CEA3A5298" Name="zh-Hant">
         <Component Id="cmpBC28FE8B65954B00AECA9C534639596D">
@@ -2770,9 +2734,6 @@
         <Component Id="cmp91C27D1766E84B8BB0F0C70888F03C2E">
           <File Id="filC888727CE05A4A9FA0DB66EE0F15097C" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hant\System.Private.ServiceModel.resources.dll" />
         </Component>
-        <Component Id="cmp8270465B1B634BFF91B933889318C6D9">
-          <File Id="filC209F02DFEC542FDAB5E8B7CFF450A27" 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">
@@ -3148,11 +3109,8 @@
       <Component Id="cmp09155DA101E1424B98832A789E93E835">
         <File Id="fil7D748565EBF5423A84CFC6D25D21F43C" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Bcl.AsyncInterfaces.dll" />
       </Component>
-      <Component Id="cmp6AA669F54C1F4675A8EA5E4BA331943F">
-        <File Id="fil2EA0B4C8BC434DA89E4D521F692BCE3C" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
-      </Component>
-      <Component Id="cmp6AAE145D9E884A0491826ABA6D54FAF6">
-        <File Id="filC52DF6FD7A0749FDAA47D64AD9713D8F" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.51407.dll" />
+      <Component Id="cmpDAFCD776C56B4CF78A4534704588E38B">
+        <File Id="fil0734B55E8FC6480B97679A249A892D54" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.48005.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4152,24 +4110,10 @@
       <ComponentRef Id="cmp2B8239B905B146A69CD5D55A353AC131" />
       <ComponentRef Id="cmpBD958F4B8F9146499DE2CA6321C65F96" />
       <ComponentRef Id="cmp166B17F72C954B0087DF991E560B399A" />
+      <ComponentRef Id="cmpDAFCD776C56B4CF78A4534704588E38B" />
       <ComponentRef Id="cmp529A2B5343FD466884FAF627E37C648D" />
       <ComponentRef Id="cmp4EE1633EE4864CE5B9015BF76BD31D14" />
       <ComponentRef Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5" />
-      <ComponentRef Id="cmp04CCC1B8A47141999E07F6FF22CA41B4" />
-      <ComponentRef Id="cmp5F5236C855744C60AB9290A74E23D498" />
-      <ComponentRef Id="cmp6AA669F54C1F4675A8EA5E4BA331943F" />
-      <ComponentRef Id="cmp3EFF8D009863427AADCCEAB9E87DBE5B" />
-      <ComponentRef Id="cmp0543A1DA92A9474084354B1BAD40631E" />
-      <ComponentRef Id="cmp611C7B0DC08E4454826C0D1196913CF4" />
-      <ComponentRef Id="cmpB5C7A619973A4EFEA3D2B08832BD31F9" />
-      <ComponentRef Id="cmpE12B8800744A4C3794F4BC8EE33DE5FE" />
-      <ComponentRef Id="cmp9B5EDBAD7A8946358A874885C55C70B0" />
-      <ComponentRef Id="cmpEC101E06C62142BB8BB9DBD59DAB3D7D" />
-      <ComponentRef Id="cmp9E908BEE2A0C4E388D536F08499298DE" />
-      <ComponentRef Id="cmp472CE35D99014E168ABDDA26D337D359" />
-      <ComponentRef Id="cmp8270465B1B634BFF91B933889318C6D9" />
-      <ComponentRef Id="cmp6AAE145D9E884A0491826ABA6D54FAF6" />
-      <ComponentRef Id="cmp145A39BC36CC45F982F5FE556EF8AD73" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index ef0057ef2e3..3ebca84bcfe 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.100-rtm.21515.2"
+    "version": "6.0.100-rc.2.21505.57"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 3262a6a8af2..fbf6e014569 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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-rtm.21514.7" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 1ec44e3ad7e..2dc75f7edd5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -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-rtm.21514.7" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-5.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.2.21480.5" />
     <PackageReference Include="NJsonSchema" Version="10.5.2" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 9313ff1644d..238d772473e 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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-rtm.21514.7" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 41e05d8f8f6..3cb21e8d889 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.IO.Packaging" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rc.2.21480.5" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0-rc2.21473.1" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.9.0-rc2.21473.1" />
@@ -30,7 +30,7 @@
     <PackageReference Include="System.Private.ServiceModel" Version="4.9.0-rc2.21473.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-rtm.21514.7" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index f968375d7d7..232a1ec3149 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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-rtm.21514.7" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 7a05d4f44c3..df46277a11a 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <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-rtm.21514.7" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.DirectoryServices" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.DirectoryServices" Version="6.0.0-rc.2.21480.5" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" />
-    <PackageReference Include="System.Management" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Security.Permissions" Version="6.0.0-rtm.21514.7" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Management" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Security.Permissions" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.2.21480.5" />
     <!-- 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" />
diff --git a/test/perf/dotnet-tools/Reporting/Reporting.csproj b/test/perf/dotnet-tools/Reporting/Reporting.csproj
index e0d2f3b8249..ca56fc51efc 100644
--- a/test/perf/dotnet-tools/Reporting/Reporting.csproj
+++ b/test/perf/dotnet-tools/Reporting/Reporting.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
index 5274b08d613..9934bd0df21 100644
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>$(PERFLAB_TARGET_FRAMEWORKS)</TargetFrameworks>
@@ -6,10 +6,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
+    <PackageReference Include="CommandLineParser" Version="2.4.3" />
     <PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
     <PackageReference Include="Perfolizer" Version="0.2.1" />
   </ItemGroup>
 </Project>
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 8315b9bea3d..8ad3769503e 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 71f31eae61c..ca6c52c5629 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rtm.21514.23" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.2.21480.10" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.2.21480.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 443ac51ac97..3e50a220974 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
     <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
   </ItemGroup>
 </Project>
diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
index 0fdc86f24ec..036022f1c65 100644
--- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rtm.21514.7" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
     <PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.5.21301.5" />
   </ItemGroup>
 </Project>
diff --git a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
index dbc018a1ae6..5fdb9f7d977 100644
--- a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+++ b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
@@ -5,7 +5,7 @@ parameters:
 steps:
 - pwsh: |
       Import-Module ${{ parameters.repoRoot }}/build.psm1 -Force
-      New-NugetConfigFile -NugetFeedUrl $(PSInternalNugetFeed) -UserName $(PSInternalNugetFeedUserName) -ClearTextPAT $(PSInternalNugetFeedPAT) -FeedName AzDevOpsFeed -Destination '${{ parameters.repoRoot }}/src/Modules'
+      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT2) -FeedName AzDevOpsFeed -Destination '${{ parameters.repoRoot }}/src/Modules'
 
       if(-not (Test-Path "${{ parameters.repoRoot }}/src/Modules/nuget.config"))
       {

From d28691f59e975e64fa76df32e6231a0b0a580420 Mon Sep 17 00:00:00 2001
From: Nikolay Kondratyev <4085884+kondratyev-nv@users.noreply.github.com>
Date: Wed, 27 Oct 2021 19:29:42 +0200
Subject: [PATCH 105/645] Fix Windows build ZIP packaging (#16299)

---
 tools/releaseBuild/azureDevOps/templates/windows-packaging.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index 35da87bde69..03ecebaf0c0 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -251,7 +251,7 @@ jobs:
       Write-Host "##$vstsCommandString"
     displayName: Compress signed files
 
-  - powershell: |
+  - pwsh: |
       $runtime = switch ($env:Architecture)
         {
           "x64" { "win7-x64" }

From f2d5ae74adfac5fcf5b528a5a40fde585d2fac63 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 27 Oct 2021 11:42:37 -0700
Subject: [PATCH 106/645] Clean up `crossgen` related build scripts also
 generate native symbols for `R2R` images (#16297)

* Clean up crossgen related build scripts

* Fix ci.psm1

* Clean up '-CrossGen' use in a few other files
---
 PowerShell.Common.props                       |   1 +
 build.psm1                                    | 227 ------------------
 tools/ci.psm1                                 |   6 +-
 tools/packaging/packaging.psm1                |  24 +-
 .../GenericLinuxFiles/PowerShellPackage.ps1   |   2 -
 .../PowerShellPackage.ps1                     |   1 -
 .../macOS/PowerShellPackageVsts.ps1           |   5 +-
 7 files changed, 7 insertions(+), 259 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index ba5e6e2dffe..4054cd5b19a 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -138,6 +138,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <LangVersion>10.0</LangVersion>
     <PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
+    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/build.psm1 b/build.psm1
index 97b89b1a02e..1f600cf0593 100644
--- a/build.psm1
+++ b/build.psm1
@@ -314,8 +314,6 @@ 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,
@@ -343,10 +341,6 @@ 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'"
         }
@@ -414,7 +408,6 @@ Fix steps:
 
     # set output options
     $OptionsArguments = @{
-        CrossGen=$CrossGen
         Output=$Output
         Runtime=$Runtime
         Configuration=$Configuration
@@ -529,12 +522,6 @@ 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
 
@@ -837,8 +824,6 @@ 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
@@ -944,7 +929,6 @@ function New-PSOptions {
                 -RootInfo ([PSCustomObject]$RootInfo) `
                 -Top $Top `
                 -Runtime $Runtime `
-                -Crossgen $Crossgen.IsPresent `
                 -Configuration $Configuration `
                 -PSModuleRestore $PSModuleRestore.IsPresent `
                 -Framework $Framework `
@@ -2360,211 +2344,6 @@ function script:Start-NativeExecution
     }
 }
 
-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
 {
@@ -3087,7 +2866,6 @@ function Restore-PSOptions {
                     -RootInfo $options.RootInfo `
                     -Top $options.Top `
                     -Runtime $options.Runtime `
-                    -Crossgen $options.Crossgen `
                     -Configuration $options.Configuration `
                     -PSModuleRestore $options.PSModuleRestore `
                     -Framework $options.Framework `
@@ -3111,10 +2889,6 @@ function New-PSOptionsObject
         [String]
         $Runtime,
 
-        [Parameter(Mandatory)]
-        [Bool]
-        $CrossGen,
-
         [Parameter(Mandatory)]
         [String]
         $Configuration,
@@ -3143,7 +2917,6 @@ function New-PSOptionsObject
         Framework = $Framework
         Runtime = $Runtime
         Output = $Output
-        CrossGen = $CrossGen
         PSModuleRestore = $PSModuleRestore
         ForMinimalSize = $ForMinimalSize
     }
diff --git a/tools/ci.psm1 b/tools/ci.psm1
index ee181f16893..432c00d6285 100644
--- a/tools/ci.psm1
+++ b/tools/ci.psm1
@@ -99,7 +99,7 @@ function Invoke-CIBuild
         Start-PSBuild -Configuration 'CodeCoverage' -PSModuleRestore -CI -ReleaseTag $releaseTag
     }
 
-    Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -CI -ReleaseTag $releaseTag
+    Start-PSBuild -PSModuleRestore -Configuration 'Release' -CI -ReleaseTag $releaseTag
     Save-PSOptions
 
     $options = (Get-PSOptions)
@@ -470,7 +470,7 @@ function Invoke-CIFinish
                 $prereleaseIteration = (get-date).Day
                 $preReleaseVersion = "$previewPrefix-$previewLabel.$prereleaseIteration"
                 # Build clean before backing to remove files from testing
-                Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime -output $buildFolder -PSOptionsPath "${buildFolder}/psoptions.json"
+                Start-PSBuild -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime -output $buildFolder -PSOptionsPath "${buildFolder}/psoptions.json"
                 $options = Get-PSOptions
                 # Remove symbol files.
                 $filter = Join-Path -Path (Split-Path $options.Output) -ChildPath '*.pdb'
@@ -481,7 +481,7 @@ function Invoke-CIFinish
                 $releaseTagParts = $releaseTag.split('.')
                 $preReleaseVersion = $releaseTagParts[0]+ ".9.9"
                 Write-Verbose "newPSReleaseTag: $preReleaseVersion" -Verbose
-                Start-PSBuild -CrossGen -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime -output $buildFolder -PSOptionsPath "${buildFolder}/psoptions.json"
+                Start-PSBuild -PSModuleRestore -Configuration 'Release' -ReleaseTag $preReleaseVersion -Clean -Runtime $Runtime -output $buildFolder -PSOptionsPath "${buildFolder}/psoptions.json"
                 $options = Get-PSOptions
                 # Remove symbol files.
                 $filter = Join-Path -Path (Split-Path $options.Output) -ChildPath '*.pdb'
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index d7669e34346..c1c04ada606 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -117,17 +117,6 @@ function Start-PSPackage {
         $Script:Options = Get-PSOptions
         $actualParams = @()
 
-        $crossGenCorrect = $false
-        if ($Runtime -match "arm" -or $Type -eq 'min-size') {
-            ## crossgen doesn't support arm32/64;
-            ## For the min-size package, we intentionally avoid crossgen.
-            $crossGenCorrect = $true
-        }
-        elseif ($Script:Options.CrossGen) {
-            $actualParams += '-CrossGen'
-            $crossGenCorrect = $true
-        }
-
         $PSModuleRestoreCorrect = $false
 
         # Require PSModuleRestore for packaging without symbols
@@ -144,14 +133,13 @@ function Start-PSPackage {
         }
 
         $precheckFailed = if ($Type -like 'fxdependent*' -or $Type -eq 'tar-alpine') {
-            ## We do not check for runtime and crossgen for framework dependent package.
+            ## We do not check on runtime for framework dependent package.
             -not $Script:Options -or                                ## Start-PSBuild hasn't been executed yet
             -not $PSModuleRestoreCorrect -or                        ## Last build didn't specify '-PSModuleRestore' correctly
             $Script:Options.Configuration -ne $Configuration -or    ## Last build was with configuration other than 'Release'
             $Script:Options.Framework -ne $script:netCoreRuntime    ## Last build wasn't for CoreCLR
         } else {
             -not $Script:Options -or                                ## Start-PSBuild hasn't been executed yet
-            -not $crossGenCorrect -or                               ## Last build didn't specify '-CrossGen' correctly
             -not $PSModuleRestoreCorrect -or                        ## Last build didn't specify '-PSModuleRestore' correctly
             $Script:Options.Runtime -ne $Runtime -or                ## Last build wasn't for the required RID
             $Script:Options.Configuration -ne $Configuration -or    ## Last build was with configuration other than 'Release'
@@ -171,14 +159,8 @@ function Start-PSPackage {
             # also ensure `Start-PSPackage` does what the user asks/expects, because once packages
             # are generated, it'll be hard to verify if they were built from the correct content.
 
-
             $params = @('-Clean')
 
-            # CrossGen cannot be done for framework dependent package as it is runtime agnostic.
-            if ($Type -notlike 'fxdependent*') {
-                $params += '-CrossGen'
-            }
-
             if (!$IncludeSymbols.IsPresent) {
                 $params += '-PSModuleRestore'
             }
@@ -4147,9 +4129,6 @@ function Invoke-AzDevOpsLinuxPackageBuild {
                 # We are cross compiling, so we can't generate experimental features
                 $buildParams.Add("SkipExperimentalFeatureGeneration", $true)
             }
-            default {
-                $buildParams.Add("Crossgen", $true)
-            }
         }
 
         $buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${mainLinuxBuildFolder}"
@@ -4169,7 +4148,6 @@ function Invoke-AzDevOpsLinuxPackageBuild {
                 Remove-Item -Path $binDir -Recurse -Force
             }
 
-            $buildParams['Crossgen'] = $false
             $buildParams['ForMinimalSize'] = $true
             $buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${minSizeLinuxBuildFolder}"
             Start-PSBuild -Clean @buildParams @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
diff --git a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 b/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1
index 9635bee4ff7..a3834fdf872 100644
--- a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1
+++ b/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1
@@ -63,7 +63,6 @@ function BuildPackages {
         } else {
             # make the artifact name unique
             $projectAssetsZipName = "linuxProjectAssets-$((Get-Date).Ticks)-symbols.zip"
-            $buildParams.Add("Crossgen", $true)
         }
 
         Start-PSBuild @buildParams @releaseTagParam
@@ -89,7 +88,6 @@ function BuildPackages {
             Remove-Item -Path $binDir -Recurse -Force
 
             ## Build 'min-size' and create 'tar.gz' package for it.
-            $buildParams['Crossgen'] = $false
             $buildParams['ForMinimalSize'] = $true
             Start-PSBuild @buildParams @releaseTagParam
             Start-PSPackage -Type min-size @releaseTagParam -LTS:$LTS
diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
index ee8dec54006..40fe755cd68 100644
--- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
+++ b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
@@ -97,7 +97,6 @@ try
     {
         Write-Verbose "Starting powershell build for RID: $Runtime and ReleaseTag: $ReleaseTag ..." -Verbose
         $buildParams = @{
-            CrossGen = !$ForMinimalSize -and $Runtime -notmatch "arm" -and $Runtime -notlike "fxdependent*"
             ForMinimalSize = $ForMinimalSize
         }
 
diff --git a/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 b/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
index 3b243dc71b4..92d64b47970 100644
--- a/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
+++ b/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
@@ -104,15 +104,14 @@ try {
     }
 
     if ($Build) {
-        $runCrossgen = $Runtime -eq 'osx-x64'
         if ($Symbols) {
-            Start-PSBuild -Clean -Configuration 'Release' -Crossgen:$runCrossgen -NoPSModuleRestore @releaseTagParam -Runtime $Runtime
+            Start-PSBuild -Clean -Configuration 'Release' -NoPSModuleRestore @releaseTagParam -Runtime $Runtime
             $pspackageParams['Type']='zip'
             $pspackageParams['IncludeSymbols']=$Symbols.IsPresent
             Write-Verbose "Starting powershell packaging(zip)..." -Verbose
             Start-PSPackage @pspackageParams @releaseTagParam
         } else {
-            Start-PSBuild -Configuration 'Release' -Crossgen:$runCrossgen -PSModuleRestore @releaseTagParam -Runtime $Runtime
+            Start-PSBuild -Configuration 'Release' -PSModuleRestore @releaseTagParam -Runtime $Runtime
             Start-PSPackage @pspackageParams @releaseTagParam
             switch ($ExtraPackage) {
                 "tar" { Start-PSPackage -Type tar @pspackageParams @releaseTagParam }

From a3c03392caaa0c7526a90f7721f9591e66f7bb7e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 27 Oct 2021 17:14:50 -0700
Subject: [PATCH 107/645] Add a major-minor build info JSON file (#16301)

---
 tools/metadata.json                           |  4 +-
 .../GenericLinuxFiles/PowerShellPackage.ps1   |  2 +-
 .../releaseBuild/azureDevOps/releaseBuild.yml |  2 +-
 .../azureDevOps/templates/linux.yml           |  4 +-
 .../templates/release-BuildJson.yml           | 47 +++++++++++++++----
 .../release-PublishPackageMsftCom.yml         |  4 +-
 .../macOS/PowerShellPackageVsts.ps1           |  3 +-
 7 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/tools/metadata.json b/tools/metadata.json
index 83e6c87fc53..4f133970e12 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -5,6 +5,6 @@
   "ReleaseTag": "v7.1.5",
   "LTSReleaseTag" : ["v7.0.8"],
   "NextReleaseTag": "v7.2.0-preview.11",
-  "LTSRelease": false,
-  "StableRelease": false
+  "LTSRelease": { "Latest": false, "Package": true },
+  "StableRelease":  { "Latest": false, "Package": true }
 }
diff --git a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 b/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1
index a3834fdf872..f96263ea6e8 100644
--- a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1
+++ b/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1
@@ -35,7 +35,7 @@ $semVersion = [System.Management.Automation.SemanticVersion] $version
 
 $metadata = Get-Content "$location/tools/metadata.json" -Raw | ConvertFrom-Json
 
-$LTS = $metadata.LTSRelease
+$LTS = $metadata.LTSRelease.Package
 
 Write-Verbose -Verbose -Message "LTS is set to: $LTS"
 
diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index 53dbe9ac31b..4616f734b25 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -217,7 +217,7 @@ stages:
 
         - powershell: |
             $metadata = Get-Content '$(Build.SourcesDirectory)/tools/metadata.json' -Raw | ConvertFrom-Json
-            $LTS = $metadata.LTSRelease
+            $LTS = $metadata.LTSRelease.Latest
             @{ ReleaseVersion = "$(Version)"; LTSRelease = $LTS } | ConvertTo-Json | Out-File "$(Build.StagingDirectory)\release.json"
             Get-Content "$(Build.StagingDirectory)\release.json"
             Write-Host "##vso[artifact.upload containerfolder=metadata;artifactname=metadata]$(Build.StagingDirectory)\release.json"
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index 30d3ee49129..353f6e2431c 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -103,7 +103,9 @@ jobs:
       Import-Module "$env:POWERSHELLROOT/tools/packaging"
 
       $metadata = Get-Content "$env:POWERSHELLROOT/tools/metadata.json" -Raw | ConvertFrom-Json
-      $LTS = $metadata.LTSRelease
+
+      # LTSRelease.Package indicates that the release should be packaged as an LTS
+      $LTS = $metadata.LTSRelease.Package
       Write-Verbose -Verbose -Message "LTS is set to: $LTS"
 
       Invoke-AzDevOpsLinuxPackageCreation -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
diff --git a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml b/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
index 5d51601625d..793b1cfd1d4 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
@@ -18,8 +18,8 @@ steps:
     $dateTime = [datetime]::new($dateTime.Ticks - ($dateTime.Ticks % [timespan]::TicksPerSecond), $dateTime.Kind)
 
     $metadata = Get-Content ./tools/metadata.json | ConvertFrom-Json
-    $stableRelease = $metadata.StableRelease
-    $ltsRelease = $metadata.LTSRelease
+    $stableRelease = $metadata.StableRelease.Latest
+    $ltsRelease = $metadata.LTSRelease.Latest
 
     $buildInfo = Get-Content $jsonFile | ConvertFrom-Json
     $buildInfo.ReleaseDate = $dateTime
@@ -35,17 +35,27 @@ steps:
     Write-Host "sending " + $vstsCommandString
     Write-Host "##$vstsCommandString"
 
-
     ## Create 'lts.json' if it's the latest stable and also a LTS release.
 
     $vstsCommandCopyLTSBuildInfo = "vso[task.setvariable variable=CopyLTSBuildInfo]NO"
+    $vstsCommandCopyVersionBuildInfo = "vso[task.setvariable variable=CopyVersionBuildInfo]NO"
 
-    if ($fileName -eq "stable.json" -and $ltsRelease)
-    {
-      $ltsFile = "$ENV:PIPELINE_WORKSPACE/lts.json"
-      Copy-Item -Path $targetFile -Destination $ltsFile -Force
-      $vstsCommandLtsJsonFile = "vso[task.setvariable variable=LtsBuildInfoJsonFile]$ltsFile"
-      $vstsCommandCopyLTSBuildInfo = "vso[task.setvariable variable=CopyLTSBuildInfo]YES"
+    if ($fileName -eq "stable.json") {
+      if ($ltsRelease) {
+        $ltsFile = "$ENV:PIPELINE_WORKSPACE/lts.json"
+        Copy-Item -Path $targetFile -Destination $ltsFile -Force
+        $vstsCommandLtsJsonFile = "vso[task.setvariable variable=LtsBuildInfoJsonFile]$ltsFile"
+        $vstsCommandCopyLTSBuildInfo = "vso[task.setvariable variable=CopyLTSBuildInfo]YES"
+      }
+
+      $releaseTag = $buildInfo.ReleaseTag
+      $version = $releaseTag -replace '^v'
+      $semVersion = [System.Management.Automation.SemanticVersion] $version
+
+      $versionFile = "$ENV:PIPELINE_WORKSPACE/$($semVersion.Major)-$($semVersion.Minor).json"
+      Copy-Item -Path $targetFile -Destination $versionFile -Force
+      $vstsCommandVersionJsonFile = "vso[task.setvariable variable=VersionBuildInfoJsonFile]$versionFile"
+      $vstsCommandCopyVersionBuildInfo = "vso[task.setvariable variable=CopyVersionBuildInfo]YES"
     }
 
     Write-Host "sending " + $vstsCommandCopyLTSBuildInfo
@@ -56,6 +66,15 @@ steps:
         Write-Host "sending " + $vstsCommandLtsJsonFile
         Write-Host "##$vstsCommandLtsJsonFile"
     }
+
+    Write-Host "sending " + $vstsCommandCopyVersionBuildInfo
+    Write-Host "##$vstsCommandCopyVersionBuildInfo"
+
+    if ($vstsCommandVersionJsonFile)
+    {
+        Write-Host "sending " + $vstsCommandVersionJsonFile
+        Write-Host "##$vstsCommandVersionJsonFile"
+    }
   displayName: Download and Capture NuPkgs
 
 - task: AzureFileCopy@2
@@ -77,3 +96,13 @@ steps:
     storage: '$(StorageAccount)'
     ContainerName: BuildInfo
   condition: and(succeeded(), eq(variables['CopyLTSBuildInfo'], 'YES'))
+
+- task: AzureFileCopy@2
+  displayName: 'AzureBlob build info ''Major-Minor.json'' Copy when needed'
+  inputs:
+    SourcePath: '$(VersionBuildInfoJsonFile)'
+    azureSubscription: '$(AzureFileCopySubscription)'
+    Destination: AzureBlob
+    storage: '$(StorageAccount)'
+    ContainerName: BuildInfo
+  condition: and(succeeded(), eq(variables['CopyVersionBuildInfo'], 'YES'))
diff --git a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml b/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml
index cb5ba23f5b9..5257fa2d9ab 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml
@@ -25,13 +25,13 @@ steps:
 
 - pwsh: |
     $metadata = Get-Content -Path "$ENV:PIPELINE_WORKSPACE/releasePipeline/metadata/release.json" -Raw | ConvertFrom-Json
-    Write-Verbose -Verbose "$(ReleaseTag) $(RepoClientCliClientID) $(RepoClientCliSecret) $(AzureVersion) $($metadata.LTSRelease)"
+    Write-Verbose -Verbose "$(ReleaseTag) $(RepoClientCliClientID) $(RepoClientCliSecret) $(AzureVersion) $($metadata.LTSRelease.Latest)"
     $params = @{
         ReleaseTag = "$(ReleaseTag)"
         AadClientId = "$(RepoClientCliClientID)"
         AadClientSecret = "$(RepoClientCliSecret)"
         BlobFolderName = "$(AzureVersion)"
-        LTS = $metadata.LTSRelease
+        LTS = $metadata.LTSRelease.Latest
         ForProduction = $true
     }
     & '$(Pipeline.Workspace)/tools/packages.microsoft.com/releaseLinuxPackages.ps1' @params
diff --git a/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 b/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
index 92d64b47970..acedbdd3388 100644
--- a/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
+++ b/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
@@ -65,7 +65,8 @@ if ($Build -or $PSCmdlet.ParameterSetName -eq 'packageSigned') {
         $semVersion = [System.Management.Automation.SemanticVersion] $version
 
         $metadata = Get-Content "$location/tools/metadata.json" -Raw | ConvertFrom-Json
-        $LTS = $metadata.LTSRelease
+
+        $LTS = $metadata.LTSRelease.Package
 
         Write-Verbose -Verbose -Message "LTS is set to: $LTS"
     }

From ffd06eb8ed26e51b939bb4088cc8b1c9a6be1f6c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 27 Oct 2021 17:15:28 -0700
Subject: [PATCH 108/645] Move mapping file into product repo and add Debian 11
  (#16316)

---
 tools/packages.microsoft.com/mapping.json     | 43 +++++++++++++++++++
 .../release-PublishPackageMsftCom.yml         |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 tools/packages.microsoft.com/mapping.json

diff --git a/tools/packages.microsoft.com/mapping.json b/tools/packages.microsoft.com/mapping.json
new file mode 100644
index 00000000000..c9ac168a43d
--- /dev/null
+++ b/tools/packages.microsoft.com/mapping.json
@@ -0,0 +1,43 @@
+{
+  "Packages" : [
+      {
+          "url": "microsoft-centos8-prod",
+          "distribution" : ["centos"],
+          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.rh.x86_64.rpm"
+      },
+      {
+          "url": "microsoft-rhel8.0-prod",
+          "distribution" : ["trusty"],
+          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.rh.x86_64.rpm"
+      },
+      {
+          "url": "microsoft-rhel7.3-prod",
+          "distribution" : ["trusty"],
+          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.rh.x86_64.rpm"
+      },
+      {
+          "distribution" : ["stretch"],
+          "PackageFormat" : "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+      },
+      {
+          "distribution" : ["buster"],
+          "PackageFormat" : "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+      },
+      {
+          "distribution" : ["bionic"],
+          "PackageFormat" : "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+      },
+      {
+          "distribution": ["focal"],
+          "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+      },
+      {
+          "distribution": ["xenial"],
+          "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+      },
+      {
+          "distribution": ["bullseye"],
+          "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+      }
+  ]
+}
diff --git a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml b/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml
index 5257fa2d9ab..56dbc48ba26 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml
@@ -34,5 +34,5 @@ steps:
         LTS = $metadata.LTSRelease.Latest
         ForProduction = $true
     }
-    & '$(Pipeline.Workspace)/tools/packages.microsoft.com/releaseLinuxPackages.ps1' @params
+    & '$(Pipeline.Workspace)/tools/packages.microsoft.com/releaseLinuxPackages.ps1' -MappingFilePath '$(System.DefaultWorkingDirectory)/tools/packages.microsoft.com/mapping.json'  @params
   displayName: Run release script

From bd4e5598cea4756cf2eecb1bc1c2cb53443d7b32 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Thu, 28 Oct 2021 10:39:55 -0700
Subject: [PATCH 109/645] Fix for SSH remoting when banner is enabled on SSHD
 endpoint (#16205)

---
 .../ExperimentalFeature.cs                    |  4 +++
 .../fanin/OutOfProcTransportManager.cs        | 34 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index cb0be3193a7..5695d54806d 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -23,6 +23,7 @@ public class ExperimentalFeature
         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
@@ -127,6 +128,9 @@ static ExperimentalFeature()
                 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"),
diff --git a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
index 75f70941856..038ea9620e5 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
@@ -1762,7 +1762,39 @@ private void ProcessErrorThread(object state)
 
                 while (true)
                 {
-                    string error = ReadError(reader);
+                    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);
 
                     if (error.Length == 0)
                     {

From 5ce5936d783d3a0a01363aad86418d86bc677541 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 28 Oct 2021 11:07:09 -0700
Subject: [PATCH 110/645] Create compliance build (#16286)

Co-authored-by: Robert Holt <rjmholt@gmail.com>
---
 assets/additionalAttributions.txt             |  11 +-
 .../ComponentGovernance.psm1                  | 135 ++++++++++++++++++
 tools/findMissingNotices.ps1                  |   2 +-
 tools/releaseBuild/azureDevOps/compliance.yml |  44 ++++++
 .../azureDevOps/templates/compliance.yml      |  22 +--
 .../templates/compliance/compliance.yml       |  90 ++++++++++++
 .../templates/compliance/generateNotice.yml   |  64 +++++++++
 7 files changed, 344 insertions(+), 24 deletions(-)
 create mode 100644 tools/ComponentGovernance/ComponentGovernance.psm1
 create mode 100644 tools/releaseBuild/azureDevOps/compliance.yml
 create mode 100644 tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
 create mode 100644 tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml

diff --git a/assets/additionalAttributions.txt b/assets/additionalAttributions.txt
index c43aba0ef65..6676ca99cf5 100644
--- a/assets/additionalAttributions.txt
+++ b/assets/additionalAttributions.txt
@@ -1,6 +1,9 @@
-## Used to generate a new TPN
-## Copy this into the additional attributions fields
-## Copy everything below here, but do not include this line
+
+-------------------------------------------------------------------
+
+-------------------------------------------------------------------
+
+Additional  -
 
 -------------------------------------------------
 Microsoft.PowerShell.Archive
@@ -35,7 +38,7 @@ Microsoft.Management.Infrastructure
 
 Copyright (c) Microsoft Corporation
 
-All rights reserved. 
+All rights reserved.
 
 MIT License
 
diff --git a/tools/ComponentGovernance/ComponentGovernance.psm1 b/tools/ComponentGovernance/ComponentGovernance.psm1
new file mode 100644
index 00000000000..53ec66d7820
--- /dev/null
+++ b/tools/ComponentGovernance/ComponentGovernance.psm1
@@ -0,0 +1,135 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Class CgData {
+    [pscredential]$Pat
+    [string]$Organization
+    [string]$Project
+
+    CgData ([pscredential]$Pat, [string]$Organization, [string]$Project) {
+        $this.Pat = $Pat
+        $this.Organization = $Organization
+        $this.Project = $Project
+    }
+}
+
+# Get the Component Governance data needed to connect to the API
+function Get-CgData {
+    if($Script:cgData){return $Script:cgData}
+    throw "First call Set-CgCredentials"
+}
+
+# Get a Component Governance API URI
+function Get-Uri {
+    param(
+        [Parameter(Mandatory=$true)]
+        [string]$PathPortion
+    )
+    $cgData = Get-CgData
+    $baseUri = "https://governance.dev.azure.com/$($cgData.Organization)/$($cgData.Project)/_apis/componentgovernance/$PathPortion"
+    Write-Verbose "uri: $baseUri" -Verbose
+    return $baseUri
+}
+
+# A class representing a Component Governance repository
+class CgRepository {
+    #Json formatted summary information about this repository. Currently contains number of active nuget.config alerts.
+    [Object] $additionalInformation
+
+    #The associations for this governed repository. For example, all service tree related entries.
+    [Object] $associations
+
+    #Creator of the governed repository.
+    [Object] $createdBy
+
+    [string] $createdDate
+
+    [int] $id
+
+    [string] $modifiedBy
+
+    [string] $modifiedDate
+
+    [string] $name
+
+    #The policies that are configured in the governed repository.
+    [object[]] $policies
+
+    [object] $projectReference
+
+    [string] $repositoryMoniker
+
+    [object] $repositoryOptions
+
+    [object] $type
+
+    [string] $url
+
+    [object] $userRole
+}
+
+# Gets a list of all repositories governed in the current project
+function Get-CgRepositories {
+    $uri = Get-Uri -PathPortion "governedrepositories?api-version=6.1-preview.1"
+    $cgData = Get-CgData
+    [CgRepository[]] (Invoke-RestMethod -Uri $uri -Authentication Basic -Credential $cgData.Pat).value
+}
+
+# Gets this PowerShell master repository
+Function Get-CgPsRepository {
+    Get-CgRepositories | Where-Object {$_.name -eq 'PowerShell' -and $_.repositoryMoniker -notlike '*/*'}
+}
+
+# Gets the Component Governance Snapshot Type (unique to each Pipeline and Job) in the repository
+function Get-CgSnapshotType {
+    param(
+        [CgRepository]
+        $CgRepository
+    )
+
+    $id = $CgRepository.Id
+    $uri = Get-Uri -PathPortion "GovernedRepositories/$id/snapshottypes?api-version=6.1-preview.1"
+    $cgData = Get-CgData
+    (Invoke-RestMethod -Authentication Basic -Credential $cgData.Pat -Uri $uri).Value
+}
+
+# Gets a Component Governance Notice for a given snapshot type
+function Get-CgNotice {
+    param(
+        [CgRepository]
+        $CgRepository,
+        [int]
+        $SnapshotTypeId
+    )
+
+    $id = $CgRepository.Id
+    $uri = Get-Uri -PathPortion "GovernedRepositories/${id}/notice?snapshotTypeId=${SnapshotTypeId}&api-version=6.1-preview.1"
+    $cgData = Get-CgData
+    (Invoke-RestMethod -Authentication Basic -Credential $cgData.Pat -Uri $uri).content
+}
+
+# Sets the Component Governance credentials used by other functions to connect to the API
+function Set-CgCredentials {
+    param(
+        [Parameter(Mandatory=$true)]
+        [securestring] $Pat,
+
+        [Parameter(Mandatory=$true)]
+        [string] $Organization,
+
+        [Parameter(Mandatory=$true)]
+        [string] $Project
+    )
+
+    $pscred = [PSCredential]::new("PAT",$Pat)
+    $script:cgData = [CgData]::new($pscred, $Organization, $Project)
+}
+
+Export-ModuleMember -Function @(
+    'Get-CgRepositories'
+    'Set-CgCredentials'
+    'Get-CgRepository'
+    'Get-CgPsRepository'
+    'Get-CgSnapshotType'
+    'Get-CgNotice'
+)
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index 7e802e4238a..d1cf198f8be 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -109,7 +109,7 @@ $targets | ForEach-Object {
     $name = $parts[0]
     $targetVersion = $parts[1]
     $pattern = [regex]::Escape($name) + " "
-    $tpnMatch = select-string -Path $PSScriptRoot\..\ThirdPartyNotices.txt -Pattern $pattern
+    $tpnMatch = Select-String -Path $PSScriptRoot\..\ThirdPartyNotices.txt -Pattern $pattern
     if (!$tpnMatch) {
         if ($existingRegistrationTable.ContainsKey($name)) {
             $registrationVersion = $existingRegistrationTable.$name.Component.Version()
diff --git a/tools/releaseBuild/azureDevOps/compliance.yml b/tools/releaseBuild/azureDevOps/compliance.yml
new file mode 100644
index 00000000000..d6aabe81dd7
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/compliance.yml
@@ -0,0 +1,44 @@
+name: Compliance-$(Build.BuildId)
+
+trigger: none
+pr: none
+
+schedules:
+  # Chrontab format, see https://en.wikipedia.org/wiki/Cron
+  # this is in UTC
+  - cron: '0 13 * * *'
+    branches:
+      include:
+      - master
+
+resources:
+  repositories:
+  - repository: ComplianceRepo
+    type: github
+    endpoint: ComplianceGHRepo
+    name: PowerShell/compliance
+    ref: master
+
+variables:
+  - name: DOTNET_CLI_TELEMETRY_OPTOUT
+    value: 1
+  - name: POWERSHELL_TELEMETRY_OPTOUT
+    value: 1
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+  # Defines the variables AzureFileCopySubscription, StorageAccount, StorageAccountKey, StorageResourceGroup, StorageSubscriptionName
+  - group: 'Azure Blob variable group'
+  # Defines the variables CgPat, CgOrganization, and CgProject
+  - group: 'ComponentGovernance'
+
+stages:
+  - stage: compliance
+    dependsOn: []
+    jobs:
+      - template: templates/compliance/compliance.yml
+        parameters:
+          parentJobs: []
+      - template: templates/compliance/generateNotice.yml
+        parameters:
+          parentJobs: []
+
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml
index 280ae3551f6..7ab3b31b97b 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance.yml
@@ -62,13 +62,6 @@ jobs:
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
     displayName: 'Run Defender Scan'
 
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
-    displayName: 'Run CredScan'
-    inputs:
-      suppressionsFile: tools/credScan/suppress.json
-      debugMode: false
-    continueOnError: true
-
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@3
     displayName: 'Run BinSkim '
     inputs:
@@ -80,18 +73,6 @@ jobs:
       AnalyzeStatistics: true
     continueOnError: true
 
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@1
-    displayName: 'Run PoliCheck'
-    inputs:
-      targetType: F
-      optionsFC: 0
-      optionsXS: 1
-      optionsPE: '1|2|3|4'
-      optionsHMENABLE: 0
-      optionsRulesDBPath: '$(Build.SourcesDirectory)\tools\terms\PowerShell-Terms-Rules.mdb'
-      optionsUEPath: $(Build.SourcesDirectory)\tools\terms\TermsExclusion.xml
-    continueOnError: true
-
   # add RoslynAnalyzers
 
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-autoapplicability.AutoApplicability@1
@@ -138,7 +119,10 @@ jobs:
       uploadModernCop: false
       uploadPREfast: false
       uploadRoslyn: false
+      uploadBinSkim: false
       uploadTSLint: false
+      uploadCredScan: false
+      uploadPoliCheck: false
 
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-report.SdtReport@1
     displayName: 'Create Security Analysis Report'
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
new file mode 100644
index 00000000000..4d1007957c8
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
@@ -0,0 +1,90 @@
+parameters:
+  - name: parentJobs
+    type: jobList
+
+jobs:
+- job: compliance
+  variables:
+  - name: runCodesignValidationInjection
+    value : false
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+
+  # Defines the variables APIScanClient, APIScanTenant and APIScanSecret
+  - group: PS-PS-APIScan
+
+  displayName: Compliance
+  dependsOn:
+    ${{ parameters.parentJobs }}
+  pool:
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019
+
+  # APIScan can take a long time
+  timeoutInMinutes: 180
+
+  steps:
+  - checkout: self
+    clean: true
+
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
+    displayName: 'Run CredScan'
+    inputs:
+      suppressionsFile: tools/credScan/suppress.json
+      debugMode: false
+    continueOnError: true
+
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@1
+    displayName: 'Run PoliCheck'
+    inputs:
+      # targetType F means file or folder and is the only applicable value and the default
+      targetType: F
+      # 1 to enable source code comment scanning, which is what we should do for open source
+      optionsFC: 1
+      # recurse
+      optionsXS: 1
+      # run for severity 1, 2, 3 and 4 issues
+      optionsPE: '1|2|3|4'
+      # disable history management
+      optionsHMENABLE: 0
+      # Excluclusion access database
+      optionsRulesDBPath: '$(Build.SourcesDirectory)\tools\terms\PowerShell-Terms-Rules.mdb'
+      # Terms Exclusion xml file
+      optionsUEPath: $(Build.SourcesDirectory)\tools\terms\TermsExclusion.xml
+    continueOnError: true
+
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
+    displayName: 'Publish Security Analysis Logs to Build Artifacts'
+    continueOnError: true
+
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-uploadtotsa.TSAUpload@1
+    displayName: 'TSA upload to Codebase: PowerShellCore_201906'
+    inputs:
+      tsaVersion: TsaV2
+      codeBaseName: 'PowerShellCore_201906'
+      uploadFortifySCA: false
+      uploadFxCop: false
+      uploadModernCop: false
+      uploadPREfast: false
+      uploadRoslyn: false
+      uploadTSLint: false
+      uploadCredScan: true
+      uploadPoliCheck: true
+      uploadBinSkim: false
+
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-report.SdtReport@1
+    displayName: 'Create Security Analysis Report'
+    inputs:
+      TsvFile: false
+      APIScan: false
+      BinSkim: false
+      CredScan: true
+      PoliCheck: true
+      PoliCheckBreakOn: Severity2Above
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: 'Component Detection'
+    inputs:
+      sourceScanPath: '$(Build.SourcesDirectory)'
+      snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
new file mode 100644
index 00000000000..c517a15b6ac
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
@@ -0,0 +1,64 @@
+parameters:
+  - name: parentJobs
+    type: jobList
+
+jobs:
+- job: generateNotice
+  variables:
+  - name: runCodesignValidationInjection
+    value : false
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+
+  displayName: Generate Notice
+  dependsOn:
+    ${{ parameters.parentJobs }}
+  pool:
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019
+
+  # APIScan can take a long time
+  timeoutInMinutes: 15
+
+  steps:
+  - checkout: self
+    clean: true
+
+  - pwsh: |
+      Get-Content ./assets/additionalAttributions.txt | Out-File '$(System.ArtifactsDirectory)\additionalAttributions.txt' -Encoding utf8NoBOM -Force
+      Get-Content -Raw -Path  '$(System.ArtifactsDirectory)\additionalAttributions.txt'
+    displayName: Get Additional Attributions
+
+  - pwsh: |
+      Import-Module ./tools/ComponentGovernance
+      $pat = ConvertTo-SecureString -String "$(CgPat)" -AsPlainText -Force
+      Set-CgCredentials -Pat $pat -Organization $(CgOrganization) -Project $(CgProject)
+      $repo = Get-CgPsRepository
+      $typeId = (Get-CgSnapshotType -CgRepository $repo | where-object {$_.isTracked -eq 'True' -and $_.buildDisplayType -eq 'Coordinated Packages'}).typeId
+      $notice = Get-CgNotice -CgRepository $repo -SnapshotTypeId $typeId
+      $notice | Out-File '$(System.ArtifactsDirectory)\ThirdPartyNotices.txt' -Encoding utf8NoBOM -Force
+      Get-Content '$(System.ArtifactsDirectory)\additionalAttributions.txt' | Out-File '$(System.ArtifactsDirectory)\ThirdPartyNotices.txt' -Encoding utf8NoBOM -Force -Append
+    displayName: Get Notice
+
+  - task: AzureFileCopy@4
+    displayName: 'upload Notice'
+    inputs:
+      SourcePath: $(System.ArtifactsDirectory)\ThirdPartyNotices.txt
+      azureSubscription: '$(AzureFileCopySubscription)'
+      Destination: AzureBlob
+      storage: '$(StorageAccount)'
+      ContainerName: 'tpn'
+      resourceGroup: '$(StorageResourceGroup)'
+
+  - task: PublishPipelineArtifact@1
+    inputs:
+      targetPath: $(System.ArtifactsDirectory)
+      artifactName: notice
+    displayName: Publish notice artifacts
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: 'Component Detection'
+    inputs:
+      sourceScanPath: '$(Build.SourcesDirectory)'
+      snapshotForceEnabled: true

From 48be7b7f45dcc2637552a7148c6dbdecd3a1a38a Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Thu, 28 Oct 2021 23:17:15 +0500
Subject: [PATCH 111/645] Avoid validation for built-in file extension and
 color VT sequences (#16320)

---
 .../FormatAndOutput/common/PSStyle.cs         | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
index 52ca35dff4b..3a641edc429 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
@@ -35,7 +35,7 @@ public enum ProgressView
         /// <summary>Classic rendering of progress.</summary>
         Classic = 1,
     }
-    
+
     #region PSStyle
     /// <summary>
     /// Contains configuration for how PowerShell renders text.
@@ -365,7 +365,7 @@ public string Error
                 get => _error;
                 set => _error = ValidateNoContent(value);
             }
-            
+
             private string _error = "\x1b[31;1m";
 
             /// <summary>
@@ -397,7 +397,7 @@ public string Debug
             {
                 get => _debug;
                 set => _debug = ValidateNoContent(value);
-            }   
+            }
 
             private string _debug = "\x1b[33;1m";
         }
@@ -467,6 +467,16 @@ public void Add(string extension, string decoration)
                     _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>
@@ -543,19 +553,19 @@ public FileInfoFormatting()
                 Extension = new FileExtensionDictionary();
 
                 // archives
-                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");
+                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");
 
                 // powershell
-                Extension.Add(".ps1", "\x1b[33;1m");
-                Extension.Add(".psd1", "\x1b[33;1m");
-                Extension.Add(".psm1", "\x1b[33;1m");
-                Extension.Add(".ps1xml", "\x1b[33;1m");
+                Extension.AddWithoutValidation(".ps1", "\x1b[33;1m");
+                Extension.AddWithoutValidation(".psd1", "\x1b[33;1m");
+                Extension.AddWithoutValidation(".psm1", "\x1b[33;1m");
+                Extension.AddWithoutValidation(".ps1xml", "\x1b[33;1m");
             }
         }
 
@@ -688,7 +698,7 @@ private PSStyle()
 
         private static string ValidateNoContent(string text)
         {
-            var decorartedString = new StringDecorated(text);
+            var decorartedString = new ValueStringDecorated(text);
             if (decorartedString.ContentLength > 0)
             {
                 throw new ArgumentException(string.Format(PSStyleStrings.TextContainsContent, decorartedString.ToString(OutputRendering.PlainText)));

From 51e11aaedfde46ed5844d98ca87d414348325a06 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Thu, 28 Oct 2021 23:22:09 +0500
Subject: [PATCH 112/645] Remove unnecessary call to `ToArray` (#16307)

---
 src/System.Management.Automation/CoreCLR/CorePsPlatform.cs   | 2 +-
 .../engine/InitialSessionState.cs                            | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
index 859aa8ecfe3..dd0877710d6 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
@@ -184,7 +184,7 @@ public static bool IsStaSupported
 #endif
 
         // format files
-        internal static readonly List<string> FormatFileNames = new()
+        internal static readonly string[] FormatFileNames = new string[]
         {
             "Certificate.format.ps1xml",
             "Diagnostics.format.ps1xml",
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index 815f7ea5628..05eb871053d 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -1434,9 +1434,6 @@ private static InitialSessionState CreateRestrictedForRemoteServer()
             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;
@@ -1446,7 +1443,7 @@ private static void IncludePowerShellCoreFormats(InitialSessionState iss)
             }
 
             iss.Formats.Clear();
-            foreach (var coreFormat in s_PSCoreFormatFileNames)
+            foreach (var coreFormat in Platform.FormatFileNames)
             {
                 iss.Formats.Add(new SessionStateFormatEntry(Path.Combine(psHome, coreFormat)));
             }

From 52b6d8940718892d487de13191a040eabae44284 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 28 Oct 2021 11:40:52 -0700
Subject: [PATCH 113/645] Update to latest .NET 6 GA build `
 6.0.100-rtm.21527.11` (#16309)

---
 .vsts-ci/mac.yml                              |   4 -
 .vsts-ci/templates/ci-build.yml               |  15 +--
 .vsts-ci/templates/nix-test.yml               |   7 --
 DotnetRuntimeMetadata.json                    |  10 +-
 assets/wix/files.wxs                          |  62 +++++++++-
 build.psm1                                    | 108 ++++++++++++++----
 global.json                                   |   2 +-
 nuget.config                                  |   2 +
 ...soft.PowerShell.Commands.Management.csproj |   2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |   6 +-
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |   2 +-
 .../Microsoft.PowerShell.SDK.csproj           |  20 ++--
 .../Microsoft.WSMan.Management.csproj         |   2 +-
 .../System.Management.Automation.csproj       |  20 ++--
 .../dotnet-tools/Reporting/Reporting.csproj   |   4 +-
 .../ResultsComparer/ResultsComparer.csproj    |   6 +-
 test/tools/TestService/TestService.csproj     |   2 +-
 test/tools/WebListener/WebListener.csproj     |   4 +-
 tools/UpdateDotnetRuntime.ps1                 |   7 +-
 tools/ci.psm1                                 |   1 +
 ...crosoft.PowerShell.Commands.Utility.csproj |   2 +-
 .../System.Management.Automation.csproj       |   3 +-
 .../templates/release-SDKTests.yml            |   6 -
 23 files changed, 198 insertions(+), 99 deletions(-)

diff --git a/.vsts-ci/mac.yml b/.vsts-ci/mac.yml
index 3cd35335bef..aeb9e8e5c22 100644
--- a/.vsts-ci/mac.yml
+++ b/.vsts-ci/mac.yml
@@ -97,10 +97,6 @@ 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
diff --git a/.vsts-ci/templates/ci-build.yml b/.vsts-ci/templates/ci-build.yml
index b88aa1b7c3d..cbbd5349417 100644
--- a/.vsts-ci/templates/ci-build.yml
+++ b/.vsts-ci/templates/ci-build.yml
@@ -11,38 +11,31 @@ jobs:
   displayName: ${{ parameters.displayName }}
 
   steps:
-  - powershell: |
+  - pwsh: |
       Get-ChildItem -Path env:
     displayName: Capture Environment
     condition: succeededOrFailed()
 
-  - powershell:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
+  - pwsh:  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()
 
-  - powershell: |
+  - pwsh: |
       Import-Module .\tools\ci.psm1
       Invoke-CIBuild
     displayName: Build
     condition: succeeded()
 
-  - powershell: |
+  - pwsh: |
       Import-Module .\tools\ci.psm1
       Restore-PSOptions
       Invoke-CIxUnit -SkipFailing
diff --git a/.vsts-ci/templates/nix-test.yml b/.vsts-ci/templates/nix-test.yml
index 6a1b6e6f9de..f2f04d9dd5c 100644
--- a/.vsts-ci/templates/nix-test.yml
+++ b/.vsts-ci/templates/nix-test.yml
@@ -33,13 +33,6 @@ 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
diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 7a24b57b192..1b95abccd68 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,13 +1,15 @@
 {
   "sdk": {
-    "channel": "6.0.1xx-rc1",
+    "channel": "6.0.1xx",
     "quality": "signed",
     "qualityFallback": "daily",
-    "packageVersionPattern": "6.0.0-rc.1",
+    "packageVersionPattern": "6.0.0",
     "sdkImageVersion": "6.0.100",
-    "nextChannel": "6.0.1xx-rc1"
+    "nextChannel": "6.0.1xx",
+    "azureFeed": "https://dotnetstage.blob.core.windows.net/6-0-100-rtm-21527-11-public",
+    "sdkImageOverride": "6.0.100-rtm.21527.11"
   },
   "internalfeed" : {
-    "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21458.32-shipping/nuget/v2"
+    "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rtm.21527.11-shipping/nuget/v2"
   }
 }
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 8fcd2f987aa..13e38dbdd68 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1990,6 +1990,9 @@
         <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,6 +2055,9 @@
         <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">
@@ -2114,6 +2120,9 @@
         <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">
@@ -2176,6 +2185,9 @@
         <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">
@@ -2238,6 +2250,9 @@
         <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">
@@ -2300,6 +2315,9 @@
         <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">
@@ -2362,6 +2380,9 @@
         <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">
@@ -2424,6 +2445,9 @@
         <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">
@@ -2486,6 +2510,9 @@
         <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">
@@ -2548,6 +2575,9 @@
         <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">
@@ -2610,6 +2640,9 @@
         <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">
@@ -2672,6 +2705,9 @@
         <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">
@@ -2734,6 +2770,9 @@
         <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">
@@ -3109,8 +3148,11 @@
       <Component Id="cmp09155DA101E1424B98832A789E93E835">
         <File Id="fil7D748565EBF5423A84CFC6D25D21F43C" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Bcl.AsyncInterfaces.dll" />
       </Component>
-      <Component Id="cmpDAFCD776C56B4CF78A4534704588E38B">
-        <File Id="fil0734B55E8FC6480B97679A249A892D54" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.48005.dll" />
+      <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>
     </DirectoryRef>
   </Fragment>
@@ -4110,10 +4152,24 @@
       <ComponentRef Id="cmp2B8239B905B146A69CD5D55A353AC131" />
       <ComponentRef Id="cmpBD958F4B8F9146499DE2CA6321C65F96" />
       <ComponentRef Id="cmp166B17F72C954B0087DF991E560B399A" />
-      <ComponentRef Id="cmpDAFCD776C56B4CF78A4534704588E38B" />
       <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" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/build.psm1 b/build.psm1
index 1f600cf0593..b8369dbaf16 100644
--- a/build.psm1
+++ b/build.psm1
@@ -16,6 +16,8 @@ $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
@@ -386,7 +388,8 @@ function Start-PSBuild {
     }
 
     # Verify if the dotnet in-use is the required version
-    $dotnetCLIInstalledVersion = Start-NativeExecution -sb { dotnet --version } -IgnoreExitcode
+    $dotnetCLIInstalledVersion = Get-LatestInstalledSDK
+
     If ($dotnetCLIInstalledVersion -ne $dotnetCLIRequiredVersion) {
         Write-Warning @"
 The currently installed .NET Command Line Tools is not the required version.
@@ -1746,6 +1749,13 @@ 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" }
@@ -1773,10 +1783,12 @@ 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"
-        Start-NativeExecution {
-            Write-Verbose -Message "downloading install script from $installObtainUrl/$installScript ..." -Verbose
+
+        Write-Verbose -Message "downloading install script from $installObtainUrl/$installScript ..." -Verbose
             & $wget $installObtainUrl/$installScript
 
             if ((Get-ChildItem "./$installScript").Length -eq 0) {
@@ -1795,9 +1807,16 @@ function Install-Dotnet {
             }
 
             if ($AzureFeed) {
-                $bashArgs += @('-AzureFeed', $AzureFeed, '-FeedCredential', $FeedCredential)
+                $bashArgs += @('-AzureFeed', $AzureFeed)
+            }
+
+            if ($FeedCredential) {
+                $bashArgs += @('-FeedCredential', $FeedCredential)
             }
 
+            $bashArgs | Out-String | Write-Verbose -Verbose
+
+        Start-NativeExecution {
             bash @bashArgs
         }
     } elseif ($environment.IsWindows) {
@@ -1820,35 +1839,44 @@ function Install-Dotnet {
             }
 
             if ($AzureFeed) {
-                $installArgs += @{
-                    AzureFeed       = $AzureFeed
-                    $FeedCredential = $FeedCredential
-                }
+                $installArgs += @{AzureFeed = $AzureFeed}
             }
 
+            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
-            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 ($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 ($InstallDir) {
+                $psArgs += @('-InstallDir', $InstallDir)
+            }
 
-                if ($AzureFeed) {
-                    $psArgs += @('-AzureFeed', $AzureFeed, '-FeedCredential', $FeedCredential)
-                }
+            if ($AzureFeed) {
+                $psArgs += @('-AzureFeed', $AzureFeed)
+            }
+
+            if ($FeedCredential) {
+                $psArgs += @('-FeedCredential', $FeedCredential)
+            }
 
+            $psArgs | Out-String | Write-Verbose -Verbose
+
+            Start-NativeExecution {
                 & $fullPSPath @psArgs
             }
         }
@@ -1882,6 +1910,10 @@ 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
@@ -2014,14 +2046,18 @@ 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 = Start-NativeExecution -sb { dotnet --version } -IgnoreExitcode
+            $dotNetVersion = Get-LatestInstalledSDK
         }
 
         if(!$dotNetExists -or $dotNetVersion -ne $dotnetCLIRequiredVersion -or $Force.IsPresent) {
@@ -2036,6 +2072,12 @@ 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 {
@@ -2057,6 +2099,12 @@ 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(
@@ -2189,17 +2237,29 @@ 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 = Start-NativeExecution -sb { dotnet --version } -IgnoreExitcode 2> $null
+        $dotnetCLIInstalledVersion = Get-LatestInstalledSDK
         Pop-Location
-        if ($dotnetCLIInstalledVersion -ne $dotnetCLIRequiredVersion) {
+
+        Write-Verbose -Verbose "dotnetCLIInstalledVersion = $dotnetCLIInstalledVersion`nchosenDotNetVersion = $chosenDotNetVersion"
+
+        if ($dotnetCLIInstalledVersion -ne $chosenDotNetVersion) {
             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
diff --git a/global.json b/global.json
index 3ebca84bcfe..047020849f2 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.100-rc.2.21505.57"
+    "version": "6.0.100"
   }
 }
diff --git a/nuget.config b/nuget.config
index 7700d4e098e..cf9fec6fb1e 100644
--- a/nuget.config
+++ b/nuget.config
@@ -4,9 +4,11 @@
     <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-rtm.21524.1-shipping/nuget/v2" />
   </packageSources>
   <disabledPackageSources>
     <clear />
   </disabledPackageSources>
 </configuration>
 
+
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index fbf6e014569..7ab8ecf2825 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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-rc.2.21480.5" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 2dc75f7edd5..bff5cc802d0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-5.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.2.21480.5" />
+    <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="NJsonSchema" Version="10.5.2" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 238d772473e..c2dba27c14f 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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-rc.2.21480.5" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 3cb21e8d889..b79ab533b88 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,19 +18,19 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rc.2.21480.5" />
+    <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" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0-rc2.21473.1" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.9.0-rc2.21473.1" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.9.0-rc2.21473.1" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.9.0-rc2.21473.1" />
-    <PackageReference Include="System.Private.ServiceModel" Version="4.9.0-rc2.21473.1" />
+    <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" />
     <!-- 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-rc.2.21480.5" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 232a1ec3149..d6b7c281f9e 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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-rc.2.21480.5" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index df46277a11a..c7ba6db749d 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <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-rc.2.21480.5" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.DirectoryServices" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" />
-    <PackageReference Include="System.Management" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Security.Permissions" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.2.21480.5" />
+    <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" />
     <!-- 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" />
diff --git a/test/perf/dotnet-tools/Reporting/Reporting.csproj b/test/perf/dotnet-tools/Reporting/Reporting.csproj
index ca56fc51efc..e0d2f3b8249 100644
--- a/test/perf/dotnet-tools/Reporting/Reporting.csproj
+++ b/test/perf/dotnet-tools/Reporting/Reporting.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
+    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="5.0.0-preview.5.20278.1" />
   </ItemGroup>
 
 </Project>
diff --git a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
index 9934bd0df21..838d6ccd673 100644
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>$(PERFLAB_TARGET_FRAMEWORKS)</TargetFrameworks>
@@ -6,10 +6,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.4.3" />
+    <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
     <PackageReference Include="Perfolizer" Version="0.2.1" />
   </ItemGroup>
 </Project>
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 8ad3769503e..491a77f0c80 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index ca6c52c5629..bbc07be5259 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.2.21480.10" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index 37e2d43dec8..7fe58363920 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -189,7 +189,7 @@ function Get-DotnetUpdate {
     try {
 
         try {
-            $latestSDKVersionString = Invoke-RestMethod -Uri "http://aka.ms/dotnet/$channel/$quality/sdk-productVersion.txt" -ErrorAction Stop | ForEach-Object { $_.Trim() }
+            $latestSDKVersionString = Invoke-RestMethod -Uri "http://aka.ms/dotnet/$channel/$quality/productVersion.txt" -ErrorAction Stop | ForEach-Object { $_.Trim() }
             $selectedQuality = $quality
         } catch {
             if ($_.exception.Response.StatusCode -eq 'NotFound') {
@@ -201,7 +201,7 @@ function Get-DotnetUpdate {
 
         if (-not $latestSDKVersionString -or -not $latestSDKVersionString.StartsWith($sdkImageVersion)) {
             # we did not get a version number so fall back to daily
-            $latestSDKVersionString = Invoke-RestMethod -Uri "http://aka.ms/dotnet/$channel/$qualityFallback/sdk-productVersion.txt" -ErrorAction Stop | ForEach-Object { $_.Trim() }
+            $latestSDKVersionString = Invoke-RestMethod -Uri "http://aka.ms/dotnet/$channel/$qualityFallback/productVersion.txt" -ErrorAction Stop | ForEach-Object { $_.Trim() }
             $selectedQuality = $qualityFallback
 
             if (-not $latestSDKVersionString.StartsWith($sdkImageVersion)) {
@@ -339,6 +339,9 @@ if ($dotnetUpdate.ShouldUpdate) {
         Start-PSBootstrap -Package
         Start-PSBuild -Clean -Configuration Release -CrossGen -InteractiveAuth:$InteractiveAuth
 
+        $publishPath = Split-Path (Get-PSOutput)
+        Remove-Item -Path "$publishPath\*.pdb"
+
         try {
             Start-PSPackage -Type msi -SkipReleaseChecks -InformationVariable wxsData
         } catch {
diff --git a/tools/ci.psm1 b/tools/ci.psm1
index 432c00d6285..f4ed3c78945 100644
--- a/tools/ci.psm1
+++ b/tools/ci.psm1
@@ -171,6 +171,7 @@ function Invoke-CIInstall
     }
 
     Set-BuildVariable -Name TestPassed -Value False
+    Write-Verbose -Verbose -Message "Calling Start-PSBootstrap from Invoke-CIInstall"
     Start-PSBootstrap
 }
 
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 3e50a220974..53eee6e16db 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
     <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
   </ItemGroup>
 </Project>
diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
index 036022f1c65..e382b8cbb33 100644
--- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@@ -9,7 +9,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0-rc.2.21480.5" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="6.0.0-preview.5.21301.5" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
   </ItemGroup>
 </Project>
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
index 5e460147141..d6b773a4476 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@@ -54,12 +54,6 @@ jobs:
             Write-Verbose -Message "Register new package source 'dotnet'" -verbose
         }
 
-        ## Remove old .NET SDKs if any exists
-        if (Test-Path -Type Container $Home/.dotnet)
-        {
-            Remove-Item $Home/.dotnet -Recurse -Force
-        }
-
         ## Install latest version from the channel
         #Install-Dotnet -Channel "$Channel" -Version $sdkVersion
 

From f41b6b415eea8524ac04c004a4d90372753f8229 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 28 Oct 2021 11:44:06 -0700
Subject: [PATCH 114/645] Add GitHub Workflow to keep notices up to date
 (#16284)

Co-authored-by: Robert Holt <rjmholt_msft@outlook.com>
---
 .github/workflows/update-cgmanifest.yml    |  64 ++++++++
 build.psm1                                 |  49 +-----
 tools/buildCommon/startNativeExecution.ps1 |  47 ++++++
 tools/findMissingNotices.ps1               | 176 +++++++++++++++------
 4 files changed, 243 insertions(+), 93 deletions(-)
 create mode 100644 .github/workflows/update-cgmanifest.yml
 create mode 100644 tools/buildCommon/startNativeExecution.ps1

diff --git a/.github/workflows/update-cgmanifest.yml b/.github/workflows/update-cgmanifest.yml
new file mode 100644
index 00000000000..9e026b70f86
--- /dev/null
+++ b/.github/workflows/update-cgmanifest.yml
@@ -0,0 +1,64 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+name: Update cgmanifest
+on:
+    workflow_dispatch:
+    schedule:
+    # At 13:00 UTC every day.
+    - cron:  '0 13 * * *'
+
+defaults:
+  run:
+    shell: pwsh
+
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+
+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: 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: Update Notices file
+        run: |
+          Invoke-WebRequest -Uri https://aka.ms/pwsh-daily-tpn -OutFile ./ThirdPartyNotices.txt
+      - name: Execute script to update cgmanifest
+        run: |
+          Import-Module ./build.psm1
+          Find-Dotnet
+          ./tools/findMissingNotices.ps1
+      - name: Microsoft Teams Notifier
+        uses: skitionek/notify-microsoft-teams@master
+        if: failure()
+        with:
+          webhook_url: ${{ secrets.PS_BUILD_TEAMS_CHANNEL }}
+          overwrite: "{title: `Failure in updating cgmanifest. Look at ${workflow_link}`}"
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        id: cpr
+        if: env.CREATE_PR == 'true'
+        with:
+          commit-message: "Update the cgmanifest with missing or updated components"
+          committer: GitHub <noreply@github.com>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          title: "Update ${{ env.FORMULA_NAME }} formula to version ${{ env.NEW_FORMULA_VERSION }}"
+          reviewers: travisez13
+          base: master
+          draft: false
+          branch: update-cgmanifest
diff --git a/build.psm1 b/build.psm1
index b8369dbaf16..2900e1bc4f8 100644
--- a/build.psm1
+++ b/build.psm1
@@ -6,6 +6,8 @@ param(
     [parameter(Mandatory = $false)][switch]$SkipLinuxDistroCheck = $false
 )
 
+. "$PSScriptRoot\tools\buildCommon\startNativeExecution.ps1"
+
 Set-StrictMode -Version 3.0
 
 # On Unix paths is separated by colon
@@ -2357,53 +2359,6 @@ 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
-    }
-}
-
 # Cleans the PowerShell repo - everything but the root folder
 function Clear-PSRepo
 {
diff --git a/tools/buildCommon/startNativeExecution.ps1 b/tools/buildCommon/startNativeExecution.ps1
new file mode 100644
index 00000000000..ee7b00d04cd
--- /dev/null
+++ b/tools/buildCommon/startNativeExecution.ps1
@@ -0,0 +1,47 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# 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(
+        [Alias('sb')]
+        [Parameter(Mandatory=$true)]
+        [scriptblock]$ScriptBlock,
+        [switch]$IgnoreExitcode,
+        [switch]$VerboseOutputOnError
+    )
+
+    $backupEAP = $ErrorActionPreference
+    $ErrorActionPreference = "Continue"
+    Write-Verbose "Executing: $ScriptBlock"
+    try {
+        if ($VerboseOutputOnError.IsPresent) {
+            $output = & $ScriptBlock 2>&1
+        } else {
+            & $ScriptBlock
+        }
+
+        # note, if $ScriptBlock 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 {$ScriptBlock} by ${callerFile}: line $callerLine failed with exit code $LASTEXITCODE"
+                throw $errorMessage
+            }
+            throw "Execution of {$ScriptBlock} failed with exit code $LASTEXITCODE"
+        }
+    } finally {
+        $ErrorActionPreference = $backupEAP
+    }
+}
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index d1cf198f8be..f2c8066234a 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -1,9 +1,23 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
+# This script is used to completely rebuild the cgmanifgest.json file,
+# which is used to generate the notice file.
 # Requires the module dotnet.project.assets from the PowerShell Gallery authored by @TravisEz13
 
-import-module dotnet.project.assets
+Import-Module dotnet.project.assets
+. "$PSScriptRoot\..\tools\buildCommon\startNativeExecution.ps1"
+
+$existingRegistrationTable = @{}
+$existingRegistrationsJson = Get-Content $PSScriptRoot\..\cgmanifest.json | ConvertFrom-Json -AsHashtable
+$existingRegistrationsJson.Registrations | ForEach-Object {
+    $registration = [Registration]$_
+    if($registration.Component) {
+        $name = $registration.Component.Name()
+        $existingRegistrationTable.Add($name, $registration)
+    }
+}
+
 Class Registration {
     [Component]$Component
     [bool]$DevelopmentDependency
@@ -79,58 +93,128 @@ function New-NugetComponent {
     return $registration
 }
 
-$existingRegistrationTable = @{}
-$newRegistrations = @()
-$existingRegistrationsJson = Get-Content $PSScriptRoot\..\cgmanifest.json | ConvertFrom-Json -AsHashtable
-$existingRegistrationsJson.Registrations | ForEach-Object {
-    $registration = [Registration]$_
-    $existingRegistrationTable.Add($registration.Component.Name(), $registration)
-    $newRegistrations += $registration
+$winDesktopSdk = 'Microsoft.NET.Sdk.WindowsDesktop'
+if (!$IsWindows) {
+    $winDesktopSdk = 'Microsoft.NET.Sdk'
+    Write-Warning "Always using $winDesktopSdk since this is not windows!!!"
 }
 
-Get-PSDrive -Name pwsh-win-core -ErrorAction Ignore | Remove-PSDrive
-Push-Location $PSScriptRoot\..\src\powershell-win-core
-$null = dotnet restore
-$null = New-PADrive -Path $PSScriptRoot\..\src\powershell-win-core\obj\project.assets.json -Name pwsh-win-core
-$targets = Get-ChildItem -Path 'pwsh-win-core:/targets/net6.0-windows7.0|win7-x64' | Where-Object {
-    $_.Type -eq 'package' -and
-    $_.Name -notlike 'DotNetAnalyzers.DocumentationAnalyzers*' -and
-    $_.Name -notlike 'StyleCop*' -and
-    $_.Name -notlike 'Microsoft.CodeAnalysis.Analyzers*' -and
-    $_.Name -notlike 'Microsoft.CodeAnalysis.NetAnalyzers*'
-}  | select-object -ExpandProperty name
-Pop-Location
-Get-PSDrive -Name pwsh-win-core | Remove-PSDrive
-
-$updateRegistrations = @()
-$targets | ForEach-Object {
-    $target = $_
-    $parts = ($target -split '\|')
-    $name = $parts[0]
-    $targetVersion = $parts[1]
-    $pattern = [regex]::Escape($name) + " "
-    $tpnMatch = Select-String -Path $PSScriptRoot\..\ThirdPartyNotices.txt -Pattern $pattern
-    if (!$tpnMatch) {
-        if ($existingRegistrationTable.ContainsKey($name)) {
-            $registrationVersion = $existingRegistrationTable.$name.Component.Version()
-            if ($registrationVersion -ne $targetVersion) {
-                $registration = New-NugetComponent -Name $name -Version $targetVersion
-                $updateRegistrations += $registration
-            } else {
-                Write-Verbose "$target already registered: $registrationVersion" -Verbose
-            }
-        } else {
+Function Get-CGRegistrations {
+    param(
+        [Parameter(Mandatory)]
+        [ValidateSet(
+            "alpine-x64",
+            "linux-arm",
+            "linux-arm64",
+            "linux-x64",
+            "osx-arm64",
+            "osx-x64",
+            "win-arm",
+            "win-arm64",
+            "win7-x64",
+            "win7-x86",
+            "modules")]
+        [string]$Runtime,
+
+        [Parameter(Mandatory)]
+        [System.Collections.Generic.Dictionary[string, Registration]] $RegistrationTable
+    )
+
+    $newRegistrations = $Registrations
+
+    $dotnetTargetName = 'net6.0'
+    $dotnetTargetNameWin7 = 'net6.0-windows7.0'
+    $unixProjectName = 'powershell-unix'
+    $windowsProjectName = 'powershell-win-core'
+    $actualRuntime = $Runtime
+
+    switch -regex ($Runtime) {
+        "alpine-.*" {
+            $folder = $unixProjectName
+            $target = "$dotnetTargetName|$Runtime"
+        }
+        "linux-.*" {
+            $folder = $unixProjectName
+            $target = "$dotnetTargetName|$Runtime"
+        }
+        "osx-.*" {
+            $folder = $unixProjectName
+            $target = "$dotnetTargetName|$Runtime"
+        }
+        "win7-.*" {
+            $sdkToUse = $winDesktopSdk
+            $folder = $windowsProjectName
+            $target = "$dotnetTargetNameWin7|$Runtime"
+        }
+        "win-.*" {
+            $folder = $windowsProjectName
+            $target = "$dotnetTargetNameWin7|$Runtime"
+        }
+        "modules" {
+            $folder = "modules"
+            $actualRuntime = 'linux-x64'
+            $target = "$dotnetTargetName|$actualRuntime"
+        }
+        Default {
+            throw "Invalid runtime name: $Runtime"
+        }
+    }
+
+    Write-Verbose "Getting registrations for $folder - $actualRuntime ..." -Verbose
+    Get-PSDrive -Name $folder -ErrorAction Ignore | Remove-PSDrive
+    Push-Location $PSScriptRoot\..\src\$folder
+    try {
+        Start-NativeExecution -VerboseOutputOnError -sb {
+            dotnet restore --runtime $actualRuntime  "/property:SDKToUse=$sdkToUse"
+        }
+        $null = New-PADrive -Path $PSScriptRoot\..\src\$folder\obj\project.assets.json -Name $folder
+        try {
+            $targets = Get-ChildItem -Path "${folder}:/targets/$target" -ErrorAction Stop | Where-Object {
+                $_.Type -eq 'package' -and
+                $_.Name -notlike 'DotNetAnalyzers.DocumentationAnalyzers*' -and
+                $_.Name -notlike 'StyleCop*' -and
+                $_.Name -notlike 'Microsoft.CodeAnalysis.Analyzers*' -and
+                $_.Name -notlike 'Microsoft.CodeAnalysis.NetAnalyzers*'
+            }  | select-object -ExpandProperty name
+        } catch {
+            Get-ChildItem -Path "${folder}:/targets" | Out-String | Write-Verbose -Verbose
+            throw
+        }
+    } finally {
+        Pop-Location
+        Get-PSDrive -Name $folder -ErrorAction Ignore | Remove-PSDrive
+    }
+
+    $targets | ForEach-Object {
+        $target = $_
+        $parts = ($target -split '\|')
+        $name = $parts[0]
+        $targetVersion = $parts[1]
+        $pattern = [regex]::Escape($name) + " "
+        $tpnMatch = Select-String -Path $PSScriptRoot\..\ThirdPartyNotices.txt -Pattern $pattern
+
+        # Add the registration to the cgmanifest if the TPN does not contain the name of the target OR
+        # the exisitng CG contains the registration, because if the existing CG contains the registration,
+        # that might be the only reason it is in the TPN.
+        if ((!$tpnMatch -or $existingRegistrationTable.ContainsKey($name)) -and !$RegistrationTable.ContainsKey($target)) {
             $registration = New-NugetComponent -Name $name -Version $targetVersion
-            $newRegistrations += $registration
+            $RegistrationTable.Add($target, $registration)
         }
     }
 }
 
-if ($updateRegistrations.count -gt 0) {
-    #TODO delete existing and add new registration
-    throw "updating registrations is not implemented"
+$registrations = [System.Collections.Generic.Dictionary[string, Registration]]::new()
+$lastCount = 0
+foreach ($runtime in "win7-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win7-x86") {
+    Get-CGRegistrations -Runtime $runtime -RegistrationTable $registrations
+    $count = $registrations.Count
+    $newCount = $count - $lastCount
+    $lastCount = $count
+    Write-Verbose "$newCount new registrations, $count total..." -Verbose
 }
 
-$newCount = $newRegistrations.count - $existingRegistrationTable.count
+$newRegistrations = $registrations.Keys | Sort-Object | ForEach-Object { $registrations[$_] }
+
+$count = $newRegistrations.Count
 @{Registrations = $newRegistrations } | ConvertTo-Json -depth 99 | Set-Content $PSScriptRoot\..\cgmanifest.json
-Write-Verbose "$newCount registrations added" -Verbose
+Write-Verbose "$count registrations created!" -Verbose

From 01426b276337b455fab79d0657a439658634f9a4 Mon Sep 17 00:00:00 2001
From: Kev Ritchie <65573253+KevRitchie@users.noreply.github.com>
Date: Thu, 28 Oct 2021 19:56:55 +0100
Subject: [PATCH 115/645] Fix `ConvertTo-Json -Depth` to allow 100 at maximum
 (#16197)

---
 .../utility/WebCmdlet/ConvertToJsonCommand.cs | 22 ++-----------------
 .../resources/WebCmdletStrings.resx           |  3 ---
 .../Json.Tests.ps1                            |  4 ++--
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
index 36e8acdfd6e..2e33a100964 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
@@ -27,15 +27,13 @@ public class ConvertToJsonCommand : PSCmdlet, IDisposable
 
         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, int.MaxValue)]
+        [ValidateRange(0, 100)]
         public int Depth
         {
             get { return _depth; }
@@ -99,23 +97,7 @@ protected virtual void Dispose(bool disposing)
                 _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>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx
index e3c64bd5ca3..3d663573018 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx
@@ -237,9 +237,6 @@
   <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>
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Json.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Json.Tests.ps1
index d3713963f96..5f33e1b6b75 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Json.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Json.Tests.ps1
@@ -1670,10 +1670,10 @@ Describe "Json Bug fixes"  -Tags "Feature" {
 
     $testCases = @(
         @{
-            Name = "ConvertTo-Json -Depth 101 throws MaximumAllowedDepthReached when the user specifies a depth greater than 100."
+            Name = "ConvertTo-Json -Depth 101 throws ParameterArgumentValidationError when the user specifies a depth greater than 100."
             NumberOfElements = 10
             MaxDepth = 101
-            FullyQualifiedErrorId = "ReachedMaximumDepthAllowed,Microsoft.PowerShell.Commands.ConvertToJsonCommand"
+            FullyQualifiedErrorId = "ParameterArgumentValidationError,Microsoft.PowerShell.Commands.ConvertToJsonCommand"
             ShouldThrow = $true
         }
         @{

From f1602c215ade588da2d60e06664c861f6af30566 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 28 Oct 2021 13:47:53 -0700
Subject: [PATCH 116/645] Fix condition in cgmanifest logic (#16324)

---
 .github/workflows/update-cgmanifest.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/update-cgmanifest.yml b/.github/workflows/update-cgmanifest.yml
index 9e026b70f86..31b55587deb 100644
--- a/.github/workflows/update-cgmanifest.yml
+++ b/.github/workflows/update-cgmanifest.yml
@@ -52,12 +52,12 @@ jobs:
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         id: cpr
-        if: env.CREATE_PR == 'true'
+        if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
         with:
-          commit-message: "Update the cgmanifest with missing or updated components"
+          commit-message: "Update to the latest license and the cgmanifest with missing or updated components"
           committer: GitHub <noreply@github.com>
           author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          title: "Update ${{ env.FORMULA_NAME }} formula to version ${{ env.NEW_FORMULA_VERSION }}"
+          title: "Update to the latest license and the cgmanifest with missing or updated components"
           reviewers: travisez13
           base: master
           draft: false

From 3b26fc8ae9af228a1b758e94f92c03922a13a924 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 28 Oct 2021 13:48:41 -0700
Subject: [PATCH 117/645] Update license and cgmanifest (#16325)

---
 .vsts-ci/linux.yml    |   8 +-
 .vsts-ci/mac.yml      |  14 +--
 .vsts-ci/windows.yml  |   8 +-
 ThirdPartyNotices.txt |  25 +++---
 cgmanifest.json       | 204 +++++++++++++++++++++++++++++++++++++++---
 5 files changed, 225 insertions(+), 34 deletions(-)

diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
index 0cc59284859..e4ddeaf27f8 100644
--- a/.vsts-ci/linux.yml
+++ b/.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,6 +30,8 @@ pr:
     - .vsts-ci/misc-analysis.yml
     - .vsts-ci/windows.yml
     - .vsts-ci/windows/*
+    - cgmanifest.json
+    - LICENSE.txt
     - test/common/markdown/*
     - test/perf/*
     - tools/releaseBuild/*
diff --git a/.vsts-ci/mac.yml b/.vsts-ci/mac.yml
index aeb9e8e5c22..84d3d1ef02a 100644
--- a/.vsts-ci/mac.yml
+++ b/.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,8 +29,10 @@ pr:
     - .dependabot/config.yml
     - .github/ISSUE_TEMPLATE/*
     - .vsts-ci/misc-analysis.yml
-    - /.vsts-ci/windows.yml
-    - /.vsts-ci/windows/*
+    - .vsts-ci/windows.yml
+    - .vsts-ci/windows/*
+    - cgmanifest.json
+    - LICENSE.txt
     - test/common/markdown/*
     - test/perf/*
     - tools/packaging/*
diff --git a/.vsts-ci/windows.yml b/.vsts-ci/windows.yml
index e96b320d77b..70775761fba 100644
--- a/.vsts-ci/windows.yml
+++ b/.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,6 +28,8 @@ pr:
     - .dependabot/config.yml
     - .github/ISSUE_TEMPLATE/*
     - .vsts-ci/misc-analysis.yml
+    - cgmanifest.json
+    - LICENSE.txt
     - test/common/markdown/*
     - test/perf/*
     - tools/packaging/*
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 0532acea64e..cfa3209cfc7 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -41,43 +41,43 @@ http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND
 
    1. Definitions.
 
-
+      
 
       "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
 
-
+      
 
       "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
 
-
+      
 
       "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
 
-
+      
 
       "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
 
-
+      
 
       "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
 
-
+      
 
       "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
 
-
+      
 
       "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
 
-
+      
 
       "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
 
-
+      
 
       "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
 
-
+      
 
       "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
 
@@ -3982,6 +3982,11 @@ 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.
 
+
+---------------------------------------------------------
+
+
+
 -------------------------------------------------------------------
 
 -------------------------------------------------------------------
diff --git a/cgmanifest.json b/cgmanifest.json
index 1e5c311e16f..38ca28d18f1 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -5,7 +5,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Common",
-          "Version": "4.0.0-5.final"
+          "Version": "4.0.0-6.final"
         }
       },
       "DevelopmentDependency": false
@@ -15,7 +15,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.CSharp",
-          "Version": "4.0.0-5.final"
+          "Version": "4.0.0-6.final"
         }
       },
       "DevelopmentDependency": false
@@ -224,8 +224,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -234,8 +234,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -244,8 +244,138 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.native.System",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.unix.System.Diagnostics.Debug",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.unix.System.Private.Uri",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.unix.System.Runtime.Extensions",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -270,6 +400,16 @@
       },
       "DevelopmentDependency": false
     },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.win7.System.Private.Uri",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
     {
       "Component": {
         "Type": "nuget",
@@ -284,8 +424,38 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win7.System.Private.Uri",
-          "Version": "4.3.0"
+          "Name": "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets",
+          "Version": "1.0.1"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -565,7 +735,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Principal.Windows",
-          "Version": "6.0.0-preview.5.21301.5"
+          "Version": "5.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -575,7 +745,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Text.Encoding.CodePages",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -619,6 +789,16 @@
         }
       },
       "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Web.Services.Description",
+          "Version": "4.9.0"
+        }
+      },
+      "DevelopmentDependency": false
     }
   ]
 }

From 4ae539fed46b7403e95f65e605cef645b207642f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Oct 2021 14:11:20 -0700
Subject: [PATCH 118/645] Bump `Microsoft.NET.Test.Sdk` from 16.11.0 to 17.0.0
 (#16312)

---
 test/xUnit/xUnit.tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index 967f1cce627..e68eafe7ea5 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="XunitXml.TestLogger" Version="3.0.66" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
   </ItemGroup>
 
   <ItemGroup>

From 979f105a99f5819d3dadb15a8b220b30afc69a3e Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 28 Oct 2021 20:16:26 -0700
Subject: [PATCH 119/645] Fix parser to generate error when array has more than
 32 dimensions (#16276)

An array cannot have more than 32 dimensions. See the doc of MarkArrayType(int rank)) https://docs.microsoft.com/en-us/dotnet/api/system.type.makearraytype?view=net-5.0#System_Type_MakeArrayType_System_Int32_ for details.

The fix is to not create the ArrayTypeName instance when the number of dimensions exceeds 32, but instead, generate a parsing error.
---
 .../engine/parser/Parser.cs                   | 19 +++++++++++++++++++
 .../resources/ParserStrings.resx              |  3 +++
 .../Language/Parser/Parsing.Tests.ps1         | 18 ++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
index c5f9d81f4b8..8fbb262edad 100644
--- a/src/System.Management.Automation/engine/parser/Parser.cs
+++ b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -1535,6 +1535,25 @@ private ITypeName CompleteArrayTypeName(ITypeName elementType, TypeName typeForA
                             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 ']'.
diff --git a/src/System.Management.Automation/resources/ParserStrings.resx b/src/System.Management.Automation/resources/ParserStrings.resx
index a0569a6f4e4..c1ae5c6ada4 100644
--- a/src/System.Management.Automation/resources/ParserStrings.resx
+++ b/src/System.Management.Automation/resources/ParserStrings.resx
@@ -296,6 +296,9 @@ 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>
diff --git a/test/powershell/Language/Parser/Parsing.Tests.ps1 b/test/powershell/Language/Parser/Parsing.Tests.ps1
index 97e46bcbe3c..70094eb5782 100644
--- a/test/powershell/Language/Parser/Parsing.Tests.ps1
+++ b/test/powershell/Language/Parser/Parsing.Tests.ps1
@@ -626,3 +626,21 @@ Describe "Keywords 'default', 'hidden', 'in', 'static' Token parsing" -Tags CI {
         . $Keyword | Should -BeExactly $Keyword
     }
 }
+
+Describe "Parsing array that has too many dimensions" -Tag CI {
+    It "ParseError for '<Script>'" -TestCases @(
+        @{ Script = '[int[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'; ErrorId = @('ArrayHasTooManyDimensions', 'EndSquareBracketExpectedAtEndOfAttribute'); StartOffset = @(5, 37); EndOffset = @(37, 37) }
+        @{ Script = '[int[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]'; ErrorId = @('ArrayHasTooManyDimensions', 'EndSquareBracketExpectedAtEndOfAttribute'); StartOffset = @(5, 38); EndOffset = @(37, 38) }
+        @{ Script = '[int[,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,]]'; ErrorId = @('ArrayHasTooManyDimensions'); StartOffset = @(5); EndOffset = @(37) }
+    ) {
+        param($Script, $ErrorId, $StartOffset, $EndOffset)
+
+        $errs = Get-ParseResults -src $Script
+        $errs.Count | Should -Be $ErrorId.Count
+        for ($i = 0; $i -lt $errs.Count; $i++) {
+            $errs[$i].ErrorId | Should -BeExactly $ErrorId[$i]
+            $errs[$i].Extent.StartScriptPosition.Offset | Should -Be $StartOffset[$i]
+            $errs[$i].Extent.EndScriptPosition.Offset | Should -Be $EndOffset[$i]
+        }
+    }
+}

From b2dd88ec8b0e026f9898ad6cd117551647d69dca Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 28 Oct 2021 20:51:35 -0700
Subject: [PATCH 120/645] Update feed and analyzer dependency (#16327)

---
 Analyzers.props                                               | 2 +-
 .../azureDevOps/templates/insert-nuget-config-azfeed.yml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Analyzers.props b/Analyzers.props
index 75459c6c9fe..dacf53c4625 100644
--- a/Analyzers.props
+++ b/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-rtm.21518.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
index 5fdb9f7d977..9cf3d8dbc8d 100644
--- a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+++ b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
@@ -15,11 +15,11 @@ steps:
   condition: and(succeededOrFailed(), ne(variables['AzDevOpsFeed'], ''))
 - pwsh: |
       Import-Module ${{ parameters.repoRoot }}/build.psm1 -Force
-      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsPackageFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT2) -FeedName AzDevOpsFeed -Destination '${{ parameters.repoRoot }}'
+      New-NugetConfigFile -NugetFeedUrl $(PSInternalNugetFeed) -UserName $(PSInternalNugetFeedUserName) -ClearTextPAT $(PSInternalNugetFeedPAT) -FeedName AzDevOpsFeed -Destination '${{ parameters.repoRoot }}'
 
       if(-not (Test-Path "${{ parameters.repoRoot }}/nuget.config"))
       {
           throw "nuget.config is not created"
       }
   displayName: 'Add nuget.config for Azure DevOps feed for packages'
-  condition: and(succeededOrFailed(), ne(variables['AzDevOpsPackageFeed'], ''))
+  condition: and(succeededOrFailed(), ne(variables['PSInternalNugetFeed'], ''))

From c44c39c92ba8fa8a8cc8b988ca75eb2e25153638 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 29 Oct 2021 11:18:43 -0700
Subject: [PATCH 121/645] Fix issues in release build (#16332)

---
 tools/packaging/packaging.psm1                       | 12 ++++++++++--
 .../azureDevOps/templates/compliance.yml             |  7 ++++---
 tools/releaseBuild/azureDevOps/templates/nuget.yml   | 12 ++++++------
 .../azureDevOps/templates/windows-hosted-build.yml   |  4 ++--
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index c1c04ada606..a2cf5c40910 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -3882,8 +3882,16 @@ function New-GlobalToolNupkg
 
     $packageInfo = @()
 
-    Remove-Item -Path (Join-Path $LinuxBinPath 'libcrypto.so.1.0.0') -Verbose -Force -Recurse
-    Remove-Item -Path (Join-Path $LinuxBinPath 'libssl.so.1.0.0') -Verbose -Force -Recurse
+    $libCryptoPath = Join-Path $LinuxBinPath 'libcrypto.so.1.0.0'
+    $libSSLPath = Join-Path $LinuxBinPath 'libssl.so.1.0.0'
+
+    if (Test-Path $libCryptoPath) {
+        Remove-Item -Path $libCryptoPath -Verbose -Force
+    }
+
+    if (Test-Path $libSSLPath) {
+        Remove-Item -Path $libSSLPath -Verbose -Force
+    }
 
     ## Remove unnecessary xml files
     Get-ChildItem -Path $LinuxBinPath, $WindowsBinPath, $WindowsDesktopBinPath -Filter *.xml | Remove-Item -Verbose
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml
index 7ab3b31b97b..8b3ec94d0d1 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance.yml
@@ -114,15 +114,16 @@ jobs:
     inputs:
       tsaVersion: TsaV2
       codeBaseName: 'PowerShellCore_201906'
+      uploadAPIScan: false
+      uploadBinSkim: true
+      uploadCredScan: false
       uploadFortifySCA: false
       uploadFxCop: false
       uploadModernCop: false
+      uploadPoliCheck: false
       uploadPREfast: false
       uploadRoslyn: false
-      uploadBinSkim: false
       uploadTSLint: false
-      uploadCredScan: false
-      uploadPoliCheck: false
 
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-report.SdtReport@1
     displayName: 'Create Security Analysis Report'
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index cd3972d5fab..467968b5a3a 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -118,20 +118,20 @@ jobs:
   - task: NuGetToolInstaller@1
     displayName: 'Install NuGet.exe'
 
-  - powershell: |
+  - pwsh: |
       Import-Module $env:REPOROOT\build.psm1
       Import-Module $env:REPOROOT\tools\packaging
       Find-Dotnet
       New-ILNugetPackage -PackagePath "$(PackagePath)" -PackageVersion "$(Version)" -WinFxdBinPath '$(winFxdPath)' -LinuxFxdBinPath '$(linuxFxdPath)' -GenAPIToolPath "$(GenAPIToolPath)"
     displayName: 'Create Nuget Package Folders'
 
-  - powershell: |
+  - pwsh: |
       Get-ChildItem $(linuxFxdPath)
       Get-ChildItem $(winFxdPath)
       Get-ChildItem $(winFxdWinDesktopPath)
     displayName: Capture fxd folders
 
-  - powershell: |
+  - pwsh: |
       Import-Module $env:REPOROOT\build.psm1
       Import-Module $env:REPOROOT\tools\packaging
       Find-Dotnet
@@ -142,7 +142,7 @@ jobs:
       New-GlobalToolNupkg -LinuxBinPath "$(linuxFxdPath)" -WindowsBinPath "$(winFxdPath)" -WindowsDesktopBinPath "$(winFxdWinDesktopPath)" -PackageVersion "$(Version)" -DestinationPath "$(PackagePath)\globaltool"
     displayName: 'Create Global tool packages'
 
-  - powershell: |
+  - pwsh: |
       Get-ChildItem "$(PackagePath)" -Recurse
     displayName: Capture generated packages
 
@@ -164,7 +164,7 @@ jobs:
     displayName: Fake copy when not signing
     condition: eq(variables['SHOULD_SIGN'], 'false')
 
-  - powershell: |
+  - pwsh: |
       Import-Module "${env:REPOROOT}\build.psm1" -Force
       Get-ChildItem -Recurse "$(System.ArtifactsDirectory)\signed\*.nupkg" -Verbose | ForEach-Object {  Start-NativeExecution -sb { nuget.exe verify -All $_.FullName } }
     displayName: Verify all packages are signed
@@ -183,7 +183,7 @@ jobs:
     parameters:
       artifactPath: '$(System.ArtifactsDirectory)\signed'
 
-  - powershell: |
+  - pwsh: |
       if (-not (Test-Path "$(System.ArtifactsDirectory)\signed\globaltool"))
       {
         $null = New-Item -Path "$(System.ArtifactsDirectory)\signed\globaltool" -ItemType Directory -Force
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
index 8cc5831b8e5..de08cb25824 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -46,7 +46,7 @@ jobs:
     parameters:
       repoRoot: $(PowerShellRoot)
 
-  - powershell: |
+  - pwsh: |
 
       $runtime = switch ($env:Architecture)
         {
@@ -66,7 +66,7 @@ jobs:
       tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 -location '$(PowerShellRoot)' -destination '$(Build.ArtifactStagingDirectory)/Symbols_$(Architecture)' -Runtime $runtime -ReleaseTag '$(ReleaseTagVar)' -Symbols @params
     displayName: 'Build Windows Universal - $(Architecture)-$(BuildConfiguration) Symbols zip'
 
-  - powershell: |
+  - pwsh: |
       $packageName = (Get-ChildItem '$(Build.ArtifactStagingDirectory)\Symbols_$(Architecture)').FullName
       $vstsCommandString = "vso[artifact.upload containerfolder=results;artifactname=results]$packageName"
       Write-Host ("sending " + $vstsCommandString)

From 727326d78c0a6f2e445e8b9672b04270fd974387 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 29 Oct 2021 16:29:40 -0700
Subject: [PATCH 122/645] Refactor `cgmanifest` generator to include all
 components (#16326)

---
 .../GHWorkflowHelper/GHWorkflowHelper.psm1    |  27 +
 .github/workflows/daily.yml                   |  35 +-
 .github/workflows/update-cgmanifest.yml       |  43 +-
 cgmanifest.json                               | 716 ++++++++++++++++--
 prquantifier.yaml                             |  11 +
 tools/findMissingNotices.ps1                  |  58 +-
 tools/packaging/packaging.psm1                |   2 +-
 7 files changed, 793 insertions(+), 99 deletions(-)
 create mode 100644 .github/workflows/GHWorkflowHelper/GHWorkflowHelper.psm1
 create mode 100644 prquantifier.yaml

diff --git a/.github/workflows/GHWorkflowHelper/GHWorkflowHelper.psm1 b/.github/workflows/GHWorkflowHelper/GHWorkflowHelper.psm1
new file mode 100644
index 00000000000..f0524ce6f23
--- /dev/null
+++ b/.github/workflows/GHWorkflowHelper/GHWorkflowHelper.psm1
@@ -0,0 +1,27 @@
+# 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
+}
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index a1c883c98f0..c71533a3e0d 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -30,18 +30,16 @@ 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
-          Write-Verbose "OLD_VERSION=$currentVersion" -Verbose
-          "OLD_VERSION=$currentVersion" | Out-File $env:GITHUB_ENV -Append
+          Set-GWVariable -Name OLD_VERSION -Value $currentVersion
 
           ./tools/UpdateDotnetRuntime.ps1 -UpdateMSIPackaging -UseInternalFeed
           $newVersion = (Get-Content .\global.json | ConvertFrom-Json).sdk.version
-          Write-Verbose "NEW_VERSION=$newVersion" -Verbose
-          "NEW_VERSION=$newVersion" | Out-File $env:GITHUB_ENV -Append
+          Set-GWVariable -Name NEW_VERSION -Value $newVersion
 
           if ($currentVersion -ne $newVersion) {
-            Write-Verbose "CREATE_PR=true" -Verbose
-            "CREATE_PR=true" | Out-File $env:GITHUB_ENV -Append
+            Set-GWVariable -Name CREATE_PR -Value 'true'
           }
       - name: Microsoft Teams Notifier
         uses: skitionek/notify-microsoft-teams@master
@@ -58,5 +56,26 @@ 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: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        id: cprtpn
+        with:
+          commit-message: "Update to the latest license and the cgmanifest with missing or updated components"
+          committer: GitHub <noreply@github.com>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          title: "Update to the latest license and the cgmanifest with missing or updated components"
+          reviewers: travisez13
+          base: master
+          draft: false
+          branch: update-cgmanifest
diff --git a/.github/workflows/update-cgmanifest.yml b/.github/workflows/update-cgmanifest.yml
index 31b55587deb..13c3bada243 100644
--- a/.github/workflows/update-cgmanifest.yml
+++ b/.github/workflows/update-cgmanifest.yml
@@ -4,9 +4,9 @@
 name: Update cgmanifest
 on:
     workflow_dispatch:
-    schedule:
-    # At 13:00 UTC every day.
-    - cron:  '0 13 * * *'
+    pull_request:
+      branches:
+      - master
 
 defaults:
   run:
@@ -15,6 +15,8 @@ defaults:
 env:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   POWERSHELL_TELEMETRY_OPTOUT: 1
+  CGMANIFEST_PATH: ''
+  NUGET_PACKAGES: ${{ github.workspace }}\.nuget\packages
 
 jobs:
   update-cgmanifest:
@@ -25,6 +27,13 @@ jobs:
     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
@@ -35,30 +44,14 @@ jobs:
         run: |
           Import-Module ./build.psm1
           Start-PSBootStrap
-      - name: Update Notices file
-        run: |
-          Invoke-WebRequest -Uri https://aka.ms/pwsh-daily-tpn -OutFile ./ThirdPartyNotices.txt
-      - name: Execute script to update cgmanifest
+      - name: Verify cgmanifest is up to date
         run: |
           Import-Module ./build.psm1
           Find-Dotnet
           ./tools/findMissingNotices.ps1
-      - name: Microsoft Teams Notifier
-        uses: skitionek/notify-microsoft-teams@master
-        if: failure()
-        with:
-          webhook_url: ${{ secrets.PS_BUILD_TEAMS_CHANNEL }}
-          overwrite: "{title: `Failure in updating cgmanifest. Look at ${workflow_link}`}"
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
-        id: cpr
-        if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+      - name: Upload cgmanifest
+        uses: actions/upload-artifact@v2
+        if: always() && env.CGMANIFEST_PATH != ''
         with:
-          commit-message: "Update to the latest license and the cgmanifest with missing or updated components"
-          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          title: "Update to the latest license and the cgmanifest with missing or updated components"
-          reviewers: travisez13
-          base: master
-          draft: false
-          branch: update-cgmanifest
+          name: cgmanifest
+          path: ${{ env.CGMANIFEST_PATH }}
diff --git a/cgmanifest.json b/cgmanifest.json
index 38ca28d18f1..9ae862d6274 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -1,5 +1,65 @@
 {
   "Registrations": [
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "DotNetAnalyzers.DocumentationAnalyzers.Unstable",
+          "Version": "1.0.0.59"
+        }
+      },
+      "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "DotNetAnalyzers.DocumentationAnalyzers",
+          "Version": "1.0.0-beta.59"
+        }
+      },
+      "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Markdig.Signed",
+          "Version": "0.22.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.ApplicationInsights",
+          "Version": "2.18.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Bcl.AsyncInterfaces",
+          "Version": "5.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.CodeAnalysis.Analyzers",
+          "Version": "3.3.2"
+        }
+      },
+      "DevelopmentDependency": true
+    },
     {
       "Component": {
         "Type": "nuget",
@@ -20,6 +80,16 @@
       },
       "DevelopmentDependency": false
     },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.CodeAnalysis.NetAnalyzers",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": true
+    },
     {
       "Component": {
         "Type": "nuget",
@@ -30,6 +100,16 @@
       },
       "DevelopmentDependency": false
     },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Extensions.ObjectPool",
+          "Version": "5.0.10"
+        }
+      },
+      "DevelopmentDependency": false
+    },
     {
       "Component": {
         "Type": "nuget",
@@ -90,6 +170,36 @@
       },
       "DevelopmentDependency": false
     },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.PowerShell.MarkdownRender",
+          "Version": "7.2.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.PowerShell.Native",
+          "Version": "7.2.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Win32.Registry.AccessControl",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
     {
       "Component": {
         "Type": "nuget",
@@ -100,6 +210,56 @@
       },
       "DevelopmentDependency": false
     },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Win32.SystemEvents",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Windows.Compatibility",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Namotion.Reflection",
+          "Version": "2.0.3"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Newtonsoft.Json",
+          "Version": "13.0.1"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "NJsonSchema",
+          "Version": "10.5.2"
+        }
+      },
+      "DevelopmentDependency": false
+    },
     {
       "Component": {
         "Type": "nuget",
@@ -250,6 +410,56 @@
       },
       "DevelopmentDependency": false
     },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.linux-arm.runtime.native.System.IO.Ports",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.linux-arm64.runtime.native.System.IO.Ports",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.linux-x64.runtime.native.System.IO.Ports",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.7.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.native.System.IO.Ports",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
     {
       "Component": {
         "Type": "nuget",
@@ -310,6 +520,16 @@
       },
       "DevelopmentDependency": false
     },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
     {
       "Component": {
         "Type": "nuget",
@@ -464,28 +684,28 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Collections.Immutable",
-          "Version": "5.0.0"
+          "Name": "StyleCop.Analyzers.Unstable",
+          "Version": "1.2.0.354"
         }
       },
-      "DevelopmentDependency": false
+      "DevelopmentDependency": true
     },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Collections",
-          "Version": "4.3.0"
+          "Name": "StyleCop.Analyzers",
+          "Version": "1.2.0-beta.354"
         }
       },
-      "DevelopmentDependency": false
+      "DevelopmentDependency": true
     },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Diagnostics.Debug",
-          "Version": "4.3.0"
+          "Name": "System.CodeDom",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -494,7 +714,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Diagnostics.DiagnosticSource",
+          "Name": "System.Collections.Immutable",
           "Version": "5.0.0"
         }
       },
@@ -504,7 +724,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Dynamic.Runtime",
+          "Name": "System.Collections",
           "Version": "4.3.0"
         }
       },
@@ -514,8 +734,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Globalization",
-          "Version": "4.3.0"
+          "Name": "System.ComponentModel.Composition.Registration",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -524,8 +744,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.IO",
-          "Version": "4.3.0"
+          "Name": "System.ComponentModel.Composition",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -534,8 +754,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Linq.Expressions",
-          "Version": "4.3.0"
+          "Name": "System.Configuration.ConfigurationManager",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -544,8 +764,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Linq",
-          "Version": "4.3.0"
+          "Name": "System.Data.Odbc",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -554,8 +774,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Memory",
-          "Version": "4.5.4"
+          "Name": "System.Data.OleDb",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -564,8 +784,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Numerics.Vectors",
-          "Version": "4.5.0"
+          "Name": "System.Data.SqlClient",
+          "Version": "4.8.3"
         }
       },
       "DevelopmentDependency": false
@@ -574,7 +794,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.ObjectModel",
+          "Name": "System.Diagnostics.Debug",
           "Version": "4.3.0"
         }
       },
@@ -584,8 +804,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Private.Uri",
-          "Version": "4.3.0"
+          "Name": "System.Diagnostics.DiagnosticSource",
+          "Version": "5.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -594,8 +814,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Reflection.DispatchProxy",
-          "Version": "4.7.1"
+          "Name": "System.Diagnostics.EventLog",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -604,8 +824,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Reflection.Emit.ILGeneration",
-          "Version": "4.3.0"
+          "Name": "System.Diagnostics.PerformanceCounter",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -614,8 +834,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Reflection.Emit.Lightweight",
-          "Version": "4.3.0"
+          "Name": "System.DirectoryServices.AccountManagement",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -624,8 +844,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Reflection.Emit",
-          "Version": "4.3.0"
+          "Name": "System.DirectoryServices.Protocols",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -634,8 +854,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Reflection.Extensions",
-          "Version": "4.3.0"
+          "Name": "System.DirectoryServices",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -644,8 +864,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Reflection.Metadata",
-          "Version": "5.0.0"
+          "Name": "System.Drawing.Common",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -654,7 +874,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Reflection.Primitives",
+          "Name": "System.Dynamic.Runtime",
           "Version": "4.3.0"
         }
       },
@@ -664,8 +884,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Reflection.TypeExtensions",
-          "Version": "4.3.0"
+          "Name": "System.Formats.Asn1",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -674,7 +894,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Reflection",
+          "Name": "System.Globalization",
           "Version": "4.3.0"
         }
       },
@@ -684,8 +904,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Resources.ResourceManager",
-          "Version": "4.3.0"
+          "Name": "System.IO.Packaging",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -694,8 +914,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Runtime.Extensions",
-          "Version": "4.3.0"
+          "Name": "System.IO.Ports",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -704,7 +924,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Runtime.Handles",
+          "Name": "System.IO",
           "Version": "4.3.0"
         }
       },
@@ -714,7 +934,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Runtime.InteropServices",
+          "Name": "System.Linq.Expressions",
           "Version": "4.3.0"
         }
       },
@@ -724,12 +944,302 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Runtime",
+          "Name": "System.Linq",
           "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
     },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Management",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Memory",
+          "Version": "4.5.4"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Net.Http.WinHttpHandler",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Numerics.Vectors",
+          "Version": "4.5.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ObjectModel",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Private.ServiceModel",
+          "Version": "4.9.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Private.Uri",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Context",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.DispatchProxy",
+          "Version": "4.7.1"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Emit.ILGeneration",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Emit.Lightweight",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Emit",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Extensions",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Metadata",
+          "Version": "5.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.Primitives",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection.TypeExtensions",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Reflection",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Resources.ResourceManager",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Runtime.Caching",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Runtime.CompilerServices.Unsafe",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Runtime.Extensions",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Runtime.Handles",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Runtime.InteropServices",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Runtime",
+          "Version": "4.3.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Security.AccessControl",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Security.Cryptography.Pkcs",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Security.Cryptography.ProtectedData",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Security.Cryptography.Xml",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Security.Permissions",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
     {
       "Component": {
         "Type": "nuget",
@@ -740,6 +1250,86 @@
       },
       "DevelopmentDependency": false
     },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ServiceModel.Duplex",
+          "Version": "4.9.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ServiceModel.Http",
+          "Version": "4.9.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ServiceModel.NetTcp",
+          "Version": "4.9.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ServiceModel.Primitives",
+          "Version": "4.9.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ServiceModel.Security",
+          "Version": "4.9.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ServiceModel.Syndication",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.ServiceProcess.ServiceController",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Speech",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
     {
       "Component": {
         "Type": "nuget",
@@ -760,6 +1350,26 @@
       },
       "DevelopmentDependency": false
     },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Text.Encodings.Web",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Threading.AccessControl",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
     {
       "Component": {
         "Type": "nuget",
@@ -799,6 +1409,16 @@
         }
       },
       "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "System.Windows.Extensions",
+          "Version": "6.0.0"
+        }
+      },
+      "DevelopmentDependency": false
     }
   ]
 }
diff --git a/prquantifier.yaml b/prquantifier.yaml
new file mode 100644
index 00000000000..240f660f88d
--- /dev/null
+++ b/prquantifier.yaml
@@ -0,0 +1,11 @@
+# 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
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index f2c8066234a..b8f7231b96d 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -5,14 +5,19 @@
 # which is used to generate the notice file.
 # Requires the module dotnet.project.assets from the PowerShell Gallery authored by @TravisEz13
 
+param(
+    [switch] $Fix
+)
+
 Import-Module dotnet.project.assets
+Import-Module "$PSScriptRoot\..\.github\workflows\GHWorkflowHelper" -Force
 . "$PSScriptRoot\..\tools\buildCommon\startNativeExecution.ps1"
 
 $existingRegistrationTable = @{}
 $existingRegistrationsJson = Get-Content $PSScriptRoot\..\cgmanifest.json | ConvertFrom-Json -AsHashtable
 $existingRegistrationsJson.Registrations | ForEach-Object {
     $registration = [Registration]$_
-    if($registration.Component) {
+    if ($registration.Component) {
         $name = $registration.Component.Name()
         $existingRegistrationTable.Add($name, $registration)
     }
@@ -73,7 +78,8 @@ Class Nuget {
 function New-NugetComponent {
     param(
         [string]$name,
-        [string]$version
+        [string]$version,
+        [switch]$DevelopmentDependency
     )
 
     $nuget = [Nuget]@{
@@ -87,7 +93,7 @@ function New-NugetComponent {
 
     $registration = [Registration]@{
         Component             = $Component
-        DevelopmentDependency = $false
+        DevelopmentDependency = $DevelopmentDependency
     }
 
     return $registration
@@ -120,7 +126,7 @@ Function Get-CGRegistrations {
         [System.Collections.Generic.Dictionary[string, Registration]] $RegistrationTable
     )
 
-    $newRegistrations = $Registrations
+    $registrationChanged = $false
 
     $dotnetTargetName = 'net6.0'
     $dotnetTargetNameWin7 = 'net6.0-windows7.0'
@@ -169,13 +175,7 @@ Function Get-CGRegistrations {
         }
         $null = New-PADrive -Path $PSScriptRoot\..\src\$folder\obj\project.assets.json -Name $folder
         try {
-            $targets = Get-ChildItem -Path "${folder}:/targets/$target" -ErrorAction Stop | Where-Object {
-                $_.Type -eq 'package' -and
-                $_.Name -notlike 'DotNetAnalyzers.DocumentationAnalyzers*' -and
-                $_.Name -notlike 'StyleCop*' -and
-                $_.Name -notlike 'Microsoft.CodeAnalysis.Analyzers*' -and
-                $_.Name -notlike 'Microsoft.CodeAnalysis.NetAnalyzers*'
-            }  | select-object -ExpandProperty name
+            $targets = Get-ChildItem -Path "${folder}:/targets/$target" -ErrorAction Stop | Where-Object { $_.Type -eq 'package' }  | select-object -ExpandProperty name
         } catch {
             Get-ChildItem -Path "${folder}:/targets" | Out-String | Write-Verbose -Verbose
             throw
@@ -190,23 +190,32 @@ Function Get-CGRegistrations {
         $parts = ($target -split '\|')
         $name = $parts[0]
         $targetVersion = $parts[1]
-        $pattern = [regex]::Escape($name) + " "
-        $tpnMatch = Select-String -Path $PSScriptRoot\..\ThirdPartyNotices.txt -Pattern $pattern
 
         # Add the registration to the cgmanifest if the TPN does not contain the name of the target OR
         # the exisitng CG contains the registration, because if the existing CG contains the registration,
         # that might be the only reason it is in the TPN.
-        if ((!$tpnMatch -or $existingRegistrationTable.ContainsKey($name)) -and !$RegistrationTable.ContainsKey($target)) {
-            $registration = New-NugetComponent -Name $name -Version $targetVersion
+        if (!$RegistrationTable.ContainsKey($target)) {
+            $DevelopmentDependency = $false
+            if (!$existingRegistrationTable.ContainsKey($name) -or $existingRegistrationTable.$name.Component.Version() -ne $targetVersion) {
+                $registrationChanged = $true
+            }
+            if ($existingRegistrationTable.ContainsKey($name) -and $existingRegistrationTable.$name.DevelopmentDependency) {
+                $DevelopmentDependency = $true
+            }
+
+            $registration = New-NugetComponent -Name $name -Version $targetVersion -DevelopmentDependency:$DevelopmentDependency
             $RegistrationTable.Add($target, $registration)
         }
     }
+
+    return $registrationChanged
 }
 
 $registrations = [System.Collections.Generic.Dictionary[string, Registration]]::new()
 $lastCount = 0
+$registrationChanged = $false
 foreach ($runtime in "win7-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win7-x86") {
-    Get-CGRegistrations -Runtime $runtime -RegistrationTable $registrations
+    $registrationChanged = (Get-CGRegistrations -Runtime $runtime -RegistrationTable $registrations) -or $registrationChanged
     $count = $registrations.Count
     $newCount = $count - $lastCount
     $lastCount = $count
@@ -216,5 +225,20 @@ foreach ($runtime in "win7-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm"
 $newRegistrations = $registrations.Keys | Sort-Object | ForEach-Object { $registrations[$_] }
 
 $count = $newRegistrations.Count
-@{Registrations = $newRegistrations } | ConvertTo-Json -depth 99 | Set-Content $PSScriptRoot\..\cgmanifest.json
+$newJson = @{Registrations = $newRegistrations } | ConvertTo-Json -depth 99
+if ($Fix -and $registrationChanged) {
+    $cgManifestPath = (Resolve-Path -Path $PSScriptRoot\..\cgmanifest.json).ProviderPath
+    $newJson | Set-Content $cgManifestPath
+    Set-GWVariable -Name CGMANIFEST_PATH -Value $cgManifestPath
+}
+
+if (!$Fix -and $registrationChanged) {
+    $temp = Get-GWTempPath
+
+    $tempJson = Join-Path -Path $temp -ChildPath "cgmanifest$((Get-Date).ToString('yyyMMddHHmm')).json"
+    $newJson | Set-Content $tempJson -Encoding utf8NoBOM
+    Set-GWVariable -Name CGMANIFEST_PATH -Value $tempJson
+    throw "cgmanifest is out of date.  run ./tools/findMissingNotices.ps1 -Fix.  Generated cgmanifest is here: $tempJson"
+}
+
 Write-Verbose "$count registrations created!" -Verbose
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index a2cf5c40910..2908357b144 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -4210,7 +4210,7 @@ function Test-PackageManifest {
     }
 
     Process {
-        Write-Verbose "Processing $($man.files) files..." -verbose
+        Write-Verbose "Processing $($man.files.count) files..." -verbose
         $man.files | ForEach-Object {
             $filePath = Join-Path $PackagePath -childPath $_.fileName
             $checksumObj = $_.checksums | Where-Object {$_.algorithm -eq 'sha256'}

From 723a50832d615f8e4ee64ce98ecff15319b28a61 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Sat, 30 Oct 2021 08:54:23 -0700
Subject: [PATCH 123/645] Don't throw exception when trying to resolve a
 possible link path (#16310)

---
 .../engine/NativeCommandProcessor.cs          | 15 +++++--
 .../NativeCommandProcessor.Tests.ps1          | 45 +++++++++++++++++++
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index ca38b337b8a..7fd6865a4e3 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -1112,10 +1112,19 @@ private static bool IsWindowsApplication(string fileName)
             //  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)
+            try
+            {
+                string linkTarget = File.ResolveLinkTarget(fileName, returnFinalTarget: false)?.FullName;
+                if (linkTarget is not null)
+                {
+                    fileName = linkTarget;
+                }
+            }
+            catch
             {
-                fileName = linkTarget;
+                // An exception may be thrown from 'File.ResolveLinkTarget' when it fails to resolve a link path,
+                // for example, when the underlying file system doesn't support reparse points.
+                // Just use the original file name in this case.
             }
 
             SHFILEINFO shinfo = new SHFILEINFO();
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
index 6888f5cba77..b76cf67bfec 100644
--- a/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
+++ b/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
@@ -252,3 +252,48 @@ Categories=Application;
         { $dllFile = "$PSHOME\System.Management.Automation.dll"; & $dllFile } | Should -Throw -ErrorId "NativeCommandFailed"
     }
 }
+
+Describe "Run native command from a mounted FAT-format VHD" -tags @("Feature", "RequireAdminOnWindows") {
+    BeforeAll {
+        if (-not $IsWindows) {
+            return;
+        }
+
+        $vhdx = Join-Path -Path $TestDrive -ChildPath ncp.vhdx
+
+        if (Test-Path -Path $vhdx) {
+            Remove-item -Path $vhdx -Force
+        }
+
+        $create_vhdx = Join-Path -Path $TestDrive -ChildPath 'create_vhdx.txt'
+
+        Set-Content -Path $create_vhdx -Force -Value @"
+            create vdisk file="$vhdx" maximum=20 type=fixed
+            select vdisk file="$vhdx"
+            attach vdisk
+            convert mbr
+            create partition primary
+            format fs=fat
+            assign letter="T"
+            detach vdisk
+"@
+
+        diskpart.exe /s $create_vhdx
+        Mount-DiskImage -ImagePath $vhdx > $null
+
+        Copy-Item "$env:WinDir\System32\whoami.exe" T:\whoami.exe
+    }
+
+    AfterAll {
+        if ($IsWindows) {
+            Dismount-DiskImage -ImagePath $vhdx
+            Remove-Item $vhdx, $create_vhdx -Force
+        }
+    }
+
+    It "Should run 'whoami.exe' from FAT file system without error" -Skip:(!$IsWindows) {
+        $expected = & "$env:WinDir\System32\whoami.exe"
+        $result = T:\whoami.exe
+        $result | Should -BeExactly $expected
+    }
+}

From aa7a31b46e66f56ed53feed5b123020bdc8a09e6 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Sat, 30 Oct 2021 11:00:07 -0700
Subject: [PATCH 124/645] Use notice task to generate license assuming
 `cgmanifest` contains all components (#16340)

* Use notice task to generate license assuming cgmanifest contains all components

* fix capture task

* fix output location

* cgmanifest using latest public

* fix additional attributions path

* split into stages to allow retry without restarting

* manually append additional attributions

* remove dead comment

* Revert "cgmanifest using latest public"

This reverts commit 6bed86730021bb8f1bd26a01f19d90fd03332ad5.
---
 tools/releaseBuild/azureDevOps/compliance.yml |  6 +++-
 .../templates/compliance/generateNotice.yml   | 36 ++++++++++++-------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/compliance.yml b/tools/releaseBuild/azureDevOps/compliance.yml
index d6aabe81dd7..0b713cb0ae7 100644
--- a/tools/releaseBuild/azureDevOps/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/compliance.yml
@@ -33,12 +33,16 @@ variables:
 
 stages:
   - stage: compliance
+    displayName: 'Compliance'
     dependsOn: []
     jobs:
       - template: templates/compliance/compliance.yml
         parameters:
           parentJobs: []
+  - stage: notice
+    displayName: Generate Notice File
+    dependsOn: []
+    jobs:
       - template: templates/compliance/generateNotice.yml
         parameters:
           parentJobs: []
-
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
index c517a15b6ac..9b726b2b215 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
@@ -18,28 +18,38 @@ jobs:
     demands:
     - ImageOverride -equals MMS2019
 
-  # APIScan can take a long time
   timeoutInMinutes: 15
 
   steps:
   - checkout: self
     clean: true
 
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: 'Component Detection'
+    inputs:
+      sourceScanPath: '$(Build.SourcesDirectory)'
+      ignoreDirectories: '$(Build.SourcesDirectory)\test,$(Build.SourcesDirectory)\docs'
+
+  - task: msospo.ospo-extension.8d7f9abb-6896-461d-9e25-4f74ed65ddb2.notice@0
+    displayName: 'NOTICE File Generator'
+    inputs:
+      outputfile: '$(System.ArtifactsDirectory)\ThirdPartyNotices.txt'
+      # output format can be html or text
+      outputformat: text
+      # this isn't working
+      # additionaldata: $(Build.SourcesDirectory)\assets\additionalAttributions.txt
+
+
   - pwsh: |
-      Get-Content ./assets/additionalAttributions.txt | Out-File '$(System.ArtifactsDirectory)\additionalAttributions.txt' -Encoding utf8NoBOM -Force
-      Get-Content -Raw -Path  '$(System.ArtifactsDirectory)\additionalAttributions.txt'
-    displayName: Get Additional Attributions
+      Get-Content -Raw -Path $(Build.SourcesDirectory)\assets\additionalAttributions.txt | Out-File '$(System.ArtifactsDirectory)\ThirdPartyNotices.txt' -Encoding utf8NoBOM -Force -Append
+      Get-Content -Raw -Path '$(Build.SourcesDirectory)\assets\additionalAttributions.txt'
+    displayName: Append Additional Attributions
+    continueOnError: true
 
   - pwsh: |
-      Import-Module ./tools/ComponentGovernance
-      $pat = ConvertTo-SecureString -String "$(CgPat)" -AsPlainText -Force
-      Set-CgCredentials -Pat $pat -Organization $(CgOrganization) -Project $(CgProject)
-      $repo = Get-CgPsRepository
-      $typeId = (Get-CgSnapshotType -CgRepository $repo | where-object {$_.isTracked -eq 'True' -and $_.buildDisplayType -eq 'Coordinated Packages'}).typeId
-      $notice = Get-CgNotice -CgRepository $repo -SnapshotTypeId $typeId
-      $notice | Out-File '$(System.ArtifactsDirectory)\ThirdPartyNotices.txt' -Encoding utf8NoBOM -Force
-      Get-Content '$(System.ArtifactsDirectory)\additionalAttributions.txt' | Out-File '$(System.ArtifactsDirectory)\ThirdPartyNotices.txt' -Encoding utf8NoBOM -Force -Append
-    displayName: Get Notice
+      Get-Content -Raw -Path '$(System.ArtifactsDirectory)\ThirdPartyNotices.txt'
+    displayName: Capture Notice
+    continueOnError: true
 
   - task: AzureFileCopy@4
     displayName: 'upload Notice'

From 154feabadfb6ea400caf54a4eab78ec0e9f56dbc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 30 Oct 2021 11:19:59 -0700
Subject: [PATCH 125/645] Update to the latest notices file (#16339)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 ThirdPartyNotices.txt | 131 ++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 89 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index cfa3209cfc7..73301c45a84 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -17,21 +17,9 @@ required to debug changes to any libraries licensed under the GNU Lesser General
 
 ---------------------------------------------------------
 
-Microsoft.Extensions.ObjectPool 5.0.9 - Apache-2.0
+Microsoft.Extensions.ObjectPool 5.0.10 - Apache-2.0
 
 
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) Andrew Arnott
-Copyright (c) 2019 David Fowler
-Copyright (c) 2016 Richard Morris
-Copyright (c) 2017 Yoshifumi Kawai
-Copyright (c) Microsoft Corporation.
-Copyright (c) 2014-2018 Michael Daines
-Copyright (c) 2013-2017, Milosz Krajewski
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2010-2019 Google LLC. http://angular.io/license
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 Apache License
 
@@ -244,7 +232,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.CodeAnalysis.Common 4.0.0-5.final - MIT
+Microsoft.CodeAnalysis.Common 4.0.0-6.final - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -265,7 +253,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Microsoft.CodeAnalysis.CSharp 4.0.0-5.final - MIT
+Microsoft.CodeAnalysis.CSharp 4.0.0-6.final - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2010,77 +1998,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
----------------------------------------------------------
-
----------------------------------------------------------
-
-System.IO.FileSystem.AccessControl 6.0.0-preview.5.21301.5 - MIT
-
-
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) Andrew Arnott
-Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2017 Yoshifumi Kawai
-Copyright (c) Microsoft Corporation
-Copyright (c) 2007 James Newton-King
-Copyright (c) 2012-2014, Yann Collet
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Copyright (c) 2018 Alexander Chermyanin
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
-Copyright (c) 2002 Sun Microsystems, Inc.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2013-2017, Milosz Krajewski
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
-Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
-
-The MIT License (MIT)
-
-Copyright (c) .NET Foundation and Contributors
-
-All rights reserved.
-
-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.
-
-
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -3194,7 +3111,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Principal.Windows 6.0.0-preview.5.21301.5 - MIT
+System.Security.Principal.Windows 5.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -3217,7 +3134,6 @@ Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
 Copyright (c) The Internet Society 1997.
-Copyright (c) 2002 Sun Microsystems, Inc.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
@@ -3912,6 +3828,43 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+System.Web.Services.Description 4.9.0-rc2.21473.1 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+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.
+
+
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -3986,7 +3939,6 @@ SOFTWARE.
 ---------------------------------------------------------
 
 
-
 -------------------------------------------------------------------
 
 -------------------------------------------------------------------
@@ -4178,3 +4130,4 @@ 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.
+

From 64392f36d17ba181db217cf6734a4cc741f8bf0f Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 1 Nov 2021 10:25:39 -0700
Subject: [PATCH 126/645] Generate manifest with latest public version of the
 packages (#16337)

* Generate manifest with latest public version of the packages

* update cgmanifest

* update the PR title for the notice update

* Fix code factor issue - use catch block for fall back

* removing noisy logging
---
 .github/workflows/daily.yml  |  4 +-
 cgmanifest.json              | 96 ++++++++++++++++++------------------
 tools/findMissingNotices.ps1 | 56 ++++++++++++++++++---
 3 files changed, 99 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index c71533a3e0d..bd1a352d0f3 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -71,10 +71,10 @@ jobs:
         uses: peter-evans/create-pull-request@v3
         id: cprtpn
         with:
-          commit-message: "Update to the latest license and the cgmanifest with missing or updated components"
+          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 license and the cgmanifest with missing or updated components"
+          title: "Update to the latest notice file"
           reviewers: travisez13
           base: master
           draft: false
diff --git a/cgmanifest.json b/cgmanifest.json
index 9ae862d6274..486e39fa48d 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -85,7 +85,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.NetAnalyzers",
-          "Version": "6.0.0"
+          "Version": "5.0.3"
         }
       },
       "DevelopmentDependency": true
@@ -195,7 +195,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Win32.Registry.AccessControl",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -215,7 +215,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Win32.SystemEvents",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -225,7 +225,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Windows.Compatibility",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -415,7 +415,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "runtime.linux-arm.runtime.native.System.IO.Ports",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -425,7 +425,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "runtime.linux-arm64.runtime.native.System.IO.Ports",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -435,7 +435,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "runtime.linux-x64.runtime.native.System.IO.Ports",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -455,7 +455,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "runtime.native.System.IO.Ports",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -525,7 +525,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -705,7 +705,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.CodeDom",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -735,7 +735,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ComponentModel.Composition.Registration",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -745,7 +745,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ComponentModel.Composition",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -755,7 +755,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Configuration.ConfigurationManager",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -765,7 +765,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Data.Odbc",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -775,7 +775,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Data.OleDb",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -815,7 +815,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Diagnostics.EventLog",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -825,7 +825,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Diagnostics.PerformanceCounter",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -835,7 +835,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.DirectoryServices.AccountManagement",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -845,7 +845,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.DirectoryServices.Protocols",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -855,7 +855,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.DirectoryServices",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -865,7 +865,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Drawing.Common",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -885,7 +885,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Formats.Asn1",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -905,7 +905,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.IO.Packaging",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -915,7 +915,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.IO.Ports",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -955,7 +955,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Management",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -975,7 +975,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Net.Http.WinHttpHandler",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1005,7 +1005,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Private.ServiceModel",
-          "Version": "4.9.0"
+          "Version": "4.9.0-rc2.21473.1"
         }
       },
       "DevelopmentDependency": false
@@ -1025,7 +1025,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Reflection.Context",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1135,7 +1135,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Runtime.Caching",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1145,7 +1145,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Runtime.CompilerServices.Unsafe",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1195,7 +1195,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.AccessControl",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1205,7 +1205,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Cryptography.Pkcs",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1215,7 +1215,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Cryptography.ProtectedData",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1225,7 +1225,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Cryptography.Xml",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1235,7 +1235,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Permissions",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1255,7 +1255,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Duplex",
-          "Version": "4.9.0"
+          "Version": "4.9.0-rc2.21473.1"
         }
       },
       "DevelopmentDependency": false
@@ -1265,7 +1265,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Http",
-          "Version": "4.9.0"
+          "Version": "4.9.0-rc2.21473.1"
         }
       },
       "DevelopmentDependency": false
@@ -1275,7 +1275,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.NetTcp",
-          "Version": "4.9.0"
+          "Version": "4.9.0-rc2.21473.1"
         }
       },
       "DevelopmentDependency": false
@@ -1285,7 +1285,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Primitives",
-          "Version": "4.9.0"
+          "Version": "4.9.0-rc2.21473.1"
         }
       },
       "DevelopmentDependency": false
@@ -1295,7 +1295,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Security",
-          "Version": "4.9.0"
+          "Version": "4.9.0-rc2.21473.1"
         }
       },
       "DevelopmentDependency": false
@@ -1305,7 +1305,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Syndication",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1315,7 +1315,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceProcess.ServiceController",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1325,7 +1325,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Speech",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1335,7 +1335,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Text.Encoding.CodePages",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1355,7 +1355,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Text.Encodings.Web",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1365,7 +1365,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Threading.AccessControl",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
@@ -1405,7 +1405,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Web.Services.Description",
-          "Version": "4.9.0"
+          "Version": "4.9.0-rc2.21473.1"
         }
       },
       "DevelopmentDependency": false
@@ -1415,7 +1415,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Windows.Extensions",
-          "Version": "6.0.0"
+          "Version": "6.0.0-rc.2.21480.5"
         }
       },
       "DevelopmentDependency": false
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index b8f7231b96d..f66f88f1295 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -75,6 +75,12 @@ Class Nuget {
     }
 }
 
+$winDesktopSdk = 'Microsoft.NET.Sdk.WindowsDesktop'
+if (!$IsWindows) {
+    $winDesktopSdk = 'Microsoft.NET.Sdk'
+    Write-Warning "Always using $winDesktopSdk since this is not windows!!!"
+}
+
 function New-NugetComponent {
     param(
         [string]$name,
@@ -99,13 +105,48 @@ function New-NugetComponent {
     return $registration
 }
 
-$winDesktopSdk = 'Microsoft.NET.Sdk.WindowsDesktop'
-if (!$IsWindows) {
-    $winDesktopSdk = 'Microsoft.NET.Sdk'
-    Write-Warning "Always using $winDesktopSdk since this is not windows!!!"
+$nugetPublicVersionCache = [System.Collections.Generic.Dictionary[string, string]]::new()
+function Get-NuGetPublicVersion {
+    param(
+        [string]$Name,
+        [string]$Version
+    )
+
+    if($nugetPublicVersionCache.ContainsKey($Name)) {
+        return $nugetPublicVersionCache[$Name]
+    }
+
+    try {
+        [System.Management.Automation.SemanticVersion]$desiredVersion = $Version
+    } catch {
+        [Version]$desiredVersion = $Version
+    }
+
+    $publicVersion = $null
+    $publicVersion = Find-Package -Name $Name -AllowPrereleaseVersions -source nuget.org -AllVersions -ErrorAction SilentlyContinue | ForEach-Object {
+        try {
+            $packageVersion = [System.Management.Automation.SemanticVersion]$_.Version
+        } catch {
+            # Fall back to using [version] if it is not a semantic version
+            $packageVersion = $_.Version
+        }
+
+        $_ | Add-Member -Name SemVer -MemberType NoteProperty -Value $packageVersion -PassThru
+    } | Where-Object { $_.SemVer -le $desiredVersion } | Sort-Object -Property semver -Descending | Select-Object -First 1 -ExpandProperty Version
+
+    if(!$publicVersion) {
+        Write-Warning "No public version found for $Name, using $Version"
+        $publicVersion = $Version
+    }
+
+    if(!$nugetPublicVersionCache.ContainsKey($Name)) {
+        $nugetPublicVersionCache.Add($Name, $publicVersion)
+    }
+
+    return $publicVersion
 }
 
-Function Get-CGRegistrations {
+function Get-CGRegistrations {
     param(
         [Parameter(Mandatory)]
         [ValidateSet(
@@ -190,20 +231,21 @@ Function Get-CGRegistrations {
         $parts = ($target -split '\|')
         $name = $parts[0]
         $targetVersion = $parts[1]
+        $publicVersion = Get-NuGetPublicVersion -Name $name -Version $targetVersion
 
         # Add the registration to the cgmanifest if the TPN does not contain the name of the target OR
         # the exisitng CG contains the registration, because if the existing CG contains the registration,
         # that might be the only reason it is in the TPN.
         if (!$RegistrationTable.ContainsKey($target)) {
             $DevelopmentDependency = $false
-            if (!$existingRegistrationTable.ContainsKey($name) -or $existingRegistrationTable.$name.Component.Version() -ne $targetVersion) {
+            if (!$existingRegistrationTable.ContainsKey($name) -or $existingRegistrationTable.$name.Component.Version() -ne $publicVersion) {
                 $registrationChanged = $true
             }
             if ($existingRegistrationTable.ContainsKey($name) -and $existingRegistrationTable.$name.DevelopmentDependency) {
                 $DevelopmentDependency = $true
             }
 
-            $registration = New-NugetComponent -Name $name -Version $targetVersion -DevelopmentDependency:$DevelopmentDependency
+            $registration = New-NugetComponent -Name $name -Version $publicVersion -DevelopmentDependency:$DevelopmentDependency
             $RegistrationTable.Add($target, $registration)
         }
     }

From 8fbffe3e4ae7ad16b6eb59a773870feecfea3b14 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 1 Nov 2021 11:03:52 -0700
Subject: [PATCH 127/645] Fix global tool and SDK tests in release pipeline
 (#16342)

---
 .../templates/release-GlobalToolTest.yml      |  5 ++++
 .../templates/release-SDKTests.yml            | 29 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
index 25295ba7c24..34ea848ca7e 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
@@ -97,6 +97,11 @@ jobs:
 
         $toolPath = "$(System.DefaultWorkingDirectory)/toolPath/${{ parameters.globalToolExeName }}"
 
+        $env:DOTNET_ROOT = if ($IsWindows) { "$env:LOCALAPPDATA\Microsoft\dotnet" } else { "$env:HOME/.dotnet" }
+
+        Write-Verbose -Verbose "DOTNET_ROOT: $env:DOTNET_ROOT"
+        Get-ChildItem $env:DOTNET_ROOT
+
         $versionFound = & $toolPath -c '$PSVersionTable.PSVersion.ToString()'
 
         if ( '$(PowerShellVersion)' -ne $versionFound)
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
index d6b773a4476..8b7663f1c37 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@@ -8,6 +8,8 @@ jobs:
   displayName: ${{ parameters.displayName }}
   pool:
     vmImage: ${{ parameters.imageName }}
+  variables:
+  - group: AzDevOpsArtifacts
   steps:
     - checkout: self
       clean: true
@@ -35,6 +37,33 @@ jobs:
         artifact: metadata
         path: '$(Pipeline.Workspace)/releasePipeline/metadata'
 
+    - pwsh:  |
+        Import-Module "$(Build.SourcesDirectory)/build.psm1" -Force
+        New-NugetConfigFile -NugetFeedUrl $(PSInternalNugetFeed) -UserName $(PSInternalNugetFeedUserName) -ClearTextPAT $(PSInternalNugetFeedPAT) -FeedName AzDevOpsFeed -Destination '$(Build.SourcesDirectory)/test/hosting'
+
+        Write-Verbose -Verbose "Capture hosting folder files"
+        Get-ChildItem '$(Build.SourcesDirectory)/test/hosting'
+
+        # The above cmdlet creates a lower-case nuget.config. There also exists a NuGet.config which we needed to replace.
+        # Hence the following workaround
+
+        if (-not $IsWindows) {
+            Move-Item -Path '$(Build.SourcesDirectory)/test/hosting/nuget.config' -Destination '$(Build.SourcesDirectory)/test/hosting/NuGet.Config' -Force -ErrorAction Continue
+            Write-Verbose -Verbose "Capture hosting folder files after Move-Item"
+            Get-ChildItem '$(Build.SourcesDirectory)/test/hosting'
+        }
+
+        if(-not (Test-Path "$(Build.SourcesDirectory)/test/hosting/NuGet.Config"))
+        {
+            throw "NuGet.Config is not created"
+        }
+        else
+        {
+            Write-Verbose -Verbose "Capture NuGet.Config contents"
+            Get-Content "$(Build.SourcesDirectory)/test/hosting/NuGet.Config" -Raw
+        }
+      displayName: Insert internal nuget feed
+
     - pwsh: |
         $dotnetMetadataPath = "$(Build.SourcesDirectory)/DotnetRuntimeMetadata.json"
         $dotnetMetadataJson = Get-Content $dotnetMetadataPath -Raw | ConvertFrom-Json

From 3071718053183212792b7a45b3eab0646a352646 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 1 Nov 2021 15:16:00 -0700
Subject: [PATCH 128/645] Add an approval for releasing build-info json
 (#16351)

---
 tools/releaseBuild/azureDevOps/releasePipeline.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index 25448d0f2e6..7abb9792fe6 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -268,13 +268,18 @@ stages:
   dependsOn: GitHubManualTasks
   displayName: Upload BuildInfoJson
   jobs:
-  - job: UploadJson
+  - deployment: UploadJson
+    displayName: Upload BuildInfoJson
     pool:
       vmImage: windows-latest
     variables:
     - group: 'Azure Blob variable group'
-    steps:
-    - template: templates/release-BuildJson.yml
+    environment: PSReleaseBuildInfoJson
+    strategy:
+      runOnce:
+        deploy:
+          steps:
+          - template: templates/release-BuildJson.yml
 
 - stage: ReleaseVPack
   dependsOn: GitHubManualTasks

From 64d11f44c3adbdb211c94c26872442dce01e863f Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 1 Nov 2021 15:23:07 -0700
Subject: [PATCH 129/645] Release build info json when it is preview (#16335)

---
 tools/metadata.json                           |  4 +-
 .../templates/release-BuildJson.yml           | 46 ++++++-------------
 2 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/tools/metadata.json b/tools/metadata.json
index 4f133970e12..3325c0e8b37 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -5,6 +5,6 @@
   "ReleaseTag": "v7.1.5",
   "LTSReleaseTag" : ["v7.0.8"],
   "NextReleaseTag": "v7.2.0-preview.11",
-  "LTSRelease": { "Latest": false, "Package": true },
-  "StableRelease":  { "Latest": false, "Package": true }
+  "LTSRelease": { "Latest": false, "Package": false },
+  "StableRelease":  { "Latest": false, "Package": false }
 }
diff --git a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml b/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
index 793b1cfd1d4..95e09b66642 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
@@ -11,6 +11,7 @@ steps:
     path: '$(Pipeline.Workspace)/releasePipeline/BuildInfoJson'
 
 - pwsh: |
+    Import-Module '$(Build.SourcesDirectory)/tools/ci.psm1'
     $jsonFile = Get-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/BuildInfoJson/*.json"
     $fileName = Split-Path $jsonFile -Leaf
 
@@ -27,25 +28,24 @@ steps:
     $targetFile = "$ENV:PIPELINE_WORKSPACE/$fileName"
     ConvertTo-Json -InputObject $buildInfo | Out-File $targetFile -Encoding ascii
 
-    if ($stableRelease) {
-      $vstsCommandCopyLTSBuildInfo = "vso[task.setvariable variable=CopyStableBuildInfo]YES"
+    if ($stableRelease -or $fileName -eq "preview.json") {
+      Set-BuildVariable -Name CopyMainBuildInfo -Value YES
+    } else {
+      Set-BuildVariable -Name CopyMainBuildInfo -Value NO
     }
 
-    $vstsCommandString = "vso[task.setvariable variable=BuildInfoJsonFile]$targetFile"
-    Write-Host "sending " + $vstsCommandString
-    Write-Host "##$vstsCommandString"
+    Set-BuildVariable -Name BuildInfoJsonFile -Value $targetFile
 
     ## Create 'lts.json' if it's the latest stable and also a LTS release.
 
-    $vstsCommandCopyLTSBuildInfo = "vso[task.setvariable variable=CopyLTSBuildInfo]NO"
-    $vstsCommandCopyVersionBuildInfo = "vso[task.setvariable variable=CopyVersionBuildInfo]NO"
-
     if ($fileName -eq "stable.json") {
       if ($ltsRelease) {
         $ltsFile = "$ENV:PIPELINE_WORKSPACE/lts.json"
         Copy-Item -Path $targetFile -Destination $ltsFile -Force
-        $vstsCommandLtsJsonFile = "vso[task.setvariable variable=LtsBuildInfoJsonFile]$ltsFile"
-        $vstsCommandCopyLTSBuildInfo = "vso[task.setvariable variable=CopyLTSBuildInfo]YES"
+        Set-BuildVariable -Name LtsBuildInfoJsonFile -Value $ltsFile
+        Set-BuildVariable -Name CopyLTSBuildInfo -Value YES
+      } else {
+        Set-BuildVariable -Name CopyLTSBuildInfo -Value NO
       }
 
       $releaseTag = $buildInfo.ReleaseTag
@@ -54,26 +54,10 @@ steps:
 
       $versionFile = "$ENV:PIPELINE_WORKSPACE/$($semVersion.Major)-$($semVersion.Minor).json"
       Copy-Item -Path $targetFile -Destination $versionFile -Force
-      $vstsCommandVersionJsonFile = "vso[task.setvariable variable=VersionBuildInfoJsonFile]$versionFile"
-      $vstsCommandCopyVersionBuildInfo = "vso[task.setvariable variable=CopyVersionBuildInfo]YES"
-    }
-
-    Write-Host "sending " + $vstsCommandCopyLTSBuildInfo
-    Write-Host "##$vstsCommandCopyLTSBuildInfo"
-
-    if ($vstsCommandLtsJsonFile)
-    {
-        Write-Host "sending " + $vstsCommandLtsJsonFile
-        Write-Host "##$vstsCommandLtsJsonFile"
-    }
-
-    Write-Host "sending " + $vstsCommandCopyVersionBuildInfo
-    Write-Host "##$vstsCommandCopyVersionBuildInfo"
-
-    if ($vstsCommandVersionJsonFile)
-    {
-        Write-Host "sending " + $vstsCommandVersionJsonFile
-        Write-Host "##$vstsCommandVersionJsonFile"
+      Set-BuildVariable -Name VersionBuildInfoJsonFile -Value $versionFile
+      Set-BuildVariable -Name CopyVersionBuildInfo -Value YES
+    } else {
+      Set-BuildVariable -Name CopyVersionBuildInfo -Value NO
     }
   displayName: Download and Capture NuPkgs
 
@@ -85,7 +69,7 @@ steps:
     Destination: AzureBlob
     storage: '$(StorageAccount)'
     ContainerName: BuildInfo
-  condition: and(succeeded(), eq(variables['CopyStableBuildInfo'], 'YES'))
+  condition: and(succeeded(), eq(variables['CopyMainBuildInfo'], 'YES'))
 
 - task: AzureFileCopy@2
   displayName: 'AzureBlob build info ''lts.json'' Copy when needed'

From 4eb9e8bea5fd338355e68d3812f208ece08b4432 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 1 Nov 2021 20:44:08 -0700
Subject: [PATCH 130/645] Move PR Quantifier config to subfolder (#16352)

---
 prquantifier.yaml => .github/prquantifier.yaml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename prquantifier.yaml => .github/prquantifier.yaml (100%)

diff --git a/prquantifier.yaml b/.github/prquantifier.yaml
similarity index 100%
rename from prquantifier.yaml
rename to .github/prquantifier.yaml

From cf22188e95b33f8471cf454797965f0724588544 Mon Sep 17 00:00:00 2001
From: Ryan Polley <rypolley+github@gmail.com>
Date: Tue, 2 Nov 2021 01:06:05 -0500
Subject: [PATCH 131/645] Add more tests to `Tee-Object -Encoding` (#14539)

---
 .../Tee-Object.Tests.ps1                      | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Tee-Object.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Tee-Object.Tests.ps1
index 7483c4d8004..6d67665c37d 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Tee-Object.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Tee-Object.Tests.ps1
@@ -19,15 +19,33 @@ Describe "Tee-Object" -Tags "CI" {
             Remove-Item -Path $testfile -ErrorAction SilentlyContinue -Force
         }
 
-	    It "Should return the output to the screen and to the variable" {
-	        Write-Output teeobjecttest1 | Tee-Object -Variable teeresults
-	        $teeresults | Should -BeExactly "teeobjecttest1"
-	    }
+        It "Should return the output to the screen and to the variable" {
+            Write-Output teeobjecttest1 | Tee-Object -Variable teeresults
+            $teeresults | Should -BeExactly "teeobjecttest1"
+        }
 
-	    It "Should tee the output to a file" {
-	        $teefile = $testfile
-	        Write-Output teeobjecttest3  | Tee-Object $teefile
-	        Get-Content $teefile | Should -BeExactly "teeobjecttest3"
+        It "Should tee the output to a file" {
+            $teefile = $testfile
+            Write-Output teeobjecttest3  | Tee-Object $teefile
+            Get-Content $teefile | Should -BeExactly "teeobjecttest3"
+        }
+
+        $unicodeTestString = "A1£ę௸🤔"
+        It "Should tee output to file using <encoding> encoding when selected" -TestCases @(
+            @{ Encoding = "ascii"; Content = "teeobjecttest1"},
+            @{ Encoding = "bigendianunicode"; Content = $unicodeTestString  },
+            @{ Encoding = "default"; Content = $unicodeTestString },
+            @{ Encoding = "latin1"; Content = "téèõbjêcttëst1" },
+            @{ Encoding = "unicode"; Content = $unicodeTestString },
+            @{ Encoding = "utf32"; Content = $unicodeTestString },
+            @{ Encoding = "utf7"; Content = $unicodeTestString},
+            @{ Encoding = "utf8"; Content = $unicodeTestString}
+        ) {
+            param($Encoding, $Content)
+            $teefile = $testfile
+            Write-Output -InputObject $content  | Tee-Object -FilePath $teefile -Encoding $Encoding
+            Get-Content -Path $teefile -Encoding $Encoding | Should -BeExactly $content
+            Remove-Item -Path $teefile -ErrorAction SilentlyContinue
         }
 
         It "Parameter 'Encoding' should accept encoding" {

From 53f8cba46f3033dc1f0b9e07444c88287557f6c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Nov 2021 09:30:41 -0700
Subject: [PATCH 132/645] Bump `XunitXml.TestLogger` from 3.0.66 to 3.0.70
 (#16356)

---
 test/xUnit/xUnit.tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index e68eafe7ea5..7c69afb0903 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Include="XunitXml.TestLogger" Version="3.0.66" />
+    <PackageReference Include="XunitXml.TestLogger" Version="3.0.70" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
   </ItemGroup>
 

From 107fd7ab1fffc755c29ccfc03a24a7bd5ed196cb Mon Sep 17 00:00:00 2001
From: Austin Farmer <5827236+farmerau@users.noreply.github.com>
Date: Tue, 2 Nov 2021 12:39:28 -0400
Subject: [PATCH 133/645] Add support to web cmdlets for open-ended input tags
 (#16193)

---
 .../BasicHtmlWebResponseObject.Common.cs      |  2 +-
 .../WebCmdlets.Tests.ps1                      | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs
index 969dd8231c8..07982009a0c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs
@@ -219,7 +219,7 @@ private static void EnsureHtmlParser()
 
             if (s_inputFieldRegex == null)
             {
-                s_inputFieldRegex = new Regex(@"<input\s+[^>]*(/>|>.*?</input>)",
+                s_inputFieldRegex = new Regex(@"<input\s+[^>]*(/?>|>.*?</input>)",
                     RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
             }
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
index 5f4f5c7728e..e4973f5515a 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
@@ -1933,6 +1933,48 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
             $response = Invoke-WebRequest -Uri $dosUri
             $response.Images | Should -Not -BeNullOrEmpty
         }
+
+        $singleInputExpected = @(
+            @{ Name = 'foo'; Value = 'bar' }
+        )
+
+        It 'correctly parses input tag(s) for `<markup>`' -TestCases @(
+            @{
+                Markup = "<input name='foo' value='bar'>";
+                ExpectedFields = $singleInputExpected
+            },
+            @{
+                Markup = "<input name='foo' value='bar'/>";
+                ExpectedFields = $singleInputExpected
+            },
+            @{
+                Markup = "<input name='foo' value='bar'>baz</input>";
+                ExpectedFields = $singleInputExpected
+            }
+            @{
+                Markup = "<input name='item1' value='bar'><input name='item2' value='foo'><input name='item3'></input><input name='item4' value='fu'><input name='item5' value='bahr'/>";
+                ExpectedFields = @(
+                    @{ Name = 'item1'; Value = 'bar'},
+                    @{ Name = 'item2'; Value = 'foo' },
+                    @{ Name = 'item3'; Value = $null },
+                    @{ Name = 'item4'; Value = 'fu' },
+                    @{ Name = 'item5'; Value = 'bahr' }
+                )
+            }
+        ) {
+            param($markup, $expectedFields)
+            $query = @{
+                contenttype = 'text/html'
+                body        = "<html><body>${markup}</body></html>"
+            }
+            $uri = Get-WebListenerUrl -Test 'Response' -Query $query
+            $response = Invoke-WebRequest -Uri $uri -UseBasicParsing
+            $response.Error | Should -BeNullOrEmpty
+            ForEach ($expectedField in $expectedFields) {
+                $actualField = $response.InputFields.FindByName($expectedField.Name)
+                $actualField.Value | Should -Be $expectedField.Value
+            }
+        }
     }
 
     Context "Denial of service" -Tag 'DOS' {

From 674ef888a2d147691d19f9e3ff65a1f09e35d82e Mon Sep 17 00:00:00 2001
From: Maksim Ivanyuk <ivanyuk.maksim@gmail.com>
Date: Wed, 3 Nov 2021 02:53:36 +0300
Subject: [PATCH 134/645] Add `-HttpVersion` parameter to web cmdlets (#15853)

---
 .../Common/HttpVersionCompletionsAttribute.cs |  51 +++++++
 .../Common/WebRequestPSCmdlet.Common.cs       |  24 +++-
 .../resources/WebCmdletStrings.resx           |   4 +-
 ...rgumentToVersionTransformationAttribute.cs |  58 ++++++++
 .../engine/InternalCommands.cs                |  46 ++-----
 .../TabCompletion/TabCompletion.Tests.ps1     |  21 +++
 .../WebCmdlets.Tests.ps1                      |  32 +++++
 .../WebListener/Controllers/GetController.cs  |  17 +--
 test/tools/WebListener/Program.cs             | 126 ++++++++++--------
 ...rgumentToVersionTransformationAttribute.cs |  51 +++++++
 10 files changed, 329 insertions(+), 101 deletions(-)
 create mode 100644 src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/HttpVersionCompletionsAttribute.cs
 create mode 100644 src/System.Management.Automation/engine/ArgumentToVersionTransformationAttribute.cs
 create mode 100644 test/xUnit/csharp/test_ArgumentToVersionTransformationAttribute.cs

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/HttpVersionCompletionsAttribute.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/HttpVersionCompletionsAttribute.cs
new file mode 100644
index 00000000000..05eb8ed96b6
--- /dev/null
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/HttpVersionCompletionsAttribute.cs
@@ -0,0 +1,51 @@
+// 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)
+        {
+        } 
+    }
+}
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
index d0abc8f3cd7..a5a4060e7fd 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
@@ -107,6 +107,18 @@ public abstract partial class WebRequestPSCmdlet : PSCmdlet
 
         #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.
@@ -1081,6 +1093,11 @@ internal virtual HttpRequestMessage GetRequest(Uri uri)
             // 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)
             {
@@ -1413,6 +1430,7 @@ internal virtual HttpResponseMessage GetResponse(HttpClient client, HttpRequestM
                         string reqVerboseMsg = string.Format(
                             CultureInfo.CurrentCulture,
                             WebCmdletStrings.WebMethodInvocationVerboseMsg,
+                            requestWithoutRange.Version,
                             requestWithoutRange.Method,
                             requestWithoutRange.RequestUri,
                             requestContentLength);
@@ -1505,10 +1523,14 @@ protected override void ProcessRecord()
                                 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);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx
index 3d663573018..8ba25baff18 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx
+++ b/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">
@@ -247,7 +247,7 @@
     <value>Following rel link {0}</value>
   </data>
   <data name="WebMethodInvocationVerboseMsg" xml:space="preserve">
-    <value>{0} with {1}-byte payload</value>
+    <value>HTTP/{0} {1} {2} with {3}-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>
diff --git a/src/System.Management.Automation/engine/ArgumentToVersionTransformationAttribute.cs b/src/System.Management.Automation/engine/ArgumentToVersionTransformationAttribute.cs
new file mode 100644
index 00000000000..facaa9e3e1a
--- /dev/null
+++ b/src/System.Management.Automation/engine/ArgumentToVersionTransformationAttribute.cs
@@ -0,0 +1,58 @@
+// 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;
+        }
+    }
+}
diff --git a/src/System.Management.Automation/engine/InternalCommands.cs b/src/System.Management.Automation/engine/InternalCommands.cs
index 8d628aea660..d9d54539bac 100644
--- a/src/System.Management.Automation/engine/InternalCommands.cs
+++ b/src/System.Management.Automation/engine/InternalCommands.cs
@@ -6,7 +6,6 @@
 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;
@@ -15,8 +14,10 @@
 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
 {
@@ -2647,46 +2648,19 @@ public SwitchParameter Off
         private SwitchParameter _off;
 
         /// <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"
-        ///   * The string 'latest', which we interpret to be the current version of PowerShell.
+        /// Handle 'latest', which we interpret to be the current version of PowerShell.
         /// </summary>
-        private sealed class ArgumentToVersionTransformationAttribute : ArgumentTransformationAttribute
+        private sealed class ArgumentToPSVersionTransformationAttribute : ArgumentToVersionTransformationAttribute
         {
-            public override object Transform(EngineIntrinsics engineIntrinsics, object inputData)
+            protected override bool TryConvertFromString(string versionString, [NotNullWhen(true)] out Version version)
             {
-                object version = PSObject.Base(inputData);
-
-                string versionStr = version as string;
-                if (versionStr != null)
-                {
-                    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;
-                    }
-                }
-
-                if (version is double)
+                if (string.Equals("latest", versionString, StringComparison.OrdinalIgnoreCase))
                 {
-                    // 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);
+                    version = PSVersionInfo.PSVersion;
+                    return true;
                 }
 
-                return inputData;
+                return base.TryConvertFromString(versionString, out version);
             }
         }
 
@@ -2711,7 +2685,7 @@ protected override void Validate(object arguments, EngineIntrinsics engineIntrin
         /// Gets or sets strict mode in the current scope.
         /// </summary>
         [Parameter(ParameterSetName = "Version", Mandatory = true)]
-        [ArgumentToVersionTransformation]
+        [ArgumentToPSVersionTransformation]
         [ValidateVersion]
         [Alias("v")]
         public Version Version
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 2674a74a21a..67aa4bb5907 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -1134,6 +1134,27 @@ dir -Recurse `
             $res.CompletionMatches | Should -HaveCount 4
             [string]::Join(',', ($res.CompletionMatches.completiontext | Sort-Object)) | Should -BeExactly "-Path,-PipelineVariable,-PSPath,-pv"
         }
+
+        It "Test completion for HttpVersion parameter name" {
+            $inputStr = 'Invoke-WebRequest -HttpV'
+            $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length
+            $res.CompletionMatches | Should -HaveCount 1
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly "-HttpVersion"
+        }
+
+        It "Test completion for HttpVersion parameter" {
+            $inputStr = 'Invoke-WebRequest -HttpVersion '
+            $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length
+            $res.CompletionMatches | Should -HaveCount 4
+            [string]::Join(',', ($res.CompletionMatches.completiontext | Sort-Object)) | Should -BeExactly "1.0,1.1,2.0,3.0"
+        }
+
+        It "Test completion for HttpVersion parameter with input" {
+            $inputStr = 'Invoke-WebRequest -HttpVersion 1'
+            $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length
+            $res.CompletionMatches | Should -HaveCount 2
+            [string]::Join(',', ($res.CompletionMatches.completiontext | Sort-Object)) | Should -BeExactly "1.0,1.1"
+        }
     }
 
     Context "Module completion for 'using module'" {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
index e4973f5515a..0f1f2ca595d 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
@@ -469,6 +469,23 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
         $result.Output.Headers.Connection | Should -Be "Close"
     }
 
+    It "Validate Invoke-WebRequest -HttpVersion '<httpVersion>'" -Skip:(!$IsWindows) -TestCases @(
+        @{ httpVersion = '1.1'},
+        @{ httpVersion = '2'}
+    ) {
+        param($httpVersion)
+        # Operation options
+        $uri = Get-WebListenerUrl -Test 'Get' -Https
+        $command = "Invoke-WebRequest -Uri $uri -HttpVersion $httpVersion -SkipCertificateCheck"
+
+        $result = ExecuteWebCommand -command $command
+        ValidateResponse -response $result
+
+        # Validate response content
+        $jsonContent = $result.Output.Content | ConvertFrom-Json
+        $jsonContent.protocol | Should -Be "HTTP/$httpVersion"
+    }
+
     It "Validate Invoke-WebRequest -MaximumRedirection" {
         $uri = Get-WebListenerUrl -Test 'Redirect' -TestValue '3'
         $command = "Invoke-WebRequest -Uri '$uri' -MaximumRedirection 4"
@@ -2118,6 +2135,21 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
         $result.Output.Headers.Connection | Should -Be "Close"
     }
 
+    It "Validate Invoke-RestMethod -HttpVersion '<httpVersion>'" -Skip:(!$IsWindows) -TestCases @(
+        @{ httpVersion = '1.1'},
+        @{ httpVersion = '2'}
+    ) {
+        param($httpVersion)
+        # Operation options
+        $uri = Get-WebListenerUrl -Test 'Get' -Https
+        $command = "Invoke-RestMethod -Uri $uri -HttpVersion $httpVersion -SkipCertificateCheck"
+
+        $result = ExecuteWebCommand -command $command
+
+        # Validate response
+        $result.Output.protocol | Should -Be "HTTP/$httpVersion"
+    }
+
     It "Validate Invoke-RestMethod -MaximumRedirection" {
         $uri = Get-WebListenerUrl -Test 'Redirect' -TestValue '3'
         $command = "Invoke-RestMethod -Uri '$uri' -MaximumRedirection 4"
diff --git a/test/tools/WebListener/Controllers/GetController.cs b/test/tools/WebListener/Controllers/GetController.cs
index 03f733f5049..631886bb7e1 100644
--- a/test/tools/WebListener/Controllers/GetController.cs
+++ b/test/tools/WebListener/Controllers/GetController.cs
@@ -1,13 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http.Extensions;
 using mvc.Models;
@@ -32,12 +28,13 @@ public JsonResult Index()
 
             Hashtable output = new Hashtable
             {
-                {"args", args},
-                {"headers", headers},
-                {"origin", Request.HttpContext.Connection.RemoteIpAddress.ToString()},
-                {"url", UriHelper.GetDisplayUrl(Request)},
-                {"query", Request.QueryString.ToUriComponent()},
-                {"method", Request.Method}
+                { "args", args },
+                { "headers", headers },
+                { "origin", Request.HttpContext.Connection.RemoteIpAddress.ToString() },
+                { "url", UriHelper.GetDisplayUrl(Request) },
+                { "query", Request.QueryString.ToUriComponent() },
+                { "method", Request.Method },
+                { "protocol", Request.Protocol }
             };
 
             if (Request.HasFormContentType)
diff --git a/test/tools/WebListener/Program.cs b/test/tools/WebListener/Program.cs
index a4b575121d2..37a62a58268 100644
--- a/test/tools/WebListener/Program.cs
+++ b/test/tools/WebListener/Program.cs
@@ -2,18 +2,13 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Net;
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
+
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 
 namespace mvc
 {
@@ -34,52 +29,79 @@ public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder()
                 .UseStartup<Startup>().UseKestrel(options =>
                 {
-                   options.AllowSynchronousIO = true;
-                   options.Listen(IPAddress.Loopback, int.Parse(args[2]));
-                   options.Listen(IPAddress.Loopback, int.Parse(args[3]), listenOptions =>
-                   {
-                       var certificate = new X509Certificate2(args[0], args[1]);
-                       HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
-                       httpsOption.SslProtocols = SslProtocols.Tls12;
-                       httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
-                       httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
-                       httpsOption.CheckCertificateRevocation = false;
-                       httpsOption.ServerCertificate = certificate;
-                       listenOptions.UseHttps(httpsOption);
-                   });
-                   options.Listen(IPAddress.Loopback, int.Parse(args[4]), listenOptions =>
-                   {
-                       var certificate = new X509Certificate2(args[0], args[1]);
-                       HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
-                       httpsOption.SslProtocols = SslProtocols.Tls11;
-                       httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
-                       httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
-                       httpsOption.CheckCertificateRevocation = false;
-                       httpsOption.ServerCertificate = certificate;
-                       listenOptions.UseHttps(httpsOption);
-                   });
-                   options.Listen(IPAddress.Loopback, int.Parse(args[5]), listenOptions =>
-                   {
-                       var certificate = new X509Certificate2(args[0], args[1]);
-                       HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
-                       httpsOption.SslProtocols = SslProtocols.Tls;
-                       httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
-                       httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
-                       httpsOption.CheckCertificateRevocation = false;
-                       httpsOption.ServerCertificate = certificate;
-                       listenOptions.UseHttps(httpsOption);
-                   });
-                   options.Listen(IPAddress.Loopback, int.Parse(args[6]), listenOptions =>
-                   {
-                       var certificate = new X509Certificate2(args[0], args[1]);
-                       HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
-                       httpsOption.SslProtocols = SslProtocols.Tls13;
-                       httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
-                       httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
-                       httpsOption.CheckCertificateRevocation = false;
-                       httpsOption.ServerCertificate = certificate;
-                       listenOptions.UseHttps(httpsOption);
-                   });
+                    options.AllowSynchronousIO = true;
+
+                    options.Listen(
+                        IPAddress.Loopback,
+                        int.Parse(args[2]),
+                        listenOptions =>
+                        {
+                            listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
+                        });
+
+                    options.Listen(
+                        IPAddress.Loopback,
+                        int.Parse(args[3]),
+                        listenOptions =>
+                        {
+                            var certificate = new X509Certificate2(args[0], args[1]);
+                            HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
+                            httpsOption.SslProtocols = SslProtocols.Tls12;
+                            httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
+                            httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
+                            httpsOption.CheckCertificateRevocation = false;
+                            httpsOption.ServerCertificate = certificate;
+                            listenOptions.UseHttps(httpsOption);
+                            listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
+                        });
+
+                    options.Listen(
+                        IPAddress.Loopback,
+                        int.Parse(args[4]),
+                        listenOptions =>
+                        {
+                            var certificate = new X509Certificate2(args[0], args[1]);
+                            HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
+                            httpsOption.SslProtocols = SslProtocols.Tls11;
+                            httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
+                            httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
+                            httpsOption.CheckCertificateRevocation = false;
+                            httpsOption.ServerCertificate = certificate;
+                            listenOptions.UseHttps(httpsOption);
+                            listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
+                        });
+
+                    options.Listen(
+                        IPAddress.Loopback,
+                        int.Parse(args[5]),
+                        listenOptions =>
+                        {
+                            var certificate = new X509Certificate2(args[0], args[1]);
+                            HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
+                            httpsOption.SslProtocols = SslProtocols.Tls;
+                            httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
+                            httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
+                            httpsOption.CheckCertificateRevocation = false;
+                            httpsOption.ServerCertificate = certificate;
+                            listenOptions.UseHttps(httpsOption);
+                            listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
+                        });
+
+                    options.Listen(
+                        IPAddress.Loopback,
+                        int.Parse(args[6]),
+                        listenOptions =>
+                        {
+                            var certificate = new X509Certificate2(args[0], args[1]);
+                            HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
+                            httpsOption.SslProtocols = SslProtocols.Tls13;
+                            httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
+                            httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
+                            httpsOption.CheckCertificateRevocation = false;
+                            httpsOption.ServerCertificate = certificate;
+                            listenOptions.UseHttps(httpsOption);
+                            listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
+                        });
                 })
                 .Build();
     }
diff --git a/test/xUnit/csharp/test_ArgumentToVersionTransformationAttribute.cs b/test/xUnit/csharp/test_ArgumentToVersionTransformationAttribute.cs
new file mode 100644
index 00000000000..d7ca7936747
--- /dev/null
+++ b/test/xUnit/csharp/test_ArgumentToVersionTransformationAttribute.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.Management.Automation;
+
+using Xunit;
+
+namespace PSTests.Parallel
+{
+    public class ArgumentToVersionTransformationAttributeTests
+    {
+        [Theory]
+        [MemberData(nameof(TestCases))]
+        public void TestConversion(object inputData, object expected)
+        {
+            var transformation = new ArgumentToVersionTransformationAttribute();
+            var result = transformation.Transform(default, inputData);
+
+            Assert.Equal(expected, result);
+        }
+
+        public static IEnumerable<object[]> TestCases()
+        {
+            // strings
+            yield return new object[] { "1.1", "1.1" };
+            yield return new object[] { "1", new Version(1, 0) };
+            yield return new object[] { string.Empty, new Version(0, 0) };
+
+            // doubles
+            yield return new object[] { 1.0, 1.0 };
+            yield return new object[] { 1.1, 1.1 };
+
+            // ints
+            yield return new object[] { 1, new Version(1, 0) };
+            yield return new object[] { 2, new Version(2, 0) };
+
+            // PSObjects
+            yield return new object[] { new PSObject(obj: 0), new Version(0, 0) };
+            yield return new object[] { new PSObject(obj: 1), new Version(1, 0) };
+
+            // unhandled
+            var obj = new object();
+            yield return new object[] { obj, obj };
+
+            var date = DateTimeOffset.UtcNow;
+            yield return new object[] { date, date };
+        }
+    }
+}

From 00d39fa4d5f562f3ee03df7f0d0355501eb1af4a Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 2 Nov 2021 17:01:34 -0700
Subject: [PATCH 135/645] Increment RC MSI build number by 100 (#16354)

---
 tools/packaging/packaging.psm1 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 2908357b144..5d24276308b 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -3096,7 +3096,7 @@ function Get-WindowsNames {
     Write-Verbose -Message "Getting Windows Names for ProductName: $ProductName; ProductNameSuffix: $ProductNameSuffix; ProductVersion: $ProductVersion" -Verbose
 
     $ProductSemanticVersion = Get-PackageSemanticVersion -Version $ProductVersion
-    $ProductVersion = Get-PackageVersionAsMajorMinorBuildRevision -Version $ProductVersion
+    $ProductVersion = Get-PackageVersionAsMajorMinorBuildRevision -Version $ProductVersion -IncrementBuildNumber
 
     $productVersionWithName = $ProductName + '_' + $ProductVersion
     $productSemanticVersionWithName = $ProductName + '-' + $ProductSemanticVersion
@@ -3748,8 +3748,9 @@ function Get-PackageVersionAsMajorMinorBuildRevision
         # Version of the Package
         [Parameter(Mandatory = $true)]
         [ValidateNotNullOrEmpty()]
-        [string] $Version
-        )
+        [string] $Version,
+        [switch] $IncrementBuildNumber
+    )
 
     Write-Verbose "Extract the version in the form of major.minor[.build[.revision]] for $Version"
     $packageVersionTokens = $Version.Split('-')
@@ -3770,6 +3771,10 @@ function Get-PackageVersionAsMajorMinorBuildRevision
                 $packageBuildTokens = $packageBuildTokens.Substring(0,4)
             }
 
+            if ($packageVersionTokens[1] -match 'rc' -and $IncrementBuildNumber) {
+                $packageBuildTokens = [int]$packageBuildTokens + 100
+            }
+
             $packageVersion = $packageVersion + '.' + $packageBuildTokens
         }
         else

From 2f7f67d1ea686f5e8be605a37e87629304ad5408 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 3 Nov 2021 09:52:13 -0700
Subject: [PATCH 136/645] Add current folder to the beginning of the module
 import (#16353)

* fix module import

* capture git status for notices wf

* Only create a pr if there is a diff

* Update .github/workflows/daily.yml
---
 .github/workflows/daily.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index bd1a352d0f3..55b7ba38f45 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -30,7 +30,7 @@ jobs:
           git fetch --prune --unshallow --tags
       - name: Execute Update .NET script
         run: |
-          Import-Module .github/workflows/GHWorkflowHelper
+          Import-Module ./.github/workflows/GHWorkflowHelper
           $currentVersion = (Get-Content .\global.json | ConvertFrom-Json).sdk.version
           Set-GWVariable -Name OLD_VERSION -Value $currentVersion
 
@@ -67,9 +67,23 @@ jobs:
       - 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: |
+          git diff --quiet ThirdPartyNotices.txt
+          $exitCode = $LASTEXITCODE
+          Write-Verbose -Message "Exit code: $exitCode" -Verbose
+          if ($LASTEXITCODE -ne 0) {
+            Set-GWVariable -Name CREATE_PR -Value 'true'
+          } else {
+            Write-Verbose "No difference found.  Not creating a PR." -Verbose
+          }
       - 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>

From ef69fdafc41017661203fde8ed3ab77414f5e14e Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Thu, 4 Nov 2021 10:28:04 +0500
Subject: [PATCH 137/645] Remove unneeded call to `File.ResolveLinkTarget` from
 `IsWindowsApplication` (#16371)

---
 .../engine/NativeCommandProcessor.cs          | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index 7fd6865a4e3..12c02e60783 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -1106,27 +1106,6 @@ private static bool IsWindowsApplication(string fileName)
                 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.
-            try
-            {
-                string linkTarget = File.ResolveLinkTarget(fileName, returnFinalTarget: false)?.FullName;
-                if (linkTarget is not null)
-                {
-                    fileName = linkTarget;
-                }
-            }
-            catch
-            {
-                // An exception may be thrown from 'File.ResolveLinkTarget' when it fails to resolve a link path,
-                // for example, when the underlying file system doesn't support reparse points.
-                // Just use the original file name in this case.
-            }
-
             SHFILEINFO shinfo = new SHFILEINFO();
             IntPtr type = SHGetFileInfo(fileName, 0, ref shinfo, (uint)Marshal.SizeOf(shinfo), SHGFI_EXETYPE);
 

From 190257512915fd1c9d627978813a6dd8283eeae0 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 8 Nov 2021 10:39:29 -0800
Subject: [PATCH 138/645] Update `metadata.json` and `README.md` for 7.2.0
 release (#16395)

---
 README.md           | 81 ++++++++++++++++++++++-----------------------
 tools/metadata.json |  6 ++--
 2 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index eb50d4a94d6..ad198f4feea 100644
--- a/README.md
+++ b/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][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]     |
+| [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]     |
 | [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][pv-macos-arm64]| [Instructions][in-macos]      |
+| [macOS 10.13+ (arm64)][corefx-macos]       | [.pkg][lts-macos-arm64] | [.pkg][rl-macos-arm64]  | [.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,39 +59,38 @@ 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][pv-macos-tar-arm64]                    | [Instructions][in-tar-macos]                   |
+| macOS (arm64)  | [64-bit][rl-macos-tar-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.0.8/PowerShell-7.0.8-win-x86.msi
-[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/PowerShell-7.0.8-win-x64.msi
-[lts-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts_7.0.8-1.ubuntu.18.04_amd64.deb
-[lts-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts_7.0.8-1.ubuntu.16.04_amd64.deb
-[lts-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts_7.0.8-1.debian.9_amd64.deb
-[lts-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts_7.0.8-1.debian.10_amd64.deb
-[lts-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts-7.0.8-1.rhel.7.x86_64.rpm
-[lts-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts-7.0.8-1.centos.8.x86_64.rpm
-[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.8/powershell-lts-7.0.8-osx-x64.pkg
-
-[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/PowerShell-7.1.5-win-x64.msi
-[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/PowerShell-7.1.5-win-x86.msi
-[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell_7.1.5-1.ubuntu.20.04_amd64.deb
-[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell_7.1.5-1.ubuntu.18.04_amd64.deb
-[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell_7.1.5-1.ubuntu.16.04_amd64.deb
-[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell_7.1.5-1.debian.9_amd64.deb
-[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell_7.1.5-1.debian.10_amd64.deb
-[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell_7.1.5-1.debian.11_amd64.deb
-[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-1.rhel.7.x86_64.rpm
-[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-1.centos.8.x86_64.rpm
-[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-osx-x64.pkg
-[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/PowerShell-7.1.5-win-arm64.zip
-[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/PowerShell-7.1.5-win-x86.zip
-[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/PowerShell-7.1.5-win-x64.zip
-[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-osx-x64.tar.gz
-[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-linux-x64.tar.gz
-[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-linux-arm32.tar.gz
-[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.5/powershell-7.1.5-linux-arm64.tar.gz
+[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
+
+[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-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
diff --git a/tools/metadata.json b/tools/metadata.json
index 3325c0e8b37..398f492d4f3 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,9 +1,9 @@
 {
-  "StableReleaseTag": "v7.1.5",
+  "StableReleaseTag": "v7.2.0",
   "PreviewReleaseTag": "v7.2.0-rc.1",
   "ServicingReleaseTag": "v7.0.8",
-  "ReleaseTag": "v7.1.5",
-  "LTSReleaseTag" : ["v7.0.8"],
+  "ReleaseTag": "v7.2.0",
+  "LTSReleaseTag" : ["v7.0.8", "7.2.0"],
   "NextReleaseTag": "v7.2.0-preview.11",
   "LTSRelease": { "Latest": false, "Package": false },
   "StableRelease":  { "Latest": false, "Package": false }

From 01069f03fc78c588f06571d67bad297d3649f796 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 8 Nov 2021 11:45:47 -0800
Subject: [PATCH 139/645] Update CgManifest.json for 6.0.0 .NET packages
 (#16398)

---
 cgmanifest.json | 94 ++++++++++++++++++++++++-------------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/cgmanifest.json b/cgmanifest.json
index 486e39fa48d..3d539c9b7b9 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -195,7 +195,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Win32.Registry.AccessControl",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -215,7 +215,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Win32.SystemEvents",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -225,7 +225,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Windows.Compatibility",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -415,7 +415,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "runtime.linux-arm.runtime.native.System.IO.Ports",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -425,7 +425,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "runtime.linux-arm64.runtime.native.System.IO.Ports",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -435,7 +435,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "runtime.linux-x64.runtime.native.System.IO.Ports",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -455,7 +455,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "runtime.native.System.IO.Ports",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -525,7 +525,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -705,7 +705,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.CodeDom",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -735,7 +735,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ComponentModel.Composition.Registration",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -745,7 +745,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ComponentModel.Composition",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -755,7 +755,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Configuration.ConfigurationManager",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -765,7 +765,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Data.Odbc",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -775,7 +775,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Data.OleDb",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -815,7 +815,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Diagnostics.EventLog",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -825,7 +825,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Diagnostics.PerformanceCounter",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -835,7 +835,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.DirectoryServices.AccountManagement",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -845,7 +845,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.DirectoryServices.Protocols",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -855,7 +855,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.DirectoryServices",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -865,7 +865,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Drawing.Common",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -885,7 +885,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Formats.Asn1",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -905,7 +905,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.IO.Packaging",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -915,7 +915,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.IO.Ports",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -955,7 +955,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Management",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -975,7 +975,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Net.Http.WinHttpHandler",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1005,7 +1005,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Private.ServiceModel",
-          "Version": "4.9.0-rc2.21473.1"
+          "Version": "4.9.0"
         }
       },
       "DevelopmentDependency": false
@@ -1025,7 +1025,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Reflection.Context",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1135,7 +1135,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Runtime.Caching",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1145,7 +1145,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Runtime.CompilerServices.Unsafe",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1195,7 +1195,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.AccessControl",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1205,7 +1205,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Cryptography.Pkcs",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1215,7 +1215,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Cryptography.ProtectedData",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1225,7 +1225,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Cryptography.Xml",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1235,7 +1235,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Permissions",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1255,7 +1255,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Duplex",
-          "Version": "4.9.0-rc2.21473.1"
+          "Version": "4.9.0"
         }
       },
       "DevelopmentDependency": false
@@ -1265,7 +1265,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Http",
-          "Version": "4.9.0-rc2.21473.1"
+          "Version": "4.9.0"
         }
       },
       "DevelopmentDependency": false
@@ -1275,7 +1275,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.NetTcp",
-          "Version": "4.9.0-rc2.21473.1"
+          "Version": "4.9.0"
         }
       },
       "DevelopmentDependency": false
@@ -1285,7 +1285,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Primitives",
-          "Version": "4.9.0-rc2.21473.1"
+          "Version": "4.9.0"
         }
       },
       "DevelopmentDependency": false
@@ -1295,7 +1295,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Security",
-          "Version": "4.9.0-rc2.21473.1"
+          "Version": "4.9.0"
         }
       },
       "DevelopmentDependency": false
@@ -1305,7 +1305,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Syndication",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1315,7 +1315,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceProcess.ServiceController",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1325,7 +1325,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Speech",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1335,7 +1335,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Text.Encoding.CodePages",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1355,7 +1355,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Text.Encodings.Web",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1365,7 +1365,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Threading.AccessControl",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1405,7 +1405,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Web.Services.Description",
-          "Version": "4.9.0-rc2.21473.1"
+          "Version": "4.9.0"
         }
       },
       "DevelopmentDependency": false
@@ -1415,7 +1415,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Windows.Extensions",
-          "Version": "6.0.0-rc.2.21480.5"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false

From d9eb54b4fd4049d03ce0e3c530e3f768a04c42ff Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 8 Nov 2021 12:28:09 -0800
Subject: [PATCH 140/645] Add checkout to build json stage to get `ci.psm1`
 (#16399)

---
 tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml b/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
index 95e09b66642..7b9d4cd329f 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
@@ -1,4 +1,7 @@
 steps:
+- checkout: self
+  clean: true
+
 - task: DownloadPipelineArtifact@2
   inputs:
     source: specific

From bc4f6b5a0435fb8272830c3d4a5d7a936b1321b3 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 8 Nov 2021 14:21:31 -0800
Subject: [PATCH 141/645] Update the usage of metadata.json for getting LTS
 information (#16381)

---
 .../templates/release-PublishPackageMsftCom.yml     | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml b/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml
index 56dbc48ba26..b5dc97b9ab6 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-PublishPackageMsftCom.yml
@@ -12,19 +12,8 @@ steps:
    git clone https://$(AzureDevOpsPat)@mscodehub.visualstudio.com/PowerShellCore/_git/Internal-PowerShellTeam-Tools '$(Pipeline.Workspace)/tools'
   displayName: Clone Internal-PowerShellTeam-Tools from MSCodeHub
 
-- task: DownloadPipelineArtifact@2
-  inputs:
-    source: specific
-    project: PowerShellCore
-    pipeline: '696'
-    preferTriggeringPipeline: true
-    runVersion: latestFromBranch
-    runBranch: '$(Build.SourceBranch)'
-    artifact: metadata
-    path: '$(Pipeline.Workspace)/releasePipeline/metadata'
-
 - pwsh: |
-    $metadata = Get-Content -Path "$ENV:PIPELINE_WORKSPACE/releasePipeline/metadata/release.json" -Raw | ConvertFrom-Json
+    $metadata = Get-Content -Path "$(Build.SourcesDirectory)/tools/metadata.json" -Raw | ConvertFrom-Json
     Write-Verbose -Verbose "$(ReleaseTag) $(RepoClientCliClientID) $(RepoClientCliSecret) $(AzureVersion) $($metadata.LTSRelease.Latest)"
     $params = @{
         ReleaseTag = "$(ReleaseTag)"

From 6d0d34f8e897a4d9689de84fdee15261b4bbcacf Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 8 Nov 2021 14:50:24 -0800
Subject: [PATCH 142/645] vPack release should use buildInfoJson new to 7.2
 (#16402)

---
 .../releaseBuild/azureDevOps/vpackRelease.yml | 66 +++++++++++--------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/vpackRelease.yml b/tools/releaseBuild/azureDevOps/vpackRelease.yml
index 70091eac8b5..2d502f23925 100644
--- a/tools/releaseBuild/azureDevOps/vpackRelease.yml
+++ b/tools/releaseBuild/azureDevOps/vpackRelease.yml
@@ -17,36 +17,44 @@ variables:
     value: 1
   - group: Azure Blob variable group
 
-jobs:
-- job: rename
-  displayName: Name the build
-  condition: succeeded()
-  pool:
-    vmImage: 'windows-latest'
-  steps:
-  - checkout: self
-    clean: true
-
-  - template: ./templates/SetVersionVariables.yml
+stages:
+- stage: prep
+  displayName: Create buildInfo and name the Pipeline
+  jobs:
+  - job: rename
+    displayName: Name the build
+    condition: succeeded()
+    pool:
+      vmImage: 'windows-latest'
+    steps:
+    - checkout: self
+      clean: true
+
+    - template: ./templates/SetVersionVariables.yml
+      parameters:
+        ReleaseTagVar: $(ReleaseTagVar)
+        CreateJson: yes
+        UseJson: no
+
+    - powershell:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
+      displayName: Set Build Name for Non-PR
+      condition: ne(variables['Build.Reason'], 'PullRequest')
+
+- stage: release
+  displayName: Release
+  jobs:
+  - template: ./templates/vpackReleaseJob.yml
     parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
+      architecture: x64
 
-  - powershell:  Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhss"))"
-    displayName: Set Build Name for Non-PR
-    condition: ne(variables['Build.Reason'], 'PullRequest')
-
-- template: ./templates/vpackReleaseJob.yml
-  parameters:
-    architecture: x64
-
-- template: ./templates/vpackReleaseJob.yml
-  parameters:
-    architecture: x86
+  - template: ./templates/vpackReleaseJob.yml
+    parameters:
+      architecture: x86
 
-- template: ./templates/vpackReleaseJob.yml
-  parameters:
-    architecture: arm32
+  - template: ./templates/vpackReleaseJob.yml
+    parameters:
+      architecture: arm32
 
-- template: ./templates/vpackReleaseJob.yml
-  parameters:
-    architecture: arm64
+  - template: ./templates/vpackReleaseJob.yml
+    parameters:
+      architecture: arm64

From b48614bf92805ca554b85fbdc5a07e5a186f1d4f Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 8 Nov 2021 14:54:48 -0800
Subject: [PATCH 143/645] Add diagnostics used to take corrective action when
 releasing buildInfoJson (#16404)

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
---
 .../azureDevOps/templates/release-BuildJson.yml             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml b/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
index 7b9d4cd329f..05c9298d837 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
@@ -25,7 +25,11 @@ steps:
     $stableRelease = $metadata.StableRelease.Latest
     $ltsRelease = $metadata.LTSRelease.Latest
 
-    $buildInfo = Get-Content $jsonFile | ConvertFrom-Json
+    Write-Verbose -Verbose "Writing $jsonFile contents:"
+    $buildInfoJsonContent = Get-Content $jsonFile -Encoding UTF8NoBom -Raw
+    Write-Verbose -Verbose $buildInfoJsonContent
+
+    $buildInfo =  $buildInfoJsonContent | ConvertFrom-Json
     $buildInfo.ReleaseDate = $dateTime
 
     $targetFile = "$ENV:PIPELINE_WORKSPACE/$fileName"

From dca88a8f504571130a36ee92d13ca5745dafe03b Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 8 Nov 2021 15:02:11 -0800
Subject: [PATCH 144/645] Update cgmanifest (#16405)

---
 cgmanifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cgmanifest.json b/cgmanifest.json
index 3d539c9b7b9..9ae862d6274 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -85,7 +85,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.NetAnalyzers",
-          "Version": "5.0.3"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": true

From a10da5a0414fa4014bf38bb2d84565a4886574d0 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 8 Nov 2021 15:03:23 -0800
Subject: [PATCH 145/645] Update change log for 7.2.0 (#16401)

* Merged PR 17994: Update change log for 7.2.0

Update change log for 7.2.0

# Conflicts:
#	.spelling

* add blank change log for 7.3

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
---
 .spelling            |   10 +-
 CHANGELOG/7.2.md     | 1122 ++++++++++++++++++++++++++++++++++++++++++
 CHANGELOG/preview.md | 1082 ----------------------------------------
 3 files changed, 1131 insertions(+), 1083 deletions(-)
 create mode 100644 CHANGELOG/7.2.md

diff --git a/.spelling b/.spelling
index 7af78c5bde5..e1347308644 100644
--- a/.spelling
+++ b/.spelling
@@ -1269,7 +1269,7 @@ package.json
 jcotton42
 RPMs
 PSDesiredStateConfiguration
- - CHANGELOG/preview.md
+ - CHANGELOG/7.2.md
 Gimly
 jborean93
 mkswd
@@ -1391,6 +1391,14 @@ 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
diff --git a/CHANGELOG/7.2.md b/CHANGELOG/7.2.md
new file mode 100644
index 00000000000..0a570847848
--- /dev/null
+++ b/CHANGELOG/7.2.md
@@ -0,0 +1,1122 @@
+# 7.2 Changelog
+
+## [7.2.0] - 2021-11-08
+
+### General Cmdlet Updates and Fixes
+
+- Handle exception when trying to resolve a possible link path (#16310)
+
+### Tests
+
+- Fix global tool and SDK tests in release pipeline (#16342)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@kondratyev-nv</p>
+
+</summary>
+
+<ul>
+<li>Add an approval for releasing build-info json (#16351)</li>
+<li>Release build info json when it is preview (#16335)</li>
+<li>Update <code>metadata.json</code> for v7.2.0 release</li>
+<li>Update to the latest notices file and update <code>cgmanifest.json</code> (#16339)(#16325)</li>
+<li>Fix issues in release build by updating usage of <code>powershell.exe</code> with <code>pwsh.exe</code> (#16332)</li>
+<li>Update feed and analyzer dependency (#16327)</li>
+<li>Update to .NET 6 GA build <code>6.0.100-rtm.21527.11</code> (#16309)</li>
+<li>Add a major-minor build info JSON file (#16301)</li>
+<li>Fix Windows build ZIP packaging (#16299) (Thanks @kondratyev-nv!)</li>
+<li>Clean up <code>crossgen</code> related build scripts also generate native symbols for <code>R2R</code> images (#16297)</li>
+<li>Fix issues reported by code signing verification tool (#16291)</li>
+</ul>
+
+</details>
+
+[7.2.0]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-rc.1...v7.2.0
+
+## [7.2.0-rc.1] - 2021-10-21
+
+### General Cmdlet Updates and Fixes
+
+- Disallow COM calls for AppLocker system lockdown (#16268)
+- Configure `Microsoft.ApplicationInsights` to not send cloud role name (#16246)
+- Disallow `Add-Type` in NoLanguage mode on a locked down machine (#16245)
+- Make property names for color VT100 sequences consistent with documentation (#16212)
+- Make moving a directory into itself with `Move-Item` an error (#16198)
+- Change `FileSystemInfo.Target` from a `CodeProperty` to an `AliasProperty` that points to `FileSystemInfo.LinkTarget` (#16165)
+
+### Tests
+
+- Removed deprecated docker-based tests for PowerShell release packages (#16224)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+<p>Bump .NET SDK to 6.0.100-rc.2</p>
+</summary>
+
+<ul>
+<li>Update .NET 6 to version 6.0.100-rc.2.21505.57 (#16249)</li>
+<li>Fix RPM packaging (Internal 17704)</li>
+<li>Update <code>ThirdPartyNotices.txt</code> (#16283)</li>
+<li>Update pipeline yaml file to use <code>ubuntu-latest</code> image (#16279)</li>
+<li>Add script to generate <code>cgmanifest.json</code> (#16278)</li>
+<li>Update version of <code>Microsoft.PowerShell.Native</code> and <code>Microsoft.PowerShell.MarkdownRender</code> packages (#16277)</li>
+<li>Add <code>cgmanifest.json</code> for generating correct third party notice file (#16266)</li>
+<li>Only upload stable <code>buildinfo</code> for stable releases (#16251)</li>
+<li>Don't upload <code>.dep</code> or <code>.tar.gz</code> for RPM because there are none (#16230)</li>
+<li>Ensure RPM license is recognized (#16189)</li>
+<li>Add condition to only generate release files in local dev build only (#16259)</li>
+<li>Ensure <code>psoptions.json</code> and <code>manifest.spdx.json</code> files always exist in packages (#16258)</li>
+<li>Fix CI script and split out ARM runs (#16252)</li>
+<li>Update vPack task version to 12 (#16250)</li>
+<li>Sign third party executables (#16229)</li>
+<li>Add Software Bill of Materials to the main packages (#16202)</li>
+<li>Upgrade <code>set-value</code> package for markdown test (#16196)</li>
+<li>Fix Microsoft update spelling issue (#16178)</li>
+<li>Move vPack build to 1ES Pool (#16169)</li>
+</ul>
+
+</details>
+
+[7.2.0-rc.1]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.10...v7.2.0-rc.1
+
+## [7.2.0-preview.10] - 2021-09-28
+
+### Engine Updates and Fixes
+
+- Remove duplicate remote server mediator code (#16027)
+
+### General Cmdlet Updates and Fixes
+
+- Use `PlainText` when writing to a host that doesn't support VT (#16092)
+- Remove support for `AppExecLinks` to retrieve target (#16044)
+- Move `GetOuputString()` and `GetFormatStyleString()` to `PSHostUserInterface` as public API (#16075)
+- Add `isOutputRedirected` parameter to `GetFormatStyleString()` method (#14397)
+- Fix `ConvertTo-SecureString` with key regression due to .NET breaking change (#16068)
+- Fix regression in `Move-Item` to only fallback to `CopyAndDelete` in specific cases (#16029)
+- Set `$?` correctly for command expression with redirection (#16046)
+- Use `CurrentCulture` when handling conversions to `DateTime` in `Add-History` (#16005) (Thanks @vexx32!)
+- Fix `NullReferenceException` in `Format-Wide` (#15990) (Thanks @DarylGraves!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze!</p>
+
+</summary>
+
+<ul>
+<li>Improve <code>CommandInvocationIntrinsics</code> API documentation and style (#14369)</li>
+<li>Use <code>bool?.GetValueOrDefault()</code> in <code>FormatWideCommand</code> (#15988) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Fix typo in build.psm1 (#16038) (Thanks @eltociear!)
+- Add `.stylecop` to `filetypexml` and format it (#16025)
+- Enable sending Teams notification when workflow fails (#15982)
+
+### Tests
+
+- Enable two previously disabled `Get-Process` tests (#15845) (Thanks @iSazonov!)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+Details
+</summary>
+
+<ul>
+<li>Add SHA256 hashes to release (#16147)</li>
+<li>Update <code>Microsoft.CodeAnalysis.CSharp</code> version (#16138)</li>
+<li>Change path for Component Governance for build to the path we actually use to build (#16137)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#16070) (#16045) (#16036) (#16021) (#15985)</li>
+<li>Update .NET to <code>6.0.100-rc.1.21458.32</code> (#16066)</li>
+<li>Update minimum required OS version for macOS (#16088)</li>
+<li>Ensure locale is set correctly on Ubuntu 20.04 in CI (#16067) (#16073)</li>
+<li>Update .NET SDK version from <code>6.0.100-preview.6.21355.2</code> to <code>6.0.100-rc.1.21455.2</code> (#16041) (#16028) (#15648)</li>
+<li>Fix the GitHub Action for updating .NET daily builds (#16042)</li>
+<li>Move from PkgES hosted agents to 1ES hosted agents (#16023)</li>
+<li>Update Ubuntu images to use Ubuntu 20.04 (#15906)</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>
+<li>Ignore error from <code>Find-Package</code> (#15999)</li>
+<li>Find packages separately for each source in <code>UpdateDotnetRuntime.ps1</code> script (#15998)</li>
+<li>Update metadata to start using .NET 6 RC1 builds (#15981)</li>
+</ul>
+
+</details>
+
+[7.2.0-preview.10]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.9...v7.2.0-preview.10
+
+## [7.2.0-preview.9] - 2021-08-23
+
+### Breaking Changes
+
+- Change the default value of `$PSStyle.OutputRendering` to `OutputRendering.Host` and remove `OutputRendering.Automatic` (#15882)
+- Fix `CA1052` for public API to make classes static when they only have static methods (#15775) (Thanks @xtqqczze!)
+- Update `pwsh.exe -File` to only accept `.ps1` script files on Windows (#15859)
+
+### Engine Updates and Fixes
+
+- Update .NET adapter to handle interface static members properly (#15908)
+- Catch and handle unauthorized access exception when removing AppLocker test files (#15881)
+
+### General Cmdlet Updates and Fixes
+
+- Add `-PassThru` parameter to `Set-Clipboard` (#13713) (Thanks @ThomasNieto!)
+- Add `-Encoding` parameter for `Tee-Object` (#12135) (Thanks @Peter-Schneider!)
+- Update `ConvertTo-Csv` and `Export-Csv` to handle `IDictionary` objects (#11029) (Thanks @vexx32!)
+- Update the parameters `-Exception` and `-ErrorRecord` for `Write-Error` to be position 0 (#13813) (Thanks @ThomasNieto!)
+- Don't use `ArgumentList` when creating COM object with `New-Object` as it's not applicable to the COM parameter set (#15915)
+- Fix `$PSStyle` list output to correctly show `TableHeader` (#15928)
+- Remove the `PSImplicitRemotingBatching` experimental feature (#15863)
+- Fix issue with `Get-Process -Module` failing to stop when it's piped to `Select-Object` (#15682) (Thanks @ArmaanMcleod!)
+- Make the experimental features `PSUnixFileStat`, `PSCultureInvariantReplaceOperator`, `PSNotApplyErrorActionToStderr`, `PSAnsiRendering`, `PSAnsiProgressFeatureName` stable (#15864)
+- Enhance `Remove-Item` to work with OneDrive (#15571) (Thanks @iSazonov!)
+- Make global tool entrypoint class static (#15880)
+- Update `ServerRemoteHost` version to be same as `PSVersion` (#15809)
+- Make the initialization of `HttpKnownHeaderNames` thread safe (#15519) (Thanks @iSazonov!)
+- `ConvertTo-Csv`: Quote fields with quotes and newlines when using `-UseQuotes AsNeeded` (#15765) (Thanks @lselden!)
+- Forwarding progress stream changes from `Foreach-Object -Parallel` runspaces (#14271) (Thanks @powercode!)
+- Add validation to `$PSStyle` to reject printable text when setting a property that only expects ANSI escape sequence (#15825)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze</p>
+
+</summary>
+
+<ul>
+<li>Avoid unneeded array allocation in module code (#14329) (Thanks @xtqqczze!)</li>
+<li>Enable and fix analysis rules <code>CA1052</code>, <code>CA1067</code>, and <code>IDE0049</code> (#15840) (Thanks @xtqqczze!)</li>
+<li>Avoid unnecessary allocation in formatting code (#15832) (Thanks @xtqqczze!)</li>
+<li>Specify the analyzed API surface for all code quality rules (#15778) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Enable `/rebase` to automatically rebase a PR (#15808)
+- Update `.editorconfig` to not replace tabs with spaces in `.tsv` files (#15815) (Thanks @SethFalco!)
+- Update PowerShell team members in the change log generation script (#15817)
+
+### Tests
+
+- Add more tests to validate the current command error handling behaviors (#15919)
+- Make `Measure-Object` property test independent of the file system (#15879)
+- Add more information when a `syslog` parsing error occurs (#15857)
+- Harden logic when looking for `syslog` entries to be sure that we select based on the process id (#15841)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze</p>
+
+</summary>
+
+<ul>
+<li>Disable implicit namespace imports for test projects (#15895)</li>
+<li>Update language version to 10 and fix related issues (#15886)</li>
+<li>Update <code>CodeQL</code> workflow to use Ubuntu 18.04 (#15868)</li>
+<li>Bump the version of various packages (#15944, #15934, #15935, #15891, #15812, #15822) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update `README` and `metadata files` for release `v7.2.0-preview.8` (#15819)
+- Update change logs for 7.0.7 and 7.1.4 (#15921)
+- Fix spelling in XML docs (#15939) (Thanks @slowy07!)
+- Update PowerShell Committee members (#15837)
+
+[7.2.0-preview.9]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.8...v7.2.0-preview.9
+
+## [7.2.0-preview.8] - 2021-07-22
+
+### Engine Updates and Fixes
+
+- Add a Windows mode to `$PSNativeCommandArgumentPassing` that allows some commands to use legacy argument passing (#15408)
+- Use `nameof` to get parameter names when creating `ArgumentNullException` (#15604) (Thanks @gukoff!)
+- Test if a command is 'Out-Default' more thoroughly for transcribing scenarios (#15653)
+- Add `Microsoft.PowerShell.Crescendo` to telemetry allow list (#15372)
+
+### General Cmdlet Updates and Fixes
+
+- Use `$PSStyle.Formatting.FormatAccent` for `Format-List` and `$PSStyle.Formatting.TableHeader` for `Format-Table` output (#14406)
+- Highlight using error color the exception `Message` and underline in `PositionMessage` for `Get-Error` (#15786)
+- Implement a completion for View parameter of format cmdlets (#14513) (Thanks @iSazonov!)
+- Add support to colorize `FileInfo` file names (#14403)
+- Don't serialize to JSON ETS properties for `DateTime` and `string` types (#15665)
+- Fix `HyperVSocketEndPoint.ServiceId` setter (#15704) (Thanks @xtqqczze!)
+- Add `DetailedView` to `$ErrorView` (#15609)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@iSazonov, @xtqqczze</p>
+
+</summary>
+
+<ul>
+<li>Remove <code>consolehost.proto</code> file (#15741) (Thanks @iSazonov!)</li>
+<li>Implement <code>IDisposable</code> for <code>ConvertToJsonCommand</code> (#15787) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDisposable</code> implementation for <code>CommandPathSearch</code> (#15793) (Thanks @xtqqczze!)</li>
+<li>Delete IDE dispose analyzer rules (#15798) (Thanks @xtqqczze!)</li>
+<li>Seal private classes (#15725) (Thanks @xtqqczze!)</li>
+<li>Enable IDE0029: <code>UseCoalesceExpression</code> (#15770) (Thanks @xtqqczze!)</li>
+<li>Enable IDE0070: <code>UseSystemHashCode</code> (#15715) (Thanks @xtqqczze!)</li>
+<li>Enable IDE0030: <code>UseCoalesceExpressionForNullable</code> (#14289) (Thanks @xtqqczze!)</li>
+<li>Fix CA1846 and CA1845 for using <code>AsSpan</code> instead of <code>Substring</code> (#15738)</li>
+<li>Use <code>List&lt;T&gt;.RemoveAll</code> to avoid creating temporary list (#15686) (Thanks @xtqqczze!)</li>
+<li>Enable IDE0044: <code>MakeFieldReadonly</code> (#13880) (Thanks @xtqqczze!)</li>
+<li>Disable IDE0130 (#15728) (Thanks @xtqqczze!)</li>
+<li>Make classes sealed (#15675) (Thanks @xtqqczze!)</li>
+<li>Enable CA1043: Use integral or string argument for indexers (#14467) (Thanks @xtqqczze!)</li>
+<li>Enable CA1812 (#15674) (Thanks @xtqqczze!)</li>
+<li>Replace <code>Single</code> with <code>First</code> when we know the element count is 1 (#15676) (Thanks @xtqqczze!)</li>
+<li>Skip analyzers for <code>Microsoft.Management.UI.Internal</code> (#15677) (Thanks @xtqqczze!)</li>
+<li>Fix CA2243: Attribute string literals should parse correctly (#15622) (Thanks @xtqqczze!)</li>
+<li>Enable CA1401 (#15621) (Thanks @xtqqczze!)</li>
+<li>Fix CA1309: Use ordinal <code>StringComparison</code> in Certificate Provider (#14352) (Thanks @xtqqczze!)</li>
+<li>Fix CA1839: Use <code>Environment.ProcessPath</code> (#15650) (Thanks @xtqqczze!)</li>
+<li>Add new analyzer rules (#15620) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Add `SkipRoslynAnalyzers` parameter to `Start-PSBuild` (#15640) (Thanks @xtqqczze!)
+- Create issue template for issues updating PowerShell through Windows update. (#15700)
+- Add `DocumentationAnalyzers` to build (#14336) (Thanks @xtqqczze!)
+- Convert GitHub issue templates to modern forms (#15645)
+
+### Tests
+
+- Add more tests for `ConvertFrom-Json` (#15706) (Thanks @strawgate!)
+- Update `glob-parent` and `hosted-git-info` test dependencies (#15643)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+Update .NET to version <code>v6.0.0-preview.6</code>
+</summary>
+
+<ul>
+<li>Add new package name for <code>osx-arm64</code> (#15813)</li>
+<li>Prefer version when available for dotnet-install (#15810)</li>
+<li>Make warning about MU being required dynamic (#15776)</li>
+<li>Add <code>Start-PSBootstrap</code> before running tests (#15804)</li>
+<li>Update to .NET 6 Preview 6 and use <code>crossgen2</code> (#15763)</li>
+<li>Enable ARM64 packaging for macOS (#15768)</li>
+<li>Make Microsoft Update opt-out/in check boxes work (#15784)</li>
+<li>Add Microsoft Update opt out to MSI install (#15727)</li>
+<li>Bump <code>NJsonSchema</code> from <code>10.4.4</code> to <code>10.4.5</code> (#15769)</li>
+<li>Fix computation of SHA512 checksum (#15736)</li>
+<li>Update the script to use quality parameter for <code>dotnet-install</code> (#15731)</li>
+<li>Generate SHA512 checksum file for all packages (#15678)</li>
+<li>Enable signing daily release build with lifetime certificate (#15642)</li>
+<li>Update metadata and README for 7.2.0-preview.7 (#15593)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Fix broken RFC links (#15807)
+- Add to bug report template getting details from `Get-Error` (#15737)
+- Update issue templates to link to new docs (#15711)
+- Add @jborean93 to Remoting Working Group (#15683)
+
+[7.2.0-preview.8]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.7...v7.2.0-preview.8
+
+## [7.2.0-preview.7] - 2021-06-17
+
+### Breaking Changes
+
+- Remove PSDesiredStateConfiguration v2.0.5 module and published it to the PowerShell Gallery (#15536)
+
+### Engine Updates and Fixes
+
+- Fix splatting being treated as positional parameter in completions (#14623) (Thanks @MartinGC94!)
+- Prevent PowerShell from crashing when a telemetry mutex can't be created (#15574) (Thanks @gukoff!)
+- Ignore all exceptions when disposing an instance of a subsystem implementation (#15511)
+- Wait for SSH exit when closing remote connection (#14635) (Thanks @dinhngtu!)
+
+### Performance
+
+- Retrieve `ProductVersion` using informational version attribute in `AmsiUtils.Init()` (#15527) (Thanks @Fs00!)
+
+### General Cmdlet Updates and Fixes
+
+- Fix retrieving dynamic parameters from provider even if globbed path returns no results (#15525)
+- Revert "Enhance Remove-Item to work with OneDrive (#15260)" due to long path issue (#15546)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@octos4murai, @iSazonov, @Fs00</p>
+
+</summary>
+
+<ul>
+<li>Correct parameter name passed to exception in <code>PSCommand</code> constructor (#15580) (Thanks @octos4murai!)</li>
+<li>Enable nullable: <code>System.Management.Automation.ICommandRuntime</code> (#15566) (Thanks @iSazonov!)</li>
+<li>Clean up code regarding <code>AppDomain.CreateDomain</code> and <code>AppDomain.Unload</code> (#15554)</li>
+<li>Replace <code>ProcessModule.FileName</code> with <code>Environment.ProcessPath</code> and remove <code>PSUtils.GetMainModule</code> (#15012) (Thanks @Fs00!)</li>
+</ul>
+
+</details>
+
+### Tests
+
+- Fix `Start-Benchmarking` to put `TargetPSVersion` and `TargetFramework` in separate parameter sets (#15508)
+- Add `win-x86` test package to the build (#15517)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@schuelermine</p>
+
+</summary>
+
+<ul>
+<li>Update README.md and metadata.json for version 7.2.0-preview.6 (#15464)</li>
+<li>Make sure GA revision increases from RC and Preview releases (#15558)</li>
+<li>Remove <code>SupportsShouldProcess</code> from <code>Start-PSBootstrap</code> in build.psm1 (#15491) (Thanks @schuelermine!)</li>
+<li>Update <code>DotnetMetadataRuntime.json</code> next channel to take daily build from .NET preview 5 (#15518)</li>
+<li>Fix <code>deps.json</code> update in the release pipeline (#15486)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Add new members to Engine and Cmdlet Working Groups document (#15560)
+- Update the `mdspell` command to exclude the folder that should be ignored (#15576)
+- Replace 'User Voice' with 'Feedback Hub' in `README.md` (#15557)
+- Update Virtual User Group chat links (#15505) (Thanks @Jaykul!)
+- Fix typo in `FileSystemProvider.cs` (#15445) (Thanks @eltociear!)
+- Add `PipelineStoppedException` notes to PowerShell API (#15324)
+- Updated governance on Working Groups (WGs) (#14603)
+- Correct and improve XML documentation comments on `PSCommand` (#15568) (Thanks @octos4murai!)
+
+[7.2.0-preview.7]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.6...v7.2.0-preview.7
+
+## [7.2.0-preview.6] - 2021-05-27
+
+### Experimental Features
+
+- [Breaking Change] Update prediction interface to provide additional feedback to a predictor plugin (#15421)
+
+### Performance
+
+- Avoid collecting logs in buffer if a pipeline execution event is not going to be logged (#15350)
+- Avoid allocation in `LanguagePrimitives.UpdateTypeConvertFromTypeTable` (#15168) (Thanks @xtqqczze!)
+- Replace `Directory.GetDirectories` with `Directory.EnumerateDirectories` to avoid array allocations (#15167) (Thanks @xtqqczze!)
+- Use `List.ConvertAll` instead of `LINQ` (#15140) (Thanks @xtqqczze!)
+
+### General Cmdlet Updates and Fixes
+
+- Use `AllocConsole` before initializing CLR to ensure codepage is correct for WinRM remoting (PowerShell/PowerShell-Native#70) (Thanks @jborean93!)
+- Add completions for `#requires` statements (#14596) (Thanks @MartinGC94!)
+- Add completions for comment-based help keywords (#15337) (Thanks @MartinGC94!)
+- Move cross platform DSC code to a PowerShell engine subsystem (#15127)
+- Fix `Minimal` progress view to handle activity that is longer than console width (#15264)
+- Handle exception if ConsoleHost tries to set cursor out of bounds because screen buffer changed (#15380)
+- Fix `NullReferenceException` in DSC `ClearCache()` (#15373)
+- Update `ControlSequenceLength` to handle colon as a virtual terminal parameter separator (#14942)
+- Update the summary comment for `StopTranscriptCmdlet.cs` (#15349) (Thanks @dbaileyut!)
+- Remove the unusable alias `d` for the `-Directory` parameter from `Get-ChildItem` (#15171) (Thanks @kvprasoon!)
+- Fix tab completion for un-localized `about` topics (#15265) (Thanks @MartinGC94!)
+- Remove the unneeded SSH stdio handle workaround (#15308)
+- Add `LoadAssemblyFromNativeMemory` API to load assemblies from memory in a native PowerShell host (#14652) (Thanks @awakecoding!)
+- Re-implement `Remove-Item` OneDrive support (#15260) (Thanks @iSazonov!)
+- Kill native processes in pipeline when pipeline is disposed on Unix (#15287)
+- Default to MTA on Windows platforms where STA is not supported (#15106)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze, @powercode, @bcwood</p>
+
+</summary>
+
+<ul>
+<li>Enable <code>nullable</code> in some classes (#14185, #14177, #14159, #14191, #14162, #14150, #14156, #14161, #14155, #14163, #14181, #14157, #14151) (Thanks @powercode!)</li>
+<li>Annotate <code>ThrowTerminatingError</code> with <code>DoesNotReturn</code> attribute (#15352) (Thanks @powercode!)</li>
+<li>Use <code>GetValueOrDefault()</code> for nullable <code>PSLanguageMode</code> (#13849) (Thanks @bcwood!)</li>
+<li>Enable <code>SA1008</code>: Opening parenthesis should be spaced correctly (#14242) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Add `winget` release script (#15050)
+
+### Tests
+
+- Enable cross-runtime benchmarking to compare different .NET runtimes (#15387) (Thanks @adamsitnik!)
+- Add the performance benchmark project for PowerShell performance testing (#15242)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+Update .NET to version <code>v6.0.0-preview.4</code>
+</summary>
+
+<ul>
+<li>Suppress prompting when uploading the <code>msixbundle</code> package to blob (#15227)</li>
+<li>Update to .NET preview 4 SDK (#15452)</li>
+<li>Update <code>AppxManifest.xml</code> with newer OS version to allow PowerShell installed from Windows Store to make system-level changes (#15375)</li>
+<li>Ensure the build works when <code>PSDesiredStateConfiguration</code> module is pulled in from PSGallery (#15355)</li>
+<li>Make sure daily release tag does not change when retrying failures (#15286)</li>
+<li>Improve messages and behavior when there's a problem in finding zip files (#15284)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Add documentation comments section to coding guidelines (#14316) (Thanks @xtqqczze!)
+
+[7.2.0-preview.6]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.5...v7.2.0-preview.6
+
+## [7.2.0-preview.5] - 2021-04-14
+
+### Breaking Changes
+
+- Make PowerShell Linux deb and RPM packages universal (#15109)
+- Enforce AppLocker Deny configuration before Execution Policy Bypass configuration (#15035)
+- Disallow mixed dash and slash in command line parameter prefix (#15142) (Thanks @davidBar-On!)
+
+### Experimental Features
+
+- `PSNativeCommandArgumentPassing`: Use `ArgumentList` for native executable invocation (breaking change) (#14692)
+
+### Engine Updates and Fixes
+
+- Add `IArgumentCompleterFactory` for parameterized `ArgumentCompleters` (#12605) (Thanks @powercode!)
+
+### General Cmdlet Updates and Fixes
+
+- Fix SSH remoting connection never finishing with misconfigured endpoint (#15175)
+- Respect `TERM` and `NO_COLOR` environment variables for `$PSStyle` rendering (#14969)
+- Use `ProgressView.Classic` when Virtual Terminal is not supported (#15048)
+- Fix `Get-Counter` issue with `-Computer` parameter (#15166) (Thanks @krishnayalavarthi!)
+- Fix redundant iteration while splitting lines (#14851) (Thanks @hez2010!)
+- Enhance `Remove-Item -Recurse` to work with OneDrive (#14902) (Thanks @iSazonov!)
+- Change minimum depth to 0 for `ConvertTo-Json` (#14830) (Thanks @kvprasoon!)
+- Allow `Set-Clipboard` to accept empty string (#14579)
+- Turn on and off `DECCKM` to modify keyboard mode for Unix native commands to work correctly (#14943)
+- Fall back to `CopyAndDelete()` when `MoveTo()` fails due to an `IOException` (#15077)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze, @iSazonov, @ZhiZe-ZG</p>
+
+</summary>
+
+<ul>
+<li>Update .NET to <code>6.0.0-preview.3</code> (#15221)</li>
+<li>Add space before comma to hosting test to fix error reported by <code>SA1001</code> (#15224)</li>
+<li>Add <code>SecureStringHelper.FromPlainTextString</code> helper method for efficient secure string creation (#14124) (Thanks @xtqqczze!)</li>
+<li>Use static lambda keyword (#15154) (Thanks @iSazonov!)</li>
+<li>Remove unnecessary <code>Array</code> -&gt; <code>List</code> -&gt; <code>Array</code> conversion in <code>ProcessBaseCommand.AllProcesses</code> (#15052) (Thanks @xtqqczze!)</li>
+<li>Standardize grammar comments in Parser.cs (#15114) (Thanks @ZhiZe-ZG!)</li>
+<li>Enable <code>SA1001</code>: Commas should be spaced correctly (#14171) (Thanks @xtqqczze!)</li>
+<li>Refactor <code>MultipleServiceCommandBase.AllServices</code> (#15053) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Use Unix line endings for shell scripts (#15180) (Thanks @xtqqczze!)
+
+### Tests
+
+- Add the missing tag in Host Utilities tests (#14983)
+- Update `copy-props` version in `package.json` (#15124)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@JustinGrote</p>
+
+</summary>
+
+<ul>
+<li>Fix <code>yarn-lock</code> for <code>copy-props</code> (#15225)</li>
+<li>Make package validation regex accept universal Linux packages (#15226)</li>
+<li>Bump NJsonSchema from 10.4.0 to 10.4.1 (#15190)</li>
+<li>Make MSI and EXE signing always copy to fix daily build (#15191)</li>
+<li>Sign internals of EXE package so that it works correctly when signed (#15132)</li>
+<li>Bump Microsoft.NET.Test.Sdk from 16.9.1 to 16.9.4 (#15141)</li>
+<li>Update daily release tag format to  work with new Microsoft Update work (#15164)</li>
+<li>Feature: Add Ubuntu 20.04 Support to install-powershell.sh (#15095) (Thanks @JustinGrote!)</li>
+<li>Treat rebuild branches like release branches (#15099)</li>
+<li>Update WiX to 3.11.2 (#15097)</li>
+<li>Bump NJsonSchema from 10.3.11 to 10.4.0 (#15092)</li>
+<li>Allow patching of preview releases (#15074)</li>
+<li>Bump Newtonsoft.Json from 12.0.3 to 13.0.1 (#15084, #15085)</li>
+<li>Update the <code>minSize</code> build package filter to be explicit (#15055)</li>
+<li>Bump NJsonSchema from 10.3.10 to 10.3.11 (#14965)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Merge `7.2.0-preview.4` changes to master (#15056)
+- Update `README` and `metadata.json` (#15046)
+- Fix broken links for `dotnet` CLI (#14937)
+
+[7.2.0-preview.5]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.4...v7.2.0-preview.5
+
+## [7.2.0-preview.4] - 2021-03-16
+
+### Breaking Changes
+
+- Fix `Get-Date -UFormat` `%G` and `%g` behavior (#14555) (Thanks @brianary!)
+
+### Engine Updates and Fixes
+
+- Update engine script signature validation to match `Get-AuthenticodeSignature` logic (#14849)
+- Avoid array allocations from `GetDirectories` and `GetFiles` (#14327) (Thanks @xtqqczze!)
+
+### General Cmdlet Updates and Fixes
+
+- Add `UseOSCIndicator` setting to enable progress indicator in terminal (#14927)
+- Re-enable VT mode on Windows after running command in `ConsoleHost` (#14413)
+- Fix `Move-Item` for `FileSystemProvider` to use copy-delete instead of move for DFS paths (#14913)
+- Fix `PromptForCredential()` to add `targetName` as domain (#14504)
+- Update `Concise` `ErrorView` to not show line information for errors from script module functions (#14912)
+- Remove the 32,767 character limit on the environment block for `Start-Process` (#14111) (Thanks @hbuckle!)
+- Don't write possible secrets to verbose stream for web cmdlets (#14788)
+
+### Tools
+
+- Update `dependabot` configuration to V2 format (#14882)
+- Add tooling issue slots in PR template (#14697)
+
+### Tests
+
+- Move misplaced test file to tests directory (#14908) (Thanks @MarianoAlipi!)
+- Refactor MSI CI (#14753)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+Update .NET to version <code>6.0.100-preview.2.21155.3</code>
+</summary>
+
+<ul>
+<li>Update .NET to version <code>6.0.100-preview.2.21155.3</code> (#15007)</li>
+<li>Bump <code>Microsoft.PowerShell.Native</code> to <code>7.2.0-preview.1</code> (#15030)</li>
+<li>Create MSIX Bundle package in release pipeline (#14982)</li>
+<li>Build self-contained minimal size package for Guest Config team (#14976)</li>
+<li>Bump XunitXml.TestLogger from 3.0.62 to 3.0.66 (#14993) (Thanks @dependabot[bot]!)</li>
+<li>Enable building PowerShell for Apple M1 runtime (#14923)</li>
+<li>Fix the variable name in the condition for miscellaneous analysis CI (#14975)</li>
+<li>Fix the variable usage in CI yaml (#14974)</li>
+<li>Disable running markdown link verification in release build CI (#14971)</li>
+<li>Bump Microsoft.CodeAnalysis.CSharp from 3.9.0-3.final to 3.9.0 (#14934) (Thanks @dependabot[bot]!)</li>
+<li>Declare which variable group is used for checking the blob in the release build (#14970)</li>
+<li>Update metadata and script to enable consuming .NET daily builds (#14940)</li>
+<li>Bump NJsonSchema from 10.3.9 to 10.3.10 (#14933) (Thanks @dependabot[bot]!)</li>
+<li>Use template that disables component governance for CI (#14938)</li>
+<li>Add suppress for nuget multi-feed warning (#14893)</li>
+<li>Bump NJsonSchema from 10.3.8 to 10.3.9 (#14926) (Thanks @dependabot[bot]!)</li>
+<li>Add exe wrapper to release (#14881)</li>
+<li>Bump Microsoft.ApplicationInsights from 2.16.0 to 2.17.0 (#14847)</li>
+<li>Bump Microsoft.NET.Test.Sdk from 16.8.3 to 16.9.1 (#14895) (Thanks @dependabot[bot]!)</li>
+<li>Bump NJsonSchema from 10.3.7 to 10.3.8 (#14896) (Thanks @dependabot[bot]!)</li>
+<li>Disable codesign validation where the file type is not supported (#14885)</li>
+<li>Fixing broken Experimental Feature list in <code>powershell.config.json</code> (#14858)</li>
+<li>Bump NJsonSchema from 10.3.6 to 10.3.7 (#14855)</li>
+<li>Add exe wrapper for Microsoft Update scenarios (#14737)</li>
+<li>Install wget on <code>CentOS</code> 7 docker image (#14857)</li>
+<li>Fix install-dotnet download (#14856)</li>
+<li>Fix Bootstrap step in Windows daily test runs (#14820)</li>
+<li>Bump NJsonSchema from 10.3.5 to 10.3.6 (#14818)</li>
+<li>Bump <code>NJsonSchema</code> from <code>10.3.4</code> to <code>10.3.5</code> (#14807)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update `README.md` and `metadata.json` for upcoming releases (#14755)
+- Merge 7.1.3 and 7.0.6 Change log to master (#15009)
+- Update `README` and `metadata.json` for releases (#14997)
+- Update ChangeLog for `v7.1.2` release (#14783)
+- Update ChangeLog for `v7.0.5` release (#14782) (Internal 14479)
+
+[7.2.0-preview.4]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.3...v7.2.0-preview.4
+
+## [7.2.0-preview.3] - 2021-02-11
+
+### Breaking Changes
+
+- Fix `Get-Date -UFormat %u` behavior to comply with ISO 8601 (#14549) (Thanks @brianary!)
+
+### Engine Updates and Fixes
+
+- Together with `PSDesiredStateConfiguration` `v3` module allows `Get-DscResource`, `Invoke-DscResource` and DSC configuration compilation on all platforms, supported by PowerShell (using class-based DSC resources).
+
+### Performance
+
+- Avoid array allocations from `Directory.GetDirectories` and `Directory.GetFiles`. (#14326) (Thanks @xtqqczze!)
+- Avoid `string.ToLowerInvariant()` from `GetEnvironmentVariableAsBool()` to avoid loading libicu at startup (#14323) (Thanks @iSazonov!)
+- Get PowerShell version in `PSVersionInfo` using assembly attribute instead of `FileVersionInfo` (#14332) (Thanks @Fs00!)
+
+### General Cmdlet Updates and Fixes
+
+- Suppress `Write-Progress` in `ConsoleHost` if output is redirected and fix tests (#14716)
+- Experimental feature `PSAnsiProgress`: Add minimal progress bar using ANSI rendering (#14414)
+- Fix web cmdlets to properly construct URI from body when using `-NoProxy` (#14673)
+- Update the `ICommandPredictor` to provide more feedback and also make feedback easier to be correlated (#14649)
+- Reset color after writing `Verbose`, `Debug`, and `Warning` messages (#14698)
+- Fix using variable for nested `ForEach-Object -Parallel` calls (#14548)
+- When formatting, if collection is modified, don't fail the entire pipeline (#14438)
+- Improve completion of parameters for attributes (#14525) (Thanks @MartinGC94!)
+- Write proper error messages for `Get-Command ' '` (#13564) (Thanks @jakekerr!)
+- Fix typo in the resource string `ProxyURINotSupplied` (#14526) (Thanks @romero126!)
+- Add support to `$PSStyle` for strikethrough and hyperlinks (#14461)
+- Fix `$PSStyle` blink codes (#14447) (Thanks @iSazonov!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze, @powercode</p>
+
+</summary>
+
+<ul>
+<li>Fix coding style issues: RCS1215, IDE0090, SA1504, SA1119, RCS1139, IDE0032 (#14356, #14341, #14241, #14204, #14442, #14443) (Thanks @xtqqczze!)</li>
+<li>Enable coding style checks: CA2249, CA1052, IDE0076, IDE0077, SA1205, SA1003, SA1314, SA1216, SA1217, SA1213 (#14395, #14483, #14494, #14495, #14441, #14476, #14470, #14471, #14472) (Thanks @xtqqczze!)</li>
+<li>Enable nullable in PowerShell codebase (#14160, #14172, #14088, #14154, #14166, #14184, #14178) (Thanks @powercode!)</li>
+<li>Use <code>string.Split(char)</code> instead of <code>string.Split(string)</code> (#14465) (Thanks @xtqqczze!)</li>
+<li>Use <code>string.Contains(char)</code> overload (#14368) (Thanks @xtqqczze!)</li>
+<li>Refactor complex <code>if</code> statements (#14398) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Update script to use .NET 6 build resources (#14705)
+- Fix the daily GitHub action (#14711) (Thanks @imba-tjd!)
+- GitHub Actions: fix deprecated `::set-env` (#14629) (Thanks @imba-tjd!)
+- Update markdown test tools (#14325) (Thanks @RDIL!)
+- Upgrade `StyleCopAnalyzers` to `v1.2.0-beta.312` (#14354) (Thanks @xtqqczze!)
+
+### Tests
+
+- Remove packaging from daily Windows build (#14749)
+- Update link to the Manning book (#14750)
+- A separate Windows packaging CI (#14670)
+- Update `ini` component version in test `package.json` (#14454)
+- Disable `libmi` dependent tests for macOS. (#14446)
+
+### Build and Packaging Improvements
+
+<details>
+
+<ul>
+<li>Fix the NuGet feed name and URL for .NET 6</li>
+<li>Fix third party signing for files in sub-folders (#14751)</li>
+<li>Make build script variable an <code>ArrayList</code> to enable <code>Add()</code> method (#14748)</li>
+<li>Remove old .NET SDKs to make <code>dotnet restore</code> work with the latest SDK in CI pipeline (#14746)</li>
+<li>Remove outdated Linux dependencies (#14688)</li>
+<li>Bump .NET SDK version to 6.0.0-preview.1 (#14719)</li>
+<li>Bump <code>NJsonSchema</code> to 10.3.4 (#14714)</li>
+<li>Update daily GitHub action to allow manual trigger (#14718)</li>
+<li>Bump <code>XunitXml.TestLogger</code> to 3.0.62 (#14702)</li>
+<li>Make universal deb package based on the deb package specification (#14681)</li>
+<li>Add manual release automation steps and improve changelog script (#14445)</li>
+<li>Fix release build to upload global tool packages to artifacts (#14620)</li>
+<li>Port changes from the PowerShell v7.0.4 release (#14637)</li>
+<li>Port changes from the PowerShell v7.1.1 release (#14621)</li>
+<li>Updated README and <code>metadata.json</code> (#14401, #14606, #14612)</li>
+<li>Do not push nupkg artifacts to MyGet (#14613)</li>
+<li>Use one feed in each <code>nuget.config</code> in official builds (#14363)</li>
+<li>Fix path signed RPMs are uploaded from in release build (#14424)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update distribution support request template to point to .NET 5.0 support document (#14578)
+- Remove security GitHub issue template (#14453)
+- Add intent for using the Discussions feature in repo (#14399)
+- Fix Universal Dashboard to refer to PowerShell Universal (#14437)
+- Update document link because of HTTP 301 redirect (#14431) (Thanks @xtqqczze!)
+
+[7.2.0-preview.3]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.2...v7.2.0-preview.3
+
+## [7.2.0-preview.2] - 2020-12-15
+
+### Breaking Changes
+
+- Improve detection of mutable value types (#12495) (Thanks @vexx32!)
+- Ensure `-PipelineVariable` is set for all output from script cmdlets (#12766) (Thanks @vexx32!)
+
+### Experimental Features
+
+- `PSAnsiRendering`: Enable ANSI formatting via `$PSStyle` and support suppressing ANSI output (#13758)
+
+### Performance
+
+- Optimize `IEnumerable` variant of replace operator (#14221) (Thanks @iSazonov!)
+- Refactor multiply operation for better performance in two `Microsoft.PowerShell.Commands.Utility` methods (#14148) (Thanks @xtqqczze!)
+- Use `Environment.TickCount64` instead of `Datetime.Now` as the random seed for AppLocker test file content (#14283) (Thanks @iSazonov!)
+- Avoid unnecessary array allocations when searching in GAC (#14291) (Thanks @xtqqczze!)
+- Use `OrdinalIgnoreCase` in `CommandLineParser` (#14303) (Thanks @iSazonov!)
+- Use `StringComparison.Ordinal` instead of `StringComparison.CurrentCulture` (#14298) (Thanks @iSazonov!)
+- Avoid creating instances of the generated delegate helper class in `-replace` implementation (#14128)
+
+### General Cmdlet Updates and Fixes
+
+- Write better error message if config file is broken (#13496) (Thanks @iSazonov!)
+- Make AppLocker Enforce mode take precedence over UMCI Audit mode (#14353)
+- Add `-SkipLimitCheck` switch to `Import-PowerShellDataFile` (#13672)
+- Restrict `New-Object` in NoLanguage mode under lock down (#14140) (Thanks @krishnayalavarthi!)
+- The `-Stream` parameter now works with directories (#13941) (Thanks @kyanha!)
+- Avoid an exception if file system does not support reparse points (#13634) (Thanks @iSazonov!)
+- Enable `CA1012`: Abstract types should not have public constructors (#13940) (Thanks @xtqqczze!)
+- Enable `SA1212`: Property accessors should follow order (#14051) (Thanks @xtqqczze!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze, @matthewjdegarmo, @powercode, @Gimly</p>
+
+</summary>
+
+<ul>
+<li>Enable <code>SA1007</code>: Operator keyword should be followed by space (#14130) (Thanks @xtqqczze!)</li>
+<li>Expand <code>where</code> alias to <code>Where-Object</code> in <code>Reset-PWSHSystemPath.ps1</code> (#14113) (Thanks @matthewjdegarmo!)</li>
+<li>Fix whitespace issues (#14092) (Thanks @xtqqczze!)</li>
+<li>Add <code>StyleCop.Analyzers</code> package (#13963) (Thanks @xtqqczze!)</li>
+<li>Enable <code>IDE0041</code>: <code>UseIsNullCheck</code> (#14041) (Thanks @xtqqczze!)</li>
+<li>Enable <code>IDE0082</code>: <code>ConvertTypeOfToNameOf</code> (#14042) (Thanks @xtqqczze!)</li>
+<li>Remove unnecessary usings part 4 (#14023) (Thanks @xtqqczze!)</li>
+<li>Fix <code>PriorityAttribute</code> name (#14094) (Thanks @xtqqczze!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Interpreter.IBoxableInstruction</code> (#14165) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Provider.IDynamicPropertyProvider</code> (#14167) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Language.IScriptExtent</code> (#14179) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Language.ICustomAstVisitor2</code> (#14192) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.LanguagePrimitives.IConversionData</code> (#14187) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Automation.Remoting.Client.IWSManNativeApiFacade</code> (#14186) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Language.ISupportsAssignment</code> (#14180) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.ICommandRuntime2</code> (#14183) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.IOutputProcessingState</code> (#14175) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.IJobDebugger</code> (#14174) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Interpreter.IInstructionProvider</code> (#14173) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.IHasSessionStateEntryVisibility</code> (#14169) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Tracing.IEtwEventCorrelator</code> (#14168) (Thanks @powercode!)</li>
+<li>Fix syntax error in Windows packaging script (#14377)</li>
+<li>Remove redundant local assignment in <code>AclCommands</code> (#14358) (Thanks @xtqqczze!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Language.IAstPostVisitHandler</code> (#14164) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.IModuleAssemblyInitializer</code> (#14158) (Thanks @powercode!)</li>
+<li>Use <code>Microsoft.PowerShell.MarkdownRender</code> package from <code>nuget.org</code> (#14090)</li>
+<li>Replace <code>GetFiles</code> in <code>TestModuleManifestCommand</code> (#14317) (Thanks @xtqqczze!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Provider.IContentWriter</code> (#14152) (Thanks @powercode!)</li>
+<li>Simplify getting Encoding in <code>TranscriptionOption.FlushContentToDisk</code> (#13910) (Thanks @Gimly!)</li>
+<li>Mark applicable structs as <code>readonly</code> and use <code>in</code>-modifier (#13919) (Thanks @xtqqczze!)</li>
+<li>Enable nullable: <code>System.Management.Automation.IArgumentCompleter</code> (#14182) (Thanks @powercode!)</li>
+<li>Enable <code>CA1822</code>: Mark <code>private</code> members as <code>static</code> (#13897) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 6 (#14338) (Thanks @xtqqczze!)</li>
+<li>Avoid array allocations from <code>GetDirectories</code>/<code>GetFiles</code>. (#14328) (Thanks @xtqqczze!)</li>
+<li>Avoid array allocations from <code>GetDirectories</code>/<code>GetFiles</code>. (#14330) (Thanks @xtqqczze!)</li>
+<li>Fix <code>RCS1188</code>: Remove redundant auto-property initialization part 2 (#14262) (Thanks @xtqqczze!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Host.IHostSupportsInteractiveSession</code> (#14170) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Provider.IPropertyCmdletProvider</code> (#14176) (Thanks @powercode!)</li>
+<li>Fix <code>IDE0090</code>: Simplify new expression part 5 (#14301) (Thanks @xtqqczze!)</li>
+<li>Enable <code>IDE0075</code>: <code>SimplifyConditionalExpression</code> (#14078) (Thanks @xtqqczze!)</li>
+<li>Remove unnecessary usings part 9 (#14288) (Thanks @xtqqczze!)</li>
+<li>Fix StyleCop and MarkdownLint CI failures (#14297) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1000</code>: Keywords should be spaced correctly (#13973) (Thanks @xtqqczze!)</li>
+<li>Fix <code>RCS1188</code>: Remove redundant auto-property initialization part 1 (#14261) (Thanks @xtqqczze!)</li>
+<li>Mark <code>private</code> members as <code>static</code> part 10 (#14235) (Thanks @xtqqczze!)</li>
+<li>Mark <code>private</code> members as <code>static</code> part 9 (#14234) (Thanks @xtqqczze!)</li>
+<li>Fix <code>SA1642</code> for <code>Microsoft.Management.Infrastructure.CimCmdlets</code> (#14239) (Thanks @xtqqczze!)</li>
+<li>Use <code>AsSpan</code>/<code>AsMemory</code> slice constructor (#14265) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.6 (#14260) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.5 (#14259) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.3 (#14257) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.2 (#14256) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 2 (#14200) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1643</code>: Destructor summary documentation should begin with standard text (#14236) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify new expression part 4.4 (#14258) (Thanks @xtqqczze!)</li>
+<li>Use xml documentation child blocks correctly (#14249) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.1 (#14255) (Thanks @xtqqczze!)</li>
+<li>Use consistent spacing in xml documentation tags (#14231) (Thanks @xtqqczze!)</li>
+<li>Enable <code>IDE0074</code>: Use coalesce compound assignment (#13396) (Thanks @xtqqczze!)</li>
+<li>Remove unnecessary finalizers (#14248) (Thanks @xtqqczze!)</li>
+<li>Mark local variable as <code>const</code> (#13217) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0032</code>: <code>UseAutoProperty</code> part 2 (#14244) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0032</code>: <code>UseAutoProperty</code> part 1 (#14243) (Thanks @xtqqczze!)</li>
+<li>Mark <code>private</code> members as <code>static</code> part 8 (#14233) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 6 (#14229) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 5 (#14228) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 4 (#14227) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 3 (#14226) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 2 (#14225) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 1 (#14224) (Thanks @xtqqczze!)</li>
+<li>Use <code>see</code> keyword in documentation (#14220) (Thanks @xtqqczze!)</li>
+<li>Enable <code>CA2211</code>: Non-constant fields should not be visible (#14073) (Thanks @xtqqczze!)</li>
+<li>Enable <code>CA1816</code>: <code>Dispose</code> methods should call <code>SuppressFinalize</code> (#14074) (Thanks @xtqqczze!)</li>
+<li>Remove incorrectly implemented finalizer (#14246) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 7 (#14230) (Thanks @xtqqczze!)</li>
+<li>Fix <code>SA1122</code>: Use <code>string.Empty</code> for empty strings (#14218) (Thanks @xtqqczze!)</li>
+<li>Fix various xml documentation issues (#14223) (Thanks @xtqqczze!)</li>
+<li>Remove unnecessary <code>using</code>s part 8 (#14072) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1006</code>: Preprocessor keywords should not be preceded by space (#14052) (Thanks @xtqqczze!)</li>
+<li>Fix <code>SA1642</code> for <code>Microsoft.PowerShell.Commands.Utility</code> (#14142) (Thanks @xtqqczze!)</li>
+<li>Enable <code>CA2216</code>: Disposable types should declare finalizer (#14089) (Thanks @xtqqczze!)</li>
+<li>Wrap and name <code>LoadBinaryModule</code> arguments (#14193) (Thanks @xtqqczze!)</li>
+<li>Wrap and name <code>GetListOfFilesFromData</code> arguments (#14194) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1002</code>: Semicolons should be spaced correctly (#14197) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 3 (#14201) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1106</code>: Code should not contain empty statements (#13964) (Thanks @xtqqczze!)</li>
+<li>Code performance fixes follow-up (#14207) (Thanks @xtqqczze!)</li>
+<li>Remove uninformative comments (#14199) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 1 (#14027) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1517</code>: Code should not contain blank lines at start of file (#14131) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1131</code>: Use readable conditions (#14132) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1507</code>: Code should not contain multiple blank lines in a row (#14136) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1516</code> Elements should be separated by blank line (#14137) (Thanks @xtqqczze!)</li>
+<li>Enable <code>IDE0031</code>: Null check can be simplified (#13548) (Thanks @xtqqczze!)</li>
+<li>Enable <code>CA1065</code>: Do not raise exceptions in unexpected locations (#14117) (Thanks @xtqqczze!)</li>
+<li>Enable <code>CA1000</code>: Do not declare <code>static</code> members on generic types (#14097) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Fixing formatting in `Reset-PWSHSystemPath.ps1` (#13689) (Thanks @dgoldman-msft!)
+
+### Tests
+
+- Reinstate `Test-Connection` tests (#13324)
+- Update markdown test packages with security fixes (#14145)
+
+### Build and Packaging Improvements
+
+<details>
+
+<ul>
+<li>Fix a typo in the <code>Get-ChangeLog</code> function (#14129)</li>
+<li>Update <code>README</code> and <code>metadata.json</code> for <code>7.2.0-preview.1</code> release (#14104)</li>
+<li>Bump <code>NJsonSchema</code> from <code>10.2.2</code> to <code>10.3.1</code> (#14040)</li>
+<li>Move windows package signing to use ESRP (#14060)</li>
+<li>Use one feed in each <code>nuget.config</code> in official builds (#14363)</li>
+<li>Fix path signed RPMs are uploaded from in release build (#14424)</li>
+<li>Add <code>Microsoft.PowerShell.MarkdownRender</code> to the package reference list (#14386)</li>
+<li>Fix issue with unsigned build (#14367)</li>
+<li>Move macOS and nuget to ESRP signing (#14324)</li>
+<li>Fix nuget packaging to scrub <code>NullableAttribute</code> (#14344)</li>
+<li>Bump <code>Microsoft.NET.Test.Sdk</code> from 16.8.0 to 16.8.3 (#14310)</li>
+<li>Bump <code>Markdig.Signed</code> from 0.22.0 to 0.22.1 (#14305)</li>
+<li>Bump <code>Microsoft.ApplicationInsights</code> from 2.15.0 to 2.16.0 (#14031)</li>
+<li>Move Linux to ESRP signing (#14210)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Fix example `nuget.config` (#14349)
+- Fix a broken link in Code Guidelines doc (#14314) (Thanks @iSazonov!)
+
+[7.2.0-preview.2]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.1...v7.2.0-preview.2
+
+## [7.2.0-preview.1] - 2020-11-17
+
+### Engine Updates and Fixes
+
+- Change the default fallback encoding for `GetEncoding` in `Start-Transcript` to be `UTF8` without a BOM (#13732) (Thanks @Gimly!)
+
+### General Cmdlet Updates and Fixes
+
+- Update `pwsh -?` output to match docs (#13748)
+- Fix `NullReferenceException` in `Test-Json` (#12942) (Thanks @iSazonov!)
+- Make `Dispose` in `TranscriptionOption` idempotent (#13839) (Thanks @krishnayalavarthi!)
+- Add additional Microsoft PowerShell modules to the tracked modules list (#12183)
+- Relax further `SSL` verification checks for `WSMan` on non-Windows hosts with verification available (#13786) (Thanks @jborean93!)
+- Add the `OutputTypeAttribute` to `Get-ExperimentalFeature` (#13738) (Thanks @ThomasNieto!)
+- Fix blocking wait when starting file associated with a Windows application (#13750)
+- Emit warning if `ConvertTo-Json` exceeds `-Depth` value (#13692)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze, @mkswd, @ThomasNieto, @PatLeong, @paul-cheung, @georgettica</p>
+
+</summary>
+
+<ul>
+<li>Fix RCS1049: Simplify boolean comparison (#13994) (Thanks @xtqqczze!)</li>
+<li>Enable IDE0062: Make local function static (#14044) (Thanks @xtqqczze!)</li>
+<li>Enable CA2207: Initialize value type static fields inline (#14068) (Thanks @xtqqczze!)</li>
+<li>Enable CA1837: Use <code>ProcessId</code> and <code>CurrentManagedThreadId</code> from <code>System.Environment</code> (#14063) (Thanks @xtqqczze and @PatLeong!)</li>
+<li>Remove unnecessary using directives (#14014, #14017, #14021, #14050, #14065, #14066, #13863, #13860, #13861, #13814) (Thanks @xtqqczze and @ThomasNieto!)</li>
+<li>Remove unnecessary usage of LINQ <code>Count</code> method (#13545) (Thanks @xtqqczze!)</li>
+<li>Fix SA1518: The code must not contain extra blank lines at the end of the file (#13574) (Thanks @xtqqczze!)</li>
+<li>Enable CA1829: Use the <code>Length</code> or <code>Count</code> property instead of <code>Count()</code> (#13925) (Thanks @xtqqczze!)</li>
+<li>Enable CA1827: Do not use <code>Count()</code> or <code>LongCount()</code> when <code>Any()</code> can be used (#13923) (Thanks @xtqqczze!)</li>
+<li>Enable or fix nullable usage in a few files (#13793, #13805, #13808, #14018, #13804) (Thanks @mkswd and @georgettica!)</li>
+<li>Enable IDE0040: Add accessibility modifiers (#13962, #13874) (Thanks @xtqqczze!)</li>
+<li>Make applicable private Guid fields readonly (#14000) (Thanks @xtqqczze!)</li>
+<li>Fix CA1003: Use generic event handler instances (#13937) (Thanks @xtqqczze!)</li>
+<li>Simplify delegate creation (#13578) (Thanks @xtqqczze!)</li>
+<li>Fix RCS1033: Remove redundant boolean literal (#13454) (Thanks @xtqqczze!)</li>
+<li>Fix RCS1221: Use pattern matching instead of combination of <code>as</code> operator and null check (#13333) (Thanks @xtqqczze!)</li>
+<li>Use <code>is not</code> syntax (#13338) (Thanks @xtqqczze!)</li>
+<li>Replace magic number with constant in PDH (#13536) (Thanks @xtqqczze!)</li>
+<li>Fix accessor order (#13538) (Thanks @xtqqczze!)</li>
+<li>Enable IDE0054: Use compound assignment (#13546) (Thanks @xtqqczze!)</li>
+<li>Fix RCS1098: Constant values should be on right side of comparisons (#13833) (Thanks @xtqqczze!)</li>
+<li>Enable CA1068: <code>CancellationToken</code> parameters must come last (#13867) (Thanks @xtqqczze!)</li>
+<li>Enable CA10XX rules with suggestion severity (#13870, #13928, #13924) (Thanks @xtqqczze!)</li>
+<li>Enable IDE0064: Make Struct fields writable (#13945) (Thanks @xtqqczze!)</li>
+<li>Run <code>dotnet-format</code> to improve formatting of source code (#13503) (Thanks @xtqqczze!)</li>
+<li>Enable CA1825: Avoid zero-length array allocations (#13961) (Thanks @xtqqczze!)</li>
+<li>Add IDE analyzer rule IDs to comments (#13960) (Thanks @xtqqczze!)</li>
+<li>Enable CA1830: Prefer strongly-typed <code>Append</code> and <code>Insert</code> method overloads on <code>StringBuilder</code> (#13926) (Thanks @xtqqczze!)</li>
+<li>Enforce code style in build (#13957) (Thanks @xtqqczze!)</li>
+<li>Enable CA1836: Prefer <code>IsEmpty</code> over <code>Count</code> when available (#13877) (Thanks @xtqqczze!)</li>
+<li>Enable CA1834: Consider using <code>StringBuilder.Append(char)</code> when applicable (#13878) (Thanks @xtqqczze!)</li>
+<li>Fix IDE0044: Make field readonly (#13884, #13885, #13888, #13892, #13889, #13886, #13890, #13891, #13887, #13893, #13969, #13967, #13968, #13970, #13971, #13966, #14012) (Thanks @xtqqczze!)</li>
+<li>Enable IDE0048: Add required parentheses (#13896) (Thanks @xtqqczze!)</li>
+<li>Enable IDE1005: Invoke delegate with conditional access (#13911) (Thanks @xtqqczze!)</li>
+<li>Enable IDE0036: Enable the check on the order of modifiers (#13958, #13881) (Thanks @xtqqczze!)</li>
+<li>Use span-based <code>String.Concat</code> instead of <code>String.Substring</code> (#13500) (Thanks @xtqqczze!)</li>
+<li>Enable CA1050: Declare types in namespace (#13872) (Thanks @xtqqczze!)</li>
+<li>Fix minor keyword typo in C# code comment (#13811) (Thanks @paul-cheung!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Enable `CodeQL` Security scanning (#13894)
+- Add global `AnalyzerConfig` with default configuration (#13835) (Thanks @xtqqczze!)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@mkswd, @xtqqczze</p>
+
+</summary>
+
+<ul>
+<li>Bump <code>Microsoft.NET.Test.Sdk</code> to <code>16.8.0</code> (#14020)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.CSharp</code> to <code>3.8.0</code> (#14075)</li>
+<li>Remove workarounds for .NET 5 RTM builds (#14038)</li>
+<li>Migrate 3rd party signing to ESRP (#14010)</li>
+<li>Fixes to release pipeline for GA release (#14034)</li>
+<li>Don't do a shallow checkout (#13992)</li>
+<li>Add validation and dependencies for Ubuntu 20.04 distribution to packaging script (#13993)</li>
+<li>Add .NET install workaround for RTM (#13991)</li>
+<li>Move to ESRP signing for Windows files (#13988)</li>
+<li>Update <code>PSReadLine</code> version to <code>2.1.0</code> (#13975)</li>
+<li>Bump .NET to version <code>5.0.100-rtm.20526.5</code> (#13920)</li>
+<li>Update script to use .NET RTM feeds (#13927)</li>
+<li>Add checkout step to release build templates (#13840)</li>
+<li>Turn on <code>/features:strict</code> for all projects (#13383) (Thanks @xtqqczze!)</li>
+<li>Bump <code>NJsonSchema</code> to <code>10.2.2</code> (#13722, #13751)</li>
+<li>Add flag to make Linux script publish to production repo (#13714)</li>
+<li>Bump <code>Markdig.Signed</code> to <code>0.22.0</code> (#13741)</li>
+<li>Use new release script for Linux packages (#13705)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Fix links to LTS versions for Windows (#14070)
+- Fix `crontab` formatting in example doc (#13712) (Thanks @dgoldman-msft!)
+
+[7.2.0-preview.1]: https://github.com/PowerShell/PowerShell/compare/v7.1.0...v7.2.0-preview.1
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index 9086cdd5665..035db721385 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,1083 +1 @@
 # Current preview release
-
-## [7.2.0-rc.1] - 2021-10-21
-
-### General Cmdlet Updates and Fixes
-
-- Disallow COM calls for AppLocker system lockdown (#16268)
-- Configure `Microsoft.ApplicationInsights` to not send cloud role name (#16246)
-- Disallow `Add-Type` in NoLanguage mode on a locked down machine (#16245)
-- Make property names for color VT100 sequences consistent with documentation (#16212)
-- Make moving a directory into itself with `Move-Item` an error (#16198)
-- Change `FileSystemInfo.Target` from a `CodeProperty` to an `AliasProperty` that points to `FileSystemInfo.LinkTarget` (#16165)
-
-### Tests
-
-- Removed deprecated docker-based tests for PowerShell release packages (#16224)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-<p>Bump .NET SDK to 6.0.100-rc.2</p>
-</summary>
-
-<ul>
-<li>Update .NET 6 to version 6.0.100-rc.2.21505.57 (#16249)</li>
-<li>Fix RPM packaging (Internal 17704)</li>
-<li>Update <code>ThirdPartyNotices.txt</code> (#16283)</li>
-<li>Update pipeline yaml file to use <code>ubuntu-latest</code> image (#16279)</li>
-<li>Add script to generate <code>cgmanifest.json</code> (#16278)</li>
-<li>Update version of <code>Microsoft.PowerShell.Native</code> and <code>Microsoft.PowerShell.MarkdownRender</code> packages (#16277)</li>
-<li>Add <code>cgmanifest.json</code> for generating correct third party notice file (#16266)</li>
-<li>Only upload stable <code>buildinfo</code> for stable releases (#16251)</li>
-<li>Don't upload <code>.dep</code> or <code>.tar.gz</code> for RPM because there are none (#16230)</li>
-<li>Ensure RPM license is recognized (#16189)</li>
-<li>Add condition to only generate release files in local dev build only (#16259)</li>
-<li>Ensure <code>psoptions.json</code> and <code>manifest.spdx.json</code> files always exist in packages (#16258)</li>
-<li>Fix CI script and split out ARM runs (#16252)</li>
-<li>Update vPack task version to 12 (#16250)</li>
-<li>Sign third party executables (#16229)</li>
-<li>Add Software Bill of Materials to the main packages (#16202)</li>
-<li>Upgrade <code>set-value</code> package for markdown test (#16196)</li>
-<li>Fix Microsoft update spelling issue (#16178)</li>
-<li>Move vPack build to 1ES Pool (#16169)</li>
-</ul>
-
-</details>
-
-[7.2.0-rc.1]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.10...v7.2.0-rc.1
-
-## [7.2.0-preview.10] - 2021-09-28
-
-### Engine Updates and Fixes
-
-- Remove duplicate remote server mediator code (#16027)
-
-### General Cmdlet Updates and Fixes
-
-- Use `PlainText` when writing to a host that doesn't support VT (#16092)
-- Remove support for `AppExecLinks` to retrieve target (#16044)
-- Move `GetOuputString()` and `GetFormatStyleString()` to `PSHostUserInterface` as public API (#16075)
-- Add `isOutputRedirected` parameter to `GetFormatStyleString()` method (#14397)
-- Fix `ConvertTo-SecureString` with key regression due to .NET breaking change (#16068)
-- Fix regression in `Move-Item` to only fallback to `CopyAndDelete` in specific cases (#16029)
-- Set `$?` correctly for command expression with redirection (#16046)
-- Use `CurrentCulture` when handling conversions to `DateTime` in `Add-History` (#16005) (Thanks @vexx32!)
-- Fix `NullReferenceException` in `Format-Wide` (#15990) (Thanks @DarylGraves!)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@xtqqczze!</p>
-
-</summary>
-
-<ul>
-<li>Improve <code>CommandInvocationIntrinsics</code> API documentation and style (#14369)</li>
-<li>Use <code>bool?.GetValueOrDefault()</code> in <code>FormatWideCommand</code> (#15988) (Thanks @xtqqczze!)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Fix typo in build.psm1 (#16038) (Thanks @eltociear!)
-- Add `.stylecop` to `filetypexml` and format it (#16025)
-- Enable sending Teams notification when workflow fails (#15982)
-
-### Tests
-
-- Enable two previously disabled `Get-Process` tests (#15845) (Thanks @iSazonov!)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-Details
-</summary>
-
-<ul>
-<li>Add SHA256 hashes to release (#16147)</li>
-<li>Update <code>Microsoft.CodeAnalysis.CSharp</code> version (#16138)</li>
-<li>Change path for Component Governance for build to the path we actually use to build (#16137)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#16070) (#16045) (#16036) (#16021) (#15985)</li>
-<li>Update .NET to <code>6.0.100-rc.1.21458.32</code> (#16066)</li>
-<li>Update minimum required OS version for macOS (#16088)</li>
-<li>Ensure locale is set correctly on Ubuntu 20.04 in CI (#16067) (#16073)</li>
-<li>Update .NET SDK version from <code>6.0.100-preview.6.21355.2</code> to <code>6.0.100-rc.1.21455.2</code> (#16041) (#16028) (#15648)</li>
-<li>Fix the GitHub Action for updating .NET daily builds (#16042)</li>
-<li>Move from PkgES hosted agents to 1ES hosted agents (#16023)</li>
-<li>Update Ubuntu images to use Ubuntu 20.04 (#15906)</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>
-<li>Ignore error from <code>Find-Package</code> (#15999)</li>
-<li>Find packages separately for each source in <code>UpdateDotnetRuntime.ps1</code> script (#15998)</li>
-<li>Update metadata to start using .NET 6 RC1 builds (#15981)</li>
-</ul>
-
-</details>
-
-[7.2.0-preview.10]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.9...v7.2.0-preview.10
-
-## [7.2.0-preview.9] - 2021-08-23
-
-### Breaking Changes
-
-- Change the default value of `$PSStyle.OutputRendering` to `OutputRendering.Host` and remove `OutputRendering.Automatic` (#15882)
-- Fix `CA1052` for public API to make classes static when they only have static methods (#15775) (Thanks @xtqqczze!)
-- Update `pwsh.exe -File` to only accept `.ps1` script files on Windows (#15859)
-
-### Engine Updates and Fixes
-
-- Update .NET adapter to handle interface static members properly (#15908)
-- Catch and handle unauthorized access exception when removing AppLocker test files (#15881)
-
-### General Cmdlet Updates and Fixes
-
-- Add `-PassThru` parameter to `Set-Clipboard` (#13713) (Thanks @ThomasNieto!)
-- Add `-Encoding` parameter for `Tee-Object` (#12135) (Thanks @Peter-Schneider!)
-- Update `ConvertTo-Csv` and `Export-Csv` to handle `IDictionary` objects (#11029) (Thanks @vexx32!)
-- Update the parameters `-Exception` and `-ErrorRecord` for `Write-Error` to be position 0 (#13813) (Thanks @ThomasNieto!)
-- Don't use `ArgumentList` when creating COM object with `New-Object` as it's not applicable to the COM parameter set (#15915)
-- Fix `$PSStyle` list output to correctly show `TableHeader` (#15928)
-- Remove the `PSImplicitRemotingBatching` experimental feature (#15863)
-- Fix issue with `Get-Process -Module` failing to stop when it's piped to `Select-Object` (#15682) (Thanks @ArmaanMcleod!)
-- Make the experimental features `PSUnixFileStat`, `PSCultureInvariantReplaceOperator`, `PSNotApplyErrorActionToStderr`, `PSAnsiRendering`, `PSAnsiProgressFeatureName` stable (#15864)
-- Enhance `Remove-Item` to work with OneDrive (#15571) (Thanks @iSazonov!)
-- Make global tool entrypoint class static (#15880)
-- Update `ServerRemoteHost` version to be same as `PSVersion` (#15809)
-- Make the initialization of `HttpKnownHeaderNames` thread safe (#15519) (Thanks @iSazonov!)
-- `ConvertTo-Csv`: Quote fields with quotes and newlines when using `-UseQuotes AsNeeded` (#15765) (Thanks @lselden!)
-- Forwarding progress stream changes from `Foreach-Object -Parallel` runspaces (#14271) (Thanks @powercode!)
-- Add validation to `$PSStyle` to reject printable text when setting a property that only expects ANSI escape sequence (#15825)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@xtqqczze</p>
-
-</summary>
-
-<ul>
-<li>Avoid unneeded array allocation in module code (#14329) (Thanks @xtqqczze!)</li>
-<li>Enable and fix analysis rules <code>CA1052</code>, <code>CA1067</code>, and <code>IDE0049</code> (#15840) (Thanks @xtqqczze!)</li>
-<li>Avoid unnecessary allocation in formatting code (#15832) (Thanks @xtqqczze!)</li>
-<li>Specify the analyzed API surface for all code quality rules (#15778) (Thanks @xtqqczze!)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Enable `/rebase` to automatically rebase a PR (#15808)
-- Update `.editorconfig` to not replace tabs with spaces in `.tsv` files (#15815) (Thanks @SethFalco!)
-- Update PowerShell team members in the change log generation script (#15817)
-
-### Tests
-
-- Add more tests to validate the current command error handling behaviors (#15919)
-- Make `Measure-Object` property test independent of the file system (#15879)
-- Add more information when a `syslog` parsing error occurs (#15857)
-- Harden logic when looking for `syslog` entries to be sure that we select based on the process id (#15841)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@xtqqczze</p>
-
-</summary>
-
-<ul>
-<li>Disable implicit namespace imports for test projects (#15895)</li>
-<li>Update language version to 10 and fix related issues (#15886)</li>
-<li>Update <code>CodeQL</code> workflow to use Ubuntu 18.04 (#15868)</li>
-<li>Bump the version of various packages (#15944, #15934, #15935, #15891, #15812, #15822) (Thanks @xtqqczze!)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Update `README` and `metadata files` for release `v7.2.0-preview.8` (#15819)
-- Update change logs for 7.0.7 and 7.1.4 (#15921)
-- Fix spelling in XML docs (#15939) (Thanks @slowy07!)
-- Update PowerShell Committee members (#15837)
-
-[7.2.0-preview.9]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.8...v7.2.0-preview.9
-
-## [7.2.0-preview.8] - 2021-07-22
-
-### Engine Updates and Fixes
-
-- Add a Windows mode to `$PSNativeCommandArgumentPassing` that allows some commands to use legacy argument passing (#15408)
-- Use `nameof` to get parameter names when creating `ArgumentNullException` (#15604) (Thanks @gukoff!)
-- Test if a command is 'Out-Default' more thoroughly for transcribing scenarios (#15653)
-- Add `Microsoft.PowerShell.Crescendo` to telemetry allow list (#15372)
-
-### General Cmdlet Updates and Fixes
-
-- Use `$PSStyle.Formatting.FormatAccent` for `Format-List` and `$PSStyle.Formatting.TableHeader` for `Format-Table` output (#14406)
-- Highlight using error color the exception `Message` and underline in `PositionMessage` for `Get-Error` (#15786)
-- Implement a completion for View parameter of format cmdlets (#14513) (Thanks @iSazonov!)
-- Add support to colorize `FileInfo` file names (#14403)
-- Don't serialize to JSON ETS properties for `DateTime` and `string` types (#15665)
-- Fix `HyperVSocketEndPoint.ServiceId` setter (#15704) (Thanks @xtqqczze!)
-- Add `DetailedView` to `$ErrorView` (#15609)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@iSazonov, @xtqqczze</p>
-
-</summary>
-
-<ul>
-<li>Remove <code>consolehost.proto</code> file (#15741) (Thanks @iSazonov!)</li>
-<li>Implement <code>IDisposable</code> for <code>ConvertToJsonCommand</code> (#15787) (Thanks @xtqqczze!)</li>
-<li>Fix <code>IDisposable</code> implementation for <code>CommandPathSearch</code> (#15793) (Thanks @xtqqczze!)</li>
-<li>Delete IDE dispose analyzer rules (#15798) (Thanks @xtqqczze!)</li>
-<li>Seal private classes (#15725) (Thanks @xtqqczze!)</li>
-<li>Enable IDE0029: <code>UseCoalesceExpression</code> (#15770) (Thanks @xtqqczze!)</li>
-<li>Enable IDE0070: <code>UseSystemHashCode</code> (#15715) (Thanks @xtqqczze!)</li>
-<li>Enable IDE0030: <code>UseCoalesceExpressionForNullable</code> (#14289) (Thanks @xtqqczze!)</li>
-<li>Fix CA1846 and CA1845 for using <code>AsSpan</code> instead of <code>Substring</code> (#15738)</li>
-<li>Use <code>List&lt;T&gt;.RemoveAll</code> to avoid creating temporary list (#15686) (Thanks @xtqqczze!)</li>
-<li>Enable IDE0044: <code>MakeFieldReadonly</code> (#13880) (Thanks @xtqqczze!)</li>
-<li>Disable IDE0130 (#15728) (Thanks @xtqqczze!)</li>
-<li>Make classes sealed (#15675) (Thanks @xtqqczze!)</li>
-<li>Enable CA1043: Use integral or string argument for indexers (#14467) (Thanks @xtqqczze!)</li>
-<li>Enable CA1812 (#15674) (Thanks @xtqqczze!)</li>
-<li>Replace <code>Single</code> with <code>First</code> when we know the element count is 1 (#15676) (Thanks @xtqqczze!)</li>
-<li>Skip analyzers for <code>Microsoft.Management.UI.Internal</code> (#15677) (Thanks @xtqqczze!)</li>
-<li>Fix CA2243: Attribute string literals should parse correctly (#15622) (Thanks @xtqqczze!)</li>
-<li>Enable CA1401 (#15621) (Thanks @xtqqczze!)</li>
-<li>Fix CA1309: Use ordinal <code>StringComparison</code> in Certificate Provider (#14352) (Thanks @xtqqczze!)</li>
-<li>Fix CA1839: Use <code>Environment.ProcessPath</code> (#15650) (Thanks @xtqqczze!)</li>
-<li>Add new analyzer rules (#15620) (Thanks @xtqqczze!)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Add `SkipRoslynAnalyzers` parameter to `Start-PSBuild` (#15640) (Thanks @xtqqczze!)
-- Create issue template for issues updating PowerShell through Windows update. (#15700)
-- Add `DocumentationAnalyzers` to build (#14336) (Thanks @xtqqczze!)
-- Convert GitHub issue templates to modern forms (#15645)
-
-### Tests
-
-- Add more tests for `ConvertFrom-Json` (#15706) (Thanks @strawgate!)
-- Update `glob-parent` and `hosted-git-info` test dependencies (#15643)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-Update .NET to version <code>v6.0.0-preview.6</code>
-</summary>
-
-<ul>
-<li>Add new package name for <code>osx-arm64</code> (#15813)</li>
-<li>Prefer version when available for dotnet-install (#15810)</li>
-<li>Make warning about MU being required dynamic (#15776)</li>
-<li>Add <code>Start-PSBootstrap</code> before running tests (#15804)</li>
-<li>Update to .NET 6 Preview 6 and use <code>crossgen2</code> (#15763)</li>
-<li>Enable ARM64 packaging for macOS (#15768)</li>
-<li>Make Microsoft Update opt-out/in check boxes work (#15784)</li>
-<li>Add Microsoft Update opt out to MSI install (#15727)</li>
-<li>Bump <code>NJsonSchema</code> from <code>10.4.4</code> to <code>10.4.5</code> (#15769)</li>
-<li>Fix computation of SHA512 checksum (#15736)</li>
-<li>Update the script to use quality parameter for <code>dotnet-install</code> (#15731)</li>
-<li>Generate SHA512 checksum file for all packages (#15678)</li>
-<li>Enable signing daily release build with lifetime certificate (#15642)</li>
-<li>Update metadata and README for 7.2.0-preview.7 (#15593)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Fix broken RFC links (#15807)
-- Add to bug report template getting details from `Get-Error` (#15737)
-- Update issue templates to link to new docs (#15711)
-- Add @jborean93 to Remoting Working Group (#15683)
-
-[7.2.0-preview.8]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.7...v7.2.0-preview.8
-
-## [7.2.0-preview.7] - 2021-06-17
-
-### Breaking Changes
-
-- Remove PSDesiredStateConfiguration v2.0.5 module and published it to the PowerShell Gallery (#15536)
-
-### Engine Updates and Fixes
-
-- Fix splatting being treated as positional parameter in completions (#14623) (Thanks @MartinGC94!)
-- Prevent PowerShell from crashing when a telemetry mutex can't be created (#15574) (Thanks @gukoff!)
-- Ignore all exceptions when disposing an instance of a subsystem implementation (#15511)
-- Wait for SSH exit when closing remote connection (#14635) (Thanks @dinhngtu!)
-
-### Performance
-
-- Retrieve `ProductVersion` using informational version attribute in `AmsiUtils.Init()` (#15527) (Thanks @Fs00!)
-
-### General Cmdlet Updates and Fixes
-
-- Fix retrieving dynamic parameters from provider even if globbed path returns no results (#15525)
-- Revert "Enhance Remove-Item to work with OneDrive (#15260)" due to long path issue (#15546)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@octos4murai, @iSazonov, @Fs00</p>
-
-</summary>
-
-<ul>
-<li>Correct parameter name passed to exception in <code>PSCommand</code> constructor (#15580) (Thanks @octos4murai!)</li>
-<li>Enable nullable: <code>System.Management.Automation.ICommandRuntime</code> (#15566) (Thanks @iSazonov!)</li>
-<li>Clean up code regarding <code>AppDomain.CreateDomain</code> and <code>AppDomain.Unload</code> (#15554)</li>
-<li>Replace <code>ProcessModule.FileName</code> with <code>Environment.ProcessPath</code> and remove <code>PSUtils.GetMainModule</code> (#15012) (Thanks @Fs00!)</li>
-</ul>
-
-</details>
-
-### Tests
-
-- Fix `Start-Benchmarking` to put `TargetPSVersion` and `TargetFramework` in separate parameter sets (#15508)
-- Add `win-x86` test package to the build (#15517)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@schuelermine</p>
-
-</summary>
-
-<ul>
-<li>Update README.md and metadata.json for version 7.2.0-preview.6 (#15464)</li>
-<li>Make sure GA revision increases from RC and Preview releases (#15558)</li>
-<li>Remove <code>SupportsShouldProcess</code> from <code>Start-PSBootstrap</code> in build.psm1 (#15491) (Thanks @schuelermine!)</li>
-<li>Update <code>DotnetMetadataRuntime.json</code> next channel to take daily build from .NET preview 5 (#15518)</li>
-<li>Fix <code>deps.json</code> update in the release pipeline (#15486)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Add new members to Engine and Cmdlet Working Groups document (#15560)
-- Update the `mdspell` command to exclude the folder that should be ignored (#15576)
-- Replace 'User Voice' with 'Feedback Hub' in `README.md` (#15557)
-- Update Virtual User Group chat links (#15505) (Thanks @Jaykul!)
-- Fix typo in `FileSystemProvider.cs` (#15445) (Thanks @eltociear!)
-- Add `PipelineStoppedException` notes to PowerShell API (#15324)
-- Updated governance on Working Groups (WGs) (#14603)
-- Correct and improve XML documentation comments on `PSCommand` (#15568) (Thanks @octos4murai!)
-
-[7.2.0-preview.7]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.6...v7.2.0-preview.7
-
-## [7.2.0-preview.6] - 2021-05-27
-
-### Experimental Features
-
-- [Breaking Change] Update prediction interface to provide additional feedback to a predictor plugin (#15421)
-
-### Performance
-
-- Avoid collecting logs in buffer if a pipeline execution event is not going to be logged (#15350)
-- Avoid allocation in `LanguagePrimitives.UpdateTypeConvertFromTypeTable` (#15168) (Thanks @xtqqczze!)
-- Replace `Directory.GetDirectories` with `Directory.EnumerateDirectories` to avoid array allocations (#15167) (Thanks @xtqqczze!)
-- Use `List.ConvertAll` instead of `LINQ` (#15140) (Thanks @xtqqczze!)
-
-### General Cmdlet Updates and Fixes
-
-- Use `AllocConsole` before initializing CLR to ensure codepage is correct for WinRM remoting (PowerShell/PowerShell-Native#70) (Thanks @jborean93!)
-- Add completions for `#requires` statements (#14596) (Thanks @MartinGC94!)
-- Add completions for comment-based help keywords (#15337) (Thanks @MartinGC94!)
-- Move cross platform DSC code to a PowerShell engine subsystem (#15127)
-- Fix `Minimal` progress view to handle activity that is longer than console width (#15264)
-- Handle exception if ConsoleHost tries to set cursor out of bounds because screen buffer changed (#15380)
-- Fix `NullReferenceException` in DSC `ClearCache()` (#15373)
-- Update `ControlSequenceLength` to handle colon as a virtual terminal parameter separator (#14942)
-- Update the summary comment for `StopTranscriptCmdlet.cs` (#15349) (Thanks @dbaileyut!)
-- Remove the unusable alias `d` for the `-Directory` parameter from `Get-ChildItem` (#15171) (Thanks @kvprasoon!)
-- Fix tab completion for un-localized `about` topics (#15265) (Thanks @MartinGC94!)
-- Remove the unneeded SSH stdio handle workaround (#15308)
-- Add `LoadAssemblyFromNativeMemory` API to load assemblies from memory in a native PowerShell host (#14652) (Thanks @awakecoding!)
-- Re-implement `Remove-Item` OneDrive support (#15260) (Thanks @iSazonov!)
-- Kill native processes in pipeline when pipeline is disposed on Unix (#15287)
-- Default to MTA on Windows platforms where STA is not supported (#15106)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@xtqqczze, @powercode, @bcwood</p>
-
-</summary>
-
-<ul>
-<li>Enable <code>nullable</code> in some classes (#14185, #14177, #14159, #14191, #14162, #14150, #14156, #14161, #14155, #14163, #14181, #14157, #14151) (Thanks @powercode!)</li>
-<li>Annotate <code>ThrowTerminatingError</code> with <code>DoesNotReturn</code> attribute (#15352) (Thanks @powercode!)</li>
-<li>Use <code>GetValueOrDefault()</code> for nullable <code>PSLanguageMode</code> (#13849) (Thanks @bcwood!)</li>
-<li>Enable <code>SA1008</code>: Opening parenthesis should be spaced correctly (#14242) (Thanks @xtqqczze!)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Add `winget` release script (#15050)
-
-### Tests
-
-- Enable cross-runtime benchmarking to compare different .NET runtimes (#15387) (Thanks @adamsitnik!)
-- Add the performance benchmark project for PowerShell performance testing (#15242)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-Update .NET to version <code>v6.0.0-preview.4</code>
-</summary>
-
-<ul>
-<li>Suppress prompting when uploading the <code>msixbundle</code> package to blob (#15227)</li>
-<li>Update to .NET preview 4 SDK (#15452)</li>
-<li>Update <code>AppxManifest.xml</code> with newer OS version to allow PowerShell installed from Windows Store to make system-level changes (#15375)</li>
-<li>Ensure the build works when <code>PSDesiredStateConfiguration</code> module is pulled in from PSGallery (#15355)</li>
-<li>Make sure daily release tag does not change when retrying failures (#15286)</li>
-<li>Improve messages and behavior when there's a problem in finding zip files (#15284)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Add documentation comments section to coding guidelines (#14316) (Thanks @xtqqczze!)
-
-[7.2.0-preview.6]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.5...v7.2.0-preview.6
-
-## [7.2.0-preview.5] - 2021-04-14
-
-### Breaking Changes
-
-- Make PowerShell Linux deb and RPM packages universal (#15109)
-- Enforce AppLocker Deny configuration before Execution Policy Bypass configuration (#15035)
-- Disallow mixed dash and slash in command line parameter prefix (#15142) (Thanks @davidBar-On!)
-
-### Experimental Features
-
-- `PSNativeCommandArgumentPassing`: Use `ArgumentList` for native executable invocation (breaking change) (#14692)
-
-### Engine Updates and Fixes
-
-- Add `IArgumentCompleterFactory` for parameterized `ArgumentCompleters` (#12605) (Thanks @powercode!)
-
-### General Cmdlet Updates and Fixes
-
-- Fix SSH remoting connection never finishing with misconfigured endpoint (#15175)
-- Respect `TERM` and `NO_COLOR` environment variables for `$PSStyle` rendering (#14969)
-- Use `ProgressView.Classic` when Virtual Terminal is not supported (#15048)
-- Fix `Get-Counter` issue with `-Computer` parameter (#15166) (Thanks @krishnayalavarthi!)
-- Fix redundant iteration while splitting lines (#14851) (Thanks @hez2010!)
-- Enhance `Remove-Item -Recurse` to work with OneDrive (#14902) (Thanks @iSazonov!)
-- Change minimum depth to 0 for `ConvertTo-Json` (#14830) (Thanks @kvprasoon!)
-- Allow `Set-Clipboard` to accept empty string (#14579)
-- Turn on and off `DECCKM` to modify keyboard mode for Unix native commands to work correctly (#14943)
-- Fall back to `CopyAndDelete()` when `MoveTo()` fails due to an `IOException` (#15077)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@xtqqczze, @iSazonov, @ZhiZe-ZG</p>
-
-</summary>
-
-<ul>
-<li>Update .NET to <code>6.0.0-preview.3</code> (#15221)</li>
-<li>Add space before comma to hosting test to fix error reported by <code>SA1001</code> (#15224)</li>
-<li>Add <code>SecureStringHelper.FromPlainTextString</code> helper method for efficient secure string creation (#14124) (Thanks @xtqqczze!)</li>
-<li>Use static lambda keyword (#15154) (Thanks @iSazonov!)</li>
-<li>Remove unnecessary <code>Array</code> -&gt; <code>List</code> -&gt; <code>Array</code> conversion in <code>ProcessBaseCommand.AllProcesses</code> (#15052) (Thanks @xtqqczze!)</li>
-<li>Standardize grammar comments in Parser.cs (#15114) (Thanks @ZhiZe-ZG!)</li>
-<li>Enable <code>SA1001</code>: Commas should be spaced correctly (#14171) (Thanks @xtqqczze!)</li>
-<li>Refactor <code>MultipleServiceCommandBase.AllServices</code> (#15053) (Thanks @xtqqczze!)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Use Unix line endings for shell scripts (#15180) (Thanks @xtqqczze!)
-
-### Tests
-
-- Add the missing tag in Host Utilities tests (#14983)
-- Update `copy-props` version in `package.json` (#15124)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@JustinGrote</p>
-
-</summary>
-
-<ul>
-<li>Fix <code>yarn-lock</code> for <code>copy-props</code> (#15225)</li>
-<li>Make package validation regex accept universal Linux packages (#15226)</li>
-<li>Bump NJsonSchema from 10.4.0 to 10.4.1 (#15190)</li>
-<li>Make MSI and EXE signing always copy to fix daily build (#15191)</li>
-<li>Sign internals of EXE package so that it works correctly when signed (#15132)</li>
-<li>Bump Microsoft.NET.Test.Sdk from 16.9.1 to 16.9.4 (#15141)</li>
-<li>Update daily release tag format to  work with new Microsoft Update work (#15164)</li>
-<li>Feature: Add Ubuntu 20.04 Support to install-powershell.sh (#15095) (Thanks @JustinGrote!)</li>
-<li>Treat rebuild branches like release branches (#15099)</li>
-<li>Update WiX to 3.11.2 (#15097)</li>
-<li>Bump NJsonSchema from 10.3.11 to 10.4.0 (#15092)</li>
-<li>Allow patching of preview releases (#15074)</li>
-<li>Bump Newtonsoft.Json from 12.0.3 to 13.0.1 (#15084, #15085)</li>
-<li>Update the <code>minSize</code> build package filter to be explicit (#15055)</li>
-<li>Bump NJsonSchema from 10.3.10 to 10.3.11 (#14965)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Merge `7.2.0-preview.4` changes to master (#15056)
-- Update `README` and `metadata.json` (#15046)
-- Fix broken links for `dotnet` CLI (#14937)
-
-[7.2.0-preview.5]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.4...v7.2.0-preview.5
-
-## [7.2.0-preview.4] - 2021-03-16
-
-### Breaking Changes
-
-- Fix `Get-Date -UFormat` `%G` and `%g` behavior (#14555) (Thanks @brianary!)
-
-### Engine Updates and Fixes
-
-- Update engine script signature validation to match `Get-AuthenticodeSignature` logic (#14849)
-- Avoid array allocations from `GetDirectories` and `GetFiles` (#14327) (Thanks @xtqqczze!)
-
-### General Cmdlet Updates and Fixes
-
-- Add `UseOSCIndicator` setting to enable progress indicator in terminal (#14927)
-- Re-enable VT mode on Windows after running command in `ConsoleHost` (#14413)
-- Fix `Move-Item` for `FileSystemProvider` to use copy-delete instead of move for DFS paths (#14913)
-- Fix `PromptForCredential()` to add `targetName` as domain (#14504)
-- Update `Concise` `ErrorView` to not show line information for errors from script module functions (#14912)
-- Remove the 32,767 character limit on the environment block for `Start-Process` (#14111) (Thanks @hbuckle!)
-- Don't write possible secrets to verbose stream for web cmdlets (#14788)
-
-### Tools
-
-- Update `dependabot` configuration to V2 format (#14882)
-- Add tooling issue slots in PR template (#14697)
-
-### Tests
-
-- Move misplaced test file to tests directory (#14908) (Thanks @MarianoAlipi!)
-- Refactor MSI CI (#14753)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-Update .NET to version <code>6.0.100-preview.2.21155.3</code>
-</summary>
-
-<ul>
-<li>Update .NET to version <code>6.0.100-preview.2.21155.3</code> (#15007)</li>
-<li>Bump <code>Microsoft.PowerShell.Native</code> to <code>7.2.0-preview.1</code> (#15030)</li>
-<li>Create MSIX Bundle package in release pipeline (#14982)</li>
-<li>Build self-contained minimal size package for Guest Config team (#14976)</li>
-<li>Bump XunitXml.TestLogger from 3.0.62 to 3.0.66 (#14993) (Thanks @dependabot[bot]!)</li>
-<li>Enable building PowerShell for Apple M1 runtime (#14923)</li>
-<li>Fix the variable name in the condition for miscellaneous analysis CI (#14975)</li>
-<li>Fix the variable usage in CI yaml (#14974)</li>
-<li>Disable running markdown link verification in release build CI (#14971)</li>
-<li>Bump Microsoft.CodeAnalysis.CSharp from 3.9.0-3.final to 3.9.0 (#14934) (Thanks @dependabot[bot]!)</li>
-<li>Declare which variable group is used for checking the blob in the release build (#14970)</li>
-<li>Update metadata and script to enable consuming .NET daily builds (#14940)</li>
-<li>Bump NJsonSchema from 10.3.9 to 10.3.10 (#14933) (Thanks @dependabot[bot]!)</li>
-<li>Use template that disables component governance for CI (#14938)</li>
-<li>Add suppress for nuget multi-feed warning (#14893)</li>
-<li>Bump NJsonSchema from 10.3.8 to 10.3.9 (#14926) (Thanks @dependabot[bot]!)</li>
-<li>Add exe wrapper to release (#14881)</li>
-<li>Bump Microsoft.ApplicationInsights from 2.16.0 to 2.17.0 (#14847)</li>
-<li>Bump Microsoft.NET.Test.Sdk from 16.8.3 to 16.9.1 (#14895) (Thanks @dependabot[bot]!)</li>
-<li>Bump NJsonSchema from 10.3.7 to 10.3.8 (#14896) (Thanks @dependabot[bot]!)</li>
-<li>Disable codesign validation where the file type is not supported (#14885)</li>
-<li>Fixing broken Experimental Feature list in <code>powershell.config.json</code> (#14858)</li>
-<li>Bump NJsonSchema from 10.3.6 to 10.3.7 (#14855)</li>
-<li>Add exe wrapper for Microsoft Update scenarios (#14737)</li>
-<li>Install wget on <code>CentOS</code> 7 docker image (#14857)</li>
-<li>Fix install-dotnet download (#14856)</li>
-<li>Fix Bootstrap step in Windows daily test runs (#14820)</li>
-<li>Bump NJsonSchema from 10.3.5 to 10.3.6 (#14818)</li>
-<li>Bump <code>NJsonSchema</code> from <code>10.3.4</code> to <code>10.3.5</code> (#14807)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Update `README.md` and `metadata.json` for upcoming releases (#14755)
-- Merge 7.1.3 and 7.0.6 Change log to master (#15009)
-- Update `README` and `metadata.json` for releases (#14997)
-- Update ChangeLog for `v7.1.2` release (#14783)
-- Update ChangeLog for `v7.0.5` release (#14782) (Internal 14479)
-
-[7.2.0-preview.4]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.3...v7.2.0-preview.4
-
-## [7.2.0-preview.3] - 2021-02-11
-
-### Breaking Changes
-
-- Fix `Get-Date -UFormat %u` behavior to comply with ISO 8601 (#14549) (Thanks @brianary!)
-
-### Engine Updates and Fixes
-
-- Together with `PSDesiredStateConfiguration` `v3` module allows `Get-DscResource`, `Invoke-DscResource` and DSC configuration compilation on all platforms, supported by PowerShell (using class-based DSC resources).
-
-### Performance
-
-- Avoid array allocations from `Directory.GetDirectories` and `Directory.GetFiles`. (#14326) (Thanks @xtqqczze!)
-- Avoid `string.ToLowerInvariant()` from `GetEnvironmentVariableAsBool()` to avoid loading libicu at startup (#14323) (Thanks @iSazonov!)
-- Get PowerShell version in `PSVersionInfo` using assembly attribute instead of `FileVersionInfo` (#14332) (Thanks @Fs00!)
-
-### General Cmdlet Updates and Fixes
-
-- Suppress `Write-Progress` in `ConsoleHost` if output is redirected and fix tests (#14716)
-- Experimental feature `PSAnsiProgress`: Add minimal progress bar using ANSI rendering (#14414)
-- Fix web cmdlets to properly construct URI from body when using `-NoProxy` (#14673)
-- Update the `ICommandPredictor` to provide more feedback and also make feedback easier to be correlated (#14649)
-- Reset color after writing `Verbose`, `Debug`, and `Warning` messages (#14698)
-- Fix using variable for nested `ForEach-Object -Parallel` calls (#14548)
-- When formatting, if collection is modified, don't fail the entire pipeline (#14438)
-- Improve completion of parameters for attributes (#14525) (Thanks @MartinGC94!)
-- Write proper error messages for `Get-Command ' '` (#13564) (Thanks @jakekerr!)
-- Fix typo in the resource string `ProxyURINotSupplied` (#14526) (Thanks @romero126!)
-- Add support to `$PSStyle` for strikethrough and hyperlinks (#14461)
-- Fix `$PSStyle` blink codes (#14447) (Thanks @iSazonov!)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@xtqqczze, @powercode</p>
-
-</summary>
-
-<ul>
-<li>Fix coding style issues: RCS1215, IDE0090, SA1504, SA1119, RCS1139, IDE0032 (#14356, #14341, #14241, #14204, #14442, #14443) (Thanks @xtqqczze!)</li>
-<li>Enable coding style checks: CA2249, CA1052, IDE0076, IDE0077, SA1205, SA1003, SA1314, SA1216, SA1217, SA1213 (#14395, #14483, #14494, #14495, #14441, #14476, #14470, #14471, #14472) (Thanks @xtqqczze!)</li>
-<li>Enable nullable in PowerShell codebase (#14160, #14172, #14088, #14154, #14166, #14184, #14178) (Thanks @powercode!)</li>
-<li>Use <code>string.Split(char)</code> instead of <code>string.Split(string)</code> (#14465) (Thanks @xtqqczze!)</li>
-<li>Use <code>string.Contains(char)</code> overload (#14368) (Thanks @xtqqczze!)</li>
-<li>Refactor complex <code>if</code> statements (#14398) (Thanks @xtqqczze!)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Update script to use .NET 6 build resources (#14705)
-- Fix the daily GitHub action (#14711) (Thanks @imba-tjd!)
-- GitHub Actions: fix deprecated `::set-env` (#14629) (Thanks @imba-tjd!)
-- Update markdown test tools (#14325) (Thanks @RDIL!)
-- Upgrade `StyleCopAnalyzers` to `v1.2.0-beta.312` (#14354) (Thanks @xtqqczze!)
-
-### Tests
-
-- Remove packaging from daily Windows build (#14749)
-- Update link to the Manning book (#14750)
-- A separate Windows packaging CI (#14670)
-- Update `ini` component version in test `package.json` (#14454)
-- Disable `libmi` dependent tests for macOS. (#14446)
-
-### Build and Packaging Improvements
-
-<details>
-
-<ul>
-<li>Fix the NuGet feed name and URL for .NET 6</li>
-<li>Fix third party signing for files in sub-folders (#14751)</li>
-<li>Make build script variable an <code>ArrayList</code> to enable <code>Add()</code> method (#14748)</li>
-<li>Remove old .NET SDKs to make <code>dotnet restore</code> work with the latest SDK in CI pipeline (#14746)</li>
-<li>Remove outdated Linux dependencies (#14688)</li>
-<li>Bump .NET SDK version to 6.0.0-preview.1 (#14719)</li>
-<li>Bump <code>NJsonSchema</code> to 10.3.4 (#14714)</li>
-<li>Update daily GitHub action to allow manual trigger (#14718)</li>
-<li>Bump <code>XunitXml.TestLogger</code> to 3.0.62 (#14702)</li>
-<li>Make universal deb package based on the deb package specification (#14681)</li>
-<li>Add manual release automation steps and improve changelog script (#14445)</li>
-<li>Fix release build to upload global tool packages to artifacts (#14620)</li>
-<li>Port changes from the PowerShell v7.0.4 release (#14637)</li>
-<li>Port changes from the PowerShell v7.1.1 release (#14621)</li>
-<li>Updated README and <code>metadata.json</code> (#14401, #14606, #14612)</li>
-<li>Do not push nupkg artifacts to MyGet (#14613)</li>
-<li>Use one feed in each <code>nuget.config</code> in official builds (#14363)</li>
-<li>Fix path signed RPMs are uploaded from in release build (#14424)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Update distribution support request template to point to .NET 5.0 support document (#14578)
-- Remove security GitHub issue template (#14453)
-- Add intent for using the Discussions feature in repo (#14399)
-- Fix Universal Dashboard to refer to PowerShell Universal (#14437)
-- Update document link because of HTTP 301 redirect (#14431) (Thanks @xtqqczze!)
-
-[7.2.0-preview.3]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.2...v7.2.0-preview.3
-
-## [7.2.0-preview.2] - 2020-12-15
-
-### Breaking Changes
-
-- Improve detection of mutable value types (#12495) (Thanks @vexx32!)
-- Ensure `-PipelineVariable` is set for all output from script cmdlets (#12766) (Thanks @vexx32!)
-
-### Experimental Features
-
-- `PSAnsiRendering`: Enable ANSI formatting via `$PSStyle` and support suppressing ANSI output (#13758)
-
-### Performance
-
-- Optimize `IEnumerable` variant of replace operator (#14221) (Thanks @iSazonov!)
-- Refactor multiply operation for better performance in two `Microsoft.PowerShell.Commands.Utility` methods (#14148) (Thanks @xtqqczze!)
-- Use `Environment.TickCount64` instead of `Datetime.Now` as the random seed for AppLocker test file content (#14283) (Thanks @iSazonov!)
-- Avoid unnecessary array allocations when searching in GAC (#14291) (Thanks @xtqqczze!)
-- Use `OrdinalIgnoreCase` in `CommandLineParser` (#14303) (Thanks @iSazonov!)
-- Use `StringComparison.Ordinal` instead of `StringComparison.CurrentCulture` (#14298) (Thanks @iSazonov!)
-- Avoid creating instances of the generated delegate helper class in `-replace` implementation (#14128)
-
-### General Cmdlet Updates and Fixes
-
-- Write better error message if config file is broken (#13496) (Thanks @iSazonov!)
-- Make AppLocker Enforce mode take precedence over UMCI Audit mode (#14353)
-- Add `-SkipLimitCheck` switch to `Import-PowerShellDataFile` (#13672)
-- Restrict `New-Object` in NoLanguage mode under lock down (#14140) (Thanks @krishnayalavarthi!)
-- The `-Stream` parameter now works with directories (#13941) (Thanks @kyanha!)
-- Avoid an exception if file system does not support reparse points (#13634) (Thanks @iSazonov!)
-- Enable `CA1012`: Abstract types should not have public constructors (#13940) (Thanks @xtqqczze!)
-- Enable `SA1212`: Property accessors should follow order (#14051) (Thanks @xtqqczze!)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@xtqqczze, @matthewjdegarmo, @powercode, @Gimly</p>
-
-</summary>
-
-<ul>
-<li>Enable <code>SA1007</code>: Operator keyword should be followed by space (#14130) (Thanks @xtqqczze!)</li>
-<li>Expand <code>where</code> alias to <code>Where-Object</code> in <code>Reset-PWSHSystemPath.ps1</code> (#14113) (Thanks @matthewjdegarmo!)</li>
-<li>Fix whitespace issues (#14092) (Thanks @xtqqczze!)</li>
-<li>Add <code>StyleCop.Analyzers</code> package (#13963) (Thanks @xtqqczze!)</li>
-<li>Enable <code>IDE0041</code>: <code>UseIsNullCheck</code> (#14041) (Thanks @xtqqczze!)</li>
-<li>Enable <code>IDE0082</code>: <code>ConvertTypeOfToNameOf</code> (#14042) (Thanks @xtqqczze!)</li>
-<li>Remove unnecessary usings part 4 (#14023) (Thanks @xtqqczze!)</li>
-<li>Fix <code>PriorityAttribute</code> name (#14094) (Thanks @xtqqczze!)</li>
-<li>Enable nullable: <code>System.Management.Automation.Interpreter.IBoxableInstruction</code> (#14165) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Management.Automation.Provider.IDynamicPropertyProvider</code> (#14167) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Management.Automation.Language.IScriptExtent</code> (#14179) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Management.Automation.Language.ICustomAstVisitor2</code> (#14192) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Management.Automation.LanguagePrimitives.IConversionData</code> (#14187) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Automation.Remoting.Client.IWSManNativeApiFacade</code> (#14186) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Management.Automation.Language.ISupportsAssignment</code> (#14180) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Management.Automation.ICommandRuntime2</code> (#14183) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Management.Automation.IOutputProcessingState</code> (#14175) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Management.Automation.IJobDebugger</code> (#14174) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Management.Automation.Interpreter.IInstructionProvider</code> (#14173) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Management.Automation.IHasSessionStateEntryVisibility</code> (#14169) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Management.Automation.Tracing.IEtwEventCorrelator</code> (#14168) (Thanks @powercode!)</li>
-<li>Fix syntax error in Windows packaging script (#14377)</li>
-<li>Remove redundant local assignment in <code>AclCommands</code> (#14358) (Thanks @xtqqczze!)</li>
-<li>Enable nullable: <code>System.Management.Automation.Language.IAstPostVisitHandler</code> (#14164) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Management.Automation.IModuleAssemblyInitializer</code> (#14158) (Thanks @powercode!)</li>
-<li>Use <code>Microsoft.PowerShell.MarkdownRender</code> package from <code>nuget.org</code> (#14090)</li>
-<li>Replace <code>GetFiles</code> in <code>TestModuleManifestCommand</code> (#14317) (Thanks @xtqqczze!)</li>
-<li>Enable nullable: <code>System.Management.Automation.Provider.IContentWriter</code> (#14152) (Thanks @powercode!)</li>
-<li>Simplify getting Encoding in <code>TranscriptionOption.FlushContentToDisk</code> (#13910) (Thanks @Gimly!)</li>
-<li>Mark applicable structs as <code>readonly</code> and use <code>in</code>-modifier (#13919) (Thanks @xtqqczze!)</li>
-<li>Enable nullable: <code>System.Management.Automation.IArgumentCompleter</code> (#14182) (Thanks @powercode!)</li>
-<li>Enable <code>CA1822</code>: Mark <code>private</code> members as <code>static</code> (#13897) (Thanks @xtqqczze!)</li>
-<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 6 (#14338) (Thanks @xtqqczze!)</li>
-<li>Avoid array allocations from <code>GetDirectories</code>/<code>GetFiles</code>. (#14328) (Thanks @xtqqczze!)</li>
-<li>Avoid array allocations from <code>GetDirectories</code>/<code>GetFiles</code>. (#14330) (Thanks @xtqqczze!)</li>
-<li>Fix <code>RCS1188</code>: Remove redundant auto-property initialization part 2 (#14262) (Thanks @xtqqczze!)</li>
-<li>Enable nullable: <code>System.Management.Automation.Host.IHostSupportsInteractiveSession</code> (#14170) (Thanks @powercode!)</li>
-<li>Enable nullable: <code>System.Management.Automation.Provider.IPropertyCmdletProvider</code> (#14176) (Thanks @powercode!)</li>
-<li>Fix <code>IDE0090</code>: Simplify new expression part 5 (#14301) (Thanks @xtqqczze!)</li>
-<li>Enable <code>IDE0075</code>: <code>SimplifyConditionalExpression</code> (#14078) (Thanks @xtqqczze!)</li>
-<li>Remove unnecessary usings part 9 (#14288) (Thanks @xtqqczze!)</li>
-<li>Fix StyleCop and MarkdownLint CI failures (#14297) (Thanks @xtqqczze!)</li>
-<li>Enable <code>SA1000</code>: Keywords should be spaced correctly (#13973) (Thanks @xtqqczze!)</li>
-<li>Fix <code>RCS1188</code>: Remove redundant auto-property initialization part 1 (#14261) (Thanks @xtqqczze!)</li>
-<li>Mark <code>private</code> members as <code>static</code> part 10 (#14235) (Thanks @xtqqczze!)</li>
-<li>Mark <code>private</code> members as <code>static</code> part 9 (#14234) (Thanks @xtqqczze!)</li>
-<li>Fix <code>SA1642</code> for <code>Microsoft.Management.Infrastructure.CimCmdlets</code> (#14239) (Thanks @xtqqczze!)</li>
-<li>Use <code>AsSpan</code>/<code>AsMemory</code> slice constructor (#14265) (Thanks @xtqqczze!)</li>
-<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.6 (#14260) (Thanks @xtqqczze!)</li>
-<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.5 (#14259) (Thanks @xtqqczze!)</li>
-<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.3 (#14257) (Thanks @xtqqczze!)</li>
-<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.2 (#14256) (Thanks @xtqqczze!)</li>
-<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 2 (#14200) (Thanks @xtqqczze!)</li>
-<li>Enable <code>SA1643</code>: Destructor summary documentation should begin with standard text (#14236) (Thanks @xtqqczze!)</li>
-<li>Fix <code>IDE0090</code>: Simplify new expression part 4.4 (#14258) (Thanks @xtqqczze!)</li>
-<li>Use xml documentation child blocks correctly (#14249) (Thanks @xtqqczze!)</li>
-<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.1 (#14255) (Thanks @xtqqczze!)</li>
-<li>Use consistent spacing in xml documentation tags (#14231) (Thanks @xtqqczze!)</li>
-<li>Enable <code>IDE0074</code>: Use coalesce compound assignment (#13396) (Thanks @xtqqczze!)</li>
-<li>Remove unnecessary finalizers (#14248) (Thanks @xtqqczze!)</li>
-<li>Mark local variable as <code>const</code> (#13217) (Thanks @xtqqczze!)</li>
-<li>Fix <code>IDE0032</code>: <code>UseAutoProperty</code> part 2 (#14244) (Thanks @xtqqczze!)</li>
-<li>Fix <code>IDE0032</code>: <code>UseAutoProperty</code> part 1 (#14243) (Thanks @xtqqczze!)</li>
-<li>Mark <code>private</code> members as <code>static</code> part 8 (#14233) (Thanks @xtqqczze!)</li>
-<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 6 (#14229) (Thanks @xtqqczze!)</li>
-<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 5 (#14228) (Thanks @xtqqczze!)</li>
-<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 4 (#14227) (Thanks @xtqqczze!)</li>
-<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 3 (#14226) (Thanks @xtqqczze!)</li>
-<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 2 (#14225) (Thanks @xtqqczze!)</li>
-<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 1 (#14224) (Thanks @xtqqczze!)</li>
-<li>Use <code>see</code> keyword in documentation (#14220) (Thanks @xtqqczze!)</li>
-<li>Enable <code>CA2211</code>: Non-constant fields should not be visible (#14073) (Thanks @xtqqczze!)</li>
-<li>Enable <code>CA1816</code>: <code>Dispose</code> methods should call <code>SuppressFinalize</code> (#14074) (Thanks @xtqqczze!)</li>
-<li>Remove incorrectly implemented finalizer (#14246) (Thanks @xtqqczze!)</li>
-<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 7 (#14230) (Thanks @xtqqczze!)</li>
-<li>Fix <code>SA1122</code>: Use <code>string.Empty</code> for empty strings (#14218) (Thanks @xtqqczze!)</li>
-<li>Fix various xml documentation issues (#14223) (Thanks @xtqqczze!)</li>
-<li>Remove unnecessary <code>using</code>s part 8 (#14072) (Thanks @xtqqczze!)</li>
-<li>Enable <code>SA1006</code>: Preprocessor keywords should not be preceded by space (#14052) (Thanks @xtqqczze!)</li>
-<li>Fix <code>SA1642</code> for <code>Microsoft.PowerShell.Commands.Utility</code> (#14142) (Thanks @xtqqczze!)</li>
-<li>Enable <code>CA2216</code>: Disposable types should declare finalizer (#14089) (Thanks @xtqqczze!)</li>
-<li>Wrap and name <code>LoadBinaryModule</code> arguments (#14193) (Thanks @xtqqczze!)</li>
-<li>Wrap and name <code>GetListOfFilesFromData</code> arguments (#14194) (Thanks @xtqqczze!)</li>
-<li>Enable <code>SA1002</code>: Semicolons should be spaced correctly (#14197) (Thanks @xtqqczze!)</li>
-<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 3 (#14201) (Thanks @xtqqczze!)</li>
-<li>Enable <code>SA1106</code>: Code should not contain empty statements (#13964) (Thanks @xtqqczze!)</li>
-<li>Code performance fixes follow-up (#14207) (Thanks @xtqqczze!)</li>
-<li>Remove uninformative comments (#14199) (Thanks @xtqqczze!)</li>
-<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 1 (#14027) (Thanks @xtqqczze!)</li>
-<li>Enable <code>SA1517</code>: Code should not contain blank lines at start of file (#14131) (Thanks @xtqqczze!)</li>
-<li>Enable <code>SA1131</code>: Use readable conditions (#14132) (Thanks @xtqqczze!)</li>
-<li>Enable <code>SA1507</code>: Code should not contain multiple blank lines in a row (#14136) (Thanks @xtqqczze!)</li>
-<li>Enable <code>SA1516</code> Elements should be separated by blank line (#14137) (Thanks @xtqqczze!)</li>
-<li>Enable <code>IDE0031</code>: Null check can be simplified (#13548) (Thanks @xtqqczze!)</li>
-<li>Enable <code>CA1065</code>: Do not raise exceptions in unexpected locations (#14117) (Thanks @xtqqczze!)</li>
-<li>Enable <code>CA1000</code>: Do not declare <code>static</code> members on generic types (#14097) (Thanks @xtqqczze!)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Fixing formatting in `Reset-PWSHSystemPath.ps1` (#13689) (Thanks @dgoldman-msft!)
-
-### Tests
-
-- Reinstate `Test-Connection` tests (#13324)
-- Update markdown test packages with security fixes (#14145)
-
-### Build and Packaging Improvements
-
-<details>
-
-<ul>
-<li>Fix a typo in the <code>Get-ChangeLog</code> function (#14129)</li>
-<li>Update <code>README</code> and <code>metadata.json</code> for <code>7.2.0-preview.1</code> release (#14104)</li>
-<li>Bump <code>NJsonSchema</code> from <code>10.2.2</code> to <code>10.3.1</code> (#14040)</li>
-<li>Move windows package signing to use ESRP (#14060)</li>
-<li>Use one feed in each <code>nuget.config</code> in official builds (#14363)</li>
-<li>Fix path signed RPMs are uploaded from in release build (#14424)</li>
-<li>Add <code>Microsoft.PowerShell.MarkdownRender</code> to the package reference list (#14386)</li>
-<li>Fix issue with unsigned build (#14367)</li>
-<li>Move macOS and nuget to ESRP signing (#14324)</li>
-<li>Fix nuget packaging to scrub <code>NullableAttribute</code> (#14344)</li>
-<li>Bump <code>Microsoft.NET.Test.Sdk</code> from 16.8.0 to 16.8.3 (#14310)</li>
-<li>Bump <code>Markdig.Signed</code> from 0.22.0 to 0.22.1 (#14305)</li>
-<li>Bump <code>Microsoft.ApplicationInsights</code> from 2.15.0 to 2.16.0 (#14031)</li>
-<li>Move Linux to ESRP signing (#14210)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Fix example `nuget.config` (#14349)
-- Fix a broken link in Code Guidelines doc (#14314) (Thanks @iSazonov!)
-
-[7.2.0-preview.2]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.1...v7.2.0-preview.2
-
-## [7.2.0-preview.1] - 2020-11-17
-
-### Engine Updates and Fixes
-
-- Change the default fallback encoding for `GetEncoding` in `Start-Transcript` to be `UTF8` without a BOM (#13732) (Thanks @Gimly!)
-
-### General Cmdlet Updates and Fixes
-
-- Update `pwsh -?` output to match docs (#13748)
-- Fix `NullReferenceException` in `Test-Json` (#12942) (Thanks @iSazonov!)
-- Make `Dispose` in `TranscriptionOption` idempotent (#13839) (Thanks @krishnayalavarthi!)
-- Add additional Microsoft PowerShell modules to the tracked modules list (#12183)
-- Relax further `SSL` verification checks for `WSMan` on non-Windows hosts with verification available (#13786) (Thanks @jborean93!)
-- Add the `OutputTypeAttribute` to `Get-ExperimentalFeature` (#13738) (Thanks @ThomasNieto!)
-- Fix blocking wait when starting file associated with a Windows application (#13750)
-- Emit warning if `ConvertTo-Json` exceeds `-Depth` value (#13692)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@xtqqczze, @mkswd, @ThomasNieto, @PatLeong, @paul-cheung, @georgettica</p>
-
-</summary>
-
-<ul>
-<li>Fix RCS1049: Simplify boolean comparison (#13994) (Thanks @xtqqczze!)</li>
-<li>Enable IDE0062: Make local function static (#14044) (Thanks @xtqqczze!)</li>
-<li>Enable CA2207: Initialize value type static fields inline (#14068) (Thanks @xtqqczze!)</li>
-<li>Enable CA1837: Use <code>ProcessId</code> and <code>CurrentManagedThreadId</code> from <code>System.Environment</code> (#14063) (Thanks @xtqqczze and @PatLeong!)</li>
-<li>Remove unnecessary using directives (#14014, #14017, #14021, #14050, #14065, #14066, #13863, #13860, #13861, #13814) (Thanks @xtqqczze and @ThomasNieto!)</li>
-<li>Remove unnecessary usage of LINQ <code>Count</code> method (#13545) (Thanks @xtqqczze!)</li>
-<li>Fix SA1518: The code must not contain extra blank lines at the end of the file (#13574) (Thanks @xtqqczze!)</li>
-<li>Enable CA1829: Use the <code>Length</code> or <code>Count</code> property instead of <code>Count()</code> (#13925) (Thanks @xtqqczze!)</li>
-<li>Enable CA1827: Do not use <code>Count()</code> or <code>LongCount()</code> when <code>Any()</code> can be used (#13923) (Thanks @xtqqczze!)</li>
-<li>Enable or fix nullable usage in a few files (#13793, #13805, #13808, #14018, #13804) (Thanks @mkswd and @georgettica!)</li>
-<li>Enable IDE0040: Add accessibility modifiers (#13962, #13874) (Thanks @xtqqczze!)</li>
-<li>Make applicable private Guid fields readonly (#14000) (Thanks @xtqqczze!)</li>
-<li>Fix CA1003: Use generic event handler instances (#13937) (Thanks @xtqqczze!)</li>
-<li>Simplify delegate creation (#13578) (Thanks @xtqqczze!)</li>
-<li>Fix RCS1033: Remove redundant boolean literal (#13454) (Thanks @xtqqczze!)</li>
-<li>Fix RCS1221: Use pattern matching instead of combination of <code>as</code> operator and null check (#13333) (Thanks @xtqqczze!)</li>
-<li>Use <code>is not</code> syntax (#13338) (Thanks @xtqqczze!)</li>
-<li>Replace magic number with constant in PDH (#13536) (Thanks @xtqqczze!)</li>
-<li>Fix accessor order (#13538) (Thanks @xtqqczze!)</li>
-<li>Enable IDE0054: Use compound assignment (#13546) (Thanks @xtqqczze!)</li>
-<li>Fix RCS1098: Constant values should be on right side of comparisons (#13833) (Thanks @xtqqczze!)</li>
-<li>Enable CA1068: <code>CancellationToken</code> parameters must come last (#13867) (Thanks @xtqqczze!)</li>
-<li>Enable CA10XX rules with suggestion severity (#13870, #13928, #13924) (Thanks @xtqqczze!)</li>
-<li>Enable IDE0064: Make Struct fields writable (#13945) (Thanks @xtqqczze!)</li>
-<li>Run <code>dotnet-format</code> to improve formatting of source code (#13503) (Thanks @xtqqczze!)</li>
-<li>Enable CA1825: Avoid zero-length array allocations (#13961) (Thanks @xtqqczze!)</li>
-<li>Add IDE analyzer rule IDs to comments (#13960) (Thanks @xtqqczze!)</li>
-<li>Enable CA1830: Prefer strongly-typed <code>Append</code> and <code>Insert</code> method overloads on <code>StringBuilder</code> (#13926) (Thanks @xtqqczze!)</li>
-<li>Enforce code style in build (#13957) (Thanks @xtqqczze!)</li>
-<li>Enable CA1836: Prefer <code>IsEmpty</code> over <code>Count</code> when available (#13877) (Thanks @xtqqczze!)</li>
-<li>Enable CA1834: Consider using <code>StringBuilder.Append(char)</code> when applicable (#13878) (Thanks @xtqqczze!)</li>
-<li>Fix IDE0044: Make field readonly (#13884, #13885, #13888, #13892, #13889, #13886, #13890, #13891, #13887, #13893, #13969, #13967, #13968, #13970, #13971, #13966, #14012) (Thanks @xtqqczze!)</li>
-<li>Enable IDE0048: Add required parentheses (#13896) (Thanks @xtqqczze!)</li>
-<li>Enable IDE1005: Invoke delegate with conditional access (#13911) (Thanks @xtqqczze!)</li>
-<li>Enable IDE0036: Enable the check on the order of modifiers (#13958, #13881) (Thanks @xtqqczze!)</li>
-<li>Use span-based <code>String.Concat</code> instead of <code>String.Substring</code> (#13500) (Thanks @xtqqczze!)</li>
-<li>Enable CA1050: Declare types in namespace (#13872) (Thanks @xtqqczze!)</li>
-<li>Fix minor keyword typo in C# code comment (#13811) (Thanks @paul-cheung!)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Enable `CodeQL` Security scanning (#13894)
-- Add global `AnalyzerConfig` with default configuration (#13835) (Thanks @xtqqczze!)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@mkswd, @xtqqczze</p>
-
-</summary>
-
-<ul>
-<li>Bump <code>Microsoft.NET.Test.Sdk</code> to <code>16.8.0</code> (#14020)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.CSharp</code> to <code>3.8.0</code> (#14075)</li>
-<li>Remove workarounds for .NET 5 RTM builds (#14038)</li>
-<li>Migrate 3rd party signing to ESRP (#14010)</li>
-<li>Fixes to release pipeline for GA release (#14034)</li>
-<li>Don't do a shallow checkout (#13992)</li>
-<li>Add validation and dependencies for Ubuntu 20.04 distribution to packaging script (#13993)</li>
-<li>Add .NET install workaround for RTM (#13991)</li>
-<li>Move to ESRP signing for Windows files (#13988)</li>
-<li>Update <code>PSReadLine</code> version to <code>2.1.0</code> (#13975)</li>
-<li>Bump .NET to version <code>5.0.100-rtm.20526.5</code> (#13920)</li>
-<li>Update script to use .NET RTM feeds (#13927)</li>
-<li>Add checkout step to release build templates (#13840)</li>
-<li>Turn on <code>/features:strict</code> for all projects (#13383) (Thanks @xtqqczze!)</li>
-<li>Bump <code>NJsonSchema</code> to <code>10.2.2</code> (#13722, #13751)</li>
-<li>Add flag to make Linux script publish to production repo (#13714)</li>
-<li>Bump <code>Markdig.Signed</code> to <code>0.22.0</code> (#13741)</li>
-<li>Use new release script for Linux packages (#13705)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Fix links to LTS versions for Windows (#14070)
-- Fix `crontab` formatting in example doc (#13712) (Thanks @dgoldman-msft!)
-
-[7.2.0-preview.1]: https://github.com/PowerShell/PowerShell/compare/v7.1.0...v7.2.0-preview.1

From f8d6b2f9fefe8467061f04986644aa47c2d10038 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 9 Nov 2021 08:31:01 -0800
Subject: [PATCH 146/645] Update `metadata.json` in preparation on
 `7.3.0-preview.1` release (#16406)

* Update `metadata.json` in preparation on `7.3.0-preview.1` release

* Update PSVersion table and tests
---
 src/System.Management.Automation/engine/PSVersionInfo.cs | 3 ++-
 test/powershell/Host/PSVersionTable.Tests.ps1            | 2 +-
 test/powershell/Language/Scripting/Requires.Tests.ps1    | 2 +-
 tools/metadata.json                                      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/System.Management.Automation/engine/PSVersionInfo.cs b/src/System.Management.Automation/engine/PSVersionInfo.cs
index 39fa635e733..6c724a2132b 100644
--- a/src/System.Management.Automation/engine/PSVersionInfo.cs
+++ b/src/System.Management.Automation/engine/PSVersionInfo.cs
@@ -64,6 +64,7 @@ public static class PSVersionInfo
         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;
 
@@ -110,7 +111,7 @@ static PSVersionInfo()
             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_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_psV72Version, s_psVersion };
             s_psVersionTable[PSVersionInfo.SerializationVersionName] = new Version(InternalSerializer.DefaultVersion);
             s_psVersionTable[PSVersionInfo.PSRemotingProtocolVersionName] = RemotingConstants.ProtocolVersion;
             s_psVersionTable[PSVersionInfo.WSManStackVersionName] = GetWSManStackVersion();
diff --git a/test/powershell/Host/PSVersionTable.Tests.ps1 b/test/powershell/Host/PSVersionTable.Tests.ps1
index e691b7661be..3f6ccfcd8ba 100644
--- a/test/powershell/Host/PSVersionTable.Tests.ps1
+++ b/test/powershell/Host/PSVersionTable.Tests.ps1
@@ -23,7 +23,7 @@ Describe "PSVersionTable" -Tags "CI" {
             $unexpectectGitCommitIdPattern = $fullVersionPattern
         }
 
-        $powerShellVersions = "1.0", "2.0", "3.0", "4.0", "5.0", "5.1", "6.0", "6.1", "6.2", "7.0", "7.1", "7.2"
+        $powerShellVersions = "1.0", "2.0", "3.0", "4.0", "5.0", "5.1", "6.0", "6.1", "6.2", "7.0", "7.1", "7.2", "7.3"
         $powerShellCompatibleVersions = $PSVersionTable.PSCompatibleVersions |
             ForEach-Object {$_.ToString(2).SubString(0,3)}
     }
diff --git a/test/powershell/Language/Scripting/Requires.Tests.ps1 b/test/powershell/Language/Scripting/Requires.Tests.ps1
index d635f05a14e..4675a9ce864 100644
--- a/test/powershell/Language/Scripting/Requires.Tests.ps1
+++ b/test/powershell/Language/Scripting/Requires.Tests.ps1
@@ -41,7 +41,7 @@ Describe "Requires tests" -Tags "CI" {
         BeforeAll {
             $currentVersion = $PSVersionTable.PSVersion
 
-            $powerShellVersions = "1.0", "2.0", "3.0", "4.0", "5.0", "5.1", "6.0", "6.1", "6.2", "7.0", "7.1", "7.2"
+            $powerShellVersions = "1.0", "2.0", "3.0", "4.0", "5.0", "5.1", "6.0", "6.1", "6.2", "7.0", "7.1", "7.2", "7.3"
             $latestVersion = [version]($powerShellVersions | Sort-Object -Descending -Top 1)
             $nonExistingMinor = "$($latestVersion.Major).$($latestVersion.Minor + 1)"
             $nonExistingMajor = "$($latestVersion.Major + 1).0"
diff --git a/tools/metadata.json b/tools/metadata.json
index 398f492d4f3..94eb77b2cab 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -4,7 +4,7 @@
   "ServicingReleaseTag": "v7.0.8",
   "ReleaseTag": "v7.2.0",
   "LTSReleaseTag" : ["v7.0.8", "7.2.0"],
-  "NextReleaseTag": "v7.2.0-preview.11",
+  "NextReleaseTag": "v7.3.0-preview.1",
   "LTSRelease": { "Latest": false, "Package": false },
   "StableRelease":  { "Latest": false, "Package": false }
 }

From d1768536721b929b15faf5d08b3d5a5a96608a29 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 9 Nov 2021 09:23:26 -0800
Subject: [PATCH 147/645] Make static CI a matrix (#16397)

* move markdown lint tests

* move markdown link tests

* refactor static link analysis into a matrix

* cache yarn packages

* fix paramater name
---
 .vsts-ci/misc-analysis.yml                    | 116 ++++++------------
 .../misc-analysis/generateMarkdownMatrix.yml  |  46 +++++++
 .vsts-ci/misc-analysis/markdown.yml           |  63 ++++++++++
 .vsts-ci/misc-analysis/mdSpell.yml            |  56 +++++++++
 .../markdown-link.tests.ps1                   |  13 +-
 .../{markdown => markdown-lint}/.gitignore    |   0
 .../{markdown => markdown-lint}/gulpfile.js   |   0
 .../markdown.tests.ps1                        |   0
 .../{markdown => markdown-lint}/package.json  |   0
 .../{markdown => markdown-lint}/yarn.lock     |   0
 10 files changed, 214 insertions(+), 80 deletions(-)
 create mode 100644 .vsts-ci/misc-analysis/generateMarkdownMatrix.yml
 create mode 100644 .vsts-ci/misc-analysis/markdown.yml
 create mode 100644 .vsts-ci/misc-analysis/mdSpell.yml
 rename test/common/{markdown => markdown-link}/markdown-link.tests.ps1 (92%)
 rename test/common/{markdown => markdown-lint}/.gitignore (100%)
 rename test/common/{markdown => markdown-lint}/gulpfile.js (100%)
 rename test/common/{markdown => markdown-lint}/markdown.tests.ps1 (100%)
 rename test/common/{markdown => markdown-lint}/package.json (100%)
 rename test/common/{markdown => markdown-lint}/yarn.lock (100%)

diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index 5de5e28265a..e1f2d8ebfc6 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -27,83 +27,41 @@ variables:
   - name: repoFolder
     value: PowerShell
 
-jobs:
-- job: CI_Compliance
-  displayName: CI Compliance
-
-  pool:
-    vmImage: windows-latest
-
-  variables:
-    - name: repoPath
-      value: $(Agent.BuildDirectory)\$(repoFolder)
-
-  steps:
-  - checkout: self
-    clean: true
-    path: $(repoFolder)
-
-  - checkout: ComplianceRepo
-
-  - 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
+stages:
+- stage: Compliance
+  jobs:
+  - job: CI_Compliance
+    displayName: CI Compliance
+
+    pool:
+      vmImage: windows-latest
+
+    variables:
+      - name: repoPath
+        value: $(Agent.BuildDirectory)\$(repoFolder)
+
+    steps:
+    - checkout: self
+      clean: true
+      path: $(repoFolder)
+
+    - 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
+    parameters:
+      jobName: generateMatrix
+      taskName: matrixTask
+  - template: ./misc-analysis/markdown.yml
     parameters:
-      sourceScanPath: '$(repoPath)'
+      matrix: $[ dependencies.generateMatrix.outputs['matrixTask.matrix'] ]
+      dependsOn: generateMatrix
diff --git a/.vsts-ci/misc-analysis/generateMarkdownMatrix.yml b/.vsts-ci/misc-analysis/generateMarkdownMatrix.yml
new file mode 100644
index 00000000000..56a43accd55
--- /dev/null
+++ b/.vsts-ci/misc-analysis/generateMarkdownMatrix.yml
@@ -0,0 +1,46 @@
+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 }}
diff --git a/.vsts-ci/misc-analysis/markdown.yml b/.vsts-ci/misc-analysis/markdown.yml
new file mode 100644
index 00000000000..5266f90cb4d
--- /dev/null
+++ b/.vsts-ci/misc-analysis/markdown.yml
@@ -0,0 +1,63 @@
+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)'
diff --git a/.vsts-ci/misc-analysis/mdSpell.yml b/.vsts-ci/misc-analysis/mdSpell.yml
new file mode 100644
index 00000000000..e07b4756968
--- /dev/null
+++ b/.vsts-ci/misc-analysis/mdSpell.yml
@@ -0,0 +1,56 @@
+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)'
diff --git a/test/common/markdown/markdown-link.tests.ps1 b/test/common/markdown-link/markdown-link.tests.ps1
similarity index 92%
rename from test/common/markdown/markdown-link.tests.ps1
rename to test/common/markdown-link/markdown-link.tests.ps1
index 4339c0174ae..96c101afd4a 100644
--- a/test/common/markdown/markdown-link.tests.ps1
+++ b/test/common/markdown-link/markdown-link.tests.ps1
@@ -25,7 +25,18 @@ Describe "Verify Markdown Links" {
         Get-Job | Remove-Job -Force
     }
 
-    $groups = Get-ChildItem -Path "$PSScriptRoot\..\..\..\*.md" -Recurse | Where-Object {$_.DirectoryName -notlike '*node_modules*'} | Group-Object -Property directory
+    $gciParams = @{}
+    if ($env:MARKDOWN_FOLDER) {
+        $gciParams["Path"] = (Join-Path -Path $env:MARKDOWN_FOLDER -ChildPath '*.md')
+    } else {
+        $gciParams["Path"] = "$PSScriptRoot\..\..\..\*.md"
+    }
+
+    if ($env:MARKDOWN_RECURSE -ne 'False') {
+        $gciParams["Recurse"] = $true
+    }
+
+    $groups = Get-ChildItem @gciParams | Where-Object {$_.DirectoryName -notlike '*node_modules*'} | Group-Object -Property directory
 
     $jobs = @{}
     # start all link verification in parallel
diff --git a/test/common/markdown/.gitignore b/test/common/markdown-lint/.gitignore
similarity index 100%
rename from test/common/markdown/.gitignore
rename to test/common/markdown-lint/.gitignore
diff --git a/test/common/markdown/gulpfile.js b/test/common/markdown-lint/gulpfile.js
similarity index 100%
rename from test/common/markdown/gulpfile.js
rename to test/common/markdown-lint/gulpfile.js
diff --git a/test/common/markdown/markdown.tests.ps1 b/test/common/markdown-lint/markdown.tests.ps1
similarity index 100%
rename from test/common/markdown/markdown.tests.ps1
rename to test/common/markdown-lint/markdown.tests.ps1
diff --git a/test/common/markdown/package.json b/test/common/markdown-lint/package.json
similarity index 100%
rename from test/common/markdown/package.json
rename to test/common/markdown-lint/package.json
diff --git a/test/common/markdown/yarn.lock b/test/common/markdown-lint/yarn.lock
similarity index 100%
rename from test/common/markdown/yarn.lock
rename to test/common/markdown-lint/yarn.lock

From eac16e81676530610ae4dd53c404af42c27cf9d7 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 9 Nov 2021 10:21:16 -0800
Subject: [PATCH 148/645] Update `metadata.json` to make 7.2.0 the latest LTS
 (#16417)

---
 tools/metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/metadata.json b/tools/metadata.json
index 94eb77b2cab..cd0546d410f 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -3,7 +3,7 @@
   "PreviewReleaseTag": "v7.2.0-rc.1",
   "ServicingReleaseTag": "v7.0.8",
   "ReleaseTag": "v7.2.0",
-  "LTSReleaseTag" : ["v7.0.8", "7.2.0"],
+  "LTSReleaseTag" : ["v7.2.0", "v7.0.8"],
   "NextReleaseTag": "v7.3.0-preview.1",
   "LTSRelease": { "Latest": false, "Package": false },
   "StableRelease":  { "Latest": false, "Package": false }

From cc28dafa8a807c4982246bbbf6e44aec589592ad Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Tue, 9 Nov 2021 14:56:46 -0800
Subject: [PATCH 149/645] Fix typo for "privacy" in MSI installer (#16407)

---
 assets/wix/Product.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/wix/Product.wxs b/assets/wix/Product.wxs
index 3691f5268ca..bf6ab5d7cd8 100644
--- a/assets/wix/Product.wxs
+++ b/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 Priacy Statement</a>]]></Text>
+        <Text><![CDATA[<a href="https://aka.ms/PowerShell-Microsoft-Update-Privacy-Statement">Read the Microsoft Update Privacy Statement</a>]]></Text>
       </Control>
       <!-- divider and bottom buttons -->
       <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" TabSkip="yes"/>

From f2a42fb9644303ab382297b10efc5acc708966b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Nov 2021 15:48:06 -0800
Subject: [PATCH 150/645] Bump `Microsoft.ApplicationInsights` from `2.18.0` to
 `2.19.0` (#16413)

* Bump Microsoft.ApplicationInsights from 2.18.0 to 2.19.0

Bumps [Microsoft.ApplicationInsights](https://github.com/Microsoft/ApplicationInsights-dotnet) from 2.18.0 to 2.19.0.
- [Release notes](https://github.com/Microsoft/ApplicationInsights-dotnet/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-dotnet/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/ApplicationInsights-dotnet/compare/2.18.0...2.19.0)

---
updated-dependencies:
- dependency-name: Microsoft.ApplicationInsights
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update cgmanifest.json

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 cgmanifest.json                                                 | 2 +-
 .../System.Management.Automation.csproj                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cgmanifest.json b/cgmanifest.json
index 9ae862d6274..a38ea0b4ae2 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -35,7 +35,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.ApplicationInsights",
-          "Version": "2.18.0"
+          "Version": "2.19.0"
         }
       },
       "DevelopmentDependency": false
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index c7ba6db749d..bfb49b7998f 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -14,7 +14,7 @@
     <!-- 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.18.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.19.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" />

From 19b5647c0a03971bd1b3c7f3ad2ea2ce30e808f2 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Tue, 9 Nov 2021 17:30:56 -0800
Subject: [PATCH 151/645] Update `README.md` to specify gathered telemetry
 (#16379)

---
 .spelling            | 1 +
 .vsts-ci/linux.yml   | 2 ++
 .vsts-ci/mac.yml     | 2 ++
 .vsts-ci/windows.yml | 2 ++
 README.md            | 5 ++---
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.spelling b/.spelling
index e1347308644..6f15f6a56bd 100644
--- a/.spelling
+++ b/.spelling
@@ -15,6 +15,7 @@
 about_
 about_debuggers
 about_jobs
+about_Telemetry
 acl
 adamdriscoll
 add-localgroupmember
diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
index e4ddeaf27f8..38aea5a9450 100644
--- a/.vsts-ci/linux.yml
+++ b/.vsts-ci/linux.yml
@@ -36,6 +36,8 @@ pr:
     - test/perf/*
     - tools/releaseBuild/*
     - tools/releaseBuild/azureDevOps/templates/*
+    - README.md
+    - .spelling
 
 variables:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
diff --git a/.vsts-ci/mac.yml b/.vsts-ci/mac.yml
index 84d3d1ef02a..89ada776403 100644
--- a/.vsts-ci/mac.yml
+++ b/.vsts-ci/mac.yml
@@ -38,6 +38,8 @@ pr:
     - tools/packaging/*
     - tools/releaseBuild/*
     - tools/releaseBuild/azureDevOps/templates/*
+    - README.md
+    - .spelling
 
 variables:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
diff --git a/.vsts-ci/windows.yml b/.vsts-ci/windows.yml
index 70775761fba..f17a063998e 100644
--- a/.vsts-ci/windows.yml
+++ b/.vsts-ci/windows.yml
@@ -35,6 +35,8 @@ pr:
     - tools/packaging/*
     - tools/releaseBuild/*
     - tools/releaseBuild/azureDevOps/templates/*
+    - README.md
+    - .spelling
 
 variables:
   GIT_CONFIG_PARAMETERS: "'core.autocrlf=false'"
diff --git a/README.md b/README.md
index ad198f4feea..022b9b3253e 100644
--- a/README.md
+++ b/README.md
@@ -239,9 +239,8 @@ License: By requesting and using the Container OS Image for Windows containers,
 
 ### Telemetry
 
-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/).
+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.
 
 ## Governance
 

From 965dc8f40fd8a42d32ae1589d917f295fa9a7fb3 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Wed, 10 Nov 2021 03:26:14 +0100
Subject: [PATCH 152/645] Fix tab completion within the script block specified
 for the `ValidateScriptAttribute`. (#14550)

---
 .../engine/CommandCompletion/CompletionAnalysis.cs    | 11 ++++++++---
 .../Host/TabCompletion/TabCompletion.Tests.ps1        |  8 ++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index 76be6418805..18bd6cbed3d 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -1813,9 +1813,14 @@ private List<CompletionResult> GetResultForIdentifier(CompletionContext completi
                     }
                 }
             }
-
-            result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
-            if (result != null) return result;
+            if (completionContext.TokenAtCursor.TokenFlags == TokenFlags.MemberName)
+            {
+                result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
+                if (result is not null)
+                {
+                    return result;
+                }
+            }
 
             if ((tokenAtCursor.TokenFlags & TokenFlags.CommandName) != 0)
             {
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 67aa4bb5907..6513bd87253 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -1097,6 +1097,14 @@ Describe "TabCompletion" -Tags CI {
             $entry.CompletionText | Should -BeExactly "Mandatory"
         }
 
+        It "Test Attribute scriptblock completion" {
+            $inputStr = '[ValidateScript({Get-Child})]$Test=ls'
+            $res = TabExpansion2 -inputScript $inputStr -cursorColumn ($inputStr.IndexOf('}'))
+            $res.CompletionMatches | Should -HaveCount 1
+            $entry = $res.CompletionMatches | Where-Object CompletionText -EQ "Get-ChildItem"
+            $entry.CompletionText | Should -BeExactly "Get-ChildItem"
+        }
+
         It "Test completion with line continuation" {
             $inputStr = @'
 dir -Recurse `

From 23f701ca3c2f3f69a27a75d76df3de23fbf04305 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 10 Nov 2021 12:29:07 -0800
Subject: [PATCH 153/645] Update release instructions with link to new build
 (#16419)

---
 .../azureDevOps/releasePipeline.yml           | 29 ++++++++++++++---
 .../templates/release/approvalJob.yml         | 31 +++++++++++++++++++
 2 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml

diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index 7abb9792fe6..d68f7bbb629 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -231,11 +231,32 @@ stages:
   dependsOn:
     - PublishPackages
     - ChangesToMaster
+  variables:
+    # adds newPwshOrgName (exists in new and old org)
+    - group: PowerShellRelease
   jobs:
-  - deployment: ReleaseSnap
-    displayName: Release Snap
-    pool: server
-    environment: PSReleaseSnapRelease
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Start the release build
+      instructions: |
+        Start the snap pipeline at: https://dev.azure.com/$(newPwshOrgName)/PowerShell/_build?definitionId=49&_a=summary
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Approve the release
+      instructions: |
+        Once the build is finished, approve the release of all channels.
+
+- stage: ReleaseToMU
+  displayName: Release to MU
+  dependsOn:
+    - PublishPackages
+    - ChangesToMaster
+  jobs:
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Release to MU
+      instructions: |
+        Notify the PM team to start the process of releasing to MU.
 
 - stage: UpdateDotnetDocker
   dependsOn: GitHubManualTasks
diff --git a/tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml b/tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml
new file mode 100644
index 00000000000..8404e64e0ef
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml
@@ -0,0 +1,31 @@
+parameters:
+  - name: displayName
+    type: string
+  - name: instructions
+    type: string
+  - name: jobName
+    type: string
+    default: approval
+  - name: timeoutInMinutes
+    type: number
+    # 2 days
+    default: 2880
+  - name: onTimeout
+    type: string
+    default: 'reject'
+    values:
+        - resume
+        - reject
+
+jobs:
+  - job: ${{ parameters.jobName }}
+    displayName: ${{ parameters.displayName }}
+    pool: server
+    timeoutInMinutes: 4320 # job times out in 3 days
+    steps:
+    - task: ManualValidation@0
+      displayName: ${{ parameters.displayName }}
+      timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+      inputs:
+        instructions: ${{ parameters.instructions }}
+        onTimeout: ${{ parameters.onTimeout }}

From 9cb33d48a8bc99d0592665a9c3337710ec1fd716 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 10 Nov 2021 13:00:18 -0800
Subject: [PATCH 154/645] Remove pre-release .NET 6 build sources (#16418)

* Remove pre-release .NET 6 build sources

* Update nuget.config
---
 DotnetRuntimeMetadata.json | 6 +++---
 nuget.config               | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 1b95abccd68..96adaddc003 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -6,10 +6,10 @@
     "packageVersionPattern": "6.0.0",
     "sdkImageVersion": "6.0.100",
     "nextChannel": "6.0.1xx",
-    "azureFeed": "https://dotnetstage.blob.core.windows.net/6-0-100-rtm-21527-11-public",
-    "sdkImageOverride": "6.0.100-rtm.21527.11"
+    "azureFeed": "",
+    "sdkImageOverride": ""
   },
   "internalfeed" : {
-    "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rtm.21527.11-shipping/nuget/v2"
+    "url": ""
   }
 }
diff --git a/nuget.config b/nuget.config
index cf9fec6fb1e..5a541e6ff31 100644
--- a/nuget.config
+++ b/nuget.config
@@ -2,9 +2,7 @@
 <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-rtm.21524.1-shipping/nuget/v2" />
   </packageSources>
   <disabledPackageSources>
     <clear />

From 292c63430bb69a1eb327f8ba30592f5b4dcb8dcf Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 10 Nov 2021 13:09:28 -0800
Subject: [PATCH 155/645] Add import so we can use common GitHub workflow
 function. (#16433)

* Update daily.yml

* Update daily.yml

* try changing error action (#16435)

* Add exit 0 (#16436)
---
 .github/workflows/daily.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 55b7ba38f45..87ea7725cb9 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -72,14 +72,17 @@ jobs:
           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

From a090b9eb5fb57ba22e998a46583cfd55a0da2fa9 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 10 Nov 2021 13:34:29 -0800
Subject: [PATCH 156/645] use different containers for different branches
 (#16434)

---
 .../templates/compliance/generateNotice.yml    | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
index 9b726b2b215..3002c18bdb4 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
@@ -24,6 +24,22 @@ jobs:
   - checkout: self
     clean: true
 
+  - pwsh: |
+      [string]$Branch=$env:BUILD_SOURCEBRANCH
+      $branchOnly = $Branch -replace '^refs/heads/';
+      $branchOnly = $branchOnly -replace '[_\-]'
+
+      if ($branchOnly -eq 'master') {
+        $container = 'tpn'
+      } else {
+        $container = "tpn-$branchOnly"
+      }
+
+      $vstsCommandString = "vso[task.setvariable variable=tpnContainer]$container"
+      Write-Verbose -Message $vstsCommandString -Verbose
+      Write-Host -Object "##$vstsCommandString"
+    displayName: Set ContainerName
+
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
@@ -58,7 +74,7 @@ jobs:
       azureSubscription: '$(AzureFileCopySubscription)'
       Destination: AzureBlob
       storage: '$(StorageAccount)'
-      ContainerName: 'tpn'
+      ContainerName: $(tpnContainer)
       resourceGroup: '$(StorageResourceGroup)'
 
   - task: PublishPipelineArtifact@1

From 7dc4587014bfa22919c933607bf564f0ba53db2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Nov 2021 11:58:58 -0800
Subject: [PATCH 157/645] Bump Microsoft.CodeAnalysis.CSharp from 4.0.0-6.final
 to 4.0.1 (#16423)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 cgmanifest.json                                               | 4 ++--
 .../Microsoft.PowerShell.Commands.Utility.csproj              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cgmanifest.json b/cgmanifest.json
index a38ea0b4ae2..30a342907d8 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -65,7 +65,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Common",
-          "Version": "4.0.0-6.final"
+          "Version": "4.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -75,7 +75,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.CSharp",
-          "Version": "4.0.0-6.final"
+          "Version": "4.0.1"
         }
       },
       "DevelopmentDependency": false
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index bff5cc802d0..bd73e6c005b 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-6.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
     <PackageReference Include="System.Threading.AccessControl" Version="6.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
     <PackageReference Include="NJsonSchema" Version="10.5.2" />

From 306147c9d1ec0472e977cff3cbfcd6af43477dd4 Mon Sep 17 00:00:00 2001
From: Sean Wheeler <sean.wheeler@microsoft.com>
Date: Sat, 13 Nov 2021 00:14:28 -0600
Subject: [PATCH 158/645] Update HelpInfoUri for 7.2 release (#16456)

---
 .../Microsoft.PowerShell.Host.psd1             |  2 +-
 .../Microsoft.PowerShell.Management.psd1       |  2 +-
 .../Microsoft.PowerShell.Security.psd1         |  2 +-
 .../Microsoft.PowerShell.Utility.psd1          |  2 +-
 src/Modules/Windows/CimCmdlets/CimCmdlets.psd1 |  2 +-
 .../Microsoft.PowerShell.Diagnostics.psd1      |  2 +-
 .../Microsoft.PowerShell.Management.psd1       |  2 +-
 .../Microsoft.PowerShell.Security.psd1         |  2 +-
 .../Microsoft.PowerShell.Utility.psd1          |  2 +-
 .../Microsoft.WSMan.Management.psd1            |  2 +-
 .../Windows/PSDiagnostics/PSDiagnostics.psd1   |  2 +-
 .../help/UpdatableHelpCommandBase.cs           | 18 +++++++++---------
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/Modules/Shared/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1 b/src/Modules/Shared/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1
index 0270ceffca0..53e9bc579cf 100644
--- a/src/Modules/Shared/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1
+++ b/src/Modules/Shared/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1
@@ -10,5 +10,5 @@ FunctionsToExport = @()
 CmdletsToExport="Start-Transcript", "Stop-Transcript"
 AliasesToExport = @()
 NestedModules="Microsoft.PowerShell.ConsoleHost.dll"
-HelpInfoURI = 'https://aka.ms/powershell71-help'
+HelpInfoURI = 'https://aka.ms/powershell72-help'
 }
diff --git a/src/Modules/Unix/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 b/src/Modules/Unix/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1
index da8f8707945..8d4d985b4bd 100644
--- a/src/Modules/Unix/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1
+++ b/src/Modules/Unix/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1
@@ -7,7 +7,7 @@ ModuleVersion="7.0.0.0"
 CompatiblePSEditions = @("Core")
 PowerShellVersion="3.0"
 NestedModules="Microsoft.PowerShell.Commands.Management.dll"
-HelpInfoURI = 'https://aka.ms/powershell71-help'
+HelpInfoURI = 'https://aka.ms/powershell72-help'
 FunctionsToExport = @()
 AliasesToExport = @("gcb", "gtz", "scb")
 CmdletsToExport=@("Add-Content",
diff --git a/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 b/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
index 1f4cc15e118..9c9f97884a3 100644
--- a/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
+++ b/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
@@ -10,5 +10,5 @@ FunctionsToExport = @()
 CmdletsToExport="Get-Credential", "Get-ExecutionPolicy", "Set-ExecutionPolicy", "ConvertFrom-SecureString", "ConvertTo-SecureString", "Get-PfxCertificate" , "Protect-CmsMessage", "Unprotect-CmsMessage", "Get-CmsMessage"
 AliasesToExport = @()
 NestedModules="Microsoft.PowerShell.Security.dll"
-HelpInfoURI = 'https://aka.ms/powershell71-help'
+HelpInfoURI = 'https://aka.ms/powershell72-help'
 }
diff --git a/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 b/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
index b883acdd0d6..31251c32bc6 100644
--- a/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
+++ b/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
@@ -30,7 +30,7 @@ CmdletsToExport = @(
 FunctionsToExport = @()
 AliasesToExport = @('fhx')
 NestedModules = @("Microsoft.PowerShell.Commands.Utility.dll")
-HelpInfoURI = 'https://aka.ms/powershell71-help'
+HelpInfoURI = 'https://aka.ms/powershell72-help'
 PrivateData = @{
   PSData = @{
     ExperimentalFeatures = @(
diff --git a/src/Modules/Windows/CimCmdlets/CimCmdlets.psd1 b/src/Modules/Windows/CimCmdlets/CimCmdlets.psd1
index 4b38d4abc9e..23dc31d37ab 100644
--- a/src/Modules/Windows/CimCmdlets/CimCmdlets.psd1
+++ b/src/Modules/Windows/CimCmdlets/CimCmdlets.psd1
@@ -14,5 +14,5 @@ CmdletsToExport= "Get-CimAssociatedInstance", "Get-CimClass", "Get-CimInstance",
     "Remove-CimSession","Set-CimInstance",
     "Export-BinaryMiLog","Import-BinaryMiLog"
 AliasesToExport = "gcim","scim","ncim", "rcim","icim","gcai","rcie","ncms","rcms","gcms","ncso","gcls"
-HelpInfoUri="https://aka.ms/powershell71-help"
+HelpInfoUri="https://aka.ms/powershell72-help"
 }
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1 b/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1
index ed2344b51b2..dba4f4a583d 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1
@@ -12,5 +12,5 @@ AliasesToExport = @()
 NestedModules="Microsoft.PowerShell.Commands.Diagnostics.dll"
 TypesToProcess="GetEvent.types.ps1xml"
 FormatsToProcess="Event.format.ps1xml", "Diagnostics.format.ps1xml"
-HelpInfoURI = 'https://aka.ms/powershell71-help'
+HelpInfoURI = 'https://aka.ms/powershell72-help'
 }
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 b/src/Modules/Windows/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1
index f7cd1dc6ace..1afafd7563b 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1
@@ -7,7 +7,7 @@ ModuleVersion="7.0.0.0"
 CompatiblePSEditions = @("Core")
 PowerShellVersion="3.0"
 NestedModules="Microsoft.PowerShell.Commands.Management.dll"
-HelpInfoURI = 'https://aka.ms/powershell71-help'
+HelpInfoURI = 'https://aka.ms/powershell72-help'
 FunctionsToExport = @()
 AliasesToExport = @("gcb", "gin", "gtz", "scb", "stz")
 CmdletsToExport=@("Add-Content",
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 b/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
index cbc5b2dc78e..a414ddd8318 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
@@ -10,5 +10,5 @@ FunctionsToExport = @()
 CmdletsToExport="Get-Acl", "Set-Acl", "Get-PfxCertificate", "Get-Credential", "Get-ExecutionPolicy", "Set-ExecutionPolicy", "Get-AuthenticodeSignature", "Set-AuthenticodeSignature", "ConvertFrom-SecureString", "ConvertTo-SecureString", "Get-CmsMessage", "Unprotect-CmsMessage", "Protect-CmsMessage" , "New-FileCatalog" , "Test-FileCatalog"
 AliasesToExport = @()
 NestedModules="Microsoft.PowerShell.Security.dll"
-HelpInfoURI = 'https://aka.ms/powershell71-help'
+HelpInfoURI = 'https://aka.ms/powershell72-help'
 }
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 b/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
index 5ea504197fa..66002121d93 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
@@ -29,7 +29,7 @@ CmdletsToExport = @(
 FunctionsToExport = @()
 AliasesToExport = @('fhx')
 NestedModules = @("Microsoft.PowerShell.Commands.Utility.dll")
-HelpInfoURI = 'https://aka.ms/powershell71-help'
+HelpInfoURI = 'https://aka.ms/powershell72-help'
 PrivateData = @{
   PSData = @{
     ExperimentalFeatures = @(
diff --git a/src/Modules/Windows/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1 b/src/Modules/Windows/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1
index d2bb2398541..b95bca7f2f4 100644
--- a/src/Modules/Windows/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1
+++ b/src/Modules/Windows/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1
@@ -11,5 +11,5 @@ CmdletsToExport="Disable-WSManCredSSP", "Enable-WSManCredSSP", "Get-WSManCredSSP
 AliasesToExport = @()
 NestedModules="Microsoft.WSMan.Management.dll"
 FormatsToProcess="WSMan.format.ps1xml"
-HelpInfoURI = 'https://aka.ms/powershell71-help'
+HelpInfoURI = 'https://aka.ms/powershell72-help'
 }
diff --git a/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psd1 b/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psd1
index dded04d4920..95726e946fb 100644
--- a/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psd1
+++ b/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psd1
@@ -10,5 +10,5 @@
     FunctionsToExport="Disable-PSTrace","Disable-PSWSManCombinedTrace","Disable-WSManTrace","Enable-PSTrace","Enable-PSWSManCombinedTrace","Enable-WSManTrace","Get-LogProperties","Set-LogProperties","Start-Trace","Stop-Trace"
     CmdletsToExport = @()
     AliasesToExport = @()
-    HelpInfoUri="https://aka.ms/powershell71-help"
+    HelpInfoUri="https://aka.ms/powershell72-help"
 }
diff --git a/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs b/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
index 49d1e67e5d9..a003bfba1ec 100644
--- a/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
+++ b/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
@@ -166,22 +166,22 @@ private void HandleProgressChanged(object sender, UpdatableHelpProgressEventArgs
         /// <summary>
         /// Static constructor
         ///
-        /// NOTE: FWLinks for core PowerShell modules are needed since they get loaded as snapins in a Remoting Endpoint.
+        /// NOTE: HelpInfoUri for core PowerShell modules are needed since they get loaded as snapins in a Remoting Endpoint.
         /// When we moved to modules in V3, we were not able to make this change as it was a risky change to make at that time.
         /// </summary>
         static UpdatableHelpCommandBase()
         {
             s_metadataCache = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
-            // TODO: assign real TechNet addresses
+            // NOTE: The HelpInfoUri must be updated with each release.
 
-            s_metadataCache.Add("Microsoft.PowerShell.Diagnostics", "https://aka.ms/powershell71-help");
-            s_metadataCache.Add("Microsoft.PowerShell.Core", "https://aka.ms/powershell71-help");
-            s_metadataCache.Add("Microsoft.PowerShell.Utility", "https://aka.ms/powershell71-help");
-            s_metadataCache.Add("Microsoft.PowerShell.Host", "https://aka.ms/powershell71-help");
-            s_metadataCache.Add("Microsoft.PowerShell.Management", "https://aka.ms/powershell71-help");
-            s_metadataCache.Add("Microsoft.PowerShell.Security", "https://aka.ms/powershell71-help");
-            s_metadataCache.Add("Microsoft.WSMan.Management", "https://aka.ms/powershell71-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Diagnostics", "https://aka.ms/powershell72-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Core", "https://aka.ms/powershell72-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Utility", "https://aka.ms/powershell72-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Host", "https://aka.ms/powershell72-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Management", "https://aka.ms/powershell72-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Security", "https://aka.ms/powershell72-help");
+            s_metadataCache.Add("Microsoft.WSMan.Management", "https://aka.ms/powershell72-help");
         }
 
         /// <summary>

From 4f86b079d0742bdea1823715bccfb8b056e5d185 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Tue, 16 Nov 2021 01:55:40 +0900
Subject: [PATCH 159/645] Fix typo in Job.cs (#16454)

---
 src/System.Management.Automation/engine/remoting/client/Job.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/remoting/client/Job.cs b/src/System.Management.Automation/engine/remoting/client/Job.cs
index 6c7efa68f28..26778bfea5f 100644
--- a/src/System.Management.Automation/engine/remoting/client/Job.cs
+++ b/src/System.Management.Automation/engine/remoting/client/Job.cs
@@ -3226,7 +3226,7 @@ protected virtual void HandleOperationComplete(object sender, OperationStateEven
             // no pipeline is created and no pipeline state changed event is raised.
             // We can wait for throttle complete, but it is raised only when all the
             // operations are completed and this means that status of job is not updated
-            // untill Operation Complete.
+            // until Operation Complete.
             ExecutionCmdletHelper helper = sender as ExecutionCmdletHelper;
             Dbg.Assert(helper != null, "Sender of OperationComplete has to be ExecutionCmdletHelper");
 

From fd4117e14552b6a8fa0bef6cc3c34bc67d4f8f0e Mon Sep 17 00:00:00 2001
From: Robert Prust <robert@powershellpr0mpt.com>
Date: Mon, 15 Nov 2021 21:01:01 +0100
Subject: [PATCH 160/645] Update `README.md` about the change logs (#16471)

include changelog for 7.2
---
 CHANGELOG/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG/README.md b/CHANGELOG/README.md
index 83efcb0fed5..60ae3af38c4 100644
--- a/CHANGELOG/README.md
+++ b/CHANGELOG/README.md
@@ -1,6 +1,7 @@
 # Changelogs
 
 * [Current preview changelog](preview.md)
+* [7.2 changelog](7.2.md)
 * [7.1 changelog](7.1.md)
 * [7.0 changelog](7.0.md)
 * [6.2 changelog](6.2.md)

From a8e3183540d51289260382b9e6c478b30ada2cff Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Fri, 19 Nov 2021 15:30:25 -0800
Subject: [PATCH 161/645] Add
 `[Microsoft.PowerShell.Commands.SetStrictModeCommand.ArgumentToPSVersionTransformationAttribute]`
 to list of patterns to remove for generated ref assembly (#16489)

---
 tools/packaging/packaging.psm1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 5d24276308b..89ec69d4b50 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -2291,6 +2291,7 @@ function CleanupGeneratedSourceCode
         '[System.Runtime.CompilerServices.NullableAttribute((byte)0)]'
         '[System.Runtime.CompilerServices.NullableAttribute(new byte[]{ (byte)2, (byte)1, (byte)1})]'
         '[System.Runtime.CompilerServices.AsyncStateMachineAttribute'
+        '[Microsoft.PowerShell.Commands.SetStrictModeCommand.ArgumentToPSVersionTransformationAttribute]'
         )
 
     $patternsToReplace = @(

From 7bb8fa16abdbfb6d2610402491860c1feff9154e Mon Sep 17 00:00:00 2001
From: Shri Ram K S <30629012+Shriram0908@users.noreply.github.com>
Date: Sat, 20 Nov 2021 05:18:26 +0530
Subject: [PATCH 162/645] Fix the `Max_PATH` condition check to handle long
 path correctly (#16487)

---
 .../namespaces/FileSystemProvider.cs          |  2 +-
 .../Get-ChildItem.Tests.ps1                   | 32 ++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index 37229a18db4..1e3ab21ccaf 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -8260,7 +8260,7 @@ internal static bool IsReparsePointLikeSymlink(FileSystemInfo fileInfo)
 
             WIN32_FIND_DATA data = default;
             string fullPath = Path.TrimEndingDirectorySeparator(fileInfo.FullName);
-            if (fullPath.Length > MAX_PATH)
+            if (fullPath.Length >= MAX_PATH)
             {
                 fullPath = PathUtils.EnsureExtendedPrefix(fullPath);
             }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
index 0dafa6f31de..5059928f322 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
@@ -6,6 +6,7 @@ Describe "Get-ChildItem" -Tags "CI" {
 
         BeforeAll {
             # Create Test data
+            $max_Path = 260
             $item_a = "a3fe710a-31af-4834-bc29-d0b584589838"
             $item_B = "B1B691A9-B7B1-4584-AED7-5259511BEEC4"
             $item_c = "c283d143-2116-4809-bf11-4f7d61613f92"
@@ -13,6 +14,9 @@ Describe "Get-ChildItem" -Tags "CI" {
             $item_E = "EE150FEB-0F21-4AFF-8066-AF59E925810C"
             $item_F = ".F81D8514-8862-4227-B041-0529B1656A43"
             $item_G = "5560A62F-74F1-4FAE-9A23-F4EBD90D2676"
+            $item_H = "5f05ebca-4859-11ec-81d3-0242ac130003"
+            $item_I = "z" * ($max_Path - $TestDrive.FullName.Length - $item_H.Length - 2)
+            $item_J = "32d74aae-9054-4fa7-be97-8c806d10e8b9"
             $null = New-Item -Path $TestDrive -Name $item_a -ItemType "File" -Force
             $null = New-Item -Path $TestDrive -Name $item_B -ItemType "File" -Force
             $null = New-Item -Path $TestDrive -Name $item_c -ItemType "File" -Force
@@ -20,6 +24,7 @@ Describe "Get-ChildItem" -Tags "CI" {
             $null = New-Item -Path $TestDrive -Name $item_E -ItemType "Directory" -Force
             $null = New-Item -Path $TestDrive -Name $item_F -ItemType "File" -Force | ForEach-Object {$_.Attributes = "hidden"}
             $null = New-Item -Path (Join-Path -Path $TestDrive -ChildPath $item_E) -Name $item_G -ItemType "File" -Force
+            $null = New-Item -Path $TestDrive\$item_I\$item_H -Name $item_J -ItemType "Directory" -Force
 
             $searchRoot = Join-Path $TestDrive -ChildPath "TestPS"
             $file1 = Join-Path $searchRoot -ChildPath "D1" -AdditionalChildPath "File1.txt"
@@ -103,16 +108,17 @@ Describe "Get-ChildItem" -Tags "CI" {
         It "Should list files in sorted order" {
             $files = Get-ChildItem -Path $TestDrive
             $files[0].Name     | Should -Be $item_E
-            $files[1].Name     | Should -Be $item_a
-            $files[2].Name     | Should -Be $item_B
-            $files[3].Name     | Should -Be $item_c
-            $files[4].Name     | Should -Be $item_D
+            $files[1].Name     | Should -Be $item_I
+            $files[2].Name     | Should -Be $item_a
+            $files[3].Name     | Should -Be $item_B
+            $files[4].Name     | Should -Be $item_c
+            $files[5].Name     | Should -Be $item_D
         }
 
         It "Should list hidden files as well when 'Force' parameter is used" {
             $files = Get-ChildItem -Path $TestDrive -Force
             $files | Should -Not -BeNullOrEmpty
-            $files.Count | Should -Be 6
+            $files.Count | Should -Be 7
             $files.Name.Contains($item_F) | Should -BeTrue
         }
 
@@ -130,22 +136,22 @@ Describe "Get-ChildItem" -Tags "CI" {
         }
 
         It "Should list items in current directory only with depth set to 0" {
-            (Get-ChildItem -Path $TestDrive -Depth 0).Count | Should -Be 5
-            (Get-ChildItem -Path $TestDrive -Depth 0 -Include *).Count | Should -Be 5
-            (Get-ChildItem -Path $TestDrive -Depth 0 -Exclude IntentionallyNonexistent).Count | Should -Be 5
+            (Get-ChildItem -Path $TestDrive -Depth 0).Count | Should -Be 6
+            (Get-ChildItem -Path $TestDrive -Depth 0 -Include *).Count | Should -Be 6
+            (Get-ChildItem -Path $TestDrive -Depth 0 -Exclude IntentionallyNonexistent).Count | Should -Be 6
         }
 
         It "Should return items recursively when using 'Include' or 'Exclude' parameters" {
-            (Get-ChildItem -Path $TestDrive -Depth 1).Count | Should -Be 6
+            (Get-ChildItem -Path $TestDrive -Depth 1).Count | Should -Be 8
             (Get-ChildItem -Path $TestDrive -Depth 1 -Include $item_G).Count | Should -Be 1
-            (Get-ChildItem -Path $TestDrive -Depth 1 -Exclude $item_a).Count | Should -Be 5
+            (Get-ChildItem -Path $TestDrive -Depth 1 -Exclude $item_a).Count | Should -Be 7
         }
 
         It "Should return items recursively when using 'Include' or 'Exclude' parameters with -LiteralPath" {
             (Get-ChildItem -LiteralPath $TestDrive -Recurse -Exclude *).Count | Should -Be 0
             (Get-ChildItem -LiteralPath $TestDrive -Recurse -Include *.dll).Count | Should -Be (Get-ChildItem $TestDrive -Recurse -Include *.dll).Count
             (Get-ChildItem -LiteralPath $TestDrive -Depth 1 -Include $item_G).Count | Should -Be 1
-            (Get-ChildItem -LiteralPath $TestDrive -Depth 1 -Exclude $item_a).Count | Should -Be 5
+            (Get-ChildItem -LiteralPath $TestDrive -Depth 1 -Exclude $item_a).Count | Should -Be 7
         }
 
         It "get-childitem path wildcard - <title>" -TestCases $PathWildCardTestCases {
@@ -207,6 +213,10 @@ Describe "Get-ChildItem" -Tags "CI" {
                 Set-Location $oldLocation
             }
         }
+
+        It "Should list the folder present when path length equal to MAX_PATH" {
+            (Get-ChildItem -Path TestDrive:\$item_I -Recurse -Force).Name.Length | Should -BeGreaterThan 0
+        }
     }
 
     Context 'Env: Provider' {

From 88ba3f61fa4f8388cb98533563d190d8fcb6c55b Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 22 Nov 2021 10:44:58 -0800
Subject: [PATCH 163/645] Use the same temporary home directory when 'HOME' env
 variable is not set (#16263)

---
 .../host/msh/ConsoleHost.cs                   |   9 +-
 .../CoreCLR/CorePsPlatform.cs                 | 298 +++++-------------
 .../DscSupport/CimDSCParser.cs                |   4 +-
 .../engine/hostifaces/LocalConnection.cs      |   4 +-
 .../security/SecurityManager.cs               |   7 +-
 .../utils/PsUtils.cs                          |  25 --
 test/powershell/Host/ConsoleHost.Tests.ps1    |  14 +
 7 files changed, 105 insertions(+), 256 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
index c2206ac7de8..56492bc7e45 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -16,6 +16,7 @@
 using System.Management.Automation.Internal;
 using System.Management.Automation.Language;
 using System.Management.Automation.Remoting;
+using System.Management.Automation.Remoting.Server;
 using System.Management.Automation.Runspaces;
 using System.Management.Automation.Tracing;
 using System.Reflection;
@@ -193,7 +194,7 @@ internal static int Start(string bannerText, string helpText)
                 {
                     ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("ServerMode");
                     ProfileOptimization.StartProfile("StartupProfileData-ServerMode");
-                    System.Management.Automation.Remoting.Server.StdIOProcessMediator.Run(
+                    StdIOProcessMediator.Run(
                         initialCommand: s_cpp.InitialCommand,
                         workingDirectory: s_cpp.WorkingDirectory,
                         configurationName: null);
@@ -203,7 +204,7 @@ internal static int Start(string bannerText, string helpText)
                 {
                     ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("SSHServer");
                     ProfileOptimization.StartProfile("StartupProfileData-SSHServerMode");
-                    System.Management.Automation.Remoting.Server.StdIOProcessMediator.Run(
+                    StdIOProcessMediator.Run(
                         initialCommand: s_cpp.InitialCommand,
                         workingDirectory: null,
                         configurationName: null);
@@ -213,7 +214,7 @@ internal static int Start(string bannerText, string helpText)
                 {
                     ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("NamedPipe");
                     ProfileOptimization.StartProfile("StartupProfileData-NamedPipeServerMode");
-                    System.Management.Automation.Remoting.RemoteSessionNamedPipeServer.RunServerMode(
+                    RemoteSessionNamedPipeServer.RunServerMode(
                         configurationName: s_cpp.ConfigurationName);
                     exitCode = 0;
                 }
@@ -221,7 +222,7 @@ internal static int Start(string bannerText, string helpText)
                 {
                     ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("SocketServerMode");
                     ProfileOptimization.StartProfile("StartupProfileData-SocketServerMode");
-                    System.Management.Automation.Remoting.Server.HyperVSocketMediator.Run(
+                    HyperVSocketMediator.Run(
                         initialCommand: s_cpp.InitialCommand,
                         configurationName: s_cpp.ConfigurationName);
                     exitCode = 0;
diff --git a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
index dd0877710d6..45be8721b7f 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
@@ -5,9 +5,8 @@
 using System.ComponentModel;
 using System.IO;
 using System.Runtime.InteropServices;
-
+using System.Management.Automation.Internal;
 using Microsoft.Win32;
-using Microsoft.Win32.SafeHandles;
 
 namespace System.Management.Automation
 {
@@ -161,6 +160,7 @@ public static bool IsStaSupported
         // Gets the location for cache and config folders.
         internal static readonly string CacheDirectory = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Microsoft\PowerShell";
         internal static readonly string ConfigDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + @"\PowerShell";
+
         private static readonly Lazy<bool> _isStaSupported = new Lazy<bool>(() =>
         {
             // See objbase.h
@@ -199,8 +199,6 @@ public static bool IsStaSupported
             "WSMan.format.ps1xml"
         };
 
-        private static string _tempDirectory = null;
-
         /// <summary>
         /// Some common environment variables used in PS have different
         /// names in different OS platforms.
@@ -214,43 +212,37 @@ internal static class CommonEnvVariableNames
 #endif
         }
 
+#if UNIX
+        private static string s_tempHome = null;
+
         /// <summary>
-        /// Remove the temporary directory created for the current process.
+        /// Get the 'HOME' environment variable or create a temporary home diretory if the environment variable is not set.
         /// </summary>
-        internal static void RemoveTemporaryDirectory()
+        private static string GetHomeOrCreateTempHome()
         {
-            if (_tempDirectory == null)
+            const string tempHomeFolderName = "pwsh-{0}-98288ff9-5712-4a14-9a11-23693b9cd91a";
+
+            string envHome = Environment.GetEnvironmentVariable("HOME") ?? s_tempHome;
+            if (envHome is not null)
             {
-                return;
+                return envHome;
             }
 
             try
             {
-                Directory.Delete(_tempDirectory, true);
+                s_tempHome = Path.Combine(Path.GetTempPath(), StringUtil.Format(tempHomeFolderName, Environment.UserName));
+                Directory.CreateDirectory(s_tempHome);
             }
-            catch
-            {
-                // ignore if there is a failure
-            }
-
-            _tempDirectory = null;
-        }
-
-        /// <summary>
-        /// Get a temporary directory to use for the current process.
-        /// </summary>
-        internal static string GetTemporaryDirectory()
-        {
-            if (_tempDirectory != null)
+            catch (UnauthorizedAccessException)
             {
-                return _tempDirectory;
+                // Directory creation may fail if the account doesn't have filesystem permission such as some service accounts.
+                // Return an empty string in this case so the process working directory will be used.
+                s_tempHome = string.Empty;
             }
 
-            _tempDirectory = PsUtils.GetTemporaryDirectory();
-            return _tempDirectory;
+            return s_tempHome;
         }
 
-#if UNIX
         /// <summary>
         /// X Desktop Group configuration type enum.
         /// </summary>
@@ -270,230 +262,100 @@ public enum XDG_Type
             DEFAULT
         }
 
-        private static string s_tempHomeDir = null;
-
         /// <summary>
         /// Function for choosing directory location of PowerShell for profile loading.
         /// </summary>
-        public static string SelectProductNameForDirectory(Platform.XDG_Type dirpath)
+        public static string SelectProductNameForDirectory(XDG_Type dirpath)
         {
             // TODO: XDG_DATA_DIRS implementation as per GitHub issue #1060
 
-            string xdgconfighome = System.Environment.GetEnvironmentVariable("XDG_CONFIG_HOME");
-            string xdgdatahome = System.Environment.GetEnvironmentVariable("XDG_DATA_HOME");
-            string xdgcachehome = System.Environment.GetEnvironmentVariable("XDG_CACHE_HOME");
-            string envHome = System.Environment.GetEnvironmentVariable(CommonEnvVariableNames.Home);
-            if (envHome == null)
-            {
-                s_tempHomeDir ??= GetTemporaryDirectory();
-                envHome = s_tempHomeDir;
-            }
+            string xdgconfighome = Environment.GetEnvironmentVariable("XDG_CONFIG_HOME");
+            string xdgdatahome = Environment.GetEnvironmentVariable("XDG_DATA_HOME");
+            string xdgcachehome = Environment.GetEnvironmentVariable("XDG_CACHE_HOME");
+            string envHome = GetHomeOrCreateTempHome();
 
             string xdgConfigHomeDefault = Path.Combine(envHome, ".config", "powershell");
             string xdgDataHomeDefault = Path.Combine(envHome, ".local", "share", "powershell");
             string xdgModuleDefault = Path.Combine(xdgDataHomeDefault, "Modules");
             string xdgCacheDefault = Path.Combine(envHome, ".cache", "powershell");
 
-            switch (dirpath)
+            try
             {
-                case Platform.XDG_Type.CONFIG:
-                    // the user has set XDG_CONFIG_HOME corresponding to profile path
-                    if (string.IsNullOrEmpty(xdgconfighome))
-                    {
-                        // xdg values have not been set
-                        return xdgConfigHomeDefault;
-                    }
-
-                    else
-                    {
-                        return Path.Combine(xdgconfighome, "powershell");
-                    }
-
-                case Platform.XDG_Type.DATA:
-                    // the user has set XDG_DATA_HOME corresponding to module path
-                    if (string.IsNullOrEmpty(xdgdatahome))
-                    {
-                        // create the xdg folder if needed
-                        if (!Directory.Exists(xdgDataHomeDefault))
+                switch (dirpath)
+                {
+                    case XDG_Type.CONFIG:
+                        // Use 'XDG_CONFIG_HOME' if it's set, otherwise use the default path.
+                        return string.IsNullOrEmpty(xdgconfighome)
+                            ? xdgConfigHomeDefault
+                            : Path.Combine(xdgconfighome, "powershell");
+
+                    case XDG_Type.DATA:
+                        // Use 'XDG_DATA_HOME' if it's set, otherwise use the default path.
+                        if (string.IsNullOrEmpty(xdgdatahome))
                         {
-                            try
-                            {
-                                Directory.CreateDirectory(xdgDataHomeDefault);
-                            }
-                            catch (UnauthorizedAccessException)
-                            {
-                                // service accounts won't have permission to create user folder
-                                return GetTemporaryDirectory();
-                            }
+                            // Create the default data directory if it doesn't exist.
+                            Directory.CreateDirectory(xdgDataHomeDefault);
+                            return xdgDataHomeDefault;
                         }
-
-                        return xdgDataHomeDefault;
-                    }
-                    else
-                    {
                         return Path.Combine(xdgdatahome, "powershell");
-                    }
 
-                case Platform.XDG_Type.USER_MODULES:
-                    // the user has set XDG_DATA_HOME corresponding to module path
-                    if (string.IsNullOrEmpty(xdgdatahome))
-                    {
-                        // xdg values have not been set
-                        if (!Directory.Exists(xdgModuleDefault)) // module folder not always guaranteed to exist
+                    case XDG_Type.USER_MODULES:
+                        // Use 'XDG_DATA_HOME' if it's set, otherwise use the default path.
+                        if (string.IsNullOrEmpty(xdgdatahome))
                         {
-                            try
-                            {
-                                Directory.CreateDirectory(xdgModuleDefault);
-                            }
-                            catch (UnauthorizedAccessException)
-                            {
-                                // service accounts won't have permission to create user folder
-                                return GetTemporaryDirectory();
-                            }
+                            Directory.CreateDirectory(xdgModuleDefault);
+                            return xdgModuleDefault;
                         }
-
-                        return xdgModuleDefault;
-                    }
-                    else
-                    {
                         return Path.Combine(xdgdatahome, "powershell", "Modules");
-                    }
 
-                case Platform.XDG_Type.SHARED_MODULES:
-                    return "/usr/local/share/powershell/Modules";
+                    case XDG_Type.SHARED_MODULES:
+                        return "/usr/local/share/powershell/Modules";
 
-                case Platform.XDG_Type.CACHE:
-                    // the user has set XDG_CACHE_HOME
-                    if (string.IsNullOrEmpty(xdgcachehome))
-                    {
-                        // xdg values have not been set
-                        if (!Directory.Exists(xdgCacheDefault)) // module folder not always guaranteed to exist
-                        {
-                            try
-                            {
-                                Directory.CreateDirectory(xdgCacheDefault);
-                            }
-                            catch (UnauthorizedAccessException)
-                            {
-                                // service accounts won't have permission to create user folder
-                                return GetTemporaryDirectory();
-                            }
-                        }
-
-                        return xdgCacheDefault;
-                    }
-                    else
-                    {
-                        if (!Directory.Exists(Path.Combine(xdgcachehome, "powershell")))
+                    case XDG_Type.CACHE:
+                        // Use 'XDG_CACHE_HOME' if it's set, otherwise use the default path.
+                        if (string.IsNullOrEmpty(xdgcachehome))
                         {
-                            try
-                            {
-                                Directory.CreateDirectory(Path.Combine(xdgcachehome, "powershell"));
-                            }
-                            catch (UnauthorizedAccessException)
-                            {
-                                // service accounts won't have permission to create user folder
-                                return GetTemporaryDirectory();
-                            }
+                            Directory.CreateDirectory(xdgCacheDefault);
+                            return xdgCacheDefault;
                         }
 
-                        return Path.Combine(xdgcachehome, "powershell");
-                    }
-
-                case Platform.XDG_Type.DEFAULT:
-                    // default for profile location
-                    return xdgConfigHomeDefault;
+                        string cachePath = Path.Combine(xdgcachehome, "powershell");
+                        Directory.CreateDirectory(cachePath);
+                        return cachePath;
 
-                default:
-                    // xdgConfigHomeDefault needs to be created in the edge case that we do not have the folder or it was deleted
-                    // This folder is the default in the event of all other failures for data storage
-                    if (!Directory.Exists(xdgConfigHomeDefault))
-                    {
-                        try
-                        {
-                            Directory.CreateDirectory(xdgConfigHomeDefault);
-                        }
-                        catch
-                        {
-                            Console.Error.WriteLine("Failed to create default data directory: " + xdgConfigHomeDefault);
-                        }
-                    }
+                    case XDG_Type.DEFAULT:
+                        // Use 'xdgConfigHomeDefault' for 'XDG_Type.DEFAULT' and create the directory if it doesn't exist.
+                        Directory.CreateDirectory(xdgConfigHomeDefault);
+                        return xdgConfigHomeDefault;
 
-                    return xdgConfigHomeDefault;
+                    default:
+                        throw new InvalidOperationException("Unreachable code.");
+                }
+            }
+            catch (UnauthorizedAccessException)
+            {
+                // Directory creation may fail if the account doesn't have filesystem permission such as some service accounts.
+                // Return an empty string in this case so the process working directory will be used.
+                return string.Empty;
             }
         }
 #endif
 
         /// <summary>
-        /// The code is copied from the .NET implementation.
+        /// Mimic 'Environment.GetFolderPath(folder)' on Unix.
         /// </summary>
-        internal static string GetFolderPath(System.Environment.SpecialFolder folder)
+        internal static string GetFolderPath(Environment.SpecialFolder folder)
         {
-            return InternalGetFolderPath(folder);
-        }
-
-        /// <summary>
-        /// The API set 'api-ms-win-shell-shellfolders-l1-1-0.dll' was removed from NanoServer, so we cannot depend on 'SHGetFolderPathW'
-        /// to get the special folder paths. Instead, we need to rely on the basic environment variables to get the special folder paths.
-        /// </summary>
-        /// <returns>
-        /// The path to the specified system special folder, if that folder physically exists on your computer.
-        /// Otherwise, an empty string (string.Empty).
-        /// </returns>
-        private static string InternalGetFolderPath(System.Environment.SpecialFolder folder)
-        {
-            string folderPath = null;
 #if UNIX
-            string envHome = System.Environment.GetEnvironmentVariable(Platform.CommonEnvVariableNames.Home);
-            if (envHome == null)
+            return folder switch
             {
-                envHome = Platform.GetTemporaryDirectory();
-            }
-
-            switch (folder)
-            {
-                case System.Environment.SpecialFolder.ProgramFiles:
-                    folderPath = "/bin";
-                    if (!System.IO.Directory.Exists(folderPath)) { folderPath = null; }
-
-                    break;
-                case System.Environment.SpecialFolder.ProgramFilesX86:
-                    folderPath = "/usr/bin";
-                    if (!System.IO.Directory.Exists(folderPath)) { folderPath = null; }
-
-                    break;
-                case System.Environment.SpecialFolder.System:
-                case System.Environment.SpecialFolder.SystemX86:
-                    folderPath = "/sbin";
-                    if (!System.IO.Directory.Exists(folderPath)) { folderPath = null; }
-
-                    break;
-                case System.Environment.SpecialFolder.Personal:
-                    folderPath = envHome;
-                    break;
-                case System.Environment.SpecialFolder.LocalApplicationData:
-                    folderPath = System.IO.Path.Combine(envHome, ".config");
-                    if (!System.IO.Directory.Exists(folderPath))
-                    {
-                        try
-                        {
-                            System.IO.Directory.CreateDirectory(folderPath);
-                        }
-                        catch (UnauthorizedAccessException)
-                        {
-                            // directory creation may fail if the account doesn't have filesystem permission such as some service accounts
-                            folderPath = string.Empty;
-                        }
-                    }
-
-                    break;
-                default:
-                    throw new NotSupportedException();
-            }
+                Environment.SpecialFolder.ProgramFiles => Directory.Exists("/bin") ? "/bin" : string.Empty,
+                Environment.SpecialFolder.MyDocuments => GetHomeOrCreateTempHome(),
+                _ => throw new NotSupportedException()
+            };
 #else
-            folderPath = System.Environment.GetFolderPath(folder);
+            return Environment.GetFolderPath(folder);
 #endif
-            return folderPath ?? string.Empty;
         }
 
         // Platform methods prefixed NonWindows are:
@@ -558,11 +420,9 @@ internal static bool NonWindowsIsSameFileSystemItem(string pathOne, string pathT
             return Unix.NativeMethods.IsSameFileSystemItem(pathOne, pathTwo);
         }
 
-        internal static bool NonWindowsGetInodeData(string path, out System.ValueTuple<UInt64, UInt64> inodeData)
+        internal static bool NonWindowsGetInodeData(string path, out ValueTuple<ulong, ulong> inodeData)
         {
-            UInt64 device = 0UL;
-            UInt64 inode = 0UL;
-            var result = Unix.NativeMethods.GetInodeData(path, out device, out inode);
+            var result = Unix.NativeMethods.GetInodeData(path, out ulong device, out ulong inode);
 
             inodeData = (device, inode);
             return result == 0;
@@ -1036,7 +896,7 @@ public static int GetProcFSParentPid(int pid)
                         return invalidPid;
                     }
 
-                    return Int32.Parse(parts[3]);
+                    return int.Parse(parts[3]);
                 }
                 catch (Exception)
                 {
@@ -1145,7 +1005,7 @@ internal static extern bool IsSameFileSystemItem([MarshalAs(UnmanagedType.LPStr)
 
                 [DllImport(psLib, CharSet = CharSet.Ansi, SetLastError = true)]
                 internal static extern int GetInodeData([MarshalAs(UnmanagedType.LPStr)] string path,
-                                                        out UInt64 device, out UInt64 inode);
+                                                        out ulong device, out ulong inode);
 
                 /// <summary>
                 /// This is a struct from getcommonstat.h in the native library.
diff --git a/src/System.Management.Automation/DscSupport/CimDSCParser.cs b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
index f518d18fa1c..d89c557b84d 100644
--- a/src/System.Management.Automation/DscSupport/CimDSCParser.cs
+++ b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
@@ -738,12 +738,12 @@ public static void Initialize(Collection<Exception> errors, List<string> moduleP
 
                 if (!Directory.Exists(systemResourceRoot))
                 {
-                    configSystemPath = Platform.GetFolderPath(Environment.SpecialFolder.System);
+                    configSystemPath = Environment.GetFolderPath(Environment.SpecialFolder.System);
                     systemResourceRoot = Path.Combine(configSystemPath, "Configuration");
                     inboxModulePath = InboxDscResourceModulePath;
                 }
 
-                var programFilesDirectory = Platform.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
+                var programFilesDirectory = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
                 Debug.Assert(programFilesDirectory != null, "Program Files environment variable does not exist!");
                 var customResourceRoot = Path.Combine(programFilesDirectory, "WindowsPowerShell\\Configuration");
                 Debug.Assert(Directory.Exists(customResourceRoot), "%ProgramFiles%\\WindowsPowerShell\\Configuration Directory does not exist");
diff --git a/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs b/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
index 7f10b75525c..9f195d7e687 100644
--- a/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
@@ -363,7 +363,7 @@ public override Debugger Debugger
             }
         }
 
-        private static readonly string s_debugPreferenceCachePath = Path.Combine(Path.Combine(Platform.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "WindowsPowerShell"), "DebugPreference.clixml");
+        private static readonly string s_debugPreferenceCachePath = Path.Combine(Platform.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "WindowsPowerShell", "DebugPreference.clixml");
         private static readonly object s_debugPreferenceLockObject = new object();
 
         /// <summary>
@@ -1242,8 +1242,6 @@ protected override void Dispose(bool disposing)
                         RunspaceOpening = null;
                     }
 
-                    Platform.RemoveTemporaryDirectory();
-
                     // Dispose the event manager
                     if (this.ExecutionContext != null && this.ExecutionContext.Events != null)
                     {
diff --git a/src/System.Management.Automation/security/SecurityManager.cs b/src/System.Management.Automation/security/SecurityManager.cs
index c82b03b99c7..25fb544507b 100644
--- a/src/System.Management.Automation/security/SecurityManager.cs
+++ b/src/System.Management.Automation/security/SecurityManager.cs
@@ -328,9 +328,10 @@ private bool CheckPolicy(ExternalScriptInfo script, PSHost host, out Exception r
                 if (string.Equals(fi.Extension, ".ps1xml", StringComparison.OrdinalIgnoreCase))
                 {
                     string[] trustedDirectories = new string[]
-                        { Platform.GetFolderPath(Environment.SpecialFolder.System),
-                          Platform.GetFolderPath(Environment.SpecialFolder.ProgramFiles)
-                        };
+                    {
+                        Environment.GetFolderPath(Environment.SpecialFolder.System),
+                        Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles)
+                    };
 
                     foreach (string trustedDirectory in trustedDirectories)
                     {
diff --git a/src/System.Management.Automation/utils/PsUtils.cs b/src/System.Management.Automation/utils/PsUtils.cs
index 574f42eace3..cf1fdf5b956 100644
--- a/src/System.Management.Automation/utils/PsUtils.cs
+++ b/src/System.Management.Automation/utils/PsUtils.cs
@@ -83,31 +83,6 @@ internal static bool IsRunningOnProcessorArchitectureARM()
             return arch == Architecture.Arm || arch == Architecture.Arm64;
         }
 
-        /// <summary>
-        /// Get a temporary directory to use, needs to be unique to avoid collision.
-        /// </summary>
-        internal static string GetTemporaryDirectory()
-        {
-            string tempDir = string.Empty;
-            string tempPath = Path.GetTempPath();
-            do
-            {
-                tempDir = Path.Combine(tempPath, System.Guid.NewGuid().ToString());
-            }
-            while (Directory.Exists(tempDir));
-
-            try
-            {
-                Directory.CreateDirectory(tempDir);
-            }
-            catch (UnauthorizedAccessException)
-            {
-                tempDir = string.Empty; // will become current working directory
-            }
-
-            return tempDir;
-        }
-
         internal static string GetHostName()
         {
             IPGlobalProperties ipProperties = IPGlobalProperties.GetIPGlobalProperties();
diff --git a/test/powershell/Host/ConsoleHost.Tests.ps1 b/test/powershell/Host/ConsoleHost.Tests.ps1
index 5c903f53745..6de6c6ad618 100644
--- a/test/powershell/Host/ConsoleHost.Tests.ps1
+++ b/test/powershell/Host/ConsoleHost.Tests.ps1
@@ -664,6 +664,20 @@ namespace StackTest {
         It "Should start if HOME is not defined" -Skip:($IsWindows) {
             bash -c "unset HOME;$powershell -c '1+1'" | Should -BeExactly 2
         }
+
+        It "Same user should use the same temporary HOME directory for different sessions" -Skip:($IsWindows) {
+            $results = bash -c @"
+unset HOME;
+$powershell -c '[System.Management.Automation.Platform]::SelectProductNameForDirectory([System.Management.Automation.Platform+XDG_Type]::DEFAULT)';
+$powershell -c '[System.Management.Automation.Platform]::SelectProductNameForDirectory([System.Management.Automation.Platform+XDG_Type]::DEFAULT)';
+"@
+            $results | Should -HaveCount 2
+            $results[0] | Should -BeExactly $results[1]
+
+            $tempHomeName = "pwsh-{0}-98288ff9-5712-4a14-9a11-23693b9cd91a" -f [System.Environment]::UserName
+            $defaultPath = Join-Path -Path ([System.IO.Path]::GetTempPath()) -ChildPath "$tempHomeName/.config/powershell"
+            $results[0] | Should -BeExactly $defaultPath
+        }
     }
 
     Context "PATH environment variable" {

From 40837dd860e1bb69dd8238ff5e5ae360a7637c13 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 23 Nov 2021 14:36:11 -0800
Subject: [PATCH 164/645] Fix NuGet package generation in release build
 (#16509)

---
 tools/packaging/packaging.psm1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 89ec69d4b50..bca41d3c816 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -2292,6 +2292,8 @@ function CleanupGeneratedSourceCode
         '[System.Runtime.CompilerServices.NullableAttribute(new byte[]{ (byte)2, (byte)1, (byte)1})]'
         '[System.Runtime.CompilerServices.AsyncStateMachineAttribute'
         '[Microsoft.PowerShell.Commands.SetStrictModeCommand.ArgumentToPSVersionTransformationAttribute]'
+        '[Microsoft.PowerShell.Commands.HttpVersionCompletionsAttribute]'
+        '[System.Management.Automation.ArgumentToVersionTransformationAttribute]'
         )
 
     $patternsToReplace = @(

From c2966acfd570a37076c28746db35a3bdcbd15412 Mon Sep 17 00:00:00 2001
From: Matt Gucci <matt9ucci@gmail.com>
Date: Wed, 1 Dec 2021 04:23:42 +0900
Subject: [PATCH 165/645] Fix PowerShell/PowerShell#13201 (#16416)

---
 build.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index 2900e1bc4f8..9e9da605967 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1855,7 +1855,7 @@ function Install-Dotnet {
         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
+            $fullDotnetInstallPath = Join-Path -Path (Convert-Path -Path $PWD.Path) -ChildPath $installScript
 
             if ($Version) {
                 $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version, '-Quality', $Quality)

From 64d2fe26f3957eeb400e48234accbc8e643ef929 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Wed, 1 Dec 2021 15:54:25 -0800
Subject: [PATCH 166/645] Fix `PSVersion` parameter version checks and error
 messages for PowerShell 7 remoting (#16228)

---
 .../remoting/commands/CustomShellCommands.cs  |  9 +--
 .../engine/remoting/commands/StartJob.cs      | 10 ++--
 .../remoting/commands/remotingcommandutil.cs  | 55 -------------------
 .../resources/RemotingErrorIdStrings.resx     |  7 +--
 .../Microsoft.PowerShell.Core/Job.Tests.ps1   | 13 +++++
 .../PSSessionConfiguration.Tests.ps1          | 16 ++----
 6 files changed, 28 insertions(+), 82 deletions(-)

diff --git a/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs b/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
index 19c093e3687..76601ff6dfb 100644
--- a/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
@@ -2320,13 +2320,8 @@ public Version PSVersion
 
             set
             {
-                RemotingCommandUtil.CheckPSVersion(value);
-
-                // Check if specified version of PowerShell is installed
-                RemotingCommandUtil.CheckIfPowerShellVersionIsInstalled(value);
-
-                psVersion = value;
-                isPSVersionSpecified = true;
+                // PowerShell 7 remoting endpoints do not support PSVersion.
+                throw new PSNotSupportedException(RemotingErrorIdStrings.PowerShellVersionNotSupported);
             }
         }
 
diff --git a/src/System.Management.Automation/engine/remoting/commands/StartJob.cs b/src/System.Management.Automation/engine/remoting/commands/StartJob.cs
index 90e10bb8f44..ff7b844d7fa 100644
--- a/src/System.Management.Automation/engine/remoting/commands/StartJob.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/StartJob.cs
@@ -512,10 +512,12 @@ public virtual Version PSVersion
 
             set
             {
-                RemotingCommandUtil.CheckPSVersion(value);
-
-                // Check if specified version of PowerShell is installed
-                RemotingCommandUtil.CheckIfPowerShellVersionIsInstalled(value);
+                // PSVersion value can only be 5.1 for Start-Job.
+                if (!(value.Major == 5 && value.Minor == 1))
+                {
+                    throw new ArgumentException(
+                        StringUtil.Format(RemotingErrorIdStrings.PSVersionParameterOutOfRange, value, "PSVersion"));
+                }
 
                 _psVersion = value;
             }
diff --git a/src/System.Management.Automation/engine/remoting/commands/remotingcommandutil.cs b/src/System.Management.Automation/engine/remoting/commands/remotingcommandutil.cs
index 094dcedc6ad..f30e4ba5109 100644
--- a/src/System.Management.Automation/engine/remoting/commands/remotingcommandutil.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/remotingcommandutil.cs
@@ -165,60 +165,5 @@ internal static void CheckHostRemotingPrerequisites()
                 throw new InvalidOperationException(errorRecord.ToString());
             }
         }
-
-        internal static void CheckPSVersion(Version version)
-        {
-            // PSVersion value can only be 2.0, 3.0, 4.0, 5.0, or 5.1
-            if (version != null)
-            {
-                // PSVersion value can only be 2.0, 3.0, 4.0, 5.0, or 5.1
-                if (!(version.Major >= 2 && version.Major <= 4 && version.Minor == 0) &&
-                    !(version.Major == 5 && version.Minor <= 1))
-                {
-                    throw new ArgumentException(
-                       StringUtil.Format(RemotingErrorIdStrings.PSVersionParameterOutOfRange, version, "PSVersion"));
-                }
-            }
-        }
-
-        /// <summary>
-        /// Checks if the specified version of PowerShell is installed.
-        /// </summary>
-        /// <param name="version"></param>
-        internal static void CheckIfPowerShellVersionIsInstalled(Version version)
-        {
-            // Check if PowerShell 2.0 is installed
-            if (version != null && version.Major == 2)
-            {
-#if CORECLR
-                // PowerShell 2.0 is not available for CoreCLR
-                throw new ArgumentException(
-                    PSRemotingErrorInvariants.FormatResourceString(
-                        RemotingErrorIdStrings.PowerShellNotInstalled,
-                        version, "PSVersion"));
-#else
-                // Because of app-compat issues, in Win8, we will have PS 2.0 installed by default but not .NET 2.0
-                // In such a case, it is not enough if we check just PowerShell registry keys. We also need to check if .NET 2.0 is installed.
-                try
-                {
-                    RegistryKey engineKey = PSSnapInReader.GetPSEngineKey(PSVersionInfo.RegistryVersion1Key);
-                    // Also check for .NET 2.0 installation
-                    if (!PsUtils.FrameworkRegistryInstallation.IsFrameworkInstalled(2, 0, 0))
-                    {
-                        throw new ArgumentException(
-                            PSRemotingErrorInvariants.FormatResourceString(
-                                RemotingErrorIdStrings.NetFrameWorkV2NotInstalled));
-                    }
-                }
-                catch (PSArgumentException)
-                {
-                    throw new ArgumentException(
-                        PSRemotingErrorInvariants.FormatResourceString(
-                            RemotingErrorIdStrings.PowerShellNotInstalled,
-                            version, "PSVersion"));
-                }
-#endif
-            }
-        }
     }
 }
diff --git a/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx b/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
index 441228c9c44..680e6d1a6b5 100644
--- a/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
+++ b/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
@@ -837,8 +837,7 @@ Note that 'Start-Job' is not supported by design in scenarios where PowerShell i
     <value>A {1} job source adapter threw an exception with the following message: {0}</value>
   </data>
   <data name="PSVersionParameterOutOfRange" xml:space="preserve">
-    <value>The value {0} is not valid for the {1} parameter. The available values are 2.0, 3.0, 4.0, 5.0, 5.1.</value>
-    <comment>{StrContains="2.0"} {StrContains="3.0"}</comment>
+    <value>The value {0} is not valid for the {1} parameter. The only allowed value is 5.1.</value>
   </data>
   <data name="BlockCannotBeUsedWithKeep" xml:space="preserve">
     <value>The Wait and Keep parameters cannot be used together in the same command.</value>
@@ -846,8 +845,8 @@ Note that 'Start-Job' is not supported by design in scenarios where PowerShell i
   <data name="WriteEventsCannotBeUsedWithoutWait" xml:space="preserve">
     <value>The WriteEvents parameter cannot be used without the Wait parameter.</value>
   </data>
-  <data name="PowerShellNotInstalled" xml:space="preserve">
-    <value>PowerShell {0} is not installed. Install PowerShell {0}, and then try again.</value>
+  <data name="PowerShellVersionNotSupported" xml:space="preserve">
+    <value>PowerShell remoting endpoint versioning is not supported on PowerShell Core.</value>
   </data>
   <data name="JobManagerRegistrationConstructorError" xml:space="preserve">
     <value>The following type cannot be instantiated because its constructor is not public: {0}.</value>
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Job.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Job.Tests.ps1
index 06d84230dce..90477267b4e 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Job.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Job.Tests.ps1
@@ -243,3 +243,16 @@ Describe "Ampersand background test" -Tag "CI","Slow" {
         }
     }
 }
+
+Describe "Start-Job with -PSVersion parameter" -Tag "CI" {
+
+    It "Verifies that -PSVersion is not supported except for version 5.1" {
+        { Start-Job -PSVersion 2.0 } | Should -Throw -ErrorId 'ParameterBindingFailed,Microsoft.PowerShell.Commands.StartJobCommand'
+    }
+
+    It "Verifies that -PSVersion 5.1 runs the job in a version 5.1 PowerShell session" -Skip:(-not $IsWindows) {
+        $version = Start-Job -PSVersion 5.1 -ScriptBlock { $PSVersionTable } | Receive-Job -Wait -AutoRemoveJob
+        $version.PSVersion.Major | Should -Be 5
+        $version.PSVersion.Minor | Should -Be 1
+    }
+}
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/PSSessionConfiguration.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/PSSessionConfiguration.Tests.ps1
index d910f2c265c..a4e9e1e5116 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/PSSessionConfiguration.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/PSSessionConfiguration.Tests.ps1
@@ -491,13 +491,9 @@ namespace PowershellTestConfigNamespace
                     $Result.Session.UseSharedProcess | Should -Be $UseSharedProcess
                 }
 
-                It "Validate Register-PSSessionConfiguration -PSVersion" {
+                It "Verifies that Register-PSSessionConfiguration -PSVersion parameter is not supported" {
 
-                    Register-PSSessionConfiguration -Name $TestSessionConfigName -PSVersion 5.1
-                    $Session = Get-PSSessionConfiguration -Name $TestSessionConfigName
-
-                    $Session.Name | Should -Be $TestSessionConfigName
-                    $Session.PSVersion | Should -BeExactly 5.1
+                    { Register-PSSessionConfiguration -Name $TestSessionConfigName -PSVersion 5.1 } | Should -Throw -ErrorId 'ParameterBindingFailed,Microsoft.PowerShell.Commands.RegisterPSSessionConfigurationCommand'
                 }
 
                 It "Validate Register-PSSessionConfiguration -startupscript parameter" -Pending {
@@ -567,13 +563,9 @@ namespace PowershellTestConfigNamespace
                     $Result.Session.UseSharedProcess | Should -Be $UseSharedProcess
                 }
 
-                It "Validate Set-PSSessionConfiguration -PSVersion" {
-
-                    Set-PSSessionConfiguration -Name $TestSessionConfigName -PSVersion 5.1
-                    $Session = (Get-PSSessionConfiguration -Name $TestSessionConfigName)
+                It "Verifies that Set-PSSessionConfiguration -PSVersion parameter is not supported" {
 
-                    $Session.Name | Should -Be $TestSessionConfigName
-                    $Session.PSVersion | Should -BeExactly 5.1
+                    { Set-PSSessionConfiguration -Name $TestSessionConfigName -PSVersion 5.1 } | Should -Throw -ErrorId 'ParameterBindingFailed,Microsoft.PowerShell.Commands.SetPSSessionConfigurationCommand'
                 }
 
                 It "Validate Set-PSSessionConfiguration -startupscript parameter" -Pending {

From 1920b1b6eaebb035805c7dc8ca5f539b6a19b90e Mon Sep 17 00:00:00 2001
From: Bar Arnon <i3arnon@gmail.com>
Date: Thu, 2 Dec 2021 20:25:12 +0200
Subject: [PATCH 167/645] Fix race condition between DisconnectAsync and
 Dispose (#16536)

---
 .../engine/remoting/client/RemotingProtocol2.cs  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs b/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
index 8b8908b6e61..07446d45fc3 100644
--- a/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
@@ -813,7 +813,7 @@ private void HandleReadyForDisconnect(object sender, EventArgs args)
                     // what thread this callback is made from.  If it was made from a transport
                     // callback event then a deadlock may occur when DisconnectAsync is called on
                     // that same thread.
-                    ThreadPool.QueueUserWorkItem(new WaitCallback(StartDisconnectAsync), RemoteSession);
+                    ThreadPool.QueueUserWorkItem(new WaitCallback(StartDisconnectAsync));
                 }
             }
         }
@@ -821,10 +821,18 @@ private void HandleReadyForDisconnect(object sender, EventArgs args)
         /// <summary>
         /// WaitCallback method to start an asynchronous disconnect.
         /// </summary>
-        /// <param name="remoteSession"></param>
-        private void StartDisconnectAsync(object remoteSession)
+        /// <param name="state"></param>
+        private void StartDisconnectAsync(object state)
         {
-            ((ClientRemoteSession)remoteSession).DisconnectAsync();
+            var remoteSession = RemoteSession;
+            try
+            {
+                remoteSession?.DisconnectAsync();
+            }
+            catch 
+            {
+                // remoteSession may have already been disposed resulting in unexpected exceptions.
+            }
         }
 
         /// <summary>

From 2d27da40d894b88cc52ef1434670e4ee30d32d79 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 2 Dec 2021 15:05:54 -0800
Subject: [PATCH 168/645] Bring back `pwsh.exe` for framework dependent
 packages to support Start-Job (#16535)

* Bring back pwsh.exe for framework dependent packages to support Start-Job

* Update wix file

* Add release tests for fxd packages

* Fix tests

* Fix stage dependencies

* Address CR comments

* Fix typo

* Add value for the hashtable item
---
 assets/wix/files.wxs                          |  4 ++
 build.psm1                                    |  7 +--
 .../azureDevOps/releasePipeline.yml           | 27 ++++++++
 .../templates/release-ValidateFxdPackage.yml  | 62 +++++++++++++++++++
 .../templates/windows-packaging.yml           |  6 +-
 5 files changed, 97 insertions(+), 9 deletions(-)
 create mode 100644 tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 13e38dbdd68..78b21b8d643 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3137,6 +3137,9 @@
           <Component Id="cmp408A3AF905EB47ADA35FBC5A6B1465A0">
             <File Id="fil2146848B6ACB45FCA8E9C8FEE3BECDD8" KeyPath="yes" Source="$(var.ProductSourcePath)\_manifest\spdx_2.2\manifest.spdx.json" />
           </Component>
+          <Component Id="cmp58D994EAF5F64D618ABC0E63DCD48C05">
+            <File Id="filFB88509DC8C044A28FF3B7CF61B1CE4F" KeyPath="yes" Source="$(var.ProductSourcePath)\_manifest\spdx_2.2\manifest.spdx.json.sha256" />
+          </Component>
         </Directory>
       </Directory>
       <Component Id="cmpA6276F9EAB41411AAAEC496E67A3DBAE">
@@ -4170,6 +4173,7 @@
       <ComponentRef Id="cmp0C4751F9D5C14419A45F234152D21DA9" />
       <ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
       <ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
+      <ComponentRef Id="cmp58D994EAF5F64D618ABC0E63DCD48C05" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/build.psm1 b/build.psm1
index 9e9da605967..d3bfb968661 100644
--- a/build.psm1
+++ b/build.psm1
@@ -439,10 +439,9 @@ 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"
+        # The UseAppHost = true property creates ".exe" for the fxdependent packages.
+        # We need this in the package as Start-Job needs it.
+        $Arguments += "/property:UseAppHost=true"
     }
     else {
         $Arguments += "--self-contained"
diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index d68f7bbb629..59160436109 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -78,6 +78,31 @@ stages:
       globalToolExeName: 'pwsh'
       globalToolPackageName: 'PowerShell.Linux.x64'
 
+- stage: ValidateFxdPackage
+  displayName: Validate Fxd Package
+  dependsOn: []
+  jobs:
+  - template: templates/release-ValidateFxdPackage.yml
+    parameters:
+      jobName: WinFxdPackage
+      displayName: Fxd Package Test Win
+      imageName: windows-latest
+      packageNamePattern: '**/*win-fxdependent.zip'
+
+  - template: templates/release-ValidateFxdPackage.yml
+    parameters:
+      jobName: FxdPackageWindDesktop
+      displayName: Fxd Package Test WinDesktop
+      imageName: windows-latest
+      packageNamePattern: '**/*win-fxdependentWinDesktop.zip'
+
+  - template: templates/release-ValidateFxdPackage.yml
+    parameters:
+      jobName: FxdPackageLinux
+      displayName: Fxd Package Test Linux
+      imageName: ubuntu-latest
+      packageNamePattern: '**/*fxdependent.tar.gz'
+
 - stage: StaticPkgValidation
   dependsOn: []
   displayName: Static package validation
@@ -142,6 +167,8 @@ stages:
   - StartDocker
   - ManualValidation
   - ReleaseAutomation
+  - ValidateFxdPackage
+  - ValidateGlobalTool
 
 # The environment here is used for approval.
   jobs:
diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml
new file mode 100644
index 00000000000..687b9d526d4
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml
@@ -0,0 +1,62 @@
+parameters:
+  jobName: ""
+  displayName: ""
+  imageName: ""
+  packageNamePattern: ""
+
+jobs:
+- job: ${{ parameters.jobName }}
+  displayName: ${{ parameters.displayName }}
+  pool:
+    vmImage: ${{ parameters.imageName }}
+  steps:
+    - checkout: self
+      clean: true
+
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        source: specific
+        project: PowerShellCore
+        pipeline: '696'
+        preferTriggeringPipeline: true
+        runVersion: latestFromBranch
+        runBranch: '$(Build.SourceBranch)'
+        artifact: finalResults
+        patterns: '${{ parameters.packageNamePattern }}'
+        path: '$(Pipeline.Workspace)/releasePipeline/finalResults'
+
+    - pwsh: |
+        Get-ChildItem -Path '$(Pipeline.Workspace)/releasePipeline/finalResults' -Recurse
+      displayName: Capture downloaded package
+
+    - pwsh: |
+        $destPath = New-Item '$(Pipeline.Workspace)/releasePipeline/finalResults/fxd' -ItemType Directory
+        $packageNameFilter = '${{ parameters.packageNamePattern }}'
+
+        if ($packageNameFilter.EndsWith('tar.gz')) {
+            $package = @(Get-ChildItem -Path '$(Pipeline.Workspace)/releasePipeline/finalResults/*.tar.gz')
+            Write-Verbose -Verbose "Package: $package"
+            if ($package.Count -ne 1) {
+                throw 'Only 1 package was expected.'
+            }
+            tar -xvf $package.FullName -C $destPath
+        }
+        else {
+            $package = @(Get-ChildItem -Path '$(Pipeline.Workspace)/releasePipeline/finalResults/*.zip')
+            Write-Verbose -Verbose "Package: $package"
+            if ($package.Count -ne 1) {
+                throw 'Only 1 package was expected.'
+            }
+            Expand-Archive -Path $package.FullName -Destination "$destPath" -Verbose
+        }
+      displayName: Expand fxd package
+
+    - pwsh: |
+        $packageNameFilter = '${{ parameters.packageNamePattern }}'
+        $pwshExeName = if ($packageNameFilter.EndsWith('tar.gz')) { 'pwsh' } else { 'pwsh.exe' }
+        $actualOutput = & $pwshExeName -c 'Start-Job -ScriptBlock { "1" } | Wait-Job | Receive-Job'
+        Write-Verbose -Verbose "Actual output: $actualOutput"
+        if ($actualOutput -ne 1) {
+            throw "Actual output is not as expected"
+        }
+      displayName: Test package
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index 03ecebaf0c0..f2b0e091f0c 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -129,6 +129,7 @@ jobs:
         "$($fullSymbolsFolder)\Modules\PSDiagnostics\PSDiagnostics.ps?1" = "Modules\PSDiagnostics"
         "$($fullSymbolsFolder)\pwsh.dll" = ""
         "$($fullSymbolsFolder)\System.Management.Automation.dll" = ""
+        "$($fullSymbolsFolder)\pwsh.exe" = ""
       }
 
       $itemsToExclude = @(
@@ -136,11 +137,6 @@ jobs:
         "$($fullSymbolsFolder)\Microsoft.PowerShell.MarkdownRender.dll"
       )
 
-      if ("$env:Architecture" -notlike 'fxdependent*')
-      {
-          $itemsToCopy +=  @{"$($fullSymbolsFolder)\pwsh.exe" = ""}
-      }
-
       Write-Verbose -verbose "recusively copying $($itemsToCopyWithRecurse | out-string) to $filesToSignDirectory"
       Copy-Item -Path $itemsToCopyWithRecurse -Destination $filesToSignDirectory -Recurse -verbose -exclude $itemsToExclude
 

From f922883757dd2d461097b72c0d6aba7584302cba Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 6 Dec 2021 13:18:44 -0800
Subject: [PATCH 169/645] Set clean state before testing `UseMU` in the MSI
 (#16543)

---
 .vsts-ci/windows/windows-packaging.yml |  1 +
 test/packaging/windows/msi.tests.ps1   | 39 +++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/.vsts-ci/windows/windows-packaging.yml b/.vsts-ci/windows/windows-packaging.yml
index b8aa2c22950..b413b7a639b 100644
--- a/.vsts-ci/windows/windows-packaging.yml
+++ b/.vsts-ci/windows/windows-packaging.yml
@@ -51,6 +51,7 @@ pr:
     - src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj
     - src/Modules/PSGalleryModules.csproj
     - src/powershell-win-core/powershell-win-core.csproj
+    - test/packaging/windows/*
     - tools/ci.psm1
     - tools/packaging/*
 
diff --git a/test/packaging/windows/msi.tests.ps1 b/test/packaging/windows/msi.tests.ps1
index 9d1c218c4c0..0ee34ca482c 100644
--- a/test/packaging/windows/msi.tests.ps1
+++ b/test/packaging/windows/msi.tests.ps1
@@ -39,7 +39,7 @@ Describe -Name "Windows MSI" -Fixture {
         }
 
         function Get-UseMU {
-            $useMu = 0
+            $useMu = $null
             $key = 'HKLM:\SOFTWARE\Microsoft\PowerShellCore\'
             if ($runtime -like '*x86*') {
                 $key = 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\PowerShellCore\'
@@ -49,6 +49,25 @@ Describe -Name "Windows MSI" -Fixture {
                 $useMu = Get-ItemPropertyValue -Path $key -Name UseMU -ErrorAction SilentlyContinue
             } catch {}
 
+            if (!$useMu) {
+                $useMu = 0
+            }
+
+            return $useMu
+        }
+
+        function Set-UseMU {
+            param(
+                [int]
+                $Value
+            )
+            $key = 'HKLM:\SOFTWARE\Microsoft\PowerShellCore\'
+            if ($runtime -like '*x86*') {
+                $key = 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\PowerShellCore\'
+            }
+
+            Set-ItemProperty -Path $key -Name UseMU -Value $Value -Type DWord
+
             return $useMu
         }
 
@@ -185,6 +204,15 @@ Describe -Name "Windows MSI" -Fixture {
     }
 
     Context "Add Path disabled" {
+        BeforeAll {
+            Set-UseMU -Value 0
+        }
+
+        It "UseMU should be 0 before install" -Skip:(!(Test-Elevated)) {
+            $useMu = Get-UseMU
+            $useMu | Should -Be 0
+        }
+
         It "MSI should install without error" -Skip:(!(Test-Elevated)) {
             {
                 Invoke-MsiExec -Install -MsiPath $msiX64Path -Properties @{ADD_PATH = 0; USE_MU = 1; ENABLE_MU = 1}
@@ -213,6 +241,15 @@ Describe -Name "Windows MSI" -Fixture {
     }
 
     Context "USE_MU disabled" {
+        BeforeAll {
+            Set-UseMU -Value 0
+        }
+
+        It "UseMU should be 0 before install" -Skip:(!(Test-Elevated)) {
+            $useMu = Get-UseMU
+            $useMu | Should -Be 0
+        }
+
         It "MSI should install without error" -Skip:(!(Test-Elevated)) {
             {
                 Invoke-MsiExec -Install -MsiPath $msiX64Path -Properties @{USE_MU = 0}

From 4f546551f5700eab9c6a5d23e45676bc7f629532 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Tue, 7 Dec 2021 12:24:31 -0800
Subject: [PATCH 170/645] Remove declaration of experimental features in
 Utility module manifest as they are stable (#16460)

---
 .../Microsoft.PowerShell.Utility.psd1              | 14 --------------
 .../Microsoft.PowerShell.Utility.psd1              | 14 --------------
 2 files changed, 28 deletions(-)

diff --git a/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 b/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
index 31251c32bc6..8efcaa03443 100644
--- a/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
+++ b/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
@@ -31,18 +31,4 @@ FunctionsToExport = @()
 AliasesToExport = @('fhx')
 NestedModules = @("Microsoft.PowerShell.Commands.Utility.dll")
 HelpInfoURI = 'https://aka.ms/powershell72-help'
-PrivateData = @{
-  PSData = @{
-    ExperimentalFeatures = @(
-      @{
-        Name        = 'Microsoft.PowerShell.Utility.PSManageBreakpointsInRunspace'
-        Description = 'Enables -BreakAll parameter on Debug-Runspace and Debug-Job cmdlets to allow users to decide if they want PowerShell to break immediately in the current location when they attach a debugger. Enables -Runspace parameter on *-PSBreakpoint cmdlets to support management of breakpoints in another runspace.'
-      }
-      @{
-        Name        = 'Microsoft.PowerShell.Utility.PSImportPSDataFileSkipLimitCheck'
-        Description = 'Enable -SkipLimitCheck switch for Import-PowerShellDataFile to not enforce built-in hashtable limits'
-      }
-    )
-  }
-}
 }
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 b/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
index 66002121d93..1b980a28913 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
@@ -30,18 +30,4 @@ FunctionsToExport = @()
 AliasesToExport = @('fhx')
 NestedModules = @("Microsoft.PowerShell.Commands.Utility.dll")
 HelpInfoURI = 'https://aka.ms/powershell72-help'
-PrivateData = @{
-  PSData = @{
-    ExperimentalFeatures = @(
-      @{
-        Name        = 'Microsoft.PowerShell.Utility.PSManageBreakpointsInRunspace'
-        Description = 'Enables -BreakAll parameter on Debug-Runspace and Debug-Job cmdlets to allow users to decide if they want PowerShell to break immediately in the current location when they attach a debugger. Enables -Runspace parameter on *-PSBreakpoint cmdlets to support management of breakpoints in another runspace.'
-      }
-      @{
-        Name        = 'Microsoft.PowerShell.Utility.PSImportPSDataFileSkipLimitCheck'
-        Description = 'Enable -NoLimit switch for Import-PowerShellDataFile to not enforce built-in hashtable limits'
-      }
-    )
-  }
-}
 }

From f0cf95ce67e52798edee46fa3e31e41e1b52f123 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 8 Dec 2021 16:11:58 -0800
Subject: [PATCH 171/645] Add explicit job name for approval tasks in Snap
 stage (#16579)

---
 tools/releaseBuild/azureDevOps/releasePipeline.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index 59160436109..fe5cb1c2464 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -265,11 +265,13 @@ stages:
   - template: templates/release/approvalJob.yml
     parameters:
       displayName: Start the release build
+      jobName: SnapStart
       instructions: |
         Start the snap pipeline at: https://dev.azure.com/$(newPwshOrgName)/PowerShell/_build?definitionId=49&_a=summary
   - template: templates/release/approvalJob.yml
     parameters:
       displayName: Approve the release
+      jobName: SnapEnd
       instructions: |
         Once the build is finished, approve the release of all channels.
 

From 6f2737238ad37aa0de718c43b288e99df4389dbb Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 10 Dec 2021 14:35:40 -0800
Subject: [PATCH 172/645] Fix broken links in markdown (#16598)

* Update coding-guidelines.md

* Update coding-guidelines.md
---
 docs/dev-process/coding-guidelines.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/dev-process/coding-guidelines.md b/docs/dev-process/coding-guidelines.md
index 9bf46aee02d..003321b9f85 100644
--- a/docs/dev-process/coding-guidelines.md
+++ b/docs/dev-process/coding-guidelines.md
@@ -88,7 +88,7 @@ We also run the [.NET code formatter tool](https://github.com/dotnet/codeformatt
 
 ### Documentation comments
 
-* Create documentation using [XML documentation comments](https://docs.microsoft.com/dotnet/csharp/codedoc) so that Visual Studio and other IDEs can use IntelliSense to show quick information about types or members.
+* Create documentation using [XML documentation comments](https://docs.microsoft.com/dotnet/csharp/language-reference/xmldoc/) so that Visual Studio and other IDEs can use IntelliSense to show quick information about types or members.
 
 * Publicly visible types and their members must be documented.
   Internal and private members may use doc comments but it is not required.
@@ -193,7 +193,7 @@ See [CODEOWNERS](../../.github/CODEOWNERS) for more information about the area e
     * [Arrays](https://docs.microsoft.com/dotnet/standard/design-guidelines/arrays)
     * [Collections](https://docs.microsoft.com/dotnet/standard/design-guidelines/guidelines-for-collections)
     * [Exceptions](https://docs.microsoft.com/dotnet/standard/design-guidelines/exceptions)
-  * [Best Practices for Developing World-Ready Applications](https://docs.microsoft.com/dotnet/standard/globalization-localization/best-practices-for-developing-world-ready-apps) - Unicode, Culture, Encoding and Localization.
+  * [Best Practices for Developing World-Ready Applications](https://docs.microsoft.com/dotnet/core/extensions/best-practices-for-developing-world-ready-apps) - Unicode, Culture, Encoding and Localization.
   * [Best Practices for Exceptions](https://docs.microsoft.com/dotnet/standard/exceptions/best-practices-for-exceptions)
   * [Best Practices for Using Strings in .NET](https://docs.microsoft.com/dotnet/standard/base-types/best-practices-strings)
   * [Best Practices for Regular Expressions in .NET](https://docs.microsoft.com/dotnet/standard/base-types/best-practices)

From 4a11a205cf7919dc0b2fc74dcfc6ec540e070d08 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 10 Dec 2021 14:38:52 -0800
Subject: [PATCH 173/645] update cgmanifest (#16600)

---
 cgmanifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cgmanifest.json b/cgmanifest.json
index 30a342907d8..96137367dd2 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -685,7 +685,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "StyleCop.Analyzers.Unstable",
-          "Version": "1.2.0.354"
+          "Version": "1.2.0.376"
         }
       },
       "DevelopmentDependency": true

From 7bebf442affc1958387fe5f8537e9ad72e2fd02f Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Fri, 10 Dec 2021 16:24:44 -0800
Subject: [PATCH 174/645] Disabled Yarn cache in markdown.yml (#16599)

---
 .vsts-ci/misc-analysis/markdown.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.vsts-ci/misc-analysis/markdown.yml b/.vsts-ci/misc-analysis/markdown.yml
index 5266f90cb4d..b63e817ef35 100644
--- a/.vsts-ci/misc-analysis/markdown.yml
+++ b/.vsts-ci/misc-analysis/markdown.yml
@@ -30,12 +30,6 @@ jobs:
 
   - 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

From bb7e0e3ba9d8859faf333d6401e3a8d1c979fa7e Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 13 Dec 2021 13:57:07 -0800
Subject: [PATCH 175/645] Update macOS build image and root folder for build
 (#16609)

---
 .../azureDevOps/templates/cloneToOfficialPath.yml    |  2 +-
 .../azureDevOps/templates/mac-package-build.yml      |  2 +-
 tools/releaseBuild/azureDevOps/templates/mac.yml     | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml b/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml
index 0a52f887671..4985433aed0 100644
--- a/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml
+++ b/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml
@@ -1,7 +1,7 @@
 steps:
   - powershell: |
       $dirSeparatorChar = [system.io.path]::DirectorySeparatorChar
-      $nativePath = "${dirSeparatorChar}PowerShell"
+      $nativePath = "${env:HOME}${dirSeparatorChar}PowerShell"
       Write-Host "##vso[task.setvariable variable=PowerShellRoot]$nativePath"
 
       if ((Test-Path "$nativePath")) {
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
index 989cdbda039..f36383e5b00 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
@@ -8,7 +8,7 @@ jobs:
   dependsOn: MacFileSigningJob_${{ parameters.buildArchitecture }}
   condition: succeeded()
   pool:
-    vmImage: internal-macos-10.14
+    vmImage: internal-macos-11
   variables:
     # Turn off Homebrew analytics
     - name: HOMEBREW_NO_ANALYTICS
diff --git a/tools/releaseBuild/azureDevOps/templates/mac.yml b/tools/releaseBuild/azureDevOps/templates/mac.yml
index 6bf7814d93b..b5998de0576 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac.yml
@@ -6,7 +6,7 @@ jobs:
   displayName: Build macOS ${{ parameters.buildArchitecture }}
   condition: succeeded()
   pool:
-    vmImage: internal-macos-10.14
+    vmImage: internal-macos-11
   variables:
     # Turn off Homebrew analytics
     - name: HOMEBREW_NO_ANALYTICS
@@ -28,11 +28,11 @@ jobs:
 
   - pwsh: |
       # create folder
-      sudo mkdir /PowerShell
+      sudo mkdir "${env:HOME}/PowerShell"
 
       # make the current user the owner
-      sudo chown $env:USER /PowerShell
-    displayName: 'Create /PowerShell'
+      sudo chown $env:USER "${env:HOME}/PowerShell"
+    displayName: 'Create ${env:HOME}/PowerShell'
 
   - template: cloneToOfficialPath.yml
 
@@ -46,7 +46,9 @@ jobs:
 
   - pwsh: |
       $env:AzDevOpsFeedPAT2 = '$(AzDevOpsFeedPAT2)'
-      $(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -Symbols -location $(PowerShellRoot) -Build -ArtifactName macosBinResults -Runtime 'osx-${{ parameters.buildArchitecture }}'
+      # Add -SkipReleaseChecks as a mitigation to unblock release.
+      # macos-10.15 does not allow creating a folder under root. Hence, moving the folder.
+      $(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -Symbols -location $(PowerShellRoot) -Build -ArtifactName macosBinResults -Runtime 'osx-${{ parameters.buildArchitecture }}' -SkipReleaseChecks
       $env:AzDevOpsFeedPAT2 = $null
     displayName: 'Build'
 

From a54b9a2c441458e0eb2da8307637754b879bb2b7 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 13 Dec 2021 16:13:17 -0800
Subject: [PATCH 176/645] Update the `vmImage` and PowerShell root directory
 for macOS builds (#16611)

---
 .../azureDevOps/templates/cloneToOfficialPath.yml  |  5 ++++-
 .../azureDevOps/templates/mac-package-build.yml    | 14 +++++++++-----
 tools/releaseBuild/azureDevOps/templates/mac.yml   | 10 ++++++----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml b/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml
index 4985433aed0..352458390f9 100644
--- a/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml
+++ b/tools/releaseBuild/azureDevOps/templates/cloneToOfficialPath.yml
@@ -1,7 +1,10 @@
+parameters:
+  nativePathRoot: ''
+
 steps:
   - powershell: |
       $dirSeparatorChar = [system.io.path]::DirectorySeparatorChar
-      $nativePath = "${env:HOME}${dirSeparatorChar}PowerShell"
+      $nativePath = "${{parameters.nativePathRoot }}${dirSeparatorChar}PowerShell"
       Write-Host "##vso[task.setvariable variable=PowerShellRoot]$nativePath"
 
       if ((Test-Path "$nativePath")) {
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
index f36383e5b00..ae828c66709 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
@@ -8,7 +8,7 @@ jobs:
   dependsOn: MacFileSigningJob_${{ parameters.buildArchitecture }}
   condition: succeeded()
   pool:
-    vmImage: internal-macos-11
+    vmImage: macos-latest
   variables:
     # Turn off Homebrew analytics
     - name: HOMEBREW_NO_ANALYTICS
@@ -23,11 +23,11 @@ jobs:
 
   - pwsh: |
       # create folder
-      sudo mkdir /PowerShell
+      sudo mkdir "$(Agent.TempDirectory)/PowerShell"
 
       # make the current user the owner
-      sudo chown $env:USER /PowerShell
-    displayName: 'Create /PowerShell'
+      sudo chown $env:USER "$(Agent.TempDirectory)/PowerShell"
+    displayName: 'Create $(Agent.TempDirectory)/PowerShell'
 
   - template: SetVersionVariables.yml
     parameters:
@@ -36,6 +36,8 @@ jobs:
   - template: shouldSign.yml
 
   - template: cloneToOfficialPath.yml
+    parameters:
+      nativePathRoot: '$(Agent.TempDirectory)'
 
   - task: DownloadBuildArtifacts@0
     displayName: Download macosBinResults
@@ -108,7 +110,9 @@ jobs:
     displayName: 'Bootstrap VM'
 
   - pwsh: |
-      $(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -location $(PowerShellRoot) -ArtifactName macosPkgResults -BuildZip $(BuildPackagePath) -ExtraPackage "tar" -Runtime 'osx-${{ parameters.buildArchitecture }}'
+      # Add -SkipReleaseChecks as a mitigation to unblock release.
+      # macos-10.15 does not allow creating a folder under root. Hence, moving the folder.
+      $(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -location $(PowerShellRoot) -ArtifactName macosPkgResults -BuildZip $(BuildPackagePath) -ExtraPackage "tar" -Runtime 'osx-${{ parameters.buildArchitecture }}' -SkipReleaseChecks
     displayName: 'Package'
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
diff --git a/tools/releaseBuild/azureDevOps/templates/mac.yml b/tools/releaseBuild/azureDevOps/templates/mac.yml
index b5998de0576..3e3b3fc2340 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac.yml
@@ -6,7 +6,7 @@ jobs:
   displayName: Build macOS ${{ parameters.buildArchitecture }}
   condition: succeeded()
   pool:
-    vmImage: internal-macos-11
+    vmImage: macos-latest
   variables:
     # Turn off Homebrew analytics
     - name: HOMEBREW_NO_ANALYTICS
@@ -28,13 +28,15 @@ jobs:
 
   - pwsh: |
       # create folder
-      sudo mkdir "${env:HOME}/PowerShell"
+      sudo mkdir "$(Agent.TempDirectory)/PowerShell"
 
       # make the current user the owner
-      sudo chown $env:USER "${env:HOME}/PowerShell"
-    displayName: 'Create ${env:HOME}/PowerShell'
+      sudo chown $env:USER "$(Agent.TempDirectory)/PowerShell"
+    displayName: 'Create $(Agent.TempDirectory)/PowerShell'
 
   - template: cloneToOfficialPath.yml
+    parameters:
+      nativePathRoot: '$(Agent.TempDirectory)'
 
   - pwsh: |
       tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -location $(PowerShellRoot) -BootStrap

From cadd5762ea6b5d5e9b7e21b10e7a7887c27fdc45 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Mon, 13 Dec 2021 19:11:19 -0800
Subject: [PATCH 177/645] Fix ForEach-Object -Parallel when passing in script
 block variable (#16564)

ForeEach-Object -Parallel using variable processing walks the script block AST to determine if the using variable was defined in the current scope, and does this by tracking the number of 'ForEach-Object -Parallel' commands in the call chain.
However, the provided script block is different, depending on whether it is passed in as a variable or via parameter binding.

$myScript = '"Hello!"'
1 | ForEach-Object -Parallel ([scriptblock]::Create($myScript))
# Script block Ast does not contain the 'ForEach-Object' command in the call chain

1 | ForEach-Object -Parallel { "Hello!" }
# Script block Ast does contain the 'ForEach-Object' command in the call chain

This change takes into account the two forms of script blocks
---
 .../engine/InternalCommands.cs                |  14 +-
 .../engine/runtime/ScriptBlockToPowerShell.cs |  97 +++++-----
 .../Foreach-Object-Parallel.Tests.ps1         | 181 +++++++++++++++++-
 3 files changed, 235 insertions(+), 57 deletions(-)

diff --git a/src/System.Management.Automation/engine/InternalCommands.cs b/src/System.Management.Automation/engine/InternalCommands.cs
index d9d54539bac..c642e30e885 100644
--- a/src/System.Management.Automation/engine/InternalCommands.cs
+++ b/src/System.Management.Automation/engine/InternalCommands.cs
@@ -382,17 +382,6 @@ public void Dispose()
         private Exception _taskCollectionException;
         private string _currentLocationPath;
 
-        // List of Foreach-Object command names and aliases.
-        // TODO: Look into using SessionState.Internal.GetAliasTable() to find all user created aliases.
-        //       But update Alias command logic to maintain reverse table that lists all aliases mapping
-        //       to a single command definition, for performance.
-        private static readonly string[] forEachNames = new string[]
-        {
-            "ForEach-Object",
-            "foreach",
-            "%"
-        };
-
         private void InitParallelParameterSet()
         {
             // The following common parameters are not (yet) supported in this parameter set.
@@ -423,8 +412,7 @@ private void InitParallelParameterSet()
             _usingValuesMap = ScriptBlockToPowerShellConverter.GetUsingValuesForEachParallel(
                 scriptBlock: Parallel,
                 isTrustedInput: allowUsingExpression,
-                context: this.Context,
-                foreachNames: forEachNames);
+                context: this.Context);
 
             // Validate using values map, which is a map of '$using:' variables referenced in the script.
             // Script block variables are not allowed since their behavior is undefined outside the runspace
diff --git a/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs b/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs
index fc1dba4aed8..efa604eb21e 100644
--- a/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs
+++ b/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs
@@ -324,13 +324,11 @@ internal static PowerShell Convert(ScriptBlockAst body,
         /// <param name = "scriptBlock">Scriptblock to search.</param>
         /// <param name = "isTrustedInput">True when input is trusted.</param>
         /// <param name = "context">Execution context.</param>
-        /// <param name = "foreachNames">List of foreach command names and aliases.</param>
         /// <returns>Dictionary of using variable map.</returns>
         internal static Dictionary<string, object> GetUsingValuesForEachParallel(
             ScriptBlock scriptBlock,
             bool isTrustedInput,
-            ExecutionContext context,
-            string[] foreachNames)
+            ExecutionContext context)
         {
             // Using variables for Foreach-Object -Parallel use are restricted to be within the 
             // Foreach-Object -Parallel call scope. This will filter the using variable map to variables 
@@ -350,7 +348,7 @@ internal static Dictionary<string, object> GetUsingValuesForEachParallel(
                 for (int i = 0; i < usingAsts.Count; ++i)
                 {
                     usingAst = (UsingExpressionAst)usingAsts[i];
-                    if (IsInForeachParallelCallingScope(usingAst, foreachNames))
+                    if (IsInForeachParallelCallingScope(scriptBlock.Ast, usingAst))
                     {
                         var value = Compiler.GetExpressionValue(usingAst.SubExpression, isTrustedInput, context);
                         string usingAstKey = PsUtils.GetUsingExpressionKey(usingAst);
@@ -382,17 +380,61 @@ internal static Dictionary<string, object> GetUsingValuesForEachParallel(
             return usingValueMap;
         }
 
+        // List of Foreach-Object command names and aliases.
+        // TODO: Look into using SessionState.Internal.GetAliasTable() to find all user created aliases.
+        //       But update Alias command logic to maintain reverse table that lists all aliases mapping
+        //       to a single command definition, for performance.
+        private static readonly string[] forEachNames = new string[]
+        {
+            "ForEach-Object",
+            "foreach",
+            "%"
+        };
+
+        private static bool FindForEachInCommand(CommandAst commandAst)
+        {
+            // Command name is always the first element in the CommandAst.
+            //  e.g., 'foreach -parallel {}'
+            var commandNameElement = (commandAst.CommandElements.Count > 0) ? commandAst.CommandElements[0] : null;
+            if (commandNameElement is StringConstantExpressionAst commandName)
+            {
+                bool found = false;
+                foreach (var foreachName in forEachNames)
+                {
+                    if (commandName.Value.Equals(foreachName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        found = true;
+                        break;
+                    }
+                }
+
+                if (found)
+                {
+                    // Verify this is foreach-object with parallel parameter set.
+                    var bindingResult = StaticParameterBinder.BindCommand(commandAst);
+                    if (bindingResult.BoundParameters.ContainsKey("Parallel"))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Walks the using Ast to verify it is used within a foreach-object -parallel command
         /// and parameter set scope, and not from within a nested foreach-object -parallel call.
         /// </summary>
+        /// <param name="scriptblockAst">Scriptblock Ast containing this using Ast</param>
         /// <param name="usingAst">Using Ast to check.</param>
-        /// <param name-"foreachNames">List of foreach-object command names.</param>
         /// <returns>True if using expression is in current call scope.</returns>
         private static bool IsInForeachParallelCallingScope(
-            UsingExpressionAst usingAst,
-            string[] foreachNames)
+            Ast scriptblockAst,
+            UsingExpressionAst usingAst)
         {
+            Diagnostics.Assert(usingAst != null, "usingAst argument cannot be null.");
+
             /*
                 Example:
                 $Test1 = "Hello"
@@ -405,54 +447,23 @@ private static bool IsInForeachParallelCallingScope(
                    }
                 }
             */
-            Diagnostics.Assert(usingAst != null, "usingAst argument cannot be null.");
 
             // Search up the parent Ast chain for 'Foreach-Object -Parallel' commands.
             Ast currentParent = usingAst.Parent;
-            int foreachNestedCount = 0;
-            while (currentParent != null)
+            while (currentParent != scriptblockAst)
             {
                 // Look for Foreach-Object outer commands
-                if (currentParent is CommandAst commandAst)
+                if (currentParent is CommandAst commandAst && 
+                    FindForEachInCommand(commandAst))
                 {
-                    foreach (var commandElement in commandAst.CommandElements)
-                    {
-                        if (commandElement is StringConstantExpressionAst commandName)
-                        {
-                            bool found = false;
-                            foreach (var foreachName in foreachNames)
-                            {
-                                if (commandName.Value.Equals(foreachName, StringComparison.OrdinalIgnoreCase))
-                                {
-                                    found = true;
-                                    break;
-                                }
-                            }
-                            
-                            if (found)
-                            {
-                                // Verify this is foreach-object with parallel parameter set.
-                                var bindingResult = StaticParameterBinder.BindCommand(commandAst);
-                                if (bindingResult.BoundParameters.ContainsKey("Parallel"))
-                                {
-                                    foreachNestedCount++;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if (foreachNestedCount > 1)
-                {
-                    // This using expression Ast is outside the original calling scope.
+                    // Using Ast is outside the invoking foreach scope.
                     return false;
                 }
 
                 currentParent = currentParent.Parent;
             }
 
-            return foreachNestedCount == 1;
+            return true;
         }
 
         /// <summary>
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Foreach-Object-Parallel.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Foreach-Object-Parallel.Tests.ps1
index 994d71601a7..fb7438608d1 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Foreach-Object-Parallel.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Foreach-Object-Parallel.Tests.ps1
@@ -87,6 +87,185 @@ Describe 'ForEach-Object -Parallel Basic Tests' -Tags 'CI' {
         $usingErrors[0].FullyQualifiedErrorId | Should -BeExactly 'UsingVariableIsUndefined,Microsoft.PowerShell.Commands.ForEachObjectCommand'
     }
 
+    It 'Verifies using variables with passed-in script block object' {
+
+        $var = "Hello"
+        $varArray = "Hello","There"
+        $sBlock = [scriptblock]::Create('$using:var; $using:varArray[1]')
+        $result = 1..1 | ForEach-Object -Parallel $sBlock
+        $result[0] | Should -BeExactly $var
+        $result[1] | Should -BeExactly $varArray[1]
+    }
+
+    It 'Verifies using variables with passed-in {} script block object' {
+
+        $var = "Hello"
+        $varArray = "Hello","There"
+        $sBlock = { $using:var; $using:varArray[1] }
+        $result = 1..1 | ForEach-Object -Parallel $sBlock
+        $result[0] | Should -BeExactly $var
+        $result[1] | Should -BeExactly $varArray[1]
+    }
+
+    It 'Verifies in scope using same-name variables in nested calls for passed-in script block objects' {
+
+        $Test1 = "Test1"
+        $sBlock = [scriptblock]::Create(@'
+            $using:Test1
+            $Test2 = "Test2"
+            $sBlock2 = [scriptblock]::Create('$using:Test2')
+            1..2 | ForEach-Object -Parallel $sBlock2
+'@)
+        $results = 1..2 | ForEach-Object -Parallel $sBlock
+        $results.Count | Should -BeExactly 6
+        $groups = $results | Group-Object -AsHashTable
+        $groups['Test1'].Count | Should -BeExactly 2
+        $groups['Test2'].Count | Should -BeExactly 4
+    }
+
+    It 'Verifies in scope using same-name variables in nested calls for passed-in {} script block objects' {
+
+        $Test1 = "Test1"
+        $sBlock = {
+            $using:Test1
+            $Test2 = "Test2"
+            $sBlock2 = [scriptblock]::Create('$using:Test2')
+            1..2 | ForEach-Object -Parallel $sBlock2
+        }
+        $results = 1..2 | ForEach-Object -Parallel $sBlock
+        $results.Count | Should -BeExactly 6
+        $groups = $results | Group-Object -AsHashTable
+        $groups['Test1'].Count | Should -BeExactly 2
+        $groups['Test2'].Count | Should -BeExactly 4
+    }
+
+    It 'Verifies in scope using same-name variables in nested calls for mixed script block objects' {
+
+        $Test1 = "Test1"
+        $sBlock = [scriptblock]::Create(@'
+            $using:Test1
+            $Test2 = "Test2"
+            1..2 | ForEach-Object -Parallel { $using:Test2 }
+'@)
+        $results = 1..2 | ForEach-Object -Parallel $sBlock
+        $results.Count | Should -BeExactly 6
+        $groups = $results | Group-Object -AsHashTable
+        $groups['Test1'].Count | Should -BeExactly 2
+        $groups['Test2'].Count | Should -BeExactly 4
+    }
+
+    It 'Verifies in scope using same-name variables in nested calls for mixed script block {} objects' {
+
+        $Test1 = "Test1"
+        $sBlock = {
+            $using:Test1
+            $Test2 = "Test2"
+            1..2 | ForEach-Object -Parallel { $using:Test2 }
+        }
+        $results = 1..2 | ForEach-Object -Parallel $sBlock
+        $results.Count | Should -BeExactly 6
+        $groups = $results | Group-Object -AsHashTable
+        $groups['Test1'].Count | Should -BeExactly 2
+        $groups['Test2'].Count | Should -BeExactly 4
+    }
+
+    It 'Verifies in scope using different-name variables in nested calls for passed-in script block objects' {
+
+        $Test1 = "Test1"
+        $sBlock = [scriptblock]::Create(@'
+            $using:Test1
+            $Test2 = "Test2"
+            $sBlock2 = [scriptblock]::Create('$using:Test2')
+            1..2 | ForEach-Object -Parallel $sBlock2
+'@)
+        $results = 1..2 | ForEach-Object -Parallel $sBlock
+        $results.Count | Should -BeExactly 6
+        $groups = $results | Group-Object -AsHashTable
+        $groups['Test1'].Count | Should -BeExactly 2
+        $groups['Test2'].Count | Should -BeExactly 4
+    }
+
+    It 'Verifies in scope using different-name variables in nested calls for passed-in script {} block objects' {
+
+        $Test1 = "Test1"
+        $sBlock = {
+            $using:Test1
+            $Test2 = "Test2"
+            $sBlock2 = [scriptblock]::Create('$using:Test2')
+            1..2 | ForEach-Object -Parallel $sBlock2
+        }
+        $results = 1..2 | ForEach-Object -Parallel $sBlock
+        $results.Count | Should -BeExactly 6
+        $groups = $results | Group-Object -AsHashTable
+        $groups['Test1'].Count | Should -BeExactly 2
+        $groups['Test2'].Count | Should -BeExactly 4
+    }
+
+    It 'Verifies in scope using different-name variables in nested calls for mixed script block objects' {
+
+        $Test1 = "Test1"
+        $sBlock = [scriptblock]::Create(@'
+            $using:Test1
+            $Test2 = "Test2"
+            1..2 | ForEach-Object -Parallel { $using:Test2 }
+'@)
+        $results = 1..2 | ForEach-Object -Parallel $sBlock
+        $results.Count | Should -BeExactly 6
+        $groups = $results | Group-Object -AsHashTable
+        $groups['Test1'].Count | Should -BeExactly 2
+        $groups['Test2'].Count | Should -BeExactly 4
+    }
+
+    It 'Verifies in scope using different-name variables in nested calls for mixed script block {} objects' {
+
+        $Test1 = "Test1"
+        $sBlock = {
+            $using:Test1
+            $Test2 = "Test2"
+            1..2 | ForEach-Object -Parallel { $using:Test2 }
+        }
+        $results = 1..2 | ForEach-Object -Parallel $sBlock
+        $results.Count | Should -BeExactly 6
+        $groups = $results | Group-Object -AsHashTable
+        $groups['Test1'].Count | Should -BeExactly 2
+        $groups['Test2'].Count | Should -BeExactly 4
+    }
+
+    It 'Verifies expected error for out of scope using variable in nested calls for passed-in script block objects' {
+
+        $Test = "TestZ"
+        $sBlock = [scriptblock]::Create(@'
+            $using:Test
+            $sBlock2 = [scriptblock]::Create('$using:Test')
+            1..1 | ForEach-Object -Parallel $sBlock2
+'@)
+        1..1 | ForEach-Object -Parallel $SBlock -ErrorVariable usingErrors 2>$null
+        $usingErrors[0].FullyQualifiedErrorId | Should -BeExactly 'UsingVariableIsUndefined,Microsoft.PowerShell.Commands.ForEachObjectCommand'
+    }
+
+    It 'Verifies expected error for out of scope using variable in nested calls for passed-in {} script block objects' {
+
+        $Test = "TestZ"
+        $sBlock = [scriptblock]::Create(@'
+            $using:Test
+            $sBlock2 = { $using:Test }
+            1..1 | ForEach-Object -Parallel $sBlock2
+'@)
+        1..1 | ForEach-Object -Parallel $SBlock -ErrorVariable usingErrors 2>$null
+        $usingErrors[0].FullyQualifiedErrorId | Should -BeExactly 'UsingVariableIsUndefined,Microsoft.PowerShell.Commands.ForEachObjectCommand'
+    }
+
+    It 'Verifies expected error for out of scope using variable in nested calls for mixed script block objects' {
+
+        $Test = "TestZ"
+        $sBlock = [scriptblock]::Create(@'
+            $using:Test
+            1..1 | ForEach-Object -Parallel { $using:Test }
+'@)
+        1..1 | ForEach-Object -Parallel $SBlock -ErrorVariable usingErrors 2>$null
+        $usingErrors[0].FullyQualifiedErrorId | Should -BeExactly 'UsingVariableIsUndefined,Microsoft.PowerShell.Commands.ForEachObjectCommand'
+    }
+
     It 'Verifies terminating error streaming' {
 
         $result = 1..1 | ForEach-Object -Parallel { throw 'Terminating Error!'; "Hello" } 2>&1
@@ -150,7 +329,7 @@ Describe 'ForEach-Object -Parallel Basic Tests' -Tags 'CI' {
         $pr[0].StatusDescription | Should -Be Running
         $ps.Dispose()
     }
- 
+
     It 'Verifies information data streaming' {
 
         $actualInformation = 1..1 | ForEach-Object -Parallel { Write-Information "Information!" } 6>&1

From d4bad46e618b6ac5e436ccccb9bd1f35dec37579 Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Tue, 14 Dec 2021 10:40:09 -0800
Subject: [PATCH 178/645] Updated README.md and metadata.json for 7.2.1 release
 (#16586)

---
 README.md           | 54 ++++++++++++++++++++++-----------------------
 tools/metadata.json |  6 ++---
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 022b9b3253e..b293f6b8ccb 100644
--- a/README.md
+++ b/README.md
@@ -64,33 +64,33 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 | 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
-
-[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
+[lts-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x86.msi
+[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x64.msi
+[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-lts_7.2.1-1.deb_amd64.deb
+[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-lts-7.2.1-1.rh.x86_64.rpm
+[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-lts-7.2.1-osx-x64.pkg
+[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-lts-7.2.1-osx-arm64.pkg
+
+[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x64.msi
+[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x86.msi
+[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell_7.2.1-1.deb_amd64.deb
+[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell_7.2.1-1.deb_amd64.deb
+[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell_7.2.1-1.deb_amd64.deb
+[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell_7.2.1-1.deb_amd64.deb
+[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell_7.2.1-1.deb_amd64.deb
+[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell_7.2.1-1.deb_amd64.deb
+[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-1.rh.x86_64.rpm
+[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-1.rh.x86_64.rpm
+[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-osx-x64.pkg
+[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-osx-arm64.pkg
+[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-arm64.zip
+[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x86.zip
+[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x64.zip
+[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-osx-x64.tar.gz
+[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-osx-arm64.tar.gz
+[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-linux-x64.tar.gz
+[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-linux-arm32.tar.gz
+[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-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
diff --git a/tools/metadata.json b/tools/metadata.json
index cd0546d410f..0f43eb740bf 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,9 +1,9 @@
 {
-  "StableReleaseTag": "v7.2.0",
+  "StableReleaseTag": "v7.2.1",
   "PreviewReleaseTag": "v7.2.0-rc.1",
   "ServicingReleaseTag": "v7.0.8",
-  "ReleaseTag": "v7.2.0",
-  "LTSReleaseTag" : ["v7.2.0", "v7.0.8"],
+  "ReleaseTag": "v7.2.1",
+  "LTSReleaseTag" : ["v7.2.1", "v7.0.8"],
   "NextReleaseTag": "v7.3.0-preview.1",
   "LTSRelease": { "Latest": false, "Package": false },
   "StableRelease":  { "Latest": false, "Package": false }

From 6b06625cc69867d617095c2bcfadb669b14a072a Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Tue, 14 Dec 2021 15:20:13 -0800
Subject: [PATCH 179/645] Updating changelog for 7.2.1 (#16616)

---
 .spelling        |  4 ++++
 CHANGELOG/7.2.md | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/.spelling b/.spelling
index 6f15f6a56bd..6c450d7d05b 100644
--- a/.spelling
+++ b/.spelling
@@ -97,11 +97,13 @@ bugfix
 build.json
 build.psm1
 bulid
+buildInfoJson
 callmejoebob
 catchable
 cdxml
 celsius
 CentOS
+CGManifest
 changelog
 changelog.md
 changelogs
@@ -116,6 +118,7 @@ childitem
 ChrisLGardner
 cimsession
 cimsupport
+ci.psm1
 classlib
 clear-itemproperty
 cloudydino
@@ -907,6 +910,7 @@ tracesource
 travisez13
 travisty
 truher
+TSAUpload
 TValue
 tylerleonhardt
 typecataloggen
diff --git a/CHANGELOG/7.2.md b/CHANGELOG/7.2.md
index 0a570847848..8eb70874ef5 100644
--- a/CHANGELOG/7.2.md
+++ b/CHANGELOG/7.2.md
@@ -1,5 +1,44 @@
 # 7.2 Changelog
 
+## [7.2.1] - 2021-12-14
+
+### General Cmdlet Updates and Fixes
+
+- Remove declaration of experimental features in Utility module manifest as they are stable (#16460)
+- Bring back pwsh.exe for framework dependent packages to support Start-Job (#16535)
+- Change default for `$PSStyle.OutputRendering` to `Ansi` (Internal 18394)
+- Update `HelpInfoUri` for 7.2 release (#16456)
+- Fix typo for "privacy" in MSI installer (#16407)
+
+### Tests
+
+- Set clean state before testing `UseMU` in the MSI (#16543)
+
+### Build and Packaging Improvements
+
+<details>
+
+<ul>
+<li>Add explicit job name for approval tasks in Snap stage (#16579)</li>
+<li>Fixing the build by removing duplicate TSAUpload entries (Internal 18399)</li>
+<li>Port CGManifest fixes (Internal 18402)</li>
+<li>Update CGManifest (Internal 18403)</li>
+<li>Updated package dependencies for 7.2.1 (Internal 18388)</li>
+<li>Use different containers for different branches (#16434)</li>
+<li>Use notice task to generate license assuming CGManifest contains all components (#16340)</li>
+<li>Create compliance build (#16286)</li>
+<li>Update release instructions with link to new build (#16419)</li>
+<li>Add diagnostics used to take corrective action when releasing buildInfoJson (#16404)</li>
+<li>vPack release should use buildInfoJson new to 7.2 (#16402)</li>
+<li>Add checkout to build json stage to get <code>ci.psm1</code> (#16399)</li>
+<li>Update the usage of metadata.json for getting LTS information (#16381)</li>
+<li>Move mapping file into product repo and add Debian 11 (#16316)</li>
+</ul>
+
+</details>
+
+[7.2.1]: https://github.com/PowerShell/PowerShell/compare/v7.2.0...v7.2.1
+
 ## [7.2.0] - 2021-11-08
 
 ### General Cmdlet Updates and Fixes

From 6662e21cb6b7fe4baf61be59036962901c354e52 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 15 Dec 2021 16:38:37 -0800
Subject: [PATCH 180/645] Fix the DSC overview URL in a markdown file and some
 small cleanup changes (#16629)

---
 build.psm1                                                    | 4 ++--
 demos/DSC/readme.md                                           | 2 +-
 .../host/msh/UpdatesNotification.cs                           | 2 +-
 src/System.Management.Automation/engine/parser/Parser.cs      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.psm1 b/build.psm1
index d3bfb968661..4330011863e 100644
--- a/build.psm1
+++ b/build.psm1
@@ -2238,7 +2238,7 @@ function Start-ResGen
 }
 
 function Find-Dotnet() {
-    Write-Verbose -Verbose "In Find-DotNet"
+    Write-Verbose "In Find-DotNet"
 
     $originalPath = $env:PATH
     $dotnetPath = if ($environment.IsWindows) { "$env:LocalAppData\Microsoft\dotnet" } else { "$env:HOME/.dotnet" }
@@ -2258,7 +2258,7 @@ function Find-Dotnet() {
         $dotnetCLIInstalledVersion = Get-LatestInstalledSDK
         Pop-Location
 
-        Write-Verbose -Verbose "dotnetCLIInstalledVersion = $dotnetCLIInstalledVersion`nchosenDotNetVersion = $chosenDotNetVersion"
+        Write-Verbose "dotnetCLIInstalledVersion = $dotnetCLIInstalledVersion; chosenDotNetVersion = $chosenDotNetVersion"
 
         if ($dotnetCLIInstalledVersion -ne $chosenDotNetVersion) {
             Write-Warning "The 'dotnet' in the current path can't find SDK version ${dotnetCLIRequiredVersion}, prepending $dotnetPath to PATH."
diff --git a/demos/DSC/readme.md b/demos/DSC/readme.md
index 0ce83fb3efa..0dd98968d2f 100644
--- a/demos/DSC/readme.md
+++ b/demos/DSC/readme.md
@@ -1,6 +1,6 @@
 # DSC MOF Compilation Demo
 
-[PowerShell Desired State Configuration](https://docs.microsoft.com/powershell/scripting/dsc/overview/overview) is a declarative configuration platform for Windows and Linux.
+[PowerShell Desired State Configuration](https://docs.microsoft.com/powershell/scripting/dsc/overview) is a declarative configuration platform for Windows and Linux.
 DSC configurations can be authored in PowerShell and compiled into the resultant MOF document.
 
 This demo shows use of PowerShell to author a DSC configuration to set the configuration of an Apache web server. PowerShell scripting is used to assess distribution and version-specific properties,
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs
index dff3757259f..e9bc2d343b4 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs
@@ -108,7 +108,7 @@ internal static void ShowUpdateNotification(PSHostUserInterface hostUI)
                 // We calculate how much whitespace we need to make it look nice
                 if (hostUI.SupportsVirtualTerminal)
                 {
-                    // Use Warning Color
+                    // Swaps foreground and background colors.
                     notificationColor = "\x1B[7m";
                     resetColor = "\x1B[0m";
 
diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
index 8fbb262edad..e3d08ca38ab 100644
--- a/src/System.Management.Automation/engine/parser/Parser.cs
+++ b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -6735,7 +6735,7 @@ private ExpressionAst ExpressionRule(bool endNumberOnTernaryOpChars = false)
                 SkipToken();
                 SkipNewlines();
 
-                // We have seen the ternary operator '?' and now expecting the 'IfFalse' expression.
+                // We have seen the ternary operator '?' and now expecting the 'IfTrue' expression.
                 ExpressionAst ifTrue = ExpressionRule(endNumberOnTernaryOpChars: true);
                 if (ifTrue == null)
                 {

From 083df00354a0d8394278dfd56c367ba4379c47aa Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Thu, 16 Dec 2021 12:12:09 -0800
Subject: [PATCH 181/645] Updated README.md and metadata.json for
 v7.3.0-preview.1 release (#16627)

---
 README.md           | 28 ++++++++++++++--------------
 tools/metadata.json |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index b293f6b8ccb..0c0163fc0f5 100644
--- a/README.md
+++ b/README.md
@@ -93,20 +93,20 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 [rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-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.3.0-preview.1/PowerShell-7.3.0-preview.1-win-x64.msi
+[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/PowerShell-7.3.0-preview.1-win-x86.msi
+[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-preview_7.3.0-preview.1-1.deb_amd64.deb
+[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-preview-7.3.0_preview.1-1.rh.x86_64.rpm
+[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-osx-x64.pkg
+[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-osx-arm64.pkg
+[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/PowerShell-7.3.0-preview.1-win-arm64.zip
+[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/PowerShell-7.3.0-preview.1-win-x86.zip
+[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/PowerShell-7.3.0-preview.1-win-x64.zip
+[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-osx-x64.tar.gz
+[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-osx-arm64.tar.gz
+[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-linux-x64.tar.gz
+[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-linux-arm32.tar.gz
+[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-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
diff --git a/tools/metadata.json b/tools/metadata.json
index 0f43eb740bf..053c8063c42 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,10 +1,10 @@
 {
   "StableReleaseTag": "v7.2.1",
-  "PreviewReleaseTag": "v7.2.0-rc.1",
+  "PreviewReleaseTag": "v7.3.0-preview.1",
   "ServicingReleaseTag": "v7.0.8",
   "ReleaseTag": "v7.2.1",
   "LTSReleaseTag" : ["v7.2.1", "v7.0.8"],
-  "NextReleaseTag": "v7.3.0-preview.1",
+  "NextReleaseTag": "v7.3.0-preview.2",
   "LTSRelease": { "Latest": false, "Package": false },
   "StableRelease":  { "Latest": false, "Package": false }
 }

From 3f1c03d4948354afd2e1d385e6aff82b07c7ef13 Mon Sep 17 00:00:00 2001
From: Andrew Menagarishvili <anmenaga@microsoft.com>
Date: Sat, 11 Dec 2021 02:26:55 +0000
Subject: [PATCH 182/645] Merged PR 18449: Change default for
 `$PSStyle.OutputRendering` to `Ansi`

Cherry picked from !18333

Cherry-picked from commit `5cb8a2b3`.
---
 .../host/msh/ConsoleHostUserInterface.cs      |  8 +++---
 .../FormatAndOutput/common/PSStyle.cs         |  2 +-
 .../engine/Utils.cs                           |  1 -
 .../engine/hostifaces/MshHostUserInterface.cs | 26 +++++--------------
 test/powershell/Host/ConsoleHost.Tests.ps1    | 14 ++++++++--
 .../Enter-PSHostProcess.Tests.ps1             | 18 +++++++++++++
 .../Get-Error.Tests.ps1                       |  2 +-
 .../Formatting/OutputRendering.Tests.ps1      |  4 +--
 .../engine/Formatting/PSStyle.Tests.ps1       |  2 +-
 9 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
index ad20eadf3d8..12459ffa3b6 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
@@ -729,7 +729,7 @@ private void WriteImpl(string value, bool newLine)
             }
 
             TextWriter writer = Console.IsOutputRedirected ? Console.Out : _parent.ConsoleTextWriter;
-            value = GetOutputString(value, SupportsVirtualTerminal, Console.IsOutputRedirected);
+            value = GetOutputString(value, SupportsVirtualTerminal);
 
             if (_parent.IsRunningAsync)
             {
@@ -1215,7 +1215,7 @@ public override void WriteDebugLine(string message)
             {
                 if (SupportsVirtualTerminal)
                 {
-                    WriteLine(GetFormatStyleString(FormatStyle.Debug, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.DebugFormatString, message) + PSStyle.Instance.Reset);
+                    WriteLine(GetFormatStyleString(FormatStyle.Debug) + StringUtil.Format(ConsoleHostUserInterfaceStrings.DebugFormatString, message) + PSStyle.Instance.Reset);
                 }
                 else
                 {
@@ -1276,7 +1276,7 @@ public override void WriteVerboseLine(string message)
             {
                 if (SupportsVirtualTerminal)
                 {
-                    WriteLine(GetFormatStyleString(FormatStyle.Verbose, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.VerboseFormatString, message) + PSStyle.Instance.Reset);
+                    WriteLine(GetFormatStyleString(FormatStyle.Verbose) + StringUtil.Format(ConsoleHostUserInterfaceStrings.VerboseFormatString, message) + PSStyle.Instance.Reset);
                 }
                 else
                 {
@@ -1320,7 +1320,7 @@ public override void WriteWarningLine(string message)
             {
                 if (SupportsVirtualTerminal)
                 {
-                    WriteLine(GetFormatStyleString(FormatStyle.Warning, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.WarningFormatString, message) + PSStyle.Instance.Reset);
+                    WriteLine(GetFormatStyleString(FormatStyle.Warning) + StringUtil.Format(ConsoleHostUserInterfaceStrings.WarningFormatString, message) + PSStyle.Instance.Reset);
                 }
                 else
                 {
diff --git a/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
index 3a641edc429..8f8d6c29d55 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
@@ -572,7 +572,7 @@ public FileInfoFormatting()
         /// <summary>
         /// Gets or sets the rendering mode for output.
         /// </summary>
-        public OutputRendering OutputRendering { get; set; } = OutputRendering.Host;
+        public OutputRendering OutputRendering { get; set; } = OutputRendering.Ansi;
 
         /// <summary>
         /// Gets value to turn off all attributes.
diff --git a/src/System.Management.Automation/engine/Utils.cs b/src/System.Management.Automation/engine/Utils.cs
index f277dcb1e49..879f43944a5 100644
--- a/src/System.Management.Automation/engine/Utils.cs
+++ b/src/System.Management.Automation/engine/Utils.cs
@@ -1574,7 +1574,6 @@ public static class InternalTestHooks
         internal static bool BypassAppLockerPolicyCaching;
         internal static bool BypassOnlineHelpRetrieval;
         internal static bool ForcePromptForChoiceDefaultOption;
-        internal static bool BypassOutputRedirectionCheck;
         internal static bool NoPromptForPassword;
         internal static bool ForceFormatListFixedLabelWidth;
 
diff --git a/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
index ea101ade659..636e888d475 100644
--- a/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
+++ b/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
@@ -304,18 +304,12 @@ public enum FormatStyle
         /// <param name="formatStyle">
         /// The format style to get the escape sequence for.
         /// </param>
-        /// <param name="isOutputRedirected">
-        /// True if the output is redirected.
-        /// </param>
         /// <returns>
         /// The ANSI escape sequence for the given format style.
         /// </returns>
-        public static string GetFormatStyleString(FormatStyle formatStyle, bool isOutputRedirected)
+        public static string GetFormatStyleString(FormatStyle formatStyle)
         {
-            // redirected console gets plaintext output to preserve existing behavior
-            if (!InternalTestHooks.BypassOutputRedirectionCheck &&
-                (PSStyle.Instance.OutputRendering == OutputRendering.PlainText ||
-                isOutputRedirected))
+            if (PSStyle.Instance.OutputRendering == OutputRendering.PlainText)
             {
                 return string.Empty;
             }
@@ -353,30 +347,22 @@ public static string GetFormatStyleString(FormatStyle formatStyle, bool isOutput
         /// <param name="supportsVirtualTerminal">
         /// True if the host supports virtual terminal.
         /// </param>
-        /// <param name="isOutputRedirected">
-        /// True if the output is redirected.
-        /// </param>
         /// <returns>
         /// The formatted text.
         /// </returns>
-        public static string GetOutputString(string text, bool supportsVirtualTerminal, bool isOutputRedirected)
+        public static string GetOutputString(string text, bool supportsVirtualTerminal)
         {
-            return GetOutputString(text, isHost: true, supportsVirtualTerminal: supportsVirtualTerminal, isOutputRedirected: isOutputRedirected);
+            return GetOutputString(text, isHost: true, supportsVirtualTerminal: supportsVirtualTerminal);
         }
 
-        internal static string GetOutputString(string text, bool isHost, bool? supportsVirtualTerminal = null, bool isOutputRedirected = false)
+        internal static string GetOutputString(string text, bool isHost, bool? supportsVirtualTerminal = null)
         {
             var sd = new ValueStringDecorated(text);
 
             if (sd.IsDecorated)
             {
                 var outputRendering = OutputRendering.Ansi;
-                if (InternalTestHooks.BypassOutputRedirectionCheck)
-                {
-                    isOutputRedirected = false;
-                }
-
-                if (isOutputRedirected || ShouldOutputPlainText(isHost, supportsVirtualTerminal))
+                if (ShouldOutputPlainText(isHost, supportsVirtualTerminal))
                 {
                     outputRendering = OutputRendering.PlainText;
                 }
diff --git a/test/powershell/Host/ConsoleHost.Tests.ps1 b/test/powershell/Host/ConsoleHost.Tests.ps1
index 6de6c6ad618..06f8f0a8198 100644
--- a/test/powershell/Host/ConsoleHost.Tests.ps1
+++ b/test/powershell/Host/ConsoleHost.Tests.ps1
@@ -414,7 +414,7 @@ export $envVarName='$guid'
 
         It "text output" {
             # Join (multiple lines) and remove whitespace (we don't care about spacing) to verify we converted to string (by generating a table)
-            -join (& $powershell -noprofile -outputFormat text { [PSCustomObject]@{X=10;Y=20} }) -replace "\s","" | Should -Be "XY--1020"
+            -join (& $powershell -noprofile -outputFormat text { $PSStyle.OutputRendering = 'PlainText'; [PSCustomObject]@{X=10;Y=20} }) -replace "\s","" | Should -Be "XY--1020"
         }
 
         It "errors are in text if error is redirected, encoded command, non-interactive, and outputformat specified" {
@@ -491,7 +491,15 @@ export $envVarName='$guid'
     }
 
     Context "Redirected standard input for 'interactive' use" {
-        $nl = [Environment]::Newline
+        BeforeAll {
+            $nl = [Environment]::Newline
+            $oldColor = $env:NO_COLOR
+            $env:NO_COLOR = 1
+        }
+
+        AfterAll {
+            $env:NO_COLOR = $oldColor
+        }
 
         # All of the following tests replace the prompt (either via an initial command or interactively)
         # so that we can read StandardOutput and reliably know exactly what the prompt is.
@@ -586,6 +594,8 @@ foo
         It "Redirected input w/ nested prompt" -Pending:($IsWindows) {
             $si = NewProcessStartInfo "-noprofile -noexit -c ""`$function:prompt = { 'PS' + ('>'*(`$NestedPromptLevel+1)) + ' ' }""" -RedirectStdIn
             $process = RunPowerShell $si
+            $process.StandardInput.Write("`$PSStyle.OutputRendering='plaintext'`n")
+            $null = $process.StandardOutput.ReadLine()
             $process.StandardInput.Write("`$Host.EnterNestedPrompt()`n")
             $process.StandardOutput.ReadLine() | Should -Be "PS> `$Host.EnterNestedPrompt()"
             $process.StandardInput.Write("exit`n")
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Enter-PSHostProcess.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Enter-PSHostProcess.Tests.ps1
index e586d047804..a4898b1e1ad 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Enter-PSHostProcess.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Enter-PSHostProcess.Tests.ps1
@@ -68,6 +68,15 @@ Exit-PSHostProcess
 Describe "Enter-PSHostProcess tests" -Tag Feature {
     Context "By Process Id" {
 
+        BeforeAll {
+            $oldColor = $env:NO_COLOR
+            $env:NO_COLOR = 1
+        }
+
+        AfterAll {
+            $env:NO_COLOR = $oldColor
+        }
+
         BeforeEach {
             # Start a normal job where the first thing it does is return $PID. After that, spin forever.
             # We will use this job as the target process for Enter-PSHostProcess
@@ -181,6 +190,15 @@ Describe "Enter-PSHostProcess tests" -Tag Feature {
 
     Context "By CustomPipeName" {
 
+        BeforeAll {
+            $oldColor = $env:NO_COLOR
+            $env:NO_COLOR = 1
+        }
+
+        AfterAll {
+            $env:NO_COLOR = $oldColor
+        }
+
         It "Can enter, exit, and re-enter using CustomPipeName" {
             $pipeName = [System.IO.Path]::GetRandomFileName()
             $pipePath = Get-PipePath -PipeName $pipeName
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Error.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Error.Tests.ps1
index 651eaa287dd..0627de64b3a 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Error.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Error.Tests.ps1
@@ -136,7 +136,7 @@ Describe 'Get-Error tests' -Tag CI {
         try {
             $originalRendering = $PSStyle.OutputRendering
             $PSStyle.OutputRendering = 'Ansi'
-            $out = pwsh -noprofile -command '$PSStyle.OutputRendering = "ANSI"; [System.Management.Automation.Internal.InternalTestHooks]::SetTestHook("BypassOutputRedirectionCheck", $true); try { 1/0 } catch { }; Get-Error' | Out-String
+            $out = pwsh -noprofile -command '$PSStyle.OutputRendering = "ANSI"; try { 1/0 } catch { }; Get-Error' | Out-String
 
             # need to escape the open square bracket so the regex works
             $resetColor = $PSStyle.Reset.Replace('[','\[')
diff --git a/test/powershell/engine/Formatting/OutputRendering.Tests.ps1 b/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
index 14085cc23ba..53732a2bd6a 100644
--- a/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
+++ b/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
@@ -21,7 +21,7 @@ Describe 'OutputRendering tests' {
     ) {
         param($outputRendering, $ansi)
 
-        $out = pwsh -noprofile -command "[System.Management.Automation.Internal.InternalTestHooks]::SetTestHook('BypassOutputRedirectionCheck', `$true); `$PSStyle.OutputRendering = '$outputRendering'; write-host '$($PSStyle.Foreground.Green)hello'"
+        $out = pwsh -noprofile -command "`$PSStyle.OutputRendering = '$outputRendering'; write-host '$($PSStyle.Foreground.Green)hello'"
 
         if ($ansi) {
             $out | Should -BeLike "*`e*" -Because ($out | Format-Hex | Out-String)
@@ -62,7 +62,7 @@ Describe 'OutputRendering tests' {
             $switch = "-$stream"
         }
 
-        $out = pwsh -noprofile -command "[System.Management.Automation.Internal.InternalTestHooks]::SetTestHook('BypassOutputRedirectionCheck', `$true); write-$stream $switch 'hello';'bye'"
+        $out = pwsh -noprofile -command "write-$stream $switch 'hello';'bye'"
         $out.Count | Should -Be 2
         $out[0] | Should -BeExactly "$($PSStyle.Formatting.$stream)$($stream.ToUpper()): hello$($PSStyle.Reset)" -Because ($out[0] | Out-String | Format-hex)
         $out[1] | Should -BeExactly "bye"
diff --git a/test/powershell/engine/Formatting/PSStyle.Tests.ps1 b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
index 04c13c5e04e..02ea4f57981 100644
--- a/test/powershell/engine/Formatting/PSStyle.Tests.ps1
+++ b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
@@ -83,7 +83,7 @@ Describe 'Tests for $PSStyle automatic variable' {
 
     It '$PSStyle has correct default for OutputRendering' {
         $PSStyle | Should -Not -BeNullOrEmpty
-        $PSStyle.OutputRendering | Should -BeExactly 'Host'
+        $PSStyle.OutputRendering | Should -BeExactly 'Ansi'
     }
 
     It '$PSStyle has correct defaults for style <key>' -TestCases (Get-TestCases $styleDefaults) {

From 2b550d2f6913b128ae13c35a5a7d6776198d71b0 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 14 Dec 2021 15:13:26 -0800
Subject: [PATCH 183/645] Check for feed value before registering

---
 .../azureDevOps/templates/release-GlobalToolTest.yml       | 6 ++++--
 .../azureDevOps/templates/release-SDKTests.yml             | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
index 34ea848ca7e..df31d05aeec 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
@@ -42,8 +42,10 @@ jobs:
         if(-not (Get-PackageSource -Name 'dotnet' -ErrorAction SilentlyContinue))
         {
             $nugetFeed = ([xml](Get-Content $(Build.SourcesDirectory)/nuget.config -Raw)).Configuration.packagesources.add | Where-Object { $_.Key -eq 'dotnet' } | Select-Object -ExpandProperty Value
-            Register-PackageSource -Name 'dotnet' -Location $nugetFeed -ProviderName NuGet
-            Write-Verbose -Message "Register new package source 'dotnet'" -verbose
+            if ($nugetFeed) {
+              Register-PackageSource -Name 'dotnet' -Location $nugetFeed -ProviderName NuGet
+              Write-Verbose -Message "Register new package source 'dotnet'" -verbose
+            }
         }
 
         ## Install latest version from the channel
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
index 8b7663f1c37..ce80e825d3f 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@@ -79,8 +79,11 @@ jobs:
         if(-not (Get-PackageSource -Name 'dotnet' -ErrorAction SilentlyContinue))
         {
             $nugetFeed = ([xml](Get-Content $(Build.SourcesDirectory)/nuget.config -Raw)).Configuration.packagesources.add | Where-Object { $_.Key -eq 'dotnet' } | Select-Object -ExpandProperty Value
-            Register-PackageSource -Name 'dotnet' -Location $nugetFeed -ProviderName NuGet
-            Write-Verbose -Message "Register new package source 'dotnet'" -verbose
+
+            if ($nugetFeed) {
+              Register-PackageSource -Name 'dotnet' -Location $nugetFeed -ProviderName NuGet
+              Write-Verbose -Message "Register new package source 'dotnet'" -verbose
+            }
         }
 
         ## Install latest version from the channel

From c8f32fc52c9491b2c45835cdd25a9d75f3d8e7f5 Mon Sep 17 00:00:00 2001
From: Andrew Menagarishvili <anmenaga@microsoft.com>
Date: Thu, 16 Dec 2021 18:59:20 +0000
Subject: [PATCH 184/645] Merged PR 18465: Changelog for v7.3.0-preview.1

Changelog for v7.3.0-preview.1
---
 .spelling            |  15 +++
 CHANGELOG/preview.md | 229 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 244 insertions(+)

diff --git a/.spelling b/.spelling
index 6f15f6a56bd..ef7e173827f 100644
--- a/.spelling
+++ b/.spelling
@@ -102,6 +102,7 @@ catchable
 cdxml
 celsius
 CentOS
+cgmanifest
 changelog
 changelog.md
 changelogs
@@ -234,6 +235,7 @@ DotnetRutimeMetadata.json
 dottedscopes
 downlevel
 dropdown
+dwtaber
 e.g.
 ebook
 ebooks
@@ -270,6 +272,7 @@ export-formatdata
 export-modulemember
 failurecode
 failurecount
+farmerau
 fbehrens
 felixfbecker
 ffeldhaus
@@ -353,6 +356,7 @@ hackathons
 HashSet
 hashtable
 hashtables
+hayhay27
 helloworld.ps1
 helpproviderwithcache
 helpproviderwithfullcache
@@ -370,6 +374,7 @@ httpbin's
 https
 hubuk
 hvitved
+i3arnon
 i.e.
 ico
 idera
@@ -427,8 +432,10 @@ jwmoss
 kanjibates
 kasper3
 katacoda
+Kellen-Stuart
 kevinmarquette
 kevinoid
+KevRitchie
 keyfileparameter
 keyhandler
 khansen00
@@ -473,10 +480,12 @@ macports
 maertendmsft
 mahawar
 Markdig.Signed
+markdown.yml
 markekraus
 marktiedemann
 Marusyk
 MarvTheRobot
+matt9ucci
 mcbobke
 md
 meir017
@@ -632,6 +641,7 @@ powershellgallery
 powershellget
 powershellmagazine.com
 powershellninja
+powershellpr0mpt
 powershellproperties
 ppadmavilasom
 pre-build
@@ -723,6 +733,7 @@ receive-pssession
 recurse
 reddit
 redhat
+redirections
 redistributable
 redistributables
 register-argumentcompleter
@@ -770,6 +781,7 @@ rkitover
 robo210
 ronn
 rpalo
+rpolley
 runspace
 runspaceinit
 runspaces
@@ -812,6 +824,7 @@ set-wsmaninstance
 set-wsmanquickconfig
 sethvs
 setversionvariables
+sha256
 ShaydeNofziger
 shellexecute
 shouldbeerrorid
@@ -837,6 +850,7 @@ start-codecoveragerun
 start-pspester
 stdin
 stevel-msft
+StevenLiekens
 stevend811
 stknohg
 strawgate
@@ -846,6 +860,7 @@ string.split
 stringbuilder
 stuntguy3000
 StyleCop
+subfolder
 submodule
 submodules
 sudo
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index 035db721385..799630aa599 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1 +1,230 @@
 # Current preview release
+
+## [7.3.0-preview.1] - 2021-12-16
+
+### Breaking Changes
+
+- Add `clean` block to script block as a peer to `begin`, `process`, and `end` to allow easy resource cleanup (#15177)
+- Change default for `$PSStyle.OutputRendering` to `Ansi` (Internal 18449)
+
+### Engine Updates and Fixes
+
+- Remove duplicate remote server mediator code (#16027)
+- Fix `PSVersion` parameter version checks and error messages for PowerShell 7 remoting (#16228)
+- Use the same temporary home directory when `HOME` env variable is not set (#16263)
+- Fix parser to generate error when array has more than 32 dimensions (#16276)
+
+### Performance
+
+- Avoid validation for built-in file extension and color VT sequences (#16320) (Thanks @iSazonov!)
+
+### General Cmdlet Updates and Fixes
+
+- Update `README.md` and `metadata.json` for next preview release (#16107)
+- Use `PlainText` when writing to a host that doesn't support VT (#16092)
+- Remove support for `AppExeCLinks` to retrieve target (#16044)
+- Move `GetOuputString()` and `GetFormatStyleString()` to `PSHostUserInterface` as public API (#16075)
+- Fix `ConvertTo-SecureString` with key regression due to .NET breaking change (#16068)
+- Fix regression in `Move-Item` to only fallback to `copy and delete` in specific cases (#16029)
+- Set `$?` correctly for command expression with redirections (#16046)
+- Use `CurrentCulture` when handling conversions to `DateTime` in `Add-History` (#16005) (Thanks @vexx32!)
+- Fix link header parsing to handle unquoted `rel` types (#15973) (Thanks @StevenLiekens!)
+- Fix a casting error when using `$PSNativeCommandUsesErrorActionPreference` (#15993)
+- Format-Wide: Fix `NullReferenceException` (#15990) (Thanks @DarylGraves!)
+- Make the native command error handling optionally honor `ErrorActionPreference` (#15897)
+- Remove declaration of experimental features in Utility module manifest as they are stable (#16460)
+- Fix race condition between `DisconnectAsync` and `Dispose` (#16536) (Thanks @i3arnon!)
+- Fix the `Max_PATH` condition check to handle long path correctly (#16487) (Thanks @Shriram0908!)
+- Update `HelpInfoUri` for 7.2 release (#16456)
+- Fix tab completion within the script block specified for the `ValidateScriptAttribute`. (#14550) (Thanks @MartinGC94!)
+- Update `README.md` to specify gathered telemetry (#16379)
+- Fix typo for "privacy" in MSI installer (#16407)
+- Remove unneeded call to `File.ResolveLinkTarget` from `IsWindowsApplication` (#16371) (Thanks @iSazonov!)
+- Add `-HttpVersion` parameter to web cmdlets (#15853) (Thanks @hayhay27!)
+- Add support to web cmdlets for open-ended input tags (#16193) (Thanks @farmerau!)
+- Add more tests to `Tee-Object -Encoding` (#14539) (Thanks @rpolley!)
+- Don't throw exception when trying to resolve a possible link path (#16310)
+- Fix `ConvertTo-Json -Depth` to allow 100 at maximum (#16197) (Thanks @KevRitchie!)
+- Fix for SSH remoting when banner is enabled on SSHD endpoint (#16205)
+- Disallow all COM for AppLocker system lock down (#16268)
+- Configure `ApplicationInsights` to not send cloud role name (#16246)
+- Disallow `Add-Type` in NoLanguage mode on a locked down machine (#16245)
+- Specify the executable path as `TargetObect` for non-zero exit code `ErrorRecord` (#16108) (Thanks @rkeithhill!)
+- Don't allow `Move-Item` with FileSystemProvider to move a directory into itself (#16198)
+- Make property names for the color VT sequences consistent with documentations (#16212)
+- Fix `PipelineVariable` to set variable in the right scope (#16199)
+- Invoke-Command: improve handling of variables with $using: expression (#16113) (Thanks @dwtaber!)
+- Change `Target` from a `CodeProperty` to be an `AliasProperty` that points to `FileSystemInfo.LinkTarget` (#16165)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze, @eltociear, @iSazonov</p>
+
+</summary>
+
+<ul>
+<li>Improve <code>CommandInvocationIntrinsics</code> API documentation and style (#14369)</li>
+<li>Use <code>bool?.GetValueOrDefault()</code> in <code>FormatWideCommand</code> (#15988) (Thanks @xtqqczze!)</li>
+<li>Remove 4 assertions which cause debug build test runs to fail (#15963)</li>
+<li>Fix typo in `Job.cs` (#16454) (Thanks @eltociear!)</li>
+<li>Remove unnecessary call to `ToArray` (#16307) (Thanks @iSazonov!)</li>
+<li>Remove the unused `FollowSymLink` function (#16231)</li>
+<li>Fix typo in `TypeTable.cs` (#16220) (Thanks @eltociear!)</li>
+<li>Fixes #16176 - replace snippet tag with code tag in comments (#16177)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Fix typo in build.psm1 (#16038) (Thanks @eltociear!)
+- Add `.stylecop` to `filetypexml` and format it (#16025)
+- Enable sending Teams notification when workflow fails (#15982)
+- Use `Convert-Path` for unknown drive in `Build.psm1` (#16416) (Thanks @matt9ucci!)
+
+### Tests
+
+- Add benchmark to test compiler performance (#16083)
+- Enable two previously disabled `Get-Process` tests (#15845) (Thanks @iSazonov!)
+- Set clean state before testing `UseMU` in the MSI (#16543)
+- Fix global tool and SDK tests in release pipeline (#16342)
+- Remove the outdated test (#16269)
+- Removed old not-used-anymore docker-based tests for PS release packages (#16224)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@github-actions[bot], @kondratyev-nv</p>
+
+</summary>
+
+<ul>
+<li>fix issue with hash file getting created before we have finished get-childitem (#16170)</li>
+<li>Add sha256 hashes to release (#16147)</li>
+<li>Change path for Component Governance for build to the path we actually use to build (#16137)</li>
+<li>Update <code>Microsoft.CodeAnalysis.CSharp</code> version (#16138)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#16070)</li>
+<li>Update .NET to <code>6.0.100-rc.1.21458.32</code> (#16066)</li>
+<li>Update minimum required OS version for macOS (#16088)</li>
+<li>Set locale correctly on Linux CI (#16073)</li>
+<li>Ensure locale is set correctly on Ubuntu 20.04 in CI (#16067)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#16045)</li>
+<li>Update .NET SDK version from `6.0.100-rc.1.21430.44` to `6.0.100-rc.1.21455.2` (#16041) (Thanks @github-actions[bot]!)</li>
+<li>Fix the GitHub Action for updating .NET daily builds (#16042)</li>
+<li>Bump Microsoft.CodeAnalysis.CSharp from 4.0.0-3.final to 4.0.0-4.21430.4 (#16036)</li>
+<li>Bump .NET to `6.0.100-rc.1.21430.44` (#16028)</li>
+<li>Move from <code>PkgES</code> hosted agents to 1ES hosted agents (#16023)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#16021)</li>
+<li>Update Ubuntu images to use Ubuntu 20.04 (#15906)</li>
+<li>Fix the mac build by updating the pool image name (#16010)</li>
+<li>Use Alpine 3.12 for building PowerShell for alpine (#16008)</li>
+<li>Update .NET SDK version from `6.0.100-preview.6.21355.2` to `6.0.100-rc.1.21426.1` (#15648) (Thanks @github-actions[bot]!)</li>
+<li>Ignore error from <code>Find-Package</code> (#15999)</li>
+<li>Find packages separately for each source in <code>UpdateDotnetRuntime.ps1</code> script (#15998)</li>
+<li>Update metadata to start using .NET 6 RC1 builds (#15981)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#15985)</li>
+<li>Merge the v7.2.0-preview.9 release branch back to GitHub master (#15983)</li>
+<li>Publish global tool package for stable releases (#15961)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> to newer version (#15962)</li>
+<li>Disabled Yarn cache in markdown.yml (#16599)</li>
+<li>Update cgmanifest (#16600)</li>
+<li>Fix broken links in markdown (#16598)</li>
+<li>Add explicit job name for approval tasks in Snap stage (#16579)</li>
+<li>Bring back <code>pwsh.exe</code> for framework dependent packages to support Start-Job (#16535)</li>
+<li>Fix NuGet package generation in release build (#16509)</li>
+<li>Add `Microsoft.PowerShell.Commands.SetStrictModeCommand.ArgumentToPSVersionTransformationAttribute` to list of patterns to remove for generated ref assembly (#16489)</li>
+<li>Bump Microsoft.CodeAnalysis.CSharp from `4.0.0-6.final` to `4.0.1` (#16423)</li>
+<li>use different containers for different branches (#16434)</li>
+<li>Add import so we can use common GitHub workflow function. (#16433)</li>
+<li>Remove pre-release .NET 6 build sources (#16418)</li>
+<li>Update release instructions with link to new build (#16419)</li>
+<li>Bump <code>Microsoft.ApplicationInsights</code> from <code>2.18.0</code> to <code>2.19.0</code> (#16413)</li>
+<li>Update <code>metadata.json</code> to make 7.2.0 the latest LTS (#16417)</li>
+<li>Make static CI a matrix (#16397)</li>
+<li>Update <code>metadata.json</code> in preparation on <code>7.3.0-preview.1</code> release (#16406)</li>
+<li>Update cgmanifest (#16405)</li>
+<li>Add diagnostics used to take corrective action when releasing `buildInfoJson` (#16404)</li>
+<li>`vPack` release should use `buildInfoJson` new to 7.2 (#16402)</li>
+<li>Update the usage of metadata.json for getting LTS information (#16381)</li>
+<li>Add checkout to build json stage to get `ci.psm1` (#16399)</li>
+<li>Update CgManifest.json for 6.0.0 .NET packages (#16398)</li>
+<li>Add current folder to the beginning of the module import (#16353)</li>
+<li>Increment RC MSI build number by 100 (#16354)</li>
+<li>Bump <code>XunitXml.TestLogger</code> from 3.0.66 to 3.0.70 (#16356)</li>
+<li>Move PR Quantifier config to subfolder (#16352)</li>
+<li>Release build info json when it is preview (#16335)</li>
+<li>Add an approval for releasing build-info json (#16351)</li>
+<li>Generate manifest with latest public version of the packages (#16337)</li>
+<li>Update to the latest notices file (#16339) (Thanks @github-actions[bot]!)</li>
+<li>Use notice task to generate license assuming cgmanifest contains all components (#16340)</li>
+<li>Refactor cgmanifest generator to include all components (#16326)</li>
+<li>Fix issues in release build (#16332)</li>
+<li>Update feed and analyzer dependency (#16327)</li>
+<li>Bump <code>Microsoft.NET.Test.Sdk</code> from 16.11.0 to 17.0.0 (#16312)</li>
+<li>Update license and cgmanifest (#16325) (Thanks @github-actions[bot]!)</li>
+<li>Fix condition in cgmanifest logic (#16324)</li>
+<li>Add GitHub Workflow to keep notices up to date (#16284)</li>
+<li>Update to latest .NET 6 GA build <code> 6.0.100-rtm.21527.11</code> (#16309)</li>
+<li>Create compliance build (#16286)</li>
+<li>Move mapping file into product repo and add Debian 11  (#16316)</li>
+<li>Add a major-minor build info JSON file (#16301)</li>
+<li>Clean up <code>crossgen</code> related build scripts also generate native symbols for <code>R2R</code> images (#16297)</li>
+<li>Fix Windows build ZIP packaging (#16299) (Thanks @kondratyev-nv!)</li>
+<li>Revert &quot;Update to use .NET 6 GA build (#16296)&quot; (#16308)</li>
+<li>Add <code>wget</code> as a dependency for Bootstrap script (#16303) (Thanks @kondratyev-nv!)</li>
+<li>Fix issues reported by code signing verification tool (#16291)</li>
+<li>Update to use .NET 6 GA build (#16296)</li>
+<li>Revert &quot;add GH workflow to keep the cgmanifest up to date.&quot; (#16294)</li>
+<li>Update ChangeLog for 7.2.0-rc.1 and also fix RPM packaging (#16290)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#16271)</li>
+<li>add GH workflow to keep the cgmanifest up to date.</li>
+<li>Update <code>ThirdPartyNotices.txt</code> (#16283)</li>
+<li>Update `testartifacts.yml` to use <code>ubuntu-latest</code> image (#16279)</li>
+<li>Update version of <code>Microsoft.PowerShell.Native</code> and <code>Microsoft.PowerShell.MarkdownRender</code> packages (#16277)</li>
+<li>Add script to generate <code>cgmanifest.json</code> (#16278)</li>
+<li>Add <code>cgmanifest.json</code> for generating correct third party notice file (#16266)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers from `6.0.0-rtm.21504.2` to `6.0.0-rtm.21516.1` (#16264)</li>
+<li>Only upload stable <code>buildinfo</code> for stable releases (#16251)</li>
+<li>Make RPM license recognized (#16189)</li>
+<li>Don't upload dep or tar.gz for RPM because there are none. (#16230)</li>
+<li>Add condition to generate release files in local dev build only (#16259)</li>
+<li>Update .NET 6 to version 6.0.100-rc.2.21505.57 (#16249)</li>
+<li>change order of try-catch-finally and split out arm runs (#16252)</li>
+<li>Ensure <code>psoptions.json</code> and <code>manifest.spdx.json</code> files always exist in packages (#16258)</li>
+<li>Update to vPack task version to 12 (#16250)</li>
+<li>Remove unneeded `NuGetConfigFile` resource string (#16232)</li>
+<li>Add Software Bill of Materials to the main packages (#16202)</li>
+<li>Sign third party exes (#16229)</li>
+<li>Upgrade <code>set-value</code> package for markdown test (#16196)</li>
+<li>Use Ubuntu 20.04 for SSH remoting test (#16225)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#16194)</li>
+<li>Bump `Microsoft.CodeAnalysis.NetAnalyzers` from `6.0.0-rc2.21458.5` to `6.0.0-rtm.21480.8` (#16183)</li>
+<li>Move vPack build to 1ES Pool (#16169)</li>
+<li>Fix Microsoft update spelling issue. (#16178)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update Windows PowerShell issues link (#16105) (Thanks @andschwa!)
+- Remove Joey from Committee and WG membership (#16119)
+- Update more docs for `net6.0` TFM (#16102) (Thanks @xtqqczze!)
+- Change `snippet` tag to `code` tag in XML comments (#16106)
+- Update build documentation to reflect .NET 6 (#15751) (Thanks @Kellen-Stuart!)
+- Update `README.md` about the change logs (#16471) (Thanks @powershellpr0mpt!)
+- Update change log for 7.2.0 (#16401)
+- Update `metadata.json` and `README.md` for 7.2.0 release (#16395)
+- Update `README.md` and `metadata.json` files for `v7.2.0-rc.1` release (#16285)
+- Update the change logs for `v7.0.8` and `v7.1.5` releases (#16248)
+
+[7.3.0-preview.1]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.10...v7.3.0-preview.1

From b7ce3c568c8bd544d4a0280c45a635d276b91fd8 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Fri, 17 Dec 2021 09:39:26 -0800
Subject: [PATCH 185/645] Fix parsing `SemanticVersion` build label from
 version string (#16608)

---
 .../engine/PSVersionInfo.cs                      |  9 ++++++++-
 .../engine/Basic/SemanticVersion.Tests.ps1       | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/PSVersionInfo.cs b/src/System.Management.Automation/engine/PSVersionInfo.cs
index 6c724a2132b..99740a44d13 100644
--- a/src/System.Management.Automation/engine/PSVersionInfo.cs
+++ b/src/System.Management.Automation/engine/PSVersionInfo.cs
@@ -729,7 +729,7 @@ private static bool TryParseVersion(string version, ref VersionResult result)
             }
             else
             {
-                if (dashIndex == -1)
+                if (plusIndex == -1)
                 {
                     // Here dashIndex == plusIndex == -1
                     // No preLabel - preLabel == null;
@@ -737,6 +737,13 @@ private static bool TryParseVersion(string version, ref VersionResult result)
                     // Format is 'major.minor.patch'
                     versionSansLabel = version;
                 }
+                else if (dashIndex == -1)
+                {
+                    // No PreReleaseLabel: preLabel == null
+                    // Format is 'major.minor.patch+BuildLabel'
+                    buildLabel = version.Substring(plusIndex + 1);
+                    versionSansLabel = version.Substring(0, plusIndex);
+                }
                 else
                 {
                     // Format is 'major.minor.patch-PreReleaseLabel+BuildLabel'
diff --git a/test/powershell/engine/Basic/SemanticVersion.Tests.ps1 b/test/powershell/engine/Basic/SemanticVersion.Tests.ps1
index 3d4227c75f8..c6fbc6af969 100644
--- a/test/powershell/engine/Basic/SemanticVersion.Tests.ps1
+++ b/test/powershell/engine/Basic/SemanticVersion.Tests.ps1
@@ -22,6 +22,22 @@ Describe "SemanticVersion api tests" -Tags 'CI' {
             $v.BuildLabel | Should -BeNullOrEmpty
             $v.ToString() | Should -Be "1.0.0"
 
+            $v = [SemanticVersion]::new("1.2.3+BLD.a1-xxx.03")
+            $v.Major | Should -Be 1
+            $v.Minor | Should -Be 2
+            $v.Patch | Should -Be 3
+            $v.PreReleaseLabel | Should -BeNullOrEmpty
+            $v.BuildLabel | Should -Be "BLD.a1-xxx.03"
+            $v.ToString() | Should -Be "1.2.3+BLD.a1-xxx.03"
+
+            $v = [SemanticVersion]::new("1.0.0+META")
+            $v.Major | Should -Be 1
+            $v.Minor | Should -Be 0
+            $v.Patch | Should -Be 0
+            $v.PreReleaseLabel | Should -BeNullOrEmpty
+            $v.BuildLabel | Should -Be "META"
+            $v.ToString() | Should -Be "1.0.0+META"
+
             $v = [SemanticVersion]::new("3.0")
             $v.Major | Should -Be 3
             $v.Minor | Should -Be 0

From a3788b0de04c2c86ec1fe44e0b9b79a81b4391ab Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 17 Dec 2021 11:28:14 -0800
Subject: [PATCH 186/645] Update SBOM generation (#16641)

---
 .github/prquantifier.yaml                     |  2 +-
 .vsts-ci/linux.yml                            |  2 +-
 .vsts-ci/mac.yml                              |  2 +-
 .vsts-ci/misc-analysis/mdSpell.yml            |  2 +-
 .vsts-ci/windows.yml                          |  2 +-
 .../windows/templates/windows-packaging.yml   |  1 +
 cgmanifest.json => tools/cgmanifest.json      |  0
 tools/findMissingNotices.ps1                  |  4 ++--
 .../templates/SetVersionVariables.yml         | 22 ++++++++++++++-----
 .../azureDevOps/templates/compliance.yml      |  2 +-
 .../templates/compliance/compliance.yml       |  2 +-
 .../templates/compliance/generateNotice.yml   |  9 +-------
 .../azureDevOps/templates/json.yml            |  2 +-
 .../azureDevOps/templates/linux.yml           | 20 ++++++++++++-----
 .../templates/mac-file-signing.yml            | 11 +++++++++-
 .../templates/mac-package-build.yml           |  5 ++++-
 .../templates/mac-package-signing.yml         | 11 +++++++++-
 .../azureDevOps/templates/mac.yml             |  2 +-
 .../azureDevOps/templates/nuget.yml           |  2 +-
 .../templates/windows-hosted-build.yml        |  2 +-
 .../templates/windows-package-signing.yml     | 10 ++++++++-
 .../templates/windows-packaging.yml           |  5 ++++-
 22 files changed, 82 insertions(+), 38 deletions(-)
 rename cgmanifest.json => tools/cgmanifest.json (100%)

diff --git a/.github/prquantifier.yaml b/.github/prquantifier.yaml
index 240f660f88d..ea891ba4988 100644
--- a/.github/prquantifier.yaml
+++ b/.github/prquantifier.yaml
@@ -7,5 +7,5 @@ Excluded:
 - '*.md'
 - '*.sln'
 # autogenerated files
-- cgmanifest.json
+- tools/cgmanifest.json
 - assets/wix/files.wxs
diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
index 38aea5a9450..9faa155f74d 100644
--- a/.vsts-ci/linux.yml
+++ b/.vsts-ci/linux.yml
@@ -30,7 +30,7 @@ pr:
     - .vsts-ci/misc-analysis.yml
     - .vsts-ci/windows.yml
     - .vsts-ci/windows/*
-    - cgmanifest.json
+    - tools/cgmanifest.json
     - LICENSE.txt
     - test/common/markdown/*
     - test/perf/*
diff --git a/.vsts-ci/mac.yml b/.vsts-ci/mac.yml
index 89ada776403..c4623c9fef0 100644
--- a/.vsts-ci/mac.yml
+++ b/.vsts-ci/mac.yml
@@ -31,7 +31,7 @@ pr:
     - .vsts-ci/misc-analysis.yml
     - .vsts-ci/windows.yml
     - .vsts-ci/windows/*
-    - cgmanifest.json
+    - tools/cgmanifest.json
     - LICENSE.txt
     - test/common/markdown/*
     - test/perf/*
diff --git a/.vsts-ci/misc-analysis/mdSpell.yml b/.vsts-ci/misc-analysis/mdSpell.yml
index e07b4756968..e9d046e5e96 100644
--- a/.vsts-ci/misc-analysis/mdSpell.yml
+++ b/.vsts-ci/misc-analysis/mdSpell.yml
@@ -53,4 +53,4 @@ jobs:
 
   - template: dailyBuildCompliance.yml@ComplianceRepo
     parameters:
-      sourceScanPath: '$(repoPath)'
+      sourceScanPath: '$(repoPath)/test/common'
diff --git a/.vsts-ci/windows.yml b/.vsts-ci/windows.yml
index f17a063998e..f886d2bd337 100644
--- a/.vsts-ci/windows.yml
+++ b/.vsts-ci/windows.yml
@@ -28,7 +28,7 @@ pr:
     - .dependabot/config.yml
     - .github/ISSUE_TEMPLATE/*
     - .vsts-ci/misc-analysis.yml
-    - cgmanifest.json
+    - tools/cgmanifest.json
     - LICENSE.txt
     - test/common/markdown/*
     - test/perf/*
diff --git a/.vsts-ci/windows/templates/windows-packaging.yml b/.vsts-ci/windows/templates/windows-packaging.yml
index 353d722bb92..88a557ca032 100644
--- a/.vsts-ci/windows/templates/windows-packaging.yml
+++ b/.vsts-ci/windows/templates/windows-packaging.yml
@@ -69,6 +69,7 @@ jobs:
       BuildDropPath: '$(System.ArtifactsDirectory)/mainBuild'
       Build_Repository_Uri: $(build.repository.uri)
       displayName: SBOM
+      sourceScanPath: '$(repoPath)\tools'
 
   - pwsh: |
       Import-Module .\tools\ci.psm1
diff --git a/cgmanifest.json b/tools/cgmanifest.json
similarity index 100%
rename from cgmanifest.json
rename to tools/cgmanifest.json
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index f66f88f1295..275116da79b 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -14,7 +14,8 @@ Import-Module "$PSScriptRoot\..\.github\workflows\GHWorkflowHelper" -Force
 . "$PSScriptRoot\..\tools\buildCommon\startNativeExecution.ps1"
 
 $existingRegistrationTable = @{}
-$existingRegistrationsJson = Get-Content $PSScriptRoot\..\cgmanifest.json | ConvertFrom-Json -AsHashtable
+$cgManifestPath = (Resolve-Path -Path $PSScriptRoot\..\tools\cgmanifest.json).ProviderPath
+$existingRegistrationsJson = Get-Content $cgManifestPath | ConvertFrom-Json -AsHashtable
 $existingRegistrationsJson.Registrations | ForEach-Object {
     $registration = [Registration]$_
     if ($registration.Component) {
@@ -269,7 +270,6 @@ $newRegistrations = $registrations.Keys | Sort-Object | ForEach-Object { $regist
 $count = $newRegistrations.Count
 $newJson = @{Registrations = $newRegistrations } | ConvertTo-Json -depth 99
 if ($Fix -and $registrationChanged) {
-    $cgManifestPath = (Resolve-Path -Path $PSScriptRoot\..\cgmanifest.json).ProviderPath
     $newJson | Set-Content $cgManifestPath
     Set-GWVariable -Name CGMANIFEST_PATH -Value $cgManifestPath
 }
diff --git a/tools/releaseBuild/azureDevOps/templates/SetVersionVariables.yml b/tools/releaseBuild/azureDevOps/templates/SetVersionVariables.yml
index 4376c4a1e58..dd9252a406f 100644
--- a/tools/releaseBuild/azureDevOps/templates/SetVersionVariables.yml
+++ b/tools/releaseBuild/azureDevOps/templates/SetVersionVariables.yml
@@ -16,21 +16,31 @@ steps:
 - powershell: |
     $path = "./build.psm1"
 
+    if($env:REPOROOT){
+      Write-Verbose "reporoot already set to ${env:REPOROOT}" -Verbose
+      exit 0
+    }
+
     if(Test-Path -Path $path)
     {
-      $vstsCommandString = "vso[task.setvariable variable=repoRoot]."
-      Write-Host ("sending " + $vstsCommandString)
-      Write-Host "##$vstsCommandString"
+      Write-Verbose "reporoot detect at: ." -Verbose
+      $repoRoot = '.'
     }
     else{
       $path = "./PowerShell/build.psm1"
       if(Test-Path -Path $path)
       {
-        $vstsCommandString = "vso[task.setvariable variable=repoRoot]./PowerShell"
-        Write-Host ("sending " + $vstsCommandString)
-        Write-Host "##$vstsCommandString"
+        Write-Verbose "reporoot detect at: ./PowerShell" -Verbose
+        $repoRoot = './PowerShell'
       }
     }
+    if($repoRoot) {
+      $vstsCommandString = "vso[task.setvariable variable=repoRoot]$repoRoot"
+      Write-Host ("sending " + $vstsCommandString)
+      Write-Host "##$vstsCommandString"
+    } else {
+      Write-Verbose -Verbose "repo not found"
+    }
   displayName: 'Set repo Root'
 
 - powershell: |
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml
index 8b3ec94d0d1..2572882e880 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance.yml
@@ -138,5 +138,5 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
+      sourceScanPath: '$(Build.SourcesDirectory)\tools'
       snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
index 4d1007957c8..50a133257dd 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
@@ -86,5 +86,5 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
+      sourceScanPath: '$(Build.SourcesDirectory)\tools'
       snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
index 3002c18bdb4..00ffccb1d23 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
@@ -43,8 +43,7 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
-      ignoreDirectories: '$(Build.SourcesDirectory)\test,$(Build.SourcesDirectory)\docs'
+      sourceScanPath: '$(Build.SourcesDirectory)\tools'
 
   - task: msospo.ospo-extension.8d7f9abb-6896-461d-9e25-4f74ed65ddb2.notice@0
     displayName: 'NOTICE File Generator'
@@ -82,9 +81,3 @@ jobs:
       targetPath: $(System.ArtifactsDirectory)
       artifactName: notice
     displayName: Publish notice artifacts
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
-      snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/json.yml b/tools/releaseBuild/azureDevOps/templates/json.yml
index 570a658756a..34d329ee7f7 100644
--- a/tools/releaseBuild/azureDevOps/templates/json.yml
+++ b/tools/releaseBuild/azureDevOps/templates/json.yml
@@ -51,5 +51,5 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
+      sourceScanPath: '$(Build.SourcesDirectory)\tools'
       snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index 353f6e2431c..7cbe62a5880 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -76,6 +76,9 @@ jobs:
       BuildDropPath: '$(System.ArtifactsDirectory)/pwshLinuxBuild'
       Build_Repository_Uri: $(Github_Build_Repository_Uri)
       displayName: ${{ parameters.buildName }} SBOM
+      PackageName: PowerShell Linux
+      PackageVersion: $(Version)
+      sourceScanPath: '$(PowerShellRoot)/tools'
 
   - ${{ if eq(variables.build,'deb') }} :
     - template: Sbom.yml@ComplianceRepo
@@ -83,6 +86,9 @@ jobs:
         BuildDropPath: '$(System.ArtifactsDirectory)/pwshLinuxBuildMinSize'
         Build_Repository_Uri: $(Github_Build_Repository_Uri)
         displayName: MinSize SBOM
+        PackageName: PowerShell Linux Minimum Size
+        PackageVersion: $(Version)
+        sourceScanPath: '$(PowerShellRoot)/tools'
 
   - ${{ if eq(variables.build,'deb') }} :
     - template: Sbom.yml@ComplianceRepo
@@ -90,6 +96,9 @@ jobs:
         BuildDropPath: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm32'
         Build_Repository_Uri: $(Github_Build_Repository_Uri)
         displayName: Arm32 SBOM
+        PackageName: PowerShell Linux Arm32
+        PackageVersion: $(Version)
+        sourceScanPath: '$(PowerShellRoot)/tools'
 
   - ${{ if eq(variables.build,'deb') }} :
     - template: Sbom.yml@ComplianceRepo
@@ -97,6 +106,9 @@ jobs:
         BuildDropPath: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm64'
         Build_Repository_Uri: $(Github_Build_Repository_Uri)
         displayName: Arm64 SBOM
+        PackageName: PowerShell Linux Arm64
+        PackageVersion: $(Version)
+        sourceScanPath: '$(PowerShellRoot)/tools'
 
   - powershell: |
       Import-Module "$env:POWERSHELLROOT/build.psm1"
@@ -148,6 +160,8 @@ jobs:
       value: false
     - name: NugetSecurityAnalysisWarningLevel
       value: none
+    - name: skipComponentGovernanceDetection
+      value: true
 
   steps:
   - checkout: self
@@ -297,9 +311,3 @@ jobs:
     parameters:
       artifactPath: '$(Build.StagingDirectory)\signedPackages\release'
       condition: and(and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
-
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
-      snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
index 1f43d39ab61..c6b1b1b8b9c 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
@@ -10,19 +10,28 @@ jobs:
       name: PowerShell1ES
       demands:
       - ImageOverride -equals MMS2019
+
     variables:
       - group: ESRP
       - name: runCodesignValidationInjection
         value: false
       - name: NugetSecurityAnalysisWarningLevel
         value: none
+      - name: repoFolder
+        value: PowerShell
+      - name: repoRoot
+        value: $(Agent.BuildDirectory)\$(repoFolder)
+      - name: complianceRepoFolder
+        value: compliance
 
     steps:
     - checkout: self
       clean: true
+      path: $(repoFolder)
 
     - checkout: ComplianceRepo
       clean: true
+      path: $(complianceRepoFolder)
 
     - template: SetVersionVariables.yml
       parameters:
@@ -107,5 +116,5 @@ jobs:
     - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
       displayName: 'Component Detection'
       inputs:
-        sourceScanPath: '$(Build.SourcesDirectory)'
+        sourceScanPath: '$(repoRoot)\tools'
         snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
index ae828c66709..ef16761f707 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
@@ -85,6 +85,9 @@ jobs:
     parameters:
       BuildDropPath: '$(System.ArtifactsDirectory)/$(SymbolsFolder)'
       Build_Repository_Uri: $(Github_Build_Repository_Uri)
+      PackageName: PowerShell macOS ${{ parameters.buildArchitecture }}
+      PackageVersion: $(Version)
+      sourceScanPath: '$(PowerShellRoot)/tools'
 
   - pwsh: |
       Import-Module $(PowerShellRoot)/build.psm1 -Force
@@ -118,5 +121,5 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
+      sourceScanPath: '$(PowerShellRoot)/tools'
       snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
index cba0ed6f9c3..5408cf5922a 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
@@ -16,12 +16,21 @@ jobs:
       value: false
     - name: NugetSecurityAnalysisWarningLevel
       value: none
+    - name: repoFolder
+      value: PowerShell
+    - name: repoRoot
+      value: $(Agent.BuildDirectory)\$(repoFolder)
+    - name: complianceRepoFolder
+      value: compliance
+
   steps:
   - checkout: self
     clean: true
+    path: $(repoFolder)
 
   - checkout: ComplianceRepo
     clean: true
+    path: $(complianceRepoFolder)
 
   - template: shouldSign.yml
 
@@ -119,5 +128,5 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
+      sourceScanPath: '$(repoRoot)/tools'
       snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/mac.yml b/tools/releaseBuild/azureDevOps/templates/mac.yml
index 3e3b3fc2340..9634c3bdb57 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac.yml
@@ -57,5 +57,5 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
+      sourceScanPath: '$(Build.SourcesDirectory)/tools'
       snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index 467968b5a3a..59d790bc4dd 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -253,4 +253,4 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
-      sourceScanPath: '$(PackagePath)'
+      sourceScanPath: '$(repoRoot)\tools'
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
index de08cb25824..00b8a4c8cf4 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -76,5 +76,5 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
-      sourceScanPath: '$(PowerShellRoot)'
+      sourceScanPath: '$(PowerShellRoot)\tools'
       snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
index dd547da6a60..f78130c1f22 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -15,13 +15,21 @@ jobs:
     - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
       value: 1
     - group: ESRP
+    - name: repoFolder
+      value: PowerShell
+    - name: repoRoot
+      value: $(Agent.BuildDirectory)\$(repoFolder)
+    - name: complianceRepoFolder
+      value: compliance
 
   steps:
   - checkout: self
     clean: true
+    path: $(repoFolder)
 
   - checkout: ComplianceRepo
     clean: true
+    path: $(complianceRepoFolder)
 
   - template: SetVersionVariables.yml
     parameters:
@@ -124,5 +132,5 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
+      sourceScanPath: '$(repoRoot)\tools'
       snapshotForceEnabled: true
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index f2b0e091f0c..7de4859b63d 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -227,6 +227,9 @@ jobs:
     parameters:
       BuildDropPath: '$(System.ArtifactsDirectory)\$(SymbolsFolder)'
       Build_Repository_Uri: $(Github_Build_Repository_Uri)
+      PackageName: PowerShell Windows ${{ parameters.Architecture }} ${{ parameters.BuildConfiguration }}
+      PackageVersion: $(Version)
+      sourceScanPath: '$(PowerShellRoot)\tools'
 
   - powershell: |
       Import-Module $(PowerShellRoot)/build.psm1 -Force
@@ -357,7 +360,7 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
-      sourceScanPath: '$(Build.SourcesDirectory)'
+      sourceScanPath: '$(PowerShellRoot)\tools'
       snapshotForceEnabled: true
 
   - powershell: |

From 67faa4888bc13bc1387a6371d42f843e69e0136b Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Sat, 18 Dec 2021 12:09:19 -0800
Subject: [PATCH 187/645] Update Images used for release (#16580)

---
 .../releaseBuild/azureDevOps/releaseBuild.yml |  2 +-
 .../azureDevOps/releasePipeline.yml           | 37 ++++++++++++++-----
 .../templates/checkAzureContainer.yml         |  2 +-
 .../azureDevOps/templates/compliance.yml      |  2 +-
 .../templates/compliance/compliance.yml       |  2 +-
 .../templates/compliance/generateNotice.yml   |  2 +-
 .../azureDevOps/templates/json.yml            |  2 +-
 .../azureDevOps/templates/linux.yml           |  4 +-
 .../templates/mac-file-signing.yml            |  2 +-
 .../templates/mac-package-signing.yml         |  2 +-
 .../azureDevOps/templates/nuget.yml           |  2 +-
 .../templates/release-GlobalToolTest.yml      |  1 +
 .../templates/release-MsixBundle.yml          |  7 +++-
 .../templates/release-SDKTests.yml            |  1 +
 .../templates/release-UpdateDepsJson.yml      |  7 +++-
 .../templates/release-ValidateFxdPackage.yml  |  1 +
 .../azureDevOps/templates/testartifacts.yml   |  1 +
 .../azureDevOps/templates/vpackReleaseJob.yml |  2 +
 .../windows-component-governance.yml          |  2 +-
 .../templates/windows-hosted-build.yml        |  2 +-
 .../templates/windows-package-signing.yml     |  2 +-
 .../templates/windows-packaging.yml           |  2 +-
 .../releaseBuild/azureDevOps/vpackRelease.yml |  7 +++-
 23 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index 4616f734b25..49fcb751472 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -207,7 +207,7 @@ stages:
         pool:
           name: PowerShell1ES
           demands:
-          - ImageOverride -equals MMS2019
+          - ImageOverride -equals MMS2019TLS
         steps:
         - checkout: self
           clean: true
diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index fe5cb1c2464..7915ab537b9 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -110,6 +110,7 @@ stages:
   - job: ValidatePkgNames
     displayName: Validate Package Names
     pool:
+      # testing
       vmImage: windows-latest
     variables:
     - group: 'Azure Blob variable group'
@@ -118,6 +119,7 @@ stages:
   - job: ValidatePkgBOM
     displayName: Validate Package BOM
     pool:
+      # testing
       vmImage: windows-latest
     variables:
     - group: 'Azure Blob variable group'
@@ -174,8 +176,11 @@ stages:
   jobs:
   - deployment: AzureBlobPublic
     displayName: Make Azure Blob Public
-    pool:
-      vmImage: windows-latest
+
+    pool: PowerShell1ES
+      demands:
+      - ImageOverride -equals MMS2019TLS
+
     variables:
     - group: 'Staging_ACR'
     environment: PSReleaseAzureBlobPublic
@@ -187,8 +192,11 @@ stages:
 
   - job: GitHubDraft
     displayName: Create GitHub Draft release
-    pool:
-      vmImage: windows-latest
+
+    pool: PowerShell1ES
+      demands:
+      - ImageOverride -equals MMS2019TLS
+
     variables:
     - group: 'Azure Blob variable group'
     - group: 'AzDevOpsArtifacts'
@@ -220,14 +228,20 @@ stages:
   dependsOn: GitHubManualTasks
   jobs:
   - job: PublishNuget
-    pool:
-      vmImage: windows-latest
+
+    pool: PowerShell1ES
+      demands:
+      - ImageOverride -equals MMS2019TLS
+
     steps:
     - template: templates/release-ReleaseToNuGet.yml
 
   - job: PublishPkgsMsftCom
-    pool:
-      vmImage: ubuntu-latest
+
+    pool: PowerShell1ES
+      demands:
+      - ImageOverride -equals MMSUbuntu20.04TLS
+
     variables:
     - group: 'AzDevOpsArtifacts'
     - group: 'packages.microsoft.com'
@@ -320,8 +334,11 @@ stages:
   jobs:
   - deployment: UploadJson
     displayName: Upload BuildInfoJson
-    pool:
-      vmImage: windows-latest
+
+    pool: PowerShell1ES
+      demands:
+      - ImageOverride -equals MMS2019TLS
+
     variables:
     - group: 'Azure Blob variable group'
     environment: PSReleaseBuildInfoJson
diff --git a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
index 8019a5de3b9..f9a2ee2dc64 100644
--- a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
+++ b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
   steps:
   - checkout: self
     clean: true
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml
index 2572882e880..9eebd8be888 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance.yml
@@ -18,7 +18,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
 
   # APIScan can take a long time
   timeoutInMinutes: 180
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
index 50a133257dd..92d5a7daec4 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
@@ -19,7 +19,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
 
   # APIScan can take a long time
   timeoutInMinutes: 180
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
index 00ffccb1d23..d904531d6c7 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
@@ -16,7 +16,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
 
   timeoutInMinutes: 15
 
diff --git a/tools/releaseBuild/azureDevOps/templates/json.yml b/tools/releaseBuild/azureDevOps/templates/json.yml
index 34d329ee7f7..cbea46d9eea 100644
--- a/tools/releaseBuild/azureDevOps/templates/json.yml
+++ b/tools/releaseBuild/azureDevOps/templates/json.yml
@@ -15,7 +15,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
 
   steps:
   #- task: <task type name>@<version>
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index 7cbe62a5880..dc415c36c78 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMSUbuntu20.04
+    - ImageOverride -equals MMSUbuntu20.04TLS
   dependsOn: ${{ parameters.parentJob }}
   variables:
     - name: runCodesignValidationInjection
@@ -151,7 +151,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
   variables:
     - name: buildName
       value: ${{ parameters.buildName }}
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
index c6b1b1b8b9c..648708fa4be 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
@@ -9,7 +9,7 @@ jobs:
     pool:
       name: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019
+      - ImageOverride -equals MMS2019TLS
 
     variables:
       - group: ESRP
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
index 5408cf5922a..b1cf9917424 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
@@ -9,7 +9,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
   variables:
     - group: ESRP
     - name: runCodesignValidationInjection
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index 59d790bc4dd..2f583b52c4a 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
 
   timeoutInMinutes: 90
 
diff --git a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
index df31d05aeec..726c7788997 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
@@ -10,6 +10,7 @@ jobs:
 - job: ${{ parameters.jobName }}
   displayName: ${{ parameters.displayName }}
   pool:
+    # test
     vmImage: ${{ parameters.imageName }}
   steps:
     - checkout: self
diff --git a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
index 93bbbcc06d1..1b424568994 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
@@ -1,8 +1,11 @@
 jobs:
 - job: CreateMSIXBundle
   displayName: Create .msixbundle file
-  pool:
-    vmImage: windows-latest
+
+  pool: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019TLS
+
   variables:
     - group: msixTools
     - group: 'Azure Blob variable group'
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
index ce80e825d3f..572f909583d 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@@ -7,6 +7,7 @@ jobs:
 - job: ${{ parameters.jobName }}
   displayName: ${{ parameters.displayName }}
   pool:
+    # testing
     vmImage: ${{ parameters.imageName }}
   variables:
   - group: AzDevOpsArtifacts
diff --git a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
index 55bf592c339..f0c43c4b93f 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
@@ -1,8 +1,11 @@
 jobs:
 - job: UpdateDepsFiles
   displayName: Update deps files
-  pool:
-    vmImage: windows-latest
+
+  pool: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019TLS
+
   variables:
   - group: 'Azure Blob variable group'
   steps:
diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml
index 687b9d526d4..a4d473cf3b8 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml
@@ -8,6 +8,7 @@ jobs:
 - job: ${{ parameters.jobName }}
   displayName: ${{ parameters.displayName }}
   pool:
+    # testing
     vmImage: ${{ parameters.imageName }}
   steps:
     - checkout: self
diff --git a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
index 1bd715f1a46..38d9ee0d158 100644
--- a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
+++ b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
@@ -8,6 +8,7 @@ jobs:
   displayName: Build test artifacts
   condition: succeeded()
   pool:
+    # testing
     vmImage: ubuntu-latest
   steps:
   - checkout: self
diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
index e6f07d55ce5..de6252bc6e3 100644
--- a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+++ b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@@ -9,6 +9,8 @@ jobs:
   displayName: Build and Publish VPack - ${{ parameters.architecture }}
   condition: succeeded()
   pool: PowerShell1ES
+    demands:
+    - ImageOverride -equals MMS2019TLS
   steps:
   - checkout: self
     clean: true
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
index b21ab208f1b..5719b4f272c 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
@@ -12,7 +12,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
 
   steps:
   - checkout: self
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
index 00b8a4c8cf4..5d5484b14d8 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -16,7 +16,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
   variables:
     - name: runCodesignValidationInjection
       value: false
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
index f78130c1f22..8a45af1bc05 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
   variables:
     - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
       value: 1
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index 7de4859b63d..6b0d28b96f2 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -16,7 +16,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019
+    - ImageOverride -equals MMS2019TLS
   variables:
     - name: BuildConfiguration
       value: ${{ parameters.BuildConfiguration }}
diff --git a/tools/releaseBuild/azureDevOps/vpackRelease.yml b/tools/releaseBuild/azureDevOps/vpackRelease.yml
index 2d502f23925..03482479cbb 100644
--- a/tools/releaseBuild/azureDevOps/vpackRelease.yml
+++ b/tools/releaseBuild/azureDevOps/vpackRelease.yml
@@ -24,8 +24,11 @@ stages:
   - job: rename
     displayName: Name the build
     condition: succeeded()
-    pool:
-      vmImage: 'windows-latest'
+
+    pool: PowerShell1ES
+      demands:
+      - ImageOverride -equals MMS2019TLS
+
     steps:
     - checkout: self
       clean: true

From 6c22065d77f0d150484ac0234938b0afb7ee11f1 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 20 Dec 2021 11:26:27 -0800
Subject: [PATCH 188/645] Register NuGet source when generating `CGManifest`
 (#16570)

* Register nuget source

* update cgmanifest
---
 tools/cgmanifest.json        | 2 +-
 tools/findMissingNotices.ps1 | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 96137367dd2..3816494e256 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -695,7 +695,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "StyleCop.Analyzers",
-          "Version": "1.2.0-beta.354"
+          "Version": "1.1.118"
         }
       },
       "DevelopmentDependency": true
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index 275116da79b..315a83284d7 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -13,6 +13,11 @@ Import-Module dotnet.project.assets
 Import-Module "$PSScriptRoot\..\.github\workflows\GHWorkflowHelper" -Force
 . "$PSScriptRoot\..\tools\buildCommon\startNativeExecution.ps1"
 
+$packageSourceName = 'findMissingNoticesNugetOrg'
+if (!(Get-PackageSource -Name $packageSourceName -ErrorAction SilentlyContinue)) {
+    $null = Register-PackageSource -Name $packageSourceName -Location https://www.nuget.org/api/v2 -ProviderName NuGet
+}
+
 $existingRegistrationTable = @{}
 $cgManifestPath = (Resolve-Path -Path $PSScriptRoot\..\tools\cgmanifest.json).ProviderPath
 $existingRegistrationsJson = Get-Content $cgManifestPath | ConvertFrom-Json -AsHashtable
@@ -109,7 +114,9 @@ function New-NugetComponent {
 $nugetPublicVersionCache = [System.Collections.Generic.Dictionary[string, string]]::new()
 function Get-NuGetPublicVersion {
     param(
+        [parameter(Mandatory)]
         [string]$Name,
+        [parameter(Mandatory)]
         [string]$Version
     )
 
@@ -124,7 +131,7 @@ function Get-NuGetPublicVersion {
     }
 
     $publicVersion = $null
-    $publicVersion = Find-Package -Name $Name -AllowPrereleaseVersions -source nuget.org -AllVersions -ErrorAction SilentlyContinue | ForEach-Object {
+    $publicVersion = Find-Package -Name $Name -AllowPrereleaseVersions -source $packageSourceName -AllVersions -ErrorAction SilentlyContinue | ForEach-Object {
         try {
             $packageVersion = [System.Management.Automation.SemanticVersion]$_.Version
         } catch {

From bf8a13908d506719887b5c5f95486fff35a7ce81 Mon Sep 17 00:00:00 2001
From: Sean Wheeler <sean.wheeler@microsoft.com>
Date: Mon, 3 Jan 2022 13:15:07 -0600
Subject: [PATCH 189/645] Update `HelpInfoUri` for 7.3 release (#16646)

---
 .../Microsoft.PowerShell.Host.psd1                 |  2 +-
 .../Microsoft.PowerShell.Management.psd1           |  2 +-
 .../Microsoft.PowerShell.Security.psd1             |  2 +-
 .../Microsoft.PowerShell.Utility.psd1              |  2 +-
 src/Modules/Windows/CimCmdlets/CimCmdlets.psd1     |  2 +-
 .../Microsoft.PowerShell.Diagnostics.psd1          |  2 +-
 .../Microsoft.PowerShell.Management.psd1           |  2 +-
 .../Microsoft.PowerShell.Security.psd1             |  2 +-
 .../Microsoft.PowerShell.Utility.psd1              |  2 +-
 .../Microsoft.WSMan.Management.psd1                |  2 +-
 .../Windows/PSDiagnostics/PSDiagnostics.psd1       |  2 +-
 .../help/UpdatableHelpCommandBase.cs               | 14 +++++++-------
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Modules/Shared/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1 b/src/Modules/Shared/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1
index 53e9bc579cf..e6d616aa61d 100644
--- a/src/Modules/Shared/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1
+++ b/src/Modules/Shared/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1
@@ -10,5 +10,5 @@ FunctionsToExport = @()
 CmdletsToExport="Start-Transcript", "Stop-Transcript"
 AliasesToExport = @()
 NestedModules="Microsoft.PowerShell.ConsoleHost.dll"
-HelpInfoURI = 'https://aka.ms/powershell72-help'
+HelpInfoURI = 'https://aka.ms/powershell73-help'
 }
diff --git a/src/Modules/Unix/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 b/src/Modules/Unix/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1
index 8d4d985b4bd..6eb576cdf03 100644
--- a/src/Modules/Unix/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1
+++ b/src/Modules/Unix/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1
@@ -7,7 +7,7 @@ ModuleVersion="7.0.0.0"
 CompatiblePSEditions = @("Core")
 PowerShellVersion="3.0"
 NestedModules="Microsoft.PowerShell.Commands.Management.dll"
-HelpInfoURI = 'https://aka.ms/powershell72-help'
+HelpInfoURI = 'https://aka.ms/powershell73-help'
 FunctionsToExport = @()
 AliasesToExport = @("gcb", "gtz", "scb")
 CmdletsToExport=@("Add-Content",
diff --git a/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 b/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
index 9c9f97884a3..440153be545 100644
--- a/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
+++ b/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
@@ -10,5 +10,5 @@ FunctionsToExport = @()
 CmdletsToExport="Get-Credential", "Get-ExecutionPolicy", "Set-ExecutionPolicy", "ConvertFrom-SecureString", "ConvertTo-SecureString", "Get-PfxCertificate" , "Protect-CmsMessage", "Unprotect-CmsMessage", "Get-CmsMessage"
 AliasesToExport = @()
 NestedModules="Microsoft.PowerShell.Security.dll"
-HelpInfoURI = 'https://aka.ms/powershell72-help'
+HelpInfoURI = 'https://aka.ms/powershell73-help'
 }
diff --git a/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 b/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
index 8efcaa03443..5761b3c745a 100644
--- a/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
+++ b/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
@@ -30,5 +30,5 @@ CmdletsToExport = @(
 FunctionsToExport = @()
 AliasesToExport = @('fhx')
 NestedModules = @("Microsoft.PowerShell.Commands.Utility.dll")
-HelpInfoURI = 'https://aka.ms/powershell72-help'
+HelpInfoURI = 'https://aka.ms/powershell73-help'
 }
diff --git a/src/Modules/Windows/CimCmdlets/CimCmdlets.psd1 b/src/Modules/Windows/CimCmdlets/CimCmdlets.psd1
index 23dc31d37ab..93c68321ca1 100644
--- a/src/Modules/Windows/CimCmdlets/CimCmdlets.psd1
+++ b/src/Modules/Windows/CimCmdlets/CimCmdlets.psd1
@@ -14,5 +14,5 @@ CmdletsToExport= "Get-CimAssociatedInstance", "Get-CimClass", "Get-CimInstance",
     "Remove-CimSession","Set-CimInstance",
     "Export-BinaryMiLog","Import-BinaryMiLog"
 AliasesToExport = "gcim","scim","ncim", "rcim","icim","gcai","rcie","ncms","rcms","gcms","ncso","gcls"
-HelpInfoUri="https://aka.ms/powershell72-help"
+HelpInfoUri="https://aka.ms/powershell73-help"
 }
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1 b/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1
index dba4f4a583d..50282d8d5b8 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1
@@ -12,5 +12,5 @@ AliasesToExport = @()
 NestedModules="Microsoft.PowerShell.Commands.Diagnostics.dll"
 TypesToProcess="GetEvent.types.ps1xml"
 FormatsToProcess="Event.format.ps1xml", "Diagnostics.format.ps1xml"
-HelpInfoURI = 'https://aka.ms/powershell72-help'
+HelpInfoURI = 'https://aka.ms/powershell73-help'
 }
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 b/src/Modules/Windows/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1
index 1afafd7563b..0b49f178b25 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1
@@ -7,7 +7,7 @@ ModuleVersion="7.0.0.0"
 CompatiblePSEditions = @("Core")
 PowerShellVersion="3.0"
 NestedModules="Microsoft.PowerShell.Commands.Management.dll"
-HelpInfoURI = 'https://aka.ms/powershell72-help'
+HelpInfoURI = 'https://aka.ms/powershell73-help'
 FunctionsToExport = @()
 AliasesToExport = @("gcb", "gin", "gtz", "scb", "stz")
 CmdletsToExport=@("Add-Content",
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 b/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
index a414ddd8318..b88bc92d2a2 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
@@ -10,5 +10,5 @@ FunctionsToExport = @()
 CmdletsToExport="Get-Acl", "Set-Acl", "Get-PfxCertificate", "Get-Credential", "Get-ExecutionPolicy", "Set-ExecutionPolicy", "Get-AuthenticodeSignature", "Set-AuthenticodeSignature", "ConvertFrom-SecureString", "ConvertTo-SecureString", "Get-CmsMessage", "Unprotect-CmsMessage", "Protect-CmsMessage" , "New-FileCatalog" , "Test-FileCatalog"
 AliasesToExport = @()
 NestedModules="Microsoft.PowerShell.Security.dll"
-HelpInfoURI = 'https://aka.ms/powershell72-help'
+HelpInfoURI = 'https://aka.ms/powershell73-help'
 }
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 b/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
index 1b980a28913..7d0e7a91e11 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
@@ -29,5 +29,5 @@ CmdletsToExport = @(
 FunctionsToExport = @()
 AliasesToExport = @('fhx')
 NestedModules = @("Microsoft.PowerShell.Commands.Utility.dll")
-HelpInfoURI = 'https://aka.ms/powershell72-help'
+HelpInfoURI = 'https://aka.ms/powershell73-help'
 }
diff --git a/src/Modules/Windows/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1 b/src/Modules/Windows/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1
index b95bca7f2f4..5eb367b7e7f 100644
--- a/src/Modules/Windows/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1
+++ b/src/Modules/Windows/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1
@@ -11,5 +11,5 @@ CmdletsToExport="Disable-WSManCredSSP", "Enable-WSManCredSSP", "Get-WSManCredSSP
 AliasesToExport = @()
 NestedModules="Microsoft.WSMan.Management.dll"
 FormatsToProcess="WSMan.format.ps1xml"
-HelpInfoURI = 'https://aka.ms/powershell72-help'
+HelpInfoURI = 'https://aka.ms/powershell73-help'
 }
diff --git a/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psd1 b/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psd1
index 95726e946fb..6185b589a82 100644
--- a/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psd1
+++ b/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psd1
@@ -10,5 +10,5 @@
     FunctionsToExport="Disable-PSTrace","Disable-PSWSManCombinedTrace","Disable-WSManTrace","Enable-PSTrace","Enable-PSWSManCombinedTrace","Enable-WSManTrace","Get-LogProperties","Set-LogProperties","Start-Trace","Stop-Trace"
     CmdletsToExport = @()
     AliasesToExport = @()
-    HelpInfoUri="https://aka.ms/powershell72-help"
+    HelpInfoUri="https://aka.ms/powershell73-help"
 }
diff --git a/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs b/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
index a003bfba1ec..af410e4bd6d 100644
--- a/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
+++ b/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
@@ -175,13 +175,13 @@ static UpdatableHelpCommandBase()
 
             // NOTE: The HelpInfoUri must be updated with each release.
 
-            s_metadataCache.Add("Microsoft.PowerShell.Diagnostics", "https://aka.ms/powershell72-help");
-            s_metadataCache.Add("Microsoft.PowerShell.Core", "https://aka.ms/powershell72-help");
-            s_metadataCache.Add("Microsoft.PowerShell.Utility", "https://aka.ms/powershell72-help");
-            s_metadataCache.Add("Microsoft.PowerShell.Host", "https://aka.ms/powershell72-help");
-            s_metadataCache.Add("Microsoft.PowerShell.Management", "https://aka.ms/powershell72-help");
-            s_metadataCache.Add("Microsoft.PowerShell.Security", "https://aka.ms/powershell72-help");
-            s_metadataCache.Add("Microsoft.WSMan.Management", "https://aka.ms/powershell72-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Diagnostics", "https://aka.ms/powershell73-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Core", "https://aka.ms/powershell73-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Utility", "https://aka.ms/powershell73-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Host", "https://aka.ms/powershell73-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Management", "https://aka.ms/powershell73-help");
+            s_metadataCache.Add("Microsoft.PowerShell.Security", "https://aka.ms/powershell73-help");
+            s_metadataCache.Add("Microsoft.WSMan.Management", "https://aka.ms/powershell73-help");
         }
 
         /// <summary>

From 7a2b44523ba77eee1a4d003ecd97cdb5aea2fd93 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Mon, 3 Jan 2022 11:20:33 -0800
Subject: [PATCH 190/645] Fix web cmdlets so that an empty `Get` does not
 include a `content-length` header (#16587)

---
 .../Common/WebRequestPSCmdlet.Common.cs       | 10 ++++--
 .../WebCmdlets.Tests.ps1                      | 36 +++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
index a5a4060e7fd..30c55f506f0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
@@ -1277,9 +1277,15 @@ internal virtual void FillRequestStream(HttpRequestMessage request)
                 }
             }
 
-            // Add the content headers
-            if (request.Content == null)
+            // For other methods like Put where empty content has meaning, we need to fill in the content
+            if (request.Content is null)
             {
+                // If this is a Get request and there is no content, then don't fill in the content as empty content gets rejected by some web services per RFC7230
+                if ((IsStandardMethodSet() && request.Method == HttpMethod.Get && ContentType is null) || (IsCustomMethodSet() && CustomMethod.ToUpperInvariant() == "GET"))
+                {
+                    return;
+                }
+
                 request.Content = new StringContent(string.Empty);
                 request.Content.Headers.Clear();
             }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
index 0f1f2ca595d..0742578fa83 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
@@ -370,6 +370,8 @@ $redirectTests = @(
 
 Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
     BeforeAll {
+        $oldProgress = $ProgressPreference
+        $ProgressPreference = 'SilentlyContinue'
         $WebListener = Start-WebListener
         $NotFoundQuery = @{
             statuscode = 404
@@ -380,6 +382,10 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
         }
     }
 
+    AfterAll {
+        $ProgressPreference = $oldProgress
+    }
+
     # Validate the output of Invoke-WebRequest
     #
     function ValidateResponse {
@@ -456,6 +462,8 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
 
         # Validate response
         ValidateResponse -response $result
+
+        $result.Output.Headers.'Content-Length' | Should -BeNullOrEmpty
     }
 
     It "Validate Invoke-WebRequest -DisableKeepAlive" {
@@ -705,6 +713,13 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
         ($result.Output.Content | ConvertFrom-Json).args.testparam | Should -Be "testvalue"
     }
 
+    It 'Validate Invoke-WebRequest empty body CustomMethod GET' {
+        $uri = Get-WebListenerUrl -Test 'Get'
+        $command = "Invoke-WebRequest -Uri '$uri' -CustomMethod GET"
+        $result = ExecuteWebCommand -command $command
+        $result.Output.Headers.'Content-Length' | Should -BeNullOrEmpty
+    }
+
     It "Validate Invoke-WebRequest body is converted to query params for CustomMethod GET and -NoProxy" {
         $uri = Get-WebListenerUrl -Test 'Get'
         $command = "Invoke-WebRequest -Uri '$uri' -CustomMethod GET -Body @{'testparam'='testvalue'} -NoProxy"
@@ -2061,6 +2076,9 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
 
 Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
     BeforeAll {
+        $oldProgress = $ProgressPreference
+        $ProgressPreference = 'SilentlyContinue'
+
         $WebListener = Start-WebListener
 
         $NotFoundQuery = @{
@@ -2072,6 +2090,10 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
         }
     }
 
+    AfterAll {
+        $ProgressPreference = $oldProgress
+    }
+
     #User-Agent changes on different platforms, so tests should only be run if on the correct platform
     It "Invoke-RestMethod returns Correct User-Agent on MacOSX" -Skip:(!$IsMacOS) {
         $uri = Get-WebListenerUrl -Test 'Get'
@@ -2111,6 +2133,7 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
 
         # Validate response
         $result.Error | Should -BeNullOrEmpty
+        $result.Output.headers.'Content-Length' | Should -Be 0
     }
 
     It "Invoke-RestMethod returns headers dictionary" {
@@ -2350,6 +2373,13 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
         $result.Output.args.testparam | Should -Be "testvalue"
     }
 
+    It 'Validate Invoke-RestMethod empty body CustomMethod GET' {
+        $uri = Get-WebListenerUrl -Test 'Get'
+        $command = "Invoke-RestMethod -Uri '$uri' -CustomMethod GET"
+        $result = ExecuteWebCommand -command $command
+        $result.Output.Headers.'Content-Length' | Should -BeNullOrEmpty
+    }
+
     It "Validate Invoke-RestMethod body is converted to query params for CustomMethod GET and -NoProxy" {
         $uri = Get-WebListenerUrl -Test 'Get'
         $command = "Invoke-RestMethod -Uri '$uri' -CustomMethod GET -Body @{'testparam'='testvalue'} -NoProxy"
@@ -3528,9 +3558,15 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
 
 Describe "Validate Invoke-WebRequest and Invoke-RestMethod -InFile" -Tags "Feature", "RequireAdminOnWindows" {
     BeforeAll {
+        $oldProgress = $ProgressPreference
+        $ProgressPreference = 'SilentlyContinue'
         $WebListener = Start-WebListener
     }
 
+    AfterAll {
+        $ProgressPreference = $oldProgress
+    }
+
     Context "InFile parameter negative tests" {
         BeforeAll {
             $uri = Get-WebListenerUrl -Test 'Post'

From 9b8916fe5a81a5a0ffb902f3ed4568b342535139 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jan 2022 16:25:15 -0800
Subject: [PATCH 191/645] Bump Microsoft.ApplicationInsights from 2.19.0 to
 2.20.0 (#16642)

---
 .../System.Management.Automation.csproj                         | 2 +-
 tools/cgmanifest.json                                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index bfb49b7998f..1f298d296ab 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -14,7 +14,7 @@
     <!-- 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.20.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" />
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 3816494e256..15bcbacc172 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -35,7 +35,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.ApplicationInsights",
-          "Version": "2.19.0"
+          "Version": "2.20.0"
         }
       },
       "DevelopmentDependency": false

From 0834c658776b982e5b180e250678cb53efa13730 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Tue, 4 Jan 2022 08:30:14 -0800
Subject: [PATCH 192/645] Add AMSI method invocation logging as experimental
 feature (#16496)

* Add AMSI method invocation logging as experimental feature

* Add fix for value type errors in logging expression

* Fix recursion error
---
 .../ExperimentalFeature.cs                    |   4 +
 .../engine/parser/Compiler.cs                 |   4 +-
 .../engine/runtime/Binding/Binders.cs         |  17 ++
 .../engine/runtime/Operations/MiscOps.cs      |  65 +++++++
 .../security/SecuritySupport.cs               | 175 +++++++++++++++---
 5 files changed, 235 insertions(+), 30 deletions(-)

diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index 5695d54806d..bfebfd6d2f6 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -25,6 +25,7 @@ public class ExperimentalFeature
         internal const string PSNativeCommandErrorActionPreferenceFeatureName = "PSNativeCommandErrorActionPreference";
         internal const string PSRemotingSSHTransportErrorHandling = "PSRemotingSSHTransportErrorHandling";
         internal const string PSCleanBlockFeatureName = "PSCleanBlock";
+        internal const string PSAMSIMethodInvocationLogging = "PSAMSIMethodInvocationLogging";
 
         #endregion
 
@@ -134,6 +135,9 @@ static ExperimentalFeature()
                 new ExperimentalFeature(
                     name: PSCleanBlockFeatureName,
                     description: "Add support of a 'Clean' block to functions and script cmdlets for easy resource cleanup"),
+                new ExperimentalFeature(
+                    name: PSAMSIMethodInvocationLogging,
+                    description: "Provides AMSI notification of .NET method invocations."),
             };
 
             EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);
diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index 9956fb29e30..b8ca57b4b05 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -639,7 +639,9 @@ internal static class CachedReflectionInfo
 
         internal static readonly MethodInfo ArgumentTransformationAttribute_Transform =
             typeof(ArgumentTransformationAttribute).GetMethod(nameof(ArgumentTransformationAttribute.Transform), InstancePublicFlags);
-        // ReSharper restore InconsistentNaming
+        
+        internal static readonly MethodInfo MemberInvocationLoggingOps_LogMemberInvocation =
+            typeof(MemberInvocationLoggingOps).GetMethod(nameof(MemberInvocationLoggingOps.LogMemberInvocation), StaticFlags);
     }
 
     internal static class ExpressionCache
diff --git a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
index a4917d5af6b..52f85e372b2 100644
--- a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
+++ b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
@@ -6903,6 +6903,23 @@ internal static DynamicMetaObject InvokeDotNetMethod(
                     expr = Expression.Block(expr, ExpressionCache.AutomationNullConstant);
                 }
 
+                if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSAMSIMethodInvocationLogging))
+                {
+                    // Expression block runs two expressions in order:
+                    //  - Log method invocation to AMSI Notifications (can throw PSSecurityException)
+                    //  - Invoke method
+                    string targetName = methodInfo.ReflectedType?.FullName ?? string.Empty;
+                    expr = Expression.Block(
+                        Expression.Call(
+                            CachedReflectionInfo.MemberInvocationLoggingOps_LogMemberInvocation,
+                            Expression.Constant(targetName),
+                            Expression.Constant(name),
+                            Expression.NewArrayInit(
+                                typeof(object),
+                                args.Select(static e => e.Expression.Cast(typeof(object))))),
+                        expr);
+                }
+
                 // If we're calling SteppablePipeline.{Begin|Process|End}, we don't want
                 // to wrap exceptions - this is very much a special case to help error
                 // propagation and ensure errors are attributed to the correct code (the
diff --git a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
index 8d50fcf5f1a..62468dcfc3f 100644
--- a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
+++ b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
@@ -3546,4 +3546,69 @@ internal static object[] GetSlice(IList list, int startIndex)
             return result;
         }
     }
+
+    internal static class MemberInvocationLoggingOps
+    {
+        private static readonly Lazy<bool> DumpLogAMSIContent = new Lazy<bool>(
+            () => {
+                object result = Environment.GetEnvironmentVariable("__PSDumpAMSILogContent");
+                if (result != null && LanguagePrimitives.TryConvertTo(result, out int value))
+                {
+                    return value == 1;
+                }
+                return false;
+            }
+        );
+
+        internal static void LogMemberInvocation(string targetName, string name, object[] args)
+        {
+            try
+            {
+                var contentName = "PowerShellMemberInvocation";
+                var argsBuilder = new Text.StringBuilder();
+
+                for (int i = 0; i < args.Length; i++)
+                {
+                    string value = args[i] is null ? "null" : args[i].ToString();
+
+                    if (i > 0)
+                    {
+                        argsBuilder.Append(", ");
+                    }
+
+                    argsBuilder.Append($"<{value}>");
+                }
+
+                string content = $"<{targetName}>.{name}({argsBuilder})";
+
+                if (DumpLogAMSIContent.Value)
+                {
+                    Console.WriteLine("\n=== Amsi notification report content ===");
+                    Console.WriteLine(content);
+                }
+
+                var success = AmsiUtils.ReportContent(
+                    name: contentName,
+                    content: content);
+
+                if (DumpLogAMSIContent.Value)
+                {
+                    Console.WriteLine($"=== Amsi notification report success: {success} ===");
+                }
+            }
+            catch (PSSecurityException)
+            {
+                // ReportContent() will throw PSSecurityException if AMSI detects malware, which 
+                // must be propagated.
+                throw;
+            }
+            catch (Exception ex)
+            {
+                if (DumpLogAMSIContent.Value)
+                {
+                    Console.WriteLine($"!!! Amsi notification report exception: {ex} !!!");
+                }
+            }
+        }
+    }
 }
diff --git a/src/System.Management.Automation/security/SecuritySupport.cs b/src/System.Management.Automation/security/SecuritySupport.cs
index e41b64db625..7b5087411ec 100644
--- a/src/System.Management.Automation/security/SecuritySupport.cs
+++ b/src/System.Management.Automation/security/SecuritySupport.cs
@@ -1383,7 +1383,10 @@ internal static AmsiNativeMethods.AMSI_RESULT ScanContent(string content, string
 #endif
         }
 
-        internal static AmsiNativeMethods.AMSI_RESULT WinScanContent(string content, string sourceMetadata, bool warmUp)
+        internal static AmsiNativeMethods.AMSI_RESULT WinScanContent(
+            string content,
+            string sourceMetadata,
+            bool warmUp)
         {
             if (string.IsNullOrEmpty(sourceMetadata))
             {
@@ -1414,33 +1417,9 @@ internal static AmsiNativeMethods.AMSI_RESULT WinScanContent(string content, str
 
                 try
                 {
-                    int hr = 0;
-
-                    // Initialize AntiMalware Scan Interface, if not already initialized.
-                    // If we failed to initialize previously, just return the neutral result ("AMSI_RESULT_NOT_DETECTED")
-                    if (s_amsiContext == IntPtr.Zero)
+                    if (!CheckAmsiInit())
                     {
-                        hr = Init();
-
-                        if (!Utils.Succeeded(hr))
-                        {
-                            s_amsiInitFailed = true;
-                            return AmsiNativeMethods.AMSI_RESULT.AMSI_RESULT_NOT_DETECTED;
-                        }
-                    }
-
-                    // Initialize the session, if one isn't already started.
-                    // If we failed to initialize previously, just return the neutral result ("AMSI_RESULT_NOT_DETECTED")
-                    if (s_amsiSession == IntPtr.Zero)
-                    {
-                        hr = AmsiNativeMethods.AmsiOpenSession(s_amsiContext, ref s_amsiSession);
-                        AmsiInitialized = true;
-
-                        if (!Utils.Succeeded(hr))
-                        {
-                            s_amsiInitFailed = true;
-                            return AmsiNativeMethods.AMSI_RESULT.AMSI_RESULT_NOT_DETECTED;
-                        }
+                        return AmsiNativeMethods.AMSI_RESULT.AMSI_RESULT_NOT_DETECTED;
                     }
 
                     if (warmUp)
@@ -1453,6 +1432,7 @@ internal static AmsiNativeMethods.AMSI_RESULT WinScanContent(string content, str
                     AmsiNativeMethods.AMSI_RESULT result = AmsiNativeMethods.AMSI_RESULT.AMSI_RESULT_CLEAN;
 
                     // Run AMSI content scan
+                    int hr;
                     unsafe
                     {
                         fixed (char* buffer = content)
@@ -1484,6 +1464,123 @@ internal static AmsiNativeMethods.AMSI_RESULT WinScanContent(string content, str
             }
         }
 
+        /// <Summary>
+        /// Reports provided content to AMSI (Antimalware Scan Interface).
+        /// </Summary>
+        /// <param name="name">Name of content being reported.</param>
+        /// <param name="content">Content being reported.</param>
+        /// <returns>True if content was successfully reported.</returns>
+        internal static bool ReportContent(
+            string name,
+            string content)
+        {
+#if UNIX
+            return false;
+#else
+            return WinReportContent(name, content);
+#endif
+        }
+
+        private static bool WinReportContent(
+            string name,
+            string content)
+        {
+            if (string.IsNullOrEmpty(name) ||
+                string.IsNullOrEmpty(content) ||
+                s_amsiInitFailed ||
+                s_amsiNotifyFailed)
+            {
+                return false;
+            }
+
+            lock (s_amsiLockObject)
+            {
+                if (s_amsiNotifyFailed)
+                {
+                    return false;
+                }
+
+                try
+                {
+                    if (!CheckAmsiInit())
+                    {
+                        return false;
+                    }
+
+                    int hr;
+                    AmsiNativeMethods.AMSI_RESULT result = AmsiNativeMethods.AMSI_RESULT.AMSI_RESULT_NOT_DETECTED;
+                    unsafe
+                    {
+                        fixed (char* buffer = content)
+                        {
+                            var buffPtr = new IntPtr(buffer);
+                            hr = AmsiNativeMethods.AmsiNotifyOperation(
+                                amsiContext: s_amsiContext,
+                                buffer: buffPtr,
+                                length: (uint)(content.Length * sizeof(char)),
+                                contentName: name,
+                                ref result);
+                        }
+                    }
+
+                    if (Utils.Succeeded(hr))
+                    {
+                        if (result == AmsiNativeMethods.AMSI_RESULT.AMSI_RESULT_DETECTED)
+                        {
+                            // If malware is detected, throw to prevent method invoke expression from running.
+                            throw new PSSecurityException(ParserStrings.ScriptContainedMaliciousContent);
+                        }
+
+                        return true;
+                    }
+
+                    return false;
+                }
+                catch (DllNotFoundException)
+                {
+                    s_amsiNotifyFailed = true;
+                    return false;
+                }
+                catch (System.EntryPointNotFoundException)
+                {
+                    s_amsiNotifyFailed = true;
+                    return false;
+                }
+            }
+        }
+
+        private static bool CheckAmsiInit()
+        {
+            // Initialize AntiMalware Scan Interface, if not already initialized.
+            // If we failed to initialize previously, just return the neutral result ("AMSI_RESULT_NOT_DETECTED")
+            if (s_amsiContext == IntPtr.Zero)
+            {
+                int hr = Init();
+
+                if (!Utils.Succeeded(hr))
+                {
+                    s_amsiInitFailed = true;
+                    return false;
+                }
+            }
+
+            // Initialize the session, if one isn't already started.
+            // If we failed to initialize previously, just return the neutral result ("AMSI_RESULT_NOT_DETECTED")
+            if (s_amsiSession == IntPtr.Zero)
+            {
+                int hr = AmsiNativeMethods.AmsiOpenSession(s_amsiContext, ref s_amsiSession);
+                AmsiInitialized = true;
+
+                if (!Utils.Succeeded(hr))
+                {
+                    s_amsiInitFailed = true;
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
         internal static void CurrentDomain_ProcessExit(object sender, EventArgs e)
         {
             if (AmsiInitialized && !AmsiUninitializeCalled)
@@ -1499,6 +1596,7 @@ internal static void CurrentDomain_ProcessExit(object sender, EventArgs e)
         private static IntPtr s_amsiSession = IntPtr.Zero;
 
         private static bool s_amsiInitFailed = false;
+        private static bool s_amsiNotifyFailed = false;
         private static readonly object s_amsiLockObject = new object();
 
         /// <summary>
@@ -1623,8 +1721,27 @@ internal static extern int AmsiInitialize(
             [DefaultDllImportSearchPathsAttribute(DllImportSearchPath.System32)]
             [DllImportAttribute("amsi.dll", EntryPoint = "AmsiScanBuffer", CallingConvention = CallingConvention.StdCall)]
             internal static extern int AmsiScanBuffer(
-                System.IntPtr amsiContext, System.IntPtr buffer, uint length,
-                [InAttribute()][MarshalAsAttribute(UnmanagedType.LPWStr)] string contentName, System.IntPtr amsiSession, ref AMSI_RESULT result);
+            System.IntPtr amsiContext,
+                System.IntPtr buffer,
+                uint length,
+                [InAttribute()][MarshalAsAttribute(UnmanagedType.LPWStr)] string contentName,
+                System.IntPtr amsiSession,
+                ref AMSI_RESULT result);
+
+            /// Return Type: HRESULT->LONG->int
+            /// amsiContext: HAMSICONTEXT->HAMSICONTEXT__*
+            /// buffer: PVOID->void*
+            /// length: ULONG->unsigned int
+            /// contentName: LPCWSTR->WCHAR*
+            /// result: AMSI_RESULT*
+            [DefaultDllImportSearchPathsAttribute(DllImportSearchPath.System32)]
+            [DllImportAttribute("amsi.dll", EntryPoint = "AmsiNotifyOperation", CallingConvention = CallingConvention.StdCall)]
+            internal static extern int AmsiNotifyOperation(
+                System.IntPtr amsiContext,
+                System.IntPtr buffer,
+                uint length,
+                [InAttribute()][MarshalAsAttribute(UnmanagedType.LPWStr)] string contentName,
+                ref AMSI_RESULT result);
 
             /// Return Type: HRESULT->LONG->int
             ///amsiContext: HAMSICONTEXT->HAMSICONTEXT__*

From a9b14a13fd9349e4df61cba7b46d47fc98f831ee Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Tue, 4 Jan 2022 14:09:27 -0800
Subject: [PATCH 193/645] Add `exec` cmdlet for bash compatibility (#16462)

---
 .../ExperimentalFeature.cs                    |   4 +
 .../engine/InitialSessionState.cs             |  18 ++-
 .../engine/Modules/SwitchProcessCommand.cs    | 115 ++++++++++++++++++
 .../resources/CommandBaseStrings.resx         |   6 +
 .../Microsoft.PowerShell.Core/Exec.Tests.ps1  |  74 +++++++++++
 .../engine/Help/HelpSystem.Tests.ps1          |   3 +-
 6 files changed, 218 insertions(+), 2 deletions(-)
 create mode 100644 src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
 create mode 100644 test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1

diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index bfebfd6d2f6..d23f5b63290 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -26,6 +26,7 @@ public class ExperimentalFeature
         internal const string PSRemotingSSHTransportErrorHandling = "PSRemotingSSHTransportErrorHandling";
         internal const string PSCleanBlockFeatureName = "PSCleanBlock";
         internal const string PSAMSIMethodInvocationLogging = "PSAMSIMethodInvocationLogging";
+        internal const string PSExecFeatureName = "PSExec";
 
         #endregion
 
@@ -138,6 +139,9 @@ static ExperimentalFeature()
                 new ExperimentalFeature(
                     name: PSAMSIMethodInvocationLogging,
                     description: "Provides AMSI notification of .NET method invocations."),
+                new ExperimentalFeature(
+                    name: PSExecFeatureName,
+                    description: "Add 'exec' built-in command on Linux and macOS"),
             };
 
             EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index 05eb871053d..ce0fff99f46 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -4634,7 +4634,7 @@ internal static SessionStateAliasEntry[] BuiltInAliases
                 const ScopedItemOptions ReadOnly_AllScope = ScopedItemOptions.ReadOnly | ScopedItemOptions.AllScope;
                 const ScopedItemOptions ReadOnly = ScopedItemOptions.ReadOnly;
 
-                return new SessionStateAliasEntry[] {
+                var builtInAliases = new List<SessionStateAliasEntry> {
                     new SessionStateAliasEntry("foreach", "ForEach-Object", string.Empty, ReadOnly_AllScope),
                     new SessionStateAliasEntry("%", "ForEach-Object", string.Empty, ReadOnly_AllScope),
                     new SessionStateAliasEntry("where", "Where-Object", string.Empty, ReadOnly_AllScope),
@@ -4801,6 +4801,15 @@ internal static SessionStateAliasEntry[] BuiltInAliases
                     //   - do not use AllScope - this causes errors in profiles that set this somewhat commonly used alias.
                     new SessionStateAliasEntry("sls", "Select-String"),
                 };
+
+#if UNIX
+                if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSExecFeatureName))
+                {
+                    builtInAliases.Add(new SessionStateAliasEntry("exec", "Switch-Process"));
+                }
+#endif
+
+                return builtInAliases.ToArray();
             }
         }
 
@@ -5439,6 +5448,13 @@ private static void InitializeCoreCmdletsAndProviders(
                 cmdlets.Add("Get-PSSubsystem", new SessionStateCmdletEntry("Get-PSSubsystem", typeof(Subsystem.GetPSSubsystemCommand), helpFile));
             }
 
+#if UNIX
+            if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSExecFeatureName))
+            {
+                cmdlets.Add("Switch-Process", new SessionStateCmdletEntry("Switch-Process", typeof(SwitchProcessCommand), helpFile));
+            }
+#endif
+
             foreach (var val in cmdlets.Values)
             {
                 val.SetPSSnapIn(psSnapInInfo);
diff --git a/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs b/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
new file mode 100644
index 00000000000..298587679b1
--- /dev/null
+++ b/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
@@ -0,0 +1,115 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Management.Automation;
+using System.Runtime.InteropServices;
+
+using Dbg = System.Management.Automation.Diagnostics;
+
+#if UNIX
+
+namespace Microsoft.PowerShell.Commands
+{
+    /// <summary>
+    /// Implements a cmdlet that allows use of execv API.
+    /// </summary>
+    [Experimental(ExperimentalFeature.PSExecFeatureName, ExperimentAction.Show)]
+    [Cmdlet(VerbsCommon.Switch, "Process", HelpUri = "https://go.microsoft.com/fwlink/?linkid=2181448")]
+    public sealed class SwitchProcessCommand : PSCmdlet
+    {
+        /// <summary>
+        /// Get or set the command and arguments to replace the current pwsh process.
+        /// </summary>
+        [Parameter(Position = 0, Mandatory = false, ValueFromRemainingArguments = true)]
+        public string[] WithCommand { get; set; } = Array.Empty<string>();
+
+        /// <summary>
+        /// Execute the command and arguments
+        /// </summary>
+        protected override void EndProcessing()
+        {
+            if (WithCommand.Length == 0)
+            {
+                return;
+            }
+
+            // execv requires command to be full path so resolve command to first match
+            var command = this.SessionState.InvokeCommand.GetCommand(WithCommand[0], CommandTypes.Application);
+            if (command is null)
+            {
+                ThrowTerminatingError(
+                    new ErrorRecord(
+                        new CommandNotFoundException(
+                            string.Format(
+                                System.Globalization.CultureInfo.InvariantCulture,
+                                CommandBaseStrings.NativeCommandNotFound,
+                                command
+                            )
+                        ),
+                        "CommandNotFound",
+                        ErrorCategory.InvalidArgument,
+                        WithCommand
+                    )
+                );
+            }
+
+            var execArgs = new string?[WithCommand.Length + 1];
+
+            // execv convention is the first arg is the program name
+            execArgs[0] = command.Name;
+
+            for (int i = 1; i < WithCommand.Length; i++)
+            {
+                execArgs[i] = WithCommand[i];
+            }
+
+            // need null terminator at end
+            execArgs[execArgs.Length - 1] = null;
+
+            int exitCode = Exec(command.Source, execArgs);
+
+            if (exitCode < 0)
+            {
+                ThrowTerminatingError(
+                    new ErrorRecord(
+                        new Exception(
+                            string.Format(
+                                System.Globalization.CultureInfo.InvariantCulture,
+                                CommandBaseStrings.ExecFailed,
+                                Marshal.GetLastPInvokeError(),
+                                string.Join(" ", WithCommand)
+                            )
+                        ),
+                        "ExecutionFailed",
+                        ErrorCategory.InvalidOperation,
+                        WithCommand
+                    )
+                );
+            }
+        }
+
+        /// <summary>
+        /// The `execv` POSIX syscall we use to exec /bin/sh.
+        /// </summary>
+        /// <param name="path">The path to the executable to exec.</param>
+        /// <param name="args">
+        /// The arguments to send through to the executable.
+        /// Array must have its final element be null.
+        /// </param>
+        /// <returns>
+        /// An exit code if exec failed, but if successful the calling process will be overwritten.
+        /// </returns>
+        [DllImport("libc",
+            EntryPoint = "execv",
+            CallingConvention = CallingConvention.Cdecl,
+            CharSet = CharSet.Ansi,
+            SetLastError = true)]
+        private static extern int Exec(string path, string?[] args);
+    }
+}
+
+#endif
diff --git a/src/System.Management.Automation/resources/CommandBaseStrings.resx b/src/System.Management.Automation/resources/CommandBaseStrings.resx
index dc2dd4bbbf5..abb918adb16 100644
--- a/src/System.Management.Automation/resources/CommandBaseStrings.resx
+++ b/src/System.Management.Automation/resources/CommandBaseStrings.resx
@@ -222,4 +222,10 @@ Reviewed by TArcher on 2010-07-20
   <data name="UseOfDeprecatedCommandWarning" xml:space="preserve">
     <value>The {0} is obsolete. {1}</value>
   </data>
+  <data name="ExecFailed" xml:space="preserve">
+    <value>Exec call failed with errorno {0} for command line: {1}</value>
+  </data>
+  <data name="NativeCommandNotFound" xml:space="preserve">
+    <value>Command '{0}' was not found. The specified command must be an executable.</value>
+  </data>
 </root>
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
new file mode 100644
index 00000000000..bd3c87e0f5c
--- /dev/null
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
@@ -0,0 +1,74 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe 'Switch-Process tests for Unix' -Tags 'CI' {
+    BeforeAll {
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        if (-not [ExperimentalFeature]::IsEnabled('PSExec') -or $IsWindows)
+        {
+            $PSDefaultParameterValues['It:Skip'] = $true
+            return
+        }
+    }
+
+    AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
+    }
+
+    It 'Exec alias should map to Switch-Process' {
+        $alias = Get-Command exec
+        $alias | Should -BeOfType [System.Management.Automation.AliasInfo]
+        $alias.Definition | Should -BeExactly 'Switch-Process'
+    }
+
+    It 'Exec by itself does nothing' {
+        exec | Should -BeNullOrEmpty
+    }
+
+    It 'Exec given a cmdlet should fail' {
+        { exec Get-Command } | Should -Throw -ErrorId 'CommandNotFound,Microsoft.PowerShell.Commands.SwitchProcessCommand'
+    }
+
+    It 'Exec given an exe should work' {
+        $id, $uname = pwsh -noprofile -noexit -outputformat text -command { $pid; exec uname }
+        Get-Process -Id $id -ErrorAction Ignore| Should -BeNullOrEmpty
+        $uname | Should -BeExactly (uname)
+    }
+
+    It 'Exec given an exe and arguments should work' {
+        $id, $uname = pwsh -noprofile -noexit -outputformat text -command { $pid; exec uname -a }
+        Get-Process -Id $id -ErrorAction Ignore| Should -BeNullOrEmpty
+        $uname | Should -BeExactly (uname -a)
+    }
+
+    It 'Exec will replace the process' {
+        $sleep = Get-Command sleep -CommandType Application | Select-Object -First 1
+        $p = Start-Process pwsh -ArgumentList "-noprofile -command exec $($sleep.Source) 90" -PassThru
+        Wait-UntilTrue {
+            ($p | Get-Process).Name -eq 'sleep'
+        } -timeout 60000 -interval 100 | Should -BeTrue
+    }
+}
+
+Describe 'Switch-Process for Windows' {
+    BeforeAll {
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        if (-not $IsWindows)
+        {
+            $PSDefaultParameterValues['It:Skip'] = $true
+            return
+        }
+    }
+
+    AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
+    }
+
+    It 'Switch-Process should not be available' {
+        Get-Command -Name Switch-Process -ErrorAction Ignore | Should -BeNullOrEmpty
+    }
+
+    It 'Exec alias should not be available' {
+        Get-Alias -Name exec -ErrorAction Ignore | Should -BeNullOrEmpty
+    }
+}
diff --git a/test/powershell/engine/Help/HelpSystem.Tests.ps1 b/test/powershell/engine/Help/HelpSystem.Tests.ps1
index 3fbd0822352..0590c7877ff 100644
--- a/test/powershell/engine/Help/HelpSystem.Tests.ps1
+++ b/test/powershell/engine/Help/HelpSystem.Tests.ps1
@@ -16,7 +16,8 @@ $script:cmdletsToSkip = @(
     "Get-ExperimentalFeature",
     "Enable-ExperimentalFeature",
     "Disable-ExperimentalFeature",
-    "Get-PSSubsystem"
+    "Get-PSSubsystem",
+    "Switch-Process"
 )
 
 function UpdateHelpFromLocalContentPath {

From 2e8009bf721f3997bbcf710a8c683f94778f97c5 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Tue, 4 Jan 2022 16:16:53 -0800
Subject: [PATCH 194/645] Change nuget release yaml to use `UseDotNet` task
 (#16701)

---
 tools/releaseBuild/azureDevOps/templates/nuget.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index 2f583b52c4a..b868c9dbdf7 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -51,10 +51,10 @@ jobs:
       Write-Host "##$vstsCommandString"
     displayName: 'Find SDK version from global.json'
 
-  - task: DotNetCoreInstaller@0
+  - task: UseDotNet@2
     displayName: 'Use .NET Core SDK from global.json'
     inputs:
-      version: '$(SDKVersion)'
+      useGlobalJson: true
 
   - task: DownloadBuildArtifacts@0
     displayName: 'Download PowerShell build artifacts - finalResults'

From e2f39fa0eb29af4c606dc06b77046370d94a91e8 Mon Sep 17 00:00:00 2001
From: Keith Hill <r_keith_hill@hotmail.com>
Date: Mon, 10 Jan 2022 16:08:00 -0700
Subject: [PATCH 195/645] Reduce the amount of startup banner text (#16516)

---
 .../host/msh/CommandLineParameterParser.cs    |  1 -
 .../host/msh/UpdatesNotification.cs           |  1 +
 .../resources/ManagedEntranceStrings.resx     |  8 +--
 test/powershell/Host/ConsoleHost.Tests.ps1    | 58 +++++++++++++++++++
 4 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
index 6908320db53..795921a0c5a 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
@@ -690,7 +690,6 @@ private void DisplayBanner(PSHostUserInterface hostUI, string? bannerText)
                 if (!string.IsNullOrEmpty(bannerText))
                 {
                     hostUI.WriteLine(bannerText);
-                    hostUI.WriteLine();
                 }
 
                 if (UpdatesNotification.CanNotifyUpdates)
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs
index e9bc2d343b4..455efe84d11 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs
@@ -126,6 +126,7 @@ internal static void ShowUpdateNotification(PSHostUserInterface hostUI)
 
                 string notificationMsg = string.Format(CultureInfo.CurrentCulture, notificationMsgTemplate, releaseTag, notificationColor, resetColor, line2Padding, line3Padding);
 
+                hostUI.WriteLine();
                 hostUI.WriteLine(notificationMsg);
             }
         }
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
index 7b13837b294..481a4216cf9 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
@@ -118,11 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="ShellBannerNonWindowsPowerShell" xml:space="preserve">
-    <value>PowerShell {0}
-Copyright (c) Microsoft Corporation.
-
-https://aka.ms/powershell
-Type 'help' to get help.</value>
+    <value>PowerShell {0}</value>
   </data>
   <data name="PSReadLineDisabledWhenScreenReaderIsActive" xml:space="preserve">
     <value>Warning: PowerShell detected that you might be using a screen reader and has disabled PSReadLine for compatibility purposes. If you want to re-enable it, run 'Import-Module PSReadLine'.</value>
@@ -383,7 +379,7 @@ All parameters are case-insensitive.</value>
 
 -NoLogo | -nol
 
-    Hides the copyright banner at startup of interactive sessions.
+    Hides the banner text at startup of interactive sessions.
 
 -NonInteractive | -noni
 
diff --git a/test/powershell/Host/ConsoleHost.Tests.ps1 b/test/powershell/Host/ConsoleHost.Tests.ps1
index 06f8f0a8198..1798a71939f 100644
--- a/test/powershell/Host/ConsoleHost.Tests.ps1
+++ b/test/powershell/Host/ConsoleHost.Tests.ps1
@@ -857,6 +857,64 @@ $powershell -c '[System.Management.Automation.Platform]::SelectProductNameForDir
             $LASTEXITCODE | Should -Be $ExitCodeBadCommandLineParameter
         }
     }
+
+    Context "Startup banner text tests" -Tag Slow {
+        BeforeAll {
+            $outputPath = "Temp:\StartupBannerTest-Output-${Pid}.txt"
+            $inputPath  = "Temp:\StartupBannerTest-Input.txt"
+            "exit" > $inputPath
+
+            # Not testing update notification banner text here
+            $oldPowerShellUpdateCheck = $env:POWERSHELL_UPDATECHECK
+            $env:POWERSHELL_UPDATECHECK = "Off"
+
+            # Set TERM to "dumb" to avoid DECCKM codes in the output
+            $oldTERM = $env:TERM
+            $env:TERM = "dumb"
+
+            $escPwd = [regex]::Escape($pwd)
+            $expectedPromptPattern = "^PS ${escPwd}> exit`$"
+
+            $spArgs = @{
+                FilePath = $powershell
+                ArgumentList = @("-NoProfile")
+                RedirectStandardInput = $inputPath
+                RedirectStandardOutput = $outputPath
+                WorkingDirectory = $pwd
+                PassThru = $true
+                NoNewWindow = $true
+                UseNewEnvironment = $false
+            }
+        }
+        AfterAll {
+            $env:TERM = $oldTERM
+            $env:POWERSHELL_UPDATECHECK = $oldPowerShellUpdateCheck
+
+            Remove-Item $inputPath -Force -ErrorAction Ignore
+            Remove-Item $outputPath -Force -ErrorAction Ignore
+        }
+        BeforeEach {
+            Remove-Item $outputPath -Force -ErrorAction Ignore
+        }
+        It "Displays expected startup banner text by default" {
+            $process = Start-Process @spArgs
+            Wait-UntilTrue -sb { $process.HasExited } -TimeoutInMilliseconds 5000 -IntervalInMilliseconds 250 | Should -BeTrue
+
+            $out = @(Get-Content $outputPath)
+            $out.Count | Should -Be 2
+            $out[0] | Should -BeExactly "PowerShell $($PSVersionTable.GitCommitId)"
+            $out[1] | Should -MatchExactly $expectedPromptPattern
+        }
+        It "Displays only the prompt with -NoLogo" {
+            $spArgs["ArgumentList"] += "-NoLogo"
+            $process = Start-Process @spArgs
+            Wait-UntilTrue -sb { $process.HasExited } -TimeoutInMilliseconds 5000 -IntervalInMilliseconds 250 | Should -BeTrue
+
+            $out = @(Get-Content $outputPath)
+            $out.Count | Should -Be 1
+            $out[0] | Should -MatchExactly $expectedPromptPattern
+        }
+    }
 }
 
 Describe "WindowStyle argument" -Tag Feature {

From 0f21156dee50c28738cd9a71086458ba651e2d28 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Tue, 11 Jan 2022 23:21:32 -0800
Subject: [PATCH 196/645] Fix `$PSNativeCommandArgPassing` = `Windows` to
 handle empty args correctly (#16639)

---
 .../engine/NativeCommandParameterBinder.cs    |  4 ++--
 .../NativeCommandArguments.Tests.ps1          | 24 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs b/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
index 59715a02125..200cfeee2ef 100644
--- a/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
+++ b/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
@@ -314,7 +314,7 @@ private void AppendOneNativeArgument(ExecutionContext context, CommandParameterI
                         }
                         else
                         {
-                            if (argArrayAst != null && ArgumentPassingStyle == NativeArgumentPassingStyle.Standard)
+                            if (argArrayAst != null && ArgumentPassingStyle != NativeArgumentPassingStyle.Legacy)
                             {
                                 // We have a literal array, so take the extent, break it on spaces and add them to the argument list.
                                 foreach (string element in argArrayAst.Extent.Text.Split(' ', StringSplitOptions.RemoveEmptyEntries))
@@ -331,7 +331,7 @@ private void AppendOneNativeArgument(ExecutionContext context, CommandParameterI
                         }
                     }
                 }
-                else if (ArgumentPassingStyle == NativeArgumentPassingStyle.Standard && currentObj != null)
+                else if (ArgumentPassingStyle != NativeArgumentPassingStyle.Legacy && currentObj != null)
                 {
                     // add empty strings to arglist, but not nulls
                     AddToArgumentList(parameter, arg);
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
index 0c7b7f9d512..c8e3c75cb17 100644
--- a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
+++ b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
@@ -171,7 +171,7 @@ Describe "Will error correctly if an attempt to set variable to improper value"
     }
 }
 
-foreach ( $argumentListValue in "Standard","Legacy" ) {
+foreach ( $argumentListValue in "Standard","Legacy","Windows" ) {
     $PSNativeCommandArgumentPassing = $argumentListValue
     Describe "Native Command Arguments (${PSNativeCommandArgumentPassing})" -tags "CI" {
         # When passing arguments to native commands, quoted segments that contain
@@ -263,6 +263,28 @@ foreach ( $argumentListValue in "Standard","Legacy" ) {
                 $lines[$i] | Should -BeExactly "Arg $i is <$($expected[$i])>"
             }
         }
+
+        It "Should handle empty args correctly (ArgumentList=${PSNativeCommandArgumentPassing})" {
+            if ($PSNativeCommandArgumentPassing -eq 'Legacy') {
+                $expectedLines = 2
+            }
+            else {
+                $expectedLines = 3
+            }
+
+            $lines = testexe -echoargs 1 '' 2
+            $lines.Count | Should -Be $expectedLines
+            $lines[0] | Should -BeExactly 'Arg 0 is <1>'
+
+            if ($expectedLines -eq 2) {
+                $lines[1] | Should -BeExactly 'Arg 1 is <2>'
+            }
+            else {
+                $lines[1] | Should -BeExactly 'Arg 1 is <>'
+                $lines[2] | Should -BeExactly 'Arg 2 is <2>'
+            }
+
+        }
     }
 }
 Describe 'PSPath to native commands' -tags "CI" {

From 1cb35533494412f54483b2add8321605151cff19 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 12 Jan 2022 00:29:35 -0800
Subject: [PATCH 197/645] Update change log to remove a broken URL (#16735)

---
 CHANGELOG/6.0.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG/6.0.md b/CHANGELOG/6.0.md
index 948197f0619..52db53afabf 100644
--- a/CHANGELOG/6.0.md
+++ b/CHANGELOG/6.0.md
@@ -766,9 +766,8 @@ For more information on this, we invite you to read [this blog post explaining P
 ### Move to .NET Core 2.0 (.NET Standard 2.0 support)
 
 PowerShell Core has moved to using .NET Core 2.0 so that we can leverage all the benefits of .NET Standard 2.0. (#3556)
-To learn more about .NET Standard 2.0, there's some great starter content [on Youtube](https://www.youtube.com/playlist?list=PLRAdsfhKI4OWx321A_pr-7HhRNk7wOLLY),
-on [the .NET blog](https://devblogs.microsoft.com/dotnet/introducing-net-standard/),
-and [on GitHub](https://github.com/dotnet/standard/blob/master/docs/faq.md).
+To learn more about .NET Standard 2.0, there's some great starter content [on Youtube](https://www.youtube.com/playlist?list=PLRAdsfhKI4OWx321A_pr-7HhRNk7wOLLY)
+and on [the .NET blog](https://devblogs.microsoft.com/dotnet/introducing-net-standard/).
 We'll also have more content soon in our [repository documentation](https://github.com/PowerShell/PowerShell/tree/master/docs) (which will eventually make its way to [official documentation](https://github.com/powershell/powershell-docs)).
 In a nutshell, .NET Standard 2.0 allows us to have universal, portable modules between Windows PowerShell (which uses the full .NET Framework) and PowerShell Core (which uses .NET Core).
 Many modules and cmdlets that didn't work in the past may now work on .NET Core, so import your favorite modules and tell us what does and doesn't work in our GitHub Issues!

From cce64f49deffaf4aabd968b9242d2ba98ff3031f Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 12 Jan 2022 10:02:03 -0800
Subject: [PATCH 198/645] Report error when PowerShell built-in modules are
 missing (#16628)

---
 .../engine/CommandDiscovery.cs                |  55 ++--
 .../engine/InitialSessionState.cs             |  65 +----
 .../engine/Modules/ImportModuleCommand.cs     | 241 +++++++++++-------
 .../engine/Modules/ModuleCmdletBase.cs        |  98 +++----
 .../engine/Modules/ModuleIntrinsics.cs        |  21 +-
 .../engine/Modules/ModuleUtils.cs             |   2 +-
 .../engine/remoting/client/remoterunspace.cs  |   8 -
 .../resources/DiscoveryExceptions.resx        |   4 +
 .../resources/Modules.resx                    |   3 +
 .../CompatiblePSEditions.Module.Tests.ps1     | 169 +++++++++++-
 10 files changed, 426 insertions(+), 240 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandDiscovery.cs b/src/System.Management.Automation/engine/CommandDiscovery.cs
index 6d7fb77eba8..5de18cdc952 100644
--- a/src/System.Management.Automation/engine/CommandDiscovery.cs
+++ b/src/System.Management.Automation/engine/CommandDiscovery.cs
@@ -376,22 +376,16 @@ private static void VerifyRequiredSnapins(IEnumerable<PSSnapInSpecification> req
 
             foreach (var requiresPSSnapIn in requiresPSSnapIns)
             {
-                IEnumerable<PSSnapInInfo> loadedPSSnapIns = null;
-                loadedPSSnapIns = context.InitialSessionState.GetPSSnapIn(requiresPSSnapIn.Name);
-                if (loadedPSSnapIns == null || !loadedPSSnapIns.Any())
+                var loadedPSSnapIn = context.InitialSessionState.GetPSSnapIn(requiresPSSnapIn.Name);
+                if (loadedPSSnapIn is null)
                 {
-                    if (requiresMissingPSSnapIns == null)
-                    {
-                        requiresMissingPSSnapIns = new Collection<string>();
-                    }
-
+                    requiresMissingPSSnapIns ??= new Collection<string>();
                     requiresMissingPSSnapIns.Add(BuildPSSnapInDisplayName(requiresPSSnapIn));
                 }
                 else
                 {
                     // the requires PSSnapin is loaded. now check the PSSnapin version
-                    PSSnapInInfo loadedPSSnapIn = loadedPSSnapIns.First();
-                    Diagnostics.Assert(loadedPSSnapIn.Version != null,
+                    Dbg.Assert(loadedPSSnapIn.Version != null,
                         string.Format(
                             CultureInfo.InvariantCulture,
                             "Version is null for loaded PSSnapin {0}.", loadedPSSnapIn));
@@ -400,11 +394,7 @@ private static void VerifyRequiredSnapins(IEnumerable<PSSnapInSpecification> req
                         if (!AreInstalledRequiresVersionsCompatible(
                             requiresPSSnapIn.Version, loadedPSSnapIn.Version))
                         {
-                            if (requiresMissingPSSnapIns == null)
-                            {
-                                requiresMissingPSSnapIns = new Collection<string>();
-                            }
-
+                            requiresMissingPSSnapIns ??= new Collection<string>();
                             requiresMissingPSSnapIns.Add(BuildPSSnapInDisplayName(requiresPSSnapIn));
                         }
                     }
@@ -1063,14 +1053,12 @@ private static CommandInfo TryModuleAutoDiscovery(string commandName,
                     return null;
 
                 CmdletInfo cmdletInfo = context.SessionState.InvokeCommand.GetCmdlet("Microsoft.PowerShell.Core\\Get-Module");
-                if ((commandOrigin == CommandOrigin.Internal) ||
-                    ((cmdletInfo != null) && (cmdletInfo.Visibility == SessionStateEntryVisibility.Public)))
+                if (commandOrigin == CommandOrigin.Internal || cmdletInfo?.Visibility == SessionStateEntryVisibility.Public)
                 {
                     // Search for a module with a matching command, as long as the user would have the ability to
                     // import the module.
                     cmdletInfo = context.SessionState.InvokeCommand.GetCmdlet("Microsoft.PowerShell.Core\\Import-Module");
-                    if (((commandOrigin == CommandOrigin.Internal) ||
-                         ((cmdletInfo != null) && (cmdletInfo.Visibility == SessionStateEntryVisibility.Public))))
+                    if (commandOrigin == CommandOrigin.Internal || cmdletInfo?.Visibility == SessionStateEntryVisibility.Public)
                     {
                         discoveryTracer.WriteLine("Executing non module-qualified search: {0}", commandName);
                         context.CommandDiscovery.RegisterLookupCommandInfoAction("ActiveModuleSearch", commandName);
@@ -1085,30 +1073,33 @@ private static CommandInfo TryModuleAutoDiscovery(string commandName,
                         {
                             // WinBlue:69141 - We need to get the full path here because the module path might be C:\Users\User1\DOCUME~1
                             // While the exportedCommands are cached, they are cached with the full path
-                            string expandedModulePath = IO.Path.GetFullPath(modulePath);
-                            string moduleShortName = System.IO.Path.GetFileNameWithoutExtension(expandedModulePath);
+                            string expandedModulePath = Path.GetFullPath(modulePath);
+                            string moduleShortName = Path.GetFileNameWithoutExtension(expandedModulePath);
                             var exportedCommands = AnalysisCache.GetExportedCommands(expandedModulePath, false, context);
 
                             if (exportedCommands == null) { continue; }
 
-                            CommandTypes exportedCommandTypes;
                             // Skip if module only has class or other types and no commands.
-                            if (exportedCommands.TryGetValue(commandName, out exportedCommandTypes))
+                            if (exportedCommands.TryGetValue(commandName, out CommandTypes exportedCommandTypes))
                             {
-                                Exception exception;
                                 discoveryTracer.WriteLine("Found in module: {0}", expandedModulePath);
-                                Collection<PSModuleInfo> matchingModule = AutoloadSpecifiedModule(expandedModulePath, context,
+                                Collection<PSModuleInfo> matchingModule = AutoloadSpecifiedModule(
+                                    expandedModulePath,
+                                    context,
                                     cmdletInfo != null ? cmdletInfo.Visibility : SessionStateEntryVisibility.Private,
-                                        out exception);
-                                lastError = exception;
-                                if ((matchingModule == null) || (matchingModule.Count == 0))
+                                    out lastError);
+
+                                if (matchingModule is null || matchingModule.Count == 0)
                                 {
-                                    string error = StringUtil.Format(DiscoveryExceptions.CouldNotAutoImportMatchingModule, commandName, moduleShortName);
-                                    CommandNotFoundException commandNotFound = new CommandNotFoundException(
+                                    string errorMessage = lastError is null
+                                        ? StringUtil.Format(DiscoveryExceptions.CouldNotAutoImportMatchingModule, commandName, moduleShortName)
+                                        : StringUtil.Format(DiscoveryExceptions.CouldNotAutoImportMatchingModuleWithErrorMessage, commandName, moduleShortName, lastError.Message);
+
+                                    throw new CommandNotFoundException(
                                         originalCommandName,
                                         lastError,
-                                        "CouldNotAutoloadMatchingModule", error);
-                                    throw commandNotFound;
+                                        "CouldNotAutoloadMatchingModule",
+                                        errorMessage);
                                 }
 
                                 result = LookupCommandInfo(commandName, commandTypes, searchResolutionOptions, commandOrigin, context);
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index ce0fff99f46..bc40e903fa4 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -1663,11 +1663,6 @@ public InitialSessionState Clone()
 
             ss.DisableFormatUpdates = this.DisableFormatUpdates;
 
-            foreach (var s in this.defaultSnapins)
-            {
-                ss.defaultSnapins.Add(s);
-            }
-
             foreach (var s in ImportedSnapins)
             {
                 ss.ImportedSnapins.Add(s.Key, s.Value);
@@ -3801,34 +3796,26 @@ public PSSnapInInfo ImportPSSnapIn(string name, out PSSnapInException warning)
 
             // Now actually load the snapin...
             PSSnapInInfo snapin = ImportPSSnapIn(newPSSnapIn, out warning);
-            if (snapin != null)
-            {
-                ImportedSnapins.Add(snapin.Name, snapin);
-            }
 
             return snapin;
         }
 
         internal PSSnapInInfo ImportCorePSSnapIn()
         {
-            // Load Microsoft.PowerShell.Core as a snapin
+            // Load Microsoft.PowerShell.Core as a snapin.
             PSSnapInInfo coreSnapin = PSSnapInReader.ReadCoreEngineSnapIn();
-            this.defaultSnapins.Add(coreSnapin);
-            try
-            {
-                PSSnapInException warning;
-                this.ImportPSSnapIn(coreSnapin, out warning);
-            }
-            catch (PSSnapInException)
-            {
-                throw;
-            }
-
+            ImportPSSnapIn(coreSnapin, out _);
             return coreSnapin;
         }
 
         internal PSSnapInInfo ImportPSSnapIn(PSSnapInInfo psSnapInInfo, out PSSnapInException warning)
         {
+            if (psSnapInInfo == null)
+            {
+                ArgumentNullException e = new ArgumentNullException(nameof(psSnapInInfo));
+                throw e;
+            }
+
             // See if the snapin is already loaded. If has been then there will be an entry in the
             // Assemblies list for it already...
             bool reload = true;
@@ -3861,12 +3848,6 @@ internal PSSnapInInfo ImportPSSnapIn(PSSnapInInfo psSnapInInfo, out PSSnapInExce
             Dictionary<string, List<SessionStateAliasEntry>> aliases = null;
             Dictionary<string, SessionStateProviderEntry> providers = null;
 
-            if (psSnapInInfo == null)
-            {
-                ArgumentNullException e = new ArgumentNullException(nameof(psSnapInInfo));
-                throw e;
-            }
-
             Assembly assembly = null;
             string helpFile = null;
 
@@ -3985,37 +3966,18 @@ internal PSSnapInInfo ImportPSSnapIn(PSSnapInInfo psSnapInInfo, out PSSnapInExce
                 }
             }
 
+            ImportedSnapins.Add(psSnapInInfo.Name, psSnapInInfo);
             return psSnapInInfo;
         }
 
-        internal List<PSSnapInInfo> GetPSSnapIn(string psSnapinName)
+        internal PSSnapInInfo GetPSSnapIn(string psSnapinName)
         {
-            List<PSSnapInInfo> loadedSnapins = null;
-            foreach (var defaultSnapin in defaultSnapins)
-            {
-                if (defaultSnapin.Name.Equals(psSnapinName, StringComparison.OrdinalIgnoreCase))
-                {
-                    if (loadedSnapins == null)
-                    {
-                        loadedSnapins = new List<PSSnapInInfo>();
-                    }
-
-                    loadedSnapins.Add(defaultSnapin);
-                }
-            }
-
-            PSSnapInInfo importedSnapin = null;
-            if (ImportedSnapins.TryGetValue(psSnapinName, out importedSnapin))
+            if (ImportedSnapins.TryGetValue(psSnapinName, out PSSnapInInfo importedSnapin))
             {
-                if (loadedSnapins == null)
-                {
-                    loadedSnapins = new List<PSSnapInInfo>();
-                }
-
-                loadedSnapins.Add(importedSnapin);
+                return importedSnapin;
             }
 
-            return loadedSnapins;
+            return null;
         }
 
         [SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFrom")]
@@ -4895,7 +4857,6 @@ internal static void RemoveAllDrivesForProvider(ProviderInfo pi, SessionStateInt
 
         internal static readonly string CoreSnapin = "Microsoft.PowerShell.Core";
         internal static readonly string CoreModule = "Microsoft.PowerShell.Core";
-        internal Collection<PSSnapInInfo> defaultSnapins = new Collection<PSSnapInInfo>();
 
         // The list of engine modules to create warnings when you try to remove them
         internal static readonly HashSet<string> EngineModules = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
diff --git a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
index 2cbb30bcb00..45011edb908 100644
--- a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
@@ -636,6 +636,8 @@ private PSModuleInfo ImportModule_LocallyViaName_WithTelemetry(ImportModuleOptio
 
         private PSModuleInfo ImportModule_LocallyViaName(ImportModuleOptions importModuleOptions, string name)
         {
+            bool shallWriteError = !importModuleOptions.SkipSystem32ModulesAndSuppressError;
+
             try
             {
                 bool found = false;
@@ -671,14 +673,14 @@ private PSModuleInfo ImportModule_LocallyViaName(ImportModuleOptions importModul
                 }
 
                 bool alreadyLoaded = false;
-                if (!string.IsNullOrEmpty(rootedPath))
+                var manifestProcessingFlags = ManifestProcessingFlags.LoadElements | ManifestProcessingFlags.NullOnFirstError;
+                if (shallWriteError)
                 {
-                    // TODO/FIXME: use IsModuleAlreadyLoaded to get consistent behavior
-                    // TODO/FIXME: (for example checking ModuleType != Manifest below seems incorrect - cdxml modules also declare their own version)
-                    // PSModuleInfo alreadyLoadedModule = null;
-                    // TryGetFromModuleTable(rootedPath, out alreadyLoadedModule);
-                    // if (!BaseForce && IsModuleAlreadyLoaded(alreadyLoadedModule))
+                    manifestProcessingFlags |= ManifestProcessingFlags.WriteErrors;
+                }
 
+                if (!string.IsNullOrEmpty(rootedPath))
+                {
                     // If the module has already been loaded, just emit it and continue...
                     if (!BaseForce && TryGetFromModuleTable(rootedPath, out PSModuleInfo module))
                     {
@@ -725,9 +727,14 @@ private PSModuleInfo ImportModule_LocallyViaName(ImportModuleOptions importModul
                                 RemoveModule(moduleToRemove);
                             }
 
-                            foundModule = LoadModule(rootedPath, null, this.BasePrefix, null, ref importModuleOptions,
-                                                     ManifestProcessingFlags.LoadElements | ManifestProcessingFlags.WriteErrors | ManifestProcessingFlags.NullOnFirstError,
-                                                     out found);
+                            foundModule = LoadModule(
+                                fileName: rootedPath,
+                                moduleBase: null,
+                                prefix: BasePrefix,
+                                ss: null, /*SessionState*/
+                                ref importModuleOptions,
+                                manifestProcessingFlags,
+                                out found);
                         }
                         else if (Directory.Exists(rootedPath))
                         {
@@ -738,21 +745,24 @@ private PSModuleInfo ImportModule_LocallyViaName(ImportModuleOptions importModul
                             }
 
                             // Load the latest valid version if it is a multi-version module directory
-                            foundModule = LoadUsingMultiVersionModuleBase(rootedPath,
-                                                                            ManifestProcessingFlags.LoadElements |
-                                                                            ManifestProcessingFlags.WriteErrors |
-                                                                            ManifestProcessingFlags.NullOnFirstError,
-                                                                            importModuleOptions, out found);
+                            foundModule = LoadUsingMultiVersionModuleBase(rootedPath, manifestProcessingFlags, importModuleOptions, out found);
 
                             if (!found)
                             {
                                 // If the path is a directory, double up the end of the string
                                 // then try to load that using extensions...
                                 rootedPath = Path.Combine(rootedPath, Path.GetFileName(rootedPath));
-                                foundModule = LoadUsingExtensions(null, rootedPath, rootedPath, null, null, this.BasePrefix, /*SessionState*/ null,
-                                                                  importModuleOptions,
-                                                                  ManifestProcessingFlags.LoadElements | ManifestProcessingFlags.WriteErrors | ManifestProcessingFlags.NullOnFirstError,
-                                                                  out found);
+                                foundModule = LoadUsingExtensions(
+                                    parentModule: null,
+                                    moduleName: rootedPath,
+                                    fileBaseName: rootedPath,
+                                    extension: null,
+                                    moduleBase: null,
+                                    prefix: BasePrefix,
+                                    ss: null, /*SessionState*/
+                                    importModuleOptions,
+                                    manifestProcessingFlags,
+                                    out found);
                             }
                         }
                     }
@@ -762,7 +772,7 @@ private PSModuleInfo ImportModule_LocallyViaName(ImportModuleOptions importModul
                     // Check if module could be a snapin. This was the case for PowerShell version 2 engine modules.
                     if (InitialSessionState.IsEngineModule(name))
                     {
-                        PSSnapInInfo snapin = ModuleCmdletBase.GetEngineSnapIn(Context, name);
+                        PSSnapInInfo snapin = Context.CurrentRunspace.InitialSessionState.GetPSSnapIn(name);
 
                         // Return the command if we found a module
                         if (snapin != null)
@@ -786,16 +796,28 @@ private PSModuleInfo ImportModule_LocallyViaName(ImportModuleOptions importModul
                         // If there is no extension, we'll have to search using the extensions
                         if (!string.IsNullOrEmpty(Path.GetExtension(name)))
                         {
-                            foundModule = LoadModule(name, null, this.BasePrefix, null, ref importModuleOptions,
-                                                     ManifestProcessingFlags.LoadElements | ManifestProcessingFlags.WriteErrors | ManifestProcessingFlags.NullOnFirstError,
-                                                     out found);
+                            foundModule = LoadModule(
+                                fileName: name,
+                                moduleBase: null,
+                                prefix: BasePrefix,
+                                ss: null, /*SessionState*/
+                                ref importModuleOptions,
+                                manifestProcessingFlags,
+                                out found);
                         }
                         else
                         {
-                            foundModule = LoadUsingExtensions(null, name, name, null, null, this.BasePrefix, /*SessionState*/ null,
-                                                              importModuleOptions,
-                                                              ManifestProcessingFlags.LoadElements | ManifestProcessingFlags.WriteErrors | ManifestProcessingFlags.NullOnFirstError,
-                                                              out found);
+                            foundModule = LoadUsingExtensions(
+                                parentModule: null,
+                                moduleName: name,
+                                fileBaseName: name,
+                                extension: null,
+                                moduleBase: null,
+                                prefix: BasePrefix,
+                                ss: null, /*SessionState*/
+                                importModuleOptions,
+                                manifestProcessingFlags,
+                                out found);
                         }
                     }
                     else
@@ -807,14 +829,17 @@ private PSModuleInfo ImportModule_LocallyViaName(ImportModuleOptions importModul
                             this.AddToAppDomainLevelCache = true;
                         }
 
-                        found = LoadUsingModulePath(found, modulePath, name, /* SessionState*/ null,
-                                                    importModuleOptions,
-                                                    ManifestProcessingFlags.LoadElements | ManifestProcessingFlags.WriteErrors | ManifestProcessingFlags.NullOnFirstError,
-                                                    out foundModule);
+                        found = LoadUsingModulePath(
+                            modulePath,
+                            name,
+                            ss: null, /* SessionState*/
+                            importModuleOptions,
+                            manifestProcessingFlags,
+                            out foundModule);
                     }
                 }
 
-                if (!found)
+                if (!found && shallWriteError)
                 {
                     ErrorRecord er = null;
                     string message = null;
@@ -856,8 +881,10 @@ private PSModuleInfo ImportModule_LocallyViaName(ImportModuleOptions importModul
             }
             catch (PSInvalidOperationException e)
             {
-                ErrorRecord er = new ErrorRecord(e.ErrorRecord, e);
-                WriteError(er);
+                if (shallWriteError)
+                {
+                    WriteError(new ErrorRecord(e.ErrorRecord, e));
+                }
             }
 
             return null;
@@ -1945,27 +1972,26 @@ private bool IsModuleInDenyList(string[] moduleDenyList, string moduleName, Modu
             return match;
         }
 
-        private List<T> FilterModuleCollection<T>(IEnumerable<T> moduleCollection)
+        private IEnumerable<T> FilterModuleCollection<T>(IEnumerable<T> moduleCollection)
         {
-            List<T> filteredModuleCollection = null;
-            if (moduleCollection != null)
+            if (moduleCollection is null)
             {
-                // the ModuleDeny list is cached in PowerShellConfig object
-                string[] moduleDenyList = PowerShellConfig.Instance.GetWindowsPowerShellCompatibilityModuleDenyList();
-                if (moduleDenyList?.Any() != true)
-                {
-                    filteredModuleCollection = new List<T>(moduleCollection);
-                }
-                else
+                return null;
+            }
+
+            // The ModuleDeny list is cached in PowerShellConfig object
+            string[] moduleDenyList = PowerShellConfig.Instance.GetWindowsPowerShellCompatibilityModuleDenyList();
+            if (moduleDenyList is null || moduleDenyList.Length == 0)
+            {
+                return moduleCollection;
+            }
+
+            var filteredModuleCollection = new List<T>();
+            foreach (var module in moduleCollection)
+            {
+                if (!IsModuleInDenyList(moduleDenyList, module as string, module as ModuleSpecification))
                 {
-                    filteredModuleCollection = new List<T>();
-                    foreach (var module in moduleCollection)
-                    {
-                        if (!IsModuleInDenyList(moduleDenyList, module as string, module as ModuleSpecification))
-                        {
-                            filteredModuleCollection.Add(module);
-                        }
-                    }
+                    filteredModuleCollection.Add(module);
                 }
             }
 
@@ -1977,38 +2003,73 @@ private void PrepareNoClobberWinCompatModuleImport(string moduleName, ModuleSpec
             Debug.Assert(string.IsNullOrEmpty(moduleName) ^ (moduleSpec == null), "Either moduleName or moduleSpec must be specified");
 
             // moduleName can be just a module name and it also can be a full path to psd1 from which we need to extract the module name
-            string coreModuleToLoad = ModuleIntrinsics.GetModuleName(moduleSpec == null ? moduleName : moduleSpec.Name);
+            string moduleToLoad = ModuleIntrinsics.GetModuleName(moduleSpec is null ? moduleName : moduleSpec.Name);
+
+            var isBuiltInModule = BuiltInModules.TryGetValue(moduleToLoad, out string normalizedName);
+            if (isBuiltInModule)
+            {
+                moduleToLoad = normalizedName;
+            }
 
-            var isModuleToLoadEngineModule = InitialSessionState.IsEngineModule(coreModuleToLoad);
             string[] noClobberModuleList = PowerShellConfig.Instance.GetWindowsPowerShellCompatibilityNoClobberModuleList();
-            if (isModuleToLoadEngineModule || ((noClobberModuleList != null) && noClobberModuleList.Contains(coreModuleToLoad, StringComparer.OrdinalIgnoreCase)))
+            if (isBuiltInModule || noClobberModuleList?.Contains(moduleToLoad, StringComparer.OrdinalIgnoreCase) == true)
             {
-                // if it is one of engine modules - first try to load it from $PSHOME\Modules
-                // otherwise rely on $env:PSModulePath (in which WinPS module location has to go after CorePS module location)
-                if (isModuleToLoadEngineModule)
+                bool shouldLoadModuleLocally = true;
+                if (isBuiltInModule)
                 {
-                    string expectedCoreModulePath = Path.Combine(ModuleIntrinsics.GetPSHomeModulePath(), coreModuleToLoad);
-                    if (Directory.Exists(expectedCoreModulePath))
+                    PSSnapInInfo loadedSnapin = Context.CurrentRunspace.InitialSessionState.GetPSSnapIn(moduleToLoad);
+                    shouldLoadModuleLocally = loadedSnapin is null;
+
+                    if (shouldLoadModuleLocally)
                     {
-                        coreModuleToLoad = expectedCoreModulePath;
+                        // If it is one of built-in modules, first try loading it from $PSHOME\Modules, otherwise rely on $env:PSModulePath.
+                        string expectedCoreModulePath = Path.Combine(ModuleIntrinsics.GetPSHomeModulePath(), moduleToLoad);
+                        if (Directory.Exists(expectedCoreModulePath))
+                        {
+                            moduleToLoad = expectedCoreModulePath;
+                        }
                     }
                 }
 
-                if (moduleSpec == null)
-                {
-                    ImportModule_LocallyViaName_WithTelemetry(importModuleOptions, coreModuleToLoad);
-                }
-                else
+                if (shouldLoadModuleLocally)
                 {
-                    ModuleSpecification tmpModuleSpec = new ModuleSpecification()
+                    // Here we want to load a core-edition compatible version of the module, so the loading procedure will skip
+                    // the 'System32' module path when searching. Also, we want to suppress writing out errors in case that a
+                    // core-compatible version of the module cannot be found, because:
+                    //  1. that's OK as long as it's not a PowerShell built-in module such as the 'Utility' moudle;
+                    //  2. the error message will be confusing to the user.
+                    bool savedValue = importModuleOptions.SkipSystem32ModulesAndSuppressError;
+                    importModuleOptions.SkipSystem32ModulesAndSuppressError = true;
+
+                    PSModuleInfo moduleInfo = moduleSpec is null
+                        ? ImportModule_LocallyViaName_WithTelemetry(importModuleOptions, moduleToLoad)
+                        : ImportModule_LocallyViaFQName(
+                            importModuleOptions,
+                            new ModuleSpecification()
+                            {
+                                Guid = moduleSpec.Guid,
+                                MaximumVersion = moduleSpec.MaximumVersion,
+                                Version = moduleSpec.Version,
+                                RequiredVersion = moduleSpec.RequiredVersion,
+                                Name = moduleToLoad
+                            });
+
+                    // If we failed to load a core-compatible version of a built-in module, we should stop trying to load the
+                    // module in 'WinCompat' mode and report an error. This could happen when a user didn't correctly deploy
+                    // the built-in modules, which would result in very confusing errors when the module auto-loading silently
+                    // attempts to load those built-in modules in 'WinCompat' mode from the 'System32' module path.
+                    //
+                    // If the loading failed but it's NOT a built-in module, then it's fine to ignore this failure and continue
+                    // to load the module in 'WinCompat' mode.
+                    if (moduleInfo is null && isBuiltInModule)
                     {
-                        Guid = moduleSpec.Guid,
-                        MaximumVersion = moduleSpec.MaximumVersion,
-                        Version = moduleSpec.Version,
-                        RequiredVersion = moduleSpec.RequiredVersion,
-                        Name = coreModuleToLoad
-                    };
-                    ImportModule_LocallyViaFQName(importModuleOptions, tmpModuleSpec);
+                        throw new InvalidOperationException(
+                            StringUtil.Format(
+                                Modules.CannotFindCoreCompatibleBuiltInModule,
+                                moduleToLoad));
+                    }
+
+                    importModuleOptions.SkipSystem32ModulesAndSuppressError = savedValue;
                 }
 
                 importModuleOptions.NoClobberExportPSSession = true;
@@ -2020,28 +2081,15 @@ internal override IList<PSModuleInfo> ImportModulesUsingWinCompat(IEnumerable<st
             IList<PSModuleInfo> moduleProxyList = new List<PSModuleInfo>();
 #if !UNIX
             // one of the two parameters can be passed: either ModuleNames (most of the time) or ModuleSpecifications (they are used in different parameter sets)
-            List<string> filteredModuleNames = FilterModuleCollection(moduleNames);
-            List<ModuleSpecification> filteredModuleFullyQualifiedNames = FilterModuleCollection(moduleFullyQualifiedNames);
+            IEnumerable<string> filteredModuleNames = FilterModuleCollection(moduleNames);
+            IEnumerable<ModuleSpecification> filteredModuleFullyQualifiedNames = FilterModuleCollection(moduleFullyQualifiedNames);
 
             // do not setup WinCompat resources if we have no modules to import
-            if ((filteredModuleNames?.Any() != true) && (filteredModuleFullyQualifiedNames?.Any() != true))
+            if (filteredModuleNames?.Any() != true && filteredModuleFullyQualifiedNames?.Any() != true)
             {
                 return moduleProxyList;
             }
 
-            var winPSVersionString = Utils.GetWindowsPowerShellVersionFromRegistry();
-            if (!winPSVersionString.StartsWith("5.1", StringComparison.OrdinalIgnoreCase))
-            {
-                string errorMessage = string.Format(CultureInfo.InvariantCulture, Modules.WinCompatRequredVersionError, winPSVersionString);
-                throw new InvalidOperationException(errorMessage);
-            }
-
-            PSSession WindowsPowerShellCompatRemotingSession = CreateWindowsPowerShellCompatResources();
-            if (WindowsPowerShellCompatRemotingSession == null)
-            {
-                return new List<PSModuleInfo>();
-            }
-
             // perform necessary preparations if module has to be imported with NoClobber mode
             if (filteredModuleNames != null)
             {
@@ -2059,13 +2107,26 @@ internal override IList<PSModuleInfo> ImportModulesUsingWinCompat(IEnumerable<st
                 }
             }
 
+            var winPSVersionString = Utils.GetWindowsPowerShellVersionFromRegistry();
+            if (!winPSVersionString.StartsWith("5.1", StringComparison.OrdinalIgnoreCase))
+            {
+                string errorMessage = string.Format(CultureInfo.InvariantCulture, Modules.WinCompatRequredVersionError, winPSVersionString);
+                throw new InvalidOperationException(errorMessage);
+            }
+
+            PSSession WindowsPowerShellCompatRemotingSession = CreateWindowsPowerShellCompatResources();
+            if (WindowsPowerShellCompatRemotingSession == null)
+            {
+                return new List<PSModuleInfo>();
+            }
+
             // perform the module import / proxy generation
             moduleProxyList = ImportModule_RemotelyViaPsrpSession(importModuleOptions, filteredModuleNames, filteredModuleFullyQualifiedNames, WindowsPowerShellCompatRemotingSession, usingWinCompat: true);
 
             foreach (PSModuleInfo moduleProxy in moduleProxyList)
             {
                 moduleProxy.IsWindowsPowerShellCompatModule = true;
-                System.Threading.Interlocked.Increment(ref s_WindowsPowerShellCompatUsageCounter);
+                Interlocked.Increment(ref s_WindowsPowerShellCompatUsageCounter);
 
                 string message = StringUtil.Format(Modules.WinCompatModuleWarning, moduleProxy.Name, WindowsPowerShellCompatRemotingSession.Name);
                 WriteWarning(message);
diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index 90019e3bfed..a4d1a7057f1 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -105,6 +105,12 @@ protected internal struct ImportModuleOptions
             /// Historically -AllowClobber in these scenarios was set as True.
             /// </summary>
             internal bool NoClobberExportPSSession;
+
+            /// <summary>
+            /// Flag that controls skipping the System32 module path when searching a module in module paths. It also suppresses
+            /// writing out errors when specified.
+            /// </summary>
+            internal bool SkipSystem32ModulesAndSuppressError;
         }
 
         /// <summary>
@@ -280,6 +286,21 @@ internal List<WildcardPattern> MatchAll
             "ModuleVersion"
         };
 
+        /// <summary>
+        /// List of PowerShell built-in modules that are shipped with PowerShell only, not on PS Gallery.
+        /// </summary>
+        protected static readonly HashSet<string> BuiltInModules = new(StringComparer.OrdinalIgnoreCase)
+        {
+            "CimCmdlets",
+            "Microsoft.PowerShell.Diagnostics",
+            "Microsoft.PowerShell.Host",
+            "Microsoft.PowerShell.Management",
+            "Microsoft.PowerShell.Security",
+            "Microsoft.PowerShell.Utility",
+            "Microsoft.WSMan.Management",
+            "PSDiagnostics",
+        };
+
         /// <summary>
         /// When module manifests lack a CompatiblePSEditions field,
         /// they will be treated as if they have this value.
@@ -307,14 +328,25 @@ internal List<WildcardPattern> MatchAll
 
         private readonly Dictionary<string, PSModuleInfo> _currentlyProcessingModules = new Dictionary<string, PSModuleInfo>();
 
-        internal bool LoadUsingModulePath(bool found, IEnumerable<string> modulePath, string name, SessionState ss,
-            ImportModuleOptions options, ManifestProcessingFlags manifestProcessingFlags, out PSModuleInfo module)
+        internal bool LoadUsingModulePath(
+            IEnumerable<string> modulePath,
+            string name,
+            SessionState ss,
+            ImportModuleOptions options,
+            ManifestProcessingFlags manifestProcessingFlags,
+            out PSModuleInfo module)
         {
-            return LoadUsingModulePath(null, found, modulePath, name, ss, options, manifestProcessingFlags, out module);
+            return LoadUsingModulePath(parentModule: null, modulePath, name, ss, options, manifestProcessingFlags, out module);
         }
 
-        internal bool LoadUsingModulePath(PSModuleInfo parentModule, bool found, IEnumerable<string> modulePath, string name, SessionState ss,
-            ImportModuleOptions options, ManifestProcessingFlags manifestProcessingFlags, out PSModuleInfo module)
+        internal bool LoadUsingModulePath(
+            PSModuleInfo parentModule,
+            IEnumerable<string> modulePath,
+            string name,
+            SessionState ss,
+            ImportModuleOptions options,
+            ManifestProcessingFlags manifestProcessingFlags,
+            out PSModuleInfo module)
         {
             string extension = Path.GetExtension(name);
             string fileBaseName;
@@ -325,11 +357,18 @@ internal bool LoadUsingModulePath(PSModuleInfo parentModule, bool found, IEnumer
                 extension = null;
             }
             else
+            {
                 fileBaseName = name.Substring(0, name.Length - extension.Length);
+            }
 
             // Now search using the module path...
+            bool found = false;
             foreach (string path in modulePath)
             {
+                if (options.SkipSystem32ModulesAndSuppressError && ModuleUtils.IsOnSystem32ModulePath(path))
+                {
+                    continue;
+                }
 #if UNIX
                 foreach (string folder in Directory.EnumerateDirectories(path))
                 {
@@ -823,7 +862,7 @@ private PSModuleInfo LoadModuleNamedInManifest(PSModuleInfo parentModule, Module
                         }
 
                         // Otherwise try the module path
-                        found = LoadUsingModulePath(parentModule, found, modulePath,
+                        found = LoadUsingModulePath(parentModule, modulePath,
                                                     moduleSpecification.Name, ss,
                                                     options, manifestProcessingFlags, out module);
                     }
@@ -2375,17 +2414,13 @@ internal PSModuleInfo LoadModuleManifest(
                 {
                     if (importingModule)
                     {
-                        IList<PSModuleInfo> moduleProxies = ImportModulesUsingWinCompat(new string[] { moduleManifestPath }, null, options);
+                        IList<PSModuleInfo> moduleProxies = ImportModulesUsingWinCompat(
+                            moduleNames: new string[] { moduleManifestPath },
+                            moduleFullyQualifiedNames: null,
+                            importModuleOptions: options);
 
-                        // we are loading by a single ManifestPath so expect max of 1
-                        if (moduleProxies.Count > 0)
-                        {
-                            return moduleProxies[0];
-                        }
-                        else
-                        {
-                            return null;
-                        }
+                        // We are loading by a single ManifestPath so expect max of 1
+                        return moduleProxies.Count > 0 ? moduleProxies[0] : null;
                     }
                 }
                 else
@@ -3706,7 +3741,7 @@ internal static object IsModuleLoaded(ExecutionContext context, ModuleSpecificat
             // If the RequiredModule is one of the Engine modules, then they could have been loaded as snapins (using InitialSessionState.CreateDefault())
             if (result == null && InitialSessionState.IsEngineModule(requiredModule.Name))
             {
-                result = ModuleCmdletBase.GetEngineSnapIn(context, requiredModule.Name);
+                result = context.CurrentRunspace.InitialSessionState.GetPSSnapIn(requiredModule.Name);
                 if (result != null)
                 {
                     loaded = true;
@@ -4883,7 +4918,7 @@ internal static void SyncCurrentLocationHandler(object sender, LocationChangedEv
             }
         }
 
-        internal static System.EventHandler<LocationChangedEventArgs> SyncCurrentLocationDelegate;
+        internal static EventHandler<LocationChangedEventArgs> SyncCurrentLocationDelegate;
 
         internal virtual IList<PSModuleInfo> ImportModulesUsingWinCompat(IEnumerable<string> moduleNames, IEnumerable<ModuleSpecification> moduleFullyQualifiedNames, ImportModuleOptions importModuleOptions) { throw new System.NotImplementedException(); }
 
@@ -5309,9 +5344,8 @@ internal PSModuleInfo LoadUsingExtensions(PSModuleInfo parentModule,
             string moduleName, string fileBaseName, string extension, string moduleBase,
             string prefix, SessionState ss, ImportModuleOptions options, ManifestProcessingFlags manifestProcessingFlags, out bool found)
         {
-            bool throwAwayModuleFileFound = false;
             return LoadUsingExtensions(parentModule, moduleName, fileBaseName, extension, moduleBase, prefix, ss,
-                                       options, manifestProcessingFlags, out found, out throwAwayModuleFileFound);
+                                       options, manifestProcessingFlags, out found, out _);
         }
 
         /// <summary>
@@ -5412,7 +5446,6 @@ internal PSModuleInfo LoadUsingExtensions(PSModuleInfo parentModule,
                 }
                 else if (File.Exists(fileName))
                 {
-                    moduleFileFound = true;
                     // Win8: 325243 - Added the version check so that we do not unload modules with the same name but different version
                     if (BaseForce && DoesAlreadyLoadedModuleSatisfyConstraints(module))
                     {
@@ -7359,29 +7392,6 @@ private static void ValidateCommandName(ModuleCmdletBase cmdlet,
             }
         }
 
-        /// <summary>
-        /// Search a PSSnapin with the specified name.
-        /// </summary>
-        internal static PSSnapInInfo GetEngineSnapIn(ExecutionContext context, string name)
-        {
-            HashSet<PSSnapInInfo> snapinSet = new HashSet<PSSnapInInfo>();
-            List<CmdletInfo> cmdlets = context.SessionState.InvokeCommand.GetCmdlets();
-            foreach (CmdletInfo cmdlet in cmdlets)
-            {
-                PSSnapInInfo snapin = cmdlet.PSSnapIn;
-                if (snapin != null && !snapinSet.Contains(snapin))
-                    snapinSet.Add(snapin);
-            }
-
-            foreach (PSSnapInInfo snapin in snapinSet)
-            {
-                if (string.Equals(snapin.Name, name, StringComparison.OrdinalIgnoreCase))
-                    return snapin;
-            }
-
-            return null;
-        }
-
         /// <summary>
         /// Returns the context cached ModuleTable module for import only if found and has safe language boundaries while
         /// exporting all functions by default.
diff --git a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
index 1d8fe6bc8b5..ada03fb4914 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
@@ -976,20 +976,17 @@ internal static string GetPSHomeModulePath()
             try
             {
                 string psHome = Utils.DefaultPowerShellAppBase;
-                if (!string.IsNullOrEmpty(psHome))
-                {
-                    // Win8: 584267 Powershell Modules are listed twice in x86, and cannot be removed
-                    // This happens because ModuleTable uses Path as the key and CBS installer
-                    // expands the path to include "SysWOW64" (for
-                    // HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\PowerShell\3\PowerShellEngine ApplicationBase).
-                    // Because of this, the module that is getting loaded during startup (through LocalRunspace)
-                    // is using "SysWow64" in the key. Later, when Import-Module is called, it loads the
-                    // module using ""System32" in the key.
 #if !UNIX
-                    psHome = psHome.ToLowerInvariant().Replace("\\syswow64\\", "\\system32\\");
+                // Win8: 584267 Powershell Modules are listed twice in x86, and cannot be removed.
+                // This happens because 'ModuleTable' uses Path as the key and x86 WinPS has "SysWOW64" in its $PSHOME.
+                // Because of this, the module that is getting loaded during startup (through LocalRunspace) is using
+                // "SysWow64" in the key. Later, when 'Import-Module' is called, it loads the module using ""System32"
+                // in the key.
+                // For the cross-platform PowerShell, a user can choose to install it under "C:\Windows\SysWOW64", and
+                // thus it may have the same problem as described above. So we keep this line of code.
+                psHome = psHome.ToLowerInvariant().Replace(@"\syswow64\", @"\system32\");
 #endif
-                    Interlocked.CompareExchange(ref s_psHomeModulePath, Path.Combine(psHome, "Modules"), null);
-                }
+                Interlocked.CompareExchange(ref s_psHomeModulePath, Path.Combine(psHome, "Modules"), null);
             }
             catch (System.Security.SecurityException)
             {
diff --git a/src/System.Management.Automation/engine/Modules/ModuleUtils.cs b/src/System.Management.Automation/engine/Modules/ModuleUtils.cs
index 26d3174ca3b..8dab2283fc5 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleUtils.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleUtils.cs
@@ -121,7 +121,7 @@ internal static bool IsPSEditionCompatible(
 #if UNIX
             return true;
 #else
-            if (!ModuleUtils.IsOnSystem32ModulePath(moduleManifestPath))
+            if (!IsOnSystem32ModulePath(moduleManifestPath))
             {
                 return true;
             }
diff --git a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
index 7ddd657872e..f2e9bd9093e 100644
--- a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
+++ b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
@@ -221,11 +221,7 @@ public override InitialSessionState InitialSessionState
         {
             get
             {
-#pragma warning disable 56503
-
                 throw PSTraceSource.NewNotImplementedException();
-
-#pragma warning restore 56503
             }
         }
 
@@ -236,11 +232,7 @@ public override JobManager JobManager
         {
             get
             {
-#pragma warning disable 56503
-
                 throw PSTraceSource.NewNotImplementedException();
-
-#pragma warning restore 56503
             }
         }
 
diff --git a/src/System.Management.Automation/resources/DiscoveryExceptions.resx b/src/System.Management.Automation/resources/DiscoveryExceptions.resx
index d3923969e8d..2d8445deb4f 100644
--- a/src/System.Management.Automation/resources/DiscoveryExceptions.resx
+++ b/src/System.Management.Automation/resources/DiscoveryExceptions.resx
@@ -206,6 +206,10 @@ The #requires statement must be in one of the following formats:
   <data name="CouldNotAutoImportMatchingModule" xml:space="preserve">
     <value>The '{0}' command was found in the module '{1}', but the module could not be loaded. For more information, run 'Import-Module {1}'.</value>
   </data>
+  <data name="CouldNotAutoImportMatchingModuleWithErrorMessage" xml:space="preserve">
+    <value>The '{0}' command was found in the module '{1}', but the module could not be loaded due to the following error: [{2}]
+For more information, run 'Import-Module {1}'.</value>
+  </data>
   <data name="CouldNotAutoImportModule" xml:space="preserve">
     <value>The module '{0}' could not be loaded. For more information, run 'Import-Module {0}'.</value>
   </data>
diff --git a/src/System.Management.Automation/resources/Modules.resx b/src/System.Management.Automation/resources/Modules.resx
index 345811502b6..2e50a3c5317 100644
--- a/src/System.Management.Automation/resources/Modules.resx
+++ b/src/System.Management.Automation/resources/Modules.resx
@@ -624,4 +624,7 @@
   <data name="CannotCreateModuleWithScriptBlock" xml:space="preserve">
     <value>Cannot create new module while the session is in ConstrainedLanguage mode.</value>
   </data>
+  <data name="CannotFindCoreCompatibleBuiltInModule" xml:space="preserve">
+    <value>Cannot find the built-in module '{0}' that is compatible with the 'Core' edition. Please make sure the PowerShell built-in modules are available. They usually come with the PowerShell package under the $PSHOME module path, and are required for PowerShell to function properly.</value>
+  </data>
 </root>
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
index 72a7c9eddb1..f9094254ec3 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
@@ -11,7 +11,7 @@ function Add-ModulePath
 
     if ($Prepend)
     {
-        $env:PSModulePAth = $Path + [System.IO.Path]::PathSeparator + $env:PSModulePath
+        $env:PSModulePath = $Path + [System.IO.Path]::PathSeparator + $env:PSModulePath
     }
     else
     {
@@ -131,6 +131,22 @@ function New-TestNestedModule
     [scriptblock]::Create($newManifestCmd).Invoke()
 }
 
+function Get-DesktopModuleToUse {
+    $system32Path = "$env:windir\system32\WindowsPowerShell\v1.0\Modules"
+    $persistentMemoryModule = "PersistentMemory"
+    $remoteDesktopModule = "RemoteDesktop"
+
+    if (Test-Path -PathType Container "$system32Path\$persistentMemoryModule") {
+        return $persistentMemoryModule
+    } elseif (Test-Path -PathType Container "$system32Path\$remoteDesktopModule") {
+        return $remoteDesktopModule
+    } else {
+        return $null
+    }
+}
+
+$desktopModuleToUse = Get-DesktopModuleToUse
+
 Describe "Get-Module with CompatiblePSEditions-checked paths" -Tag "CI" {
 
     BeforeAll {
@@ -643,6 +659,37 @@ Describe "Additional tests for Import-Module with WinCompat" -Tag "Feature" {
             '{"Microsoft.PowerShell:ExecutionPolicy": "RemoteSigned", "WindowsPowerShellCompatibilityNoClobberModuleList": ["' + $ModuleName2 + '"]}' | Out-File -Force $ConfigPath
             & $pwsh -NoProfile -NonInteractive -settingsFile $ConfigPath -c "[System.Management.Automation.Internal.InternalTestHooks]::SetTestHook('TestWindowsPowerShellPSHomeLocation', `'$basePath`');Test-${ModuleName2}PSEdition;Test-$ModuleName2" | Should -Be @('Desktop','Core')
         }
+
+        It "NoClobber WinCompat list in powershell.config is a Desktop-edition module" {
+            if (-not $desktopModuleToUse) {
+                throw 'Neither the "PersistentMemory" module nor the "RemoteDesktop" module is available. Please check and use a desktop-edition module that is under the System32 module path.'
+            }
+
+            ## The 'Desktop' edition module 'PersistentMemory' (available on Windows Client) or 'RemoteDesktop' (available on Windows Server) should not be imported twice.
+            $ConfigPath = Join-Path $TestDrive 'powershell.config.json'
+@"
+{"Microsoft.PowerShell:ExecutionPolicy": "RemoteSigned", "WindowsPowerShellCompatibilityNoClobberModuleList": ["$desktopModuleToUse"]}
+"@ | Out-File -Force $ConfigPath
+            $env:PSModulePath = ''
+
+            ## The desktop-edition module is listed in the no-clobber list, so we will first try loading a core-edition
+            ## compatible version of the module before loading the remote one. The 'system32' module path will be skipped
+            ## in this attempt, which is by-design.
+            ## If we don't skip the 'system32' module path in this loading attempt, the desktop-edition module will be
+            ## imported twice as a remote module, and then 'Remove-Module' won't close the WinCompat session.
+            $script = @"
+Import-Module $desktopModuleToUse -UseWindowsPowerShell -WarningAction Ignore
+Get-Module $desktopModuleToUse | ForEach-Object { `$_.ModuleType.ToString() }
+(Get-PSSession | Measure-Object).Count
+Remove-Module $desktopModuleToUse
+(Get-PSSession | Measure-Object).Count
+"@
+            $scriptBlock = [scriptblock]::Create($script)
+            $results = & $pwsh -NoProfile -NonInteractive -settingsFile $ConfigPath -c $scriptBlock
+            $results[0] | Should -BeExactly 'Script'
+            $results[1] | Should -BeExactly 1
+            $results[2] | Should -BeExactly 0
+        }
     }
 
     Context "Tests around PSModulePath in WinCompat process" {
@@ -1343,3 +1390,123 @@ Describe "Import-Module nested module behaviour with Edition checking" -Tag "Fea
         }
     }
 }
+
+Describe "WinCompat importing should check availablity of built-in modules" -Tag "CI" {
+    BeforeAll {
+        if (-not $IsWindows ) {
+            $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+            $PSDefaultParameterValues["it:skip"] = $true
+            return
+        }
+
+        ## Copy the current PowerShell instance to a temp location
+        $tempDir = Join-Path ([System.IO.Path]::GetTempPath()) "WinCompat"
+        $pwshDir = Join-Path $tempDir "pwsh"
+        $moduleDir = Join-Path $tempDir "Modules"
+        $savedModulePath = $env:PSModulePath
+
+        if (Test-Path $tempDir) {
+            Remove-Item $tempDir -Recurse -Force
+        }
+
+        Write-Host "Making a copy of the running PowerShell instance ..." -ForegroundColor Yellow
+        Copy-Item $PSHOME $pwshDir -Recurse -Force
+        Move-Item $pwshDir\Modules $moduleDir -Force
+        Write-Host "-- Done copying!" -ForegroundColor Yellow
+    }
+
+    AfterAll {
+        if (-not $IsWindows) {
+            $global:PSDefaultParameterValues = $originalDefaultParameterValues
+            return
+        }
+
+        $env:PSModulePath = $savedModulePath
+        Remove-Item $tempDir -Recurse -Force
+    }
+
+    It "Missing built-in modules will trigger error instead of loading the non-compatible ones in System32 directory. Running '<Command>'" -TestCases @(
+        @{
+            Command = 'Start-Transcript';
+            FullyQualifiedErrorId = "CouldNotAutoloadMatchingModule";
+            ExceptionMessage = "*'Start-Transcript'*'Microsoft.PowerShell.Host'*'Microsoft.PowerShell.Host'*'Core'*`$PSHOME*'Import-Module Microsoft.PowerShell.Host'*"
+        }
+        @{
+            Command = 'Import-Module Microsoft.PowerShell.Host';
+            FullyQualifiedErrorId = "System.InvalidOperationException,Microsoft.PowerShell.Commands.ImportModuleCommand"
+            ExceptionMessage = "*'Microsoft.PowerShell.Host'*'Core'*`$PSHOME*"
+        }
+        @{
+            Command = 'Import-Module CimCmdlets'
+            FullyQualifiedErrorId = "System.InvalidOperationException,Microsoft.PowerShell.Commands.ImportModuleCommand"
+            ExceptionMessage = "*'CimCmdlets'*'Core'*`$PSHOME*"
+        }
+        @{
+            Command = 'Import-Module Microsoft.PowerShell.Utility'
+            FullyQualifiedErrorId = "System.InvalidOperationException,Microsoft.PowerShell.Commands.ImportModuleCommand"
+            ExceptionMessage = "*'Microsoft.PowerShell.Utility'*'Core'*`$PSHOME*"
+        }
+    ) {
+        param(
+            $Command,
+            $FullyQualifiedErrorId,
+            $ExceptionMessage
+        )
+
+        $template = @'
+    try {{
+        {0}
+    }} catch {{
+        $_.FullyQualifiedErrorId
+        $_.Exception.Message
+    }}
+'@
+        $env:PSModulePath = ''
+        $script = $template -f $Command
+        $scriptBlock = [scriptblock]::Create($script)
+
+        $result = & "$pwshDir\pwsh.exe" -NoProfile -NonInteractive -c $scriptBlock
+        $result | Should -HaveCount 2
+        $result[0] | Should -BeExactly $FullyQualifiedErrorId
+        $result[1] | Should -BeLike $ExceptionMessage
+    }
+
+    It "Attempt to load a 'Desktop' edition module should fail because 'Export-PSSession' cannot be found" {
+        if (-not $desktopModuleToUse) {
+            throw 'Neither the "PersistentMemory" module nor the "RemoteDesktop" module is available. Please check and use a desktop-edition module that is under the System32 module path.'
+        }
+
+        $script = @"
+    try {
+        Import-Module $desktopModuleToUse -ErrorAction Stop
+    } catch {
+        `$_.FullyQualifiedErrorId
+        `$_.Exception.Message
+    }
+"@
+        $env:PSModulePath = ''
+        $scriptBlock = [scriptblock]::Create($script)
+        $result = & "$pwshDir\pwsh.exe" -NoProfile -NonInteractive -c $scriptBlock
+        $result | Should -HaveCount 2
+        $result[0] | Should -BeExactly "CommandNotFoundException,Microsoft.PowerShell.Commands.ImportModuleCommand"
+        $result[1] | Should -BeLike "*'$desktopModuleToUse'*'Export-PSSession'*'Microsoft.PowerShell.Utility'*"
+    }
+
+    It "When built-in modules are available but not in `$PSHOME module path, things should work" {
+        $env:PSModulePath = ''
+        $result = & "$pwshDir\pwsh.exe" -NoProfile -NonInteractive -c @"
+            `$env:PSModulePath += ';$moduleDir'
+            Import-Module Microsoft.PowerShell.Utility -UseWindowsPowerShell -WarningAction Ignore
+            Get-Module Microsoft.PowerShell.Utility | ForEach-Object ModuleType
+            Get-Module Microsoft.PowerShell.Utility | Where-Object ModuleType -eq 'Manifest' | ForEach-Object Path
+            Get-Module Microsoft.PowerShell.Utility | Where-Object ModuleType -eq 'Script' | ForEach-Object { `$_.ExportedCommands.Keys }
+"@
+        $result | Should -HaveCount 6
+        $result[0] | Should -BeExactly 'Manifest'
+        $result[1] | Should -BeExactly 'Script'
+        $result[2] | Should -BeExactly "$moduleDir\Microsoft.PowerShell.Utility\Microsoft.PowerShell.Utility.psd1"
+        $result[3] | Should -BeExactly 'Convert-String'
+        $result[4] | Should -BeExactly 'ConvertFrom-String'
+        $result[5] | Should -BeExactly 'CFS'
+    }
+}

From ed6e0588c8395d779159df537b3d6c5320e0689c Mon Sep 17 00:00:00 2001
From: Thomas-Yu <42897266+Thomas-Yu@users.noreply.github.com>
Date: Wed, 12 Jan 2022 11:17:02 -0800
Subject: [PATCH 199/645] Add `-StrictMode` to `Invoke-Command` to allow
 specifying strict mode when invoking command locally (#16545)

---
 .../ExperimentalFeature.cs                    |   4 +
 .../remoting/commands/InvokeCommandCommand.cs | 122 ++++++++++++++++--
 .../Invoke-Command.Tests.ps1                  |  41 ++++++
 3 files changed, 154 insertions(+), 13 deletions(-)
 create mode 100644 test/powershell/Modules/Microsoft.PowerShell.Core/Invoke-Command.Tests.ps1

diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index d23f5b63290..f6e3632e16e 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -27,6 +27,7 @@ public class ExperimentalFeature
         internal const string PSCleanBlockFeatureName = "PSCleanBlock";
         internal const string PSAMSIMethodInvocationLogging = "PSAMSIMethodInvocationLogging";
         internal const string PSExecFeatureName = "PSExec";
+        internal const string PSStrictModeAssignment = "PSStrictModeAssignment";
 
         #endregion
 
@@ -142,6 +143,9 @@ static ExperimentalFeature()
                 new ExperimentalFeature(
                     name: PSExecFeatureName,
                     description: "Add 'exec' built-in command on Linux and macOS"),
+                new ExperimentalFeature(
+                    name: PSStrictModeAssignment,
+                    description: "Add support of setting Strict-Mode with Invoke-Command"),
             };
 
             EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);
diff --git a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
index c86f7903a1a..a3aca6de70c 100644
--- a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
@@ -263,6 +263,72 @@ public override SwitchParameter UseSSL
             }
         }
 
+        private sealed class ArgumentToPSVersionTransformationAttribute : ArgumentToVersionTransformationAttribute
+        {
+            protected override bool TryConvertFromString(string versionString, [NotNullWhen(true)] out Version version)
+            {
+                if (string.Equals("off", versionString, StringComparison.OrdinalIgnoreCase))
+                {
+                    version = new Version(0, 0);
+                    return true;
+                }
+
+                if (string.Equals("latest", versionString, StringComparison.OrdinalIgnoreCase))
+                {
+                    version = PSVersionInfo.PSVersion;
+                    return true;
+                }
+
+                return base.TryConvertFromString(versionString, out version);
+            }
+        }
+
+        private static readonly Version s_OffVersion = new Version(0, 0);
+
+        private sealed class ValidateVersionAttribute : ValidateArgumentsAttribute
+        {
+            protected override void Validate(object arguments, EngineIntrinsics engineIntrinsics)
+            {
+                Version version = arguments as Version;
+                if (version == s_OffVersion)
+                {
+                    return;
+                }
+
+                if (version == null || !PSVersionInfo.IsValidPSVersion(version))
+                {
+                    // No conversion succeeded so throw an exception...
+                    throw new ValidationMetadataException(
+                        "InvalidPSVersion",
+                        null,
+                        Metadata.ValidateVersionFailure,
+                        arguments);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets strict mode.
+        /// </summary>
+        [Experimental(ExperimentalFeature.PSStrictModeAssignment, ExperimentAction.Show)]
+        [Parameter(ParameterSetName = InvokeCommandCommand.InProcParameterSet)]
+        [ArgumentToPSVersionTransformation]
+        [ValidateVersion]
+        public Version StrictMode
+        {
+            get
+            {
+                return _strictmodeversion;
+            }
+
+            set
+            {
+                _strictmodeversion = value;
+            }
+        }
+
+        private Version _strictmodeversion = null;
+
         /// <summary>
         /// For WSMan session:
         /// If this parameter is not specified then the value specified in
@@ -823,6 +889,8 @@ public virtual SwitchParameter RemoteDebug
 
         #endregion
 
+        private Version _savedStrictModeVersion;
+
         #endregion Parameters
 
         #region Overrides
@@ -946,6 +1014,12 @@ protected override void BeginProcessing()
                     }
                 }
 
+                if (_strictmodeversion != null)
+                {
+                    _savedStrictModeVersion = Context.EngineSessionState.CurrentScope.StrictModeVersion;
+                    Context.EngineSessionState.CurrentScope.StrictModeVersion = _strictmodeversion;
+                }
+
                 return;
             }
 
@@ -1162,7 +1236,19 @@ protected override void ProcessRecord()
                 }
                 else if (ParameterSetName.Equals(InvokeCommandCommand.InProcParameterSet) && (_steppablePipeline != null))
                 {
-                    _steppablePipeline.Process(InputObject);
+                    try
+                    {
+                        _steppablePipeline.Process(InputObject);
+                    }
+                    catch
+                    {
+                        if (_strictmodeversion != null)
+                        {
+                            Context.EngineSessionState.CurrentScope.StrictModeVersion = _savedStrictModeVersion;
+                        }
+                        
+                        throw;
+                    }
                 }
                 else
                 {
@@ -1193,20 +1279,30 @@ protected override void EndProcessing()
             {
                 if (ParameterSetName.Equals(InvokeCommandCommand.InProcParameterSet))
                 {
-                    if (_steppablePipeline != null)
-                    {
-                        _steppablePipeline.End();
+                    try
+                    {   
+                        if (_steppablePipeline != null)
+                        {
+                            _steppablePipeline.End();
+                        }
+                        else
+                        {
+                            ScriptBlock.InvokeUsingCmdlet(
+                                contextCmdlet: this,
+                                useLocalScope: !NoNewScope,
+                                errorHandlingBehavior: ScriptBlock.ErrorHandlingBehavior.WriteToCurrentErrorPipe,
+                                dollarUnder: AutomationNull.Value,
+                                input: _input,
+                                scriptThis: AutomationNull.Value,
+                                args: ArgumentList);
+                        }
                     }
-                    else
+                    finally
                     {
-                        ScriptBlock.InvokeUsingCmdlet(
-                            contextCmdlet: this,
-                            useLocalScope: !NoNewScope,
-                            errorHandlingBehavior: ScriptBlock.ErrorHandlingBehavior.WriteToCurrentErrorPipe,
-                            dollarUnder: AutomationNull.Value,
-                            input: _input,
-                            scriptThis: AutomationNull.Value,
-                            args: ArgumentList);
+                        if (_strictmodeversion != null)
+                        {
+                            Context.EngineSessionState.CurrentScope.StrictModeVersion = _savedStrictModeVersion;
+                        }
                     }
                 }
                 else
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Invoke-Command.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Invoke-Command.Tests.ps1
new file mode 100644
index 00000000000..1765e5d8217
--- /dev/null
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Invoke-Command.Tests.ps1
@@ -0,0 +1,41 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe "Invoke-Command" -Tags "CI" {
+    Context "StrictMode tests" {
+        BeforeAll {
+            $skipTest = !($EnabledExperimentalFeatures -contains "PSStrictModeAssignment");
+            If (Test-Path Variable:InvokeCommand__Test) {
+                Remove-Item Variable:InvokeCommand__Test
+            }
+        }
+
+        It "Setting -StrictMode parameter with uninitialized variable throws error"  -skip:$skipTest {
+            { Invoke-Command -StrictMode 3.0 {$InvokeCommand__Test} } | Should -Throw -ErrorId 'VariableIsUndefined'
+        }
+
+        It "Setting -StrictMode parameter with initialized variable does not throw error" -skip:$skipTest {
+            $InvokeCommand__Test = 'Something'
+            Invoke-Command -StrictMode 3.0 {$InvokeCommand__Test} | Should -Be 'Something'
+            Remove-Item Variable:InvokeCommand__Test
+        }
+
+        It "-StrictMode parameter sets StrictMode back to original state after process completes" -skip:$skipTest {
+            { Invoke-Command -StrictMode 3.0 {$InvokeCommand__Test} } | Should -Throw -ErrorId 'VariableIsUndefined'
+            { Invoke-Command {$InvokeCommand__Test} } | Should -Not -Throw
+        }
+
+        It "-StrictMode parameter works on piped input" -skip:$skipTest {
+            "There" | Invoke-Command -ScriptBlock { "Hello $input" } -StrictMode 3.0 | Should -Be 'Hello There'
+            { "There" | Invoke-Command -ScriptBlock { "Hello $InvokeCommand__Test" } -StrictMode 3.0 } | Should -Throw -ErrorId 'VariableIsUndefined'
+        }
+
+        It "-StrictMode latest works" -skip:$skipTest {
+            { Invoke-Command -StrictMode latest {$InvokeCommand__Test} } | Should -Throw -ErrorId 'VariableIsUndefined'
+        }
+
+        It "-StrictMode off works" -skip:$skipTest {
+            { Invoke-Command -StrictMode off {$InvokeCommand__Test} } | Should -Not -Throw
+        }
+    }
+}

From 87b61a04522b45c01513b7424a14d1362235c46c Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Wed, 12 Jan 2022 15:08:47 -0800
Subject: [PATCH 200/645] remove assert that is incorrect and affecting our
 tests (#16588)

---
 .../host/msh/PendingProgress.cs                                 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
index fad667dba2d..df120a2d0e5 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
@@ -937,8 +937,6 @@ internal override
                 return nodesCompressed;
             }
 
-            Dbg.Assert(false, "with all nodes invisible, we should never reach this point.");
-
             return 0;
         }
 

From 83a809b1f0ef4f24ce44aa5011a5495e2239b345 Mon Sep 17 00:00:00 2001
From: KiwiThePoodle <42877043+KiwiThePoodle@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:33:43 -0800
Subject: [PATCH 201/645] Make `Measure-Object` ignore missing properties
 unless running in strict mode (#16589)

---
 .../commands/utility/Measure-Object.cs        | 13 +++++++-----
 .../Measure-Object.Tests.ps1                  | 20 +++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
index e6a99c38cb0..d885d0a64f1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
@@ -792,9 +792,9 @@ private void WritePropertyNotFoundError(string propertyName, string errorId)
         {
             Diagnostics.Assert(Property != null, "no property and no InputObject should have been addressed");
             ErrorRecord errorRecord = new(
-                    PSTraceSource.NewArgumentException("Property"),
+                    PSTraceSource.NewArgumentException(propertyName),
                     errorId,
-                    ErrorCategory.InvalidArgument,
+                    ErrorCategory.ObjectNotFound,
                     null);
             errorRecord.ErrorDetails = new ErrorDetails(
                 this, "MeasureObjectStrings", "PropertyNotFound", propertyName);
@@ -820,9 +820,12 @@ protected override void EndProcessing()
                 Statistics stat = _statistics[propertyName];
                 if (stat.count == 0 && Property != null)
                 {
-                    // Why are there two different ids for this error?
-                    string errorId = (IsMeasuringGeneric) ? "GenericMeasurePropertyNotFound" : "TextMeasurePropertyNotFound";
-                    WritePropertyNotFoundError(propertyName, errorId);
+                    if (Context.IsStrictVersion(2))
+                    {
+                        string errorId = (IsMeasuringGeneric) ? "GenericMeasurePropertyNotFound" : "TextMeasurePropertyNotFound";
+                        WritePropertyNotFoundError(propertyName, errorId);
+                    }
+                    
                     continue;
                 }
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Measure-Object.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Measure-Object.Tests.ps1
index b1cf1b36d39..509afc36524 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Measure-Object.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Measure-Object.Tests.ps1
@@ -189,6 +189,26 @@ Describe "Measure-Object" -Tags "CI" {
         }
     }
 
+    Context "Empty folder tests" {
+        BeforeAll {
+            $repoPath = Join-Path -Path $TESTDRIVE -ChildPath "my_folder"
+            $testEmptyFolder = New-Item $repoPath -ItemType "directory"
+            $propertyName = "Length"
+        }
+
+        AfterAll {
+            Set-StrictMode -off
+        }
+
+        It "Should not throw an invalid property error when not in StrictMode" {
+            { Set-StrictMode -off; Get-Item $testEmptyFolder | Measure-Object $propertyName -ErrorAction Stop -sum } | Should -Not -Throw
+        }
+
+        It "Should throw an invalid property error when in StrictMode" {
+            { Set-StrictMode -version 3.0; Get-Item $testEmptyFolder | Measure-Object $propertyName -ErrorAction Stop -sum } | Should -Throw -ErrorId 'GenericMeasurePropertyNotFound,Microsoft.PowerShell.Commands.MeasureObjectCommand'
+        }
+    }
+
     Context "String tests" {
         BeforeAll {
             $nl = [Environment]::NewLine

From da7c52a52ff8320a62321219a5b08cc2a0c52abe Mon Sep 17 00:00:00 2001
From: Sergey Zalyadeev <sergey.zalyadeev@gmail.com>
Date: Thu, 13 Jan 2022 23:28:03 +0300
Subject: [PATCH 202/645] Add lock and null check to remoting internals
 (#16542) (#16683)

* fix crash Copy-Item to remote session (#16542)

* update comments

* remove lock (#16542)

Co-authored-by: Sergey Zalyadeev <sergey.zalyadeev@cayosoft.com>
---
 .../remoting/fanin/PriorityCollection.cs      | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs b/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
index 7baebdc98ae..a29a202b5ae 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
@@ -220,21 +220,29 @@ internal byte[] ReadOrRegisterCallback(OnDataAvailableCallback callback,
             lock (_readSyncObject)
             {
                 priorityType = DataPriorityType.Default;
-
-                // send data from which ever stream that has data directly.
+                // Send data from which ever stream that has data directly.
                 byte[] result = null;
-                result = _dataToBeSent[(int)DataPriorityType.PromptResponse].ReadOrRegisterCallback(_onSendCollectionDataAvailable);
-                priorityType = DataPriorityType.PromptResponse;
+                SerializedDataStream promptDataToBeSent = _dataToBeSent[(int)DataPriorityType.PromptResponse];
+                if (promptDataToBeSent is not null)
+                {
+                    result = promptDataToBeSent.ReadOrRegisterCallback(_onSendCollectionDataAvailable);
+                    priorityType = DataPriorityType.PromptResponse;
+                }
 
                 if (result == null)
                 {
-                    result = _dataToBeSent[(int)DataPriorityType.Default].ReadOrRegisterCallback(_onSendCollectionDataAvailable);
-                    priorityType = DataPriorityType.Default;
+                    SerializedDataStream defaultDataToBeSent = _dataToBeSent[(int)DataPriorityType.Default];
+                    if (defaultDataToBeSent is not null)
+                    {
+                        result = defaultDataToBeSent.ReadOrRegisterCallback(_onSendCollectionDataAvailable);
+                        priorityType = DataPriorityType.Default;
+                    }
                 }
-                // no data to return..so register the callback.
+
+                // No data to return..so register the callback.
                 if (result == null)
                 {
-                    // register callback.
+                    // Register callback.
                     _onDataAvailableCallback = callback;
                 }
 

From 686c84ccccaa9d9409de23d71a3108466faccacc Mon Sep 17 00:00:00 2001
From: "Mathias R. Jessen" <IISResetMe@users.noreply.github.com>
Date: Fri, 14 Jan 2022 02:39:54 +0100
Subject: [PATCH 203/645] Add new parameter to `Start-Sleep`: `[-Duration]
 <timespan>` (#16185)

---
 .../commands/utility/StartSleepCommand.cs     |  29 +++++
 .../resources/StartSleepStrings.resx          | 123 ++++++++++++++++++
 .../engine/Attributes.cs                      |  59 +++++++++
 .../Start-Sleep.Tests.ps1                     |  24 ++++
 4 files changed, 235 insertions(+)
 create mode 100644 src/Microsoft.PowerShell.Commands.Utility/resources/StartSleepStrings.resx

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
index a57d635f3eb..a1524e5ed4f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
@@ -55,6 +55,15 @@ public void Dispose()
         [Alias("ms")]
         public int Milliseconds { get; set; }
 
+        /// <summary>
+        /// Allows sleep time to be specified as a TimeSpan.
+        /// </summary>
+        [Parameter(Position = 0, Mandatory = true, ParameterSetName = "FromTimeSpan", ValueFromPipeline = true,
+                   ValueFromPipelineByPropertyName = true)]
+        [ValidateRange(ValidateRangeKind.NonNegative)]
+        [Alias("ts")]
+        public TimeSpan Duration { get; set; }
+
         #endregion
 
         #region methods
@@ -104,6 +113,26 @@ protected override void ProcessRecord()
                 case "Milliseconds":
                     sleepTime = Milliseconds;
                     break;
+                
+                case "FromTimeSpan":
+                    if (Duration.TotalMilliseconds > int.MaxValue)
+                    {
+                        PSArgumentException argumentException = PSTraceSource.NewArgumentException(
+                            nameof(Duration),
+                            StartSleepStrings.MaximumDurationExceeded,
+                            TimeSpan.FromMilliseconds(int.MaxValue),
+                            Duration);
+
+                        ThrowTerminatingError(
+                            new ErrorRecord(
+                                argumentException,
+                                "MaximumDurationExceeded",
+                                ErrorCategory.InvalidArgument,
+                                targetObject: null));
+                    }
+
+                    sleepTime = (int)Math.Floor(Duration.TotalMilliseconds);
+                    break;
 
                 default:
                     Dbg.Diagnostics.Assert(false, "Only one of the specified parameter sets should be called.");
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/StartSleepStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/StartSleepStrings.resx
new file mode 100644
index 00000000000..32804b9e21b
--- /dev/null
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/StartSleepStrings.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="MaximumDurationExceeded" xml:space="preserve">
+    <value>The '-Duration' parameter value must not exceed '{0}', provided value was '{1}'.</value>
+  </data>
+</root>
diff --git a/src/System.Management.Automation/engine/Attributes.cs b/src/System.Management.Automation/engine/Attributes.cs
index a0411c78df7..9965824a927 100644
--- a/src/System.Management.Automation/engine/Attributes.cs
+++ b/src/System.Management.Automation/engine/Attributes.cs
@@ -1088,6 +1088,12 @@ public ValidateRangeAttribute(ValidateRangeKind kind) : base()
 
         private static void ValidateRange(object element, ValidateRangeKind rangeKind)
         {
+            if (element is TimeSpan ts)
+            {
+                ValidateTimeSpanRange(ts, rangeKind);
+                return;
+            }
+
             Type commonType = GetCommonType(typeof(int), element.GetType());
             if (commonType == null)
             {
@@ -1212,6 +1218,59 @@ private void ValidateRange(object element)
             }
         }
 
+        private static void ValidateTimeSpanRange(TimeSpan element, ValidateRangeKind rangeKind)
+        {
+            TimeSpan zero = TimeSpan.Zero;
+
+            switch (rangeKind)
+            {
+                case ValidateRangeKind.Positive:
+                    if (zero.CompareTo(element) >= 0)
+                    {
+                        throw new ValidationMetadataException(
+                            "ValidateRangePositiveFailure",
+                            null,
+                            Metadata.ValidateRangePositiveFailure,
+                            element.ToString());
+                    }
+
+                    break;
+                case ValidateRangeKind.NonNegative:
+                    if (zero.CompareTo(element) > 0)
+                    {
+                        throw new ValidationMetadataException(
+                            "ValidateRangeNonNegativeFailure",
+                            null,
+                            Metadata.ValidateRangeNonNegativeFailure,
+                            element.ToString());
+                    }
+
+                    break;
+                case ValidateRangeKind.Negative:
+                    if (zero.CompareTo(element) <= 0)
+                    {
+                        throw new ValidationMetadataException(
+                            "ValidateRangeNegativeFailure",
+                            null,
+                            Metadata.ValidateRangeNegativeFailure,
+                            element.ToString());
+                    }
+
+                    break;
+                case ValidateRangeKind.NonPositive:
+                    if (zero.CompareTo(element) < 0)
+                    {
+                        throw new ValidationMetadataException(
+                            "ValidateRangeNonPositiveFailure",
+                            null,
+                            Metadata.ValidateRangeNonPositiveFailure,
+                            element.ToString());
+                    }
+
+                    break;
+            }
+        }
+
         private static Type GetCommonType(Type minType, Type maxType)
         {
             Type resultType = null;
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Start-Sleep.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Start-Sleep.Tests.ps1
index 59ac3e9903d..e4899ce5439 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Start-Sleep.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Start-Sleep.Tests.ps1
@@ -23,6 +23,15 @@ Describe "Start-Sleep DRT Unit Tests" -Tags "CI" {
         $watch.ElapsedMilliseconds | Should -BeLessThan $maxTime
     }
 
+    It "Should work properly when sleeping with a [TimeSpan]" {
+        $duration = [timespan]::FromMilliseconds(1500)
+        $watch = [System.Diagnostics.Stopwatch]::StartNew()
+        Start-Sleep -Duration $duration
+        $watch.Stop()
+        $watch.ElapsedMilliseconds | Should -BeGreaterThan $minTime
+        $watch.ElapsedMilliseconds | Should -BeLessThan $maxTime
+    }
+
     It "Should work properly when sleeping with ms alias" {
         $watch = [System.Diagnostics.Stopwatch]::StartNew()
         Start-Sleep -ms 1500
@@ -38,6 +47,21 @@ Describe "Start-Sleep DRT Unit Tests" -Tags "CI" {
         $watch.ElapsedMilliseconds | Should -BeGreaterThan $minTime
         $watch.ElapsedMilliseconds | Should -BeLessThan $maxTime
     }
+
+    It "Should work properly when sleeping without parameters from [timespan]" {
+        $duration = [timespan]::FromMilliseconds(1500)
+        $watch = [System.Diagnostics.Stopwatch]::StartNew()
+        Start-Sleep $duration
+        $watch.Stop()
+        $watch.ElapsedMilliseconds | Should -BeGreaterThan $minTime
+        $watch.ElapsedMilliseconds | Should -BeLessThan $maxTime
+    }
+
+    It "Should validate [timespan] parameter values" {
+        { Start-Sleep -Duration    '0:00:01' } | Should -Not -Throw
+        { Start-Sleep -Duration   '-0:00:01' } | Should -Throw -ErrorId 'ParameterArgumentValidationError,Microsoft.PowerShell.Commands.StartSleepCommand'
+        { Start-Sleep -Duration '30.0:00:00' } | Should -Throw -ErrorId 'MaximumDurationExceeded,Microsoft.PowerShell.Commands.StartSleepCommand'
+    }
 }
 
 Describe "Start-Sleep" -Tags "CI" {

From 186d6be47d858460a3d0ba6abd81f779cb633b55 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 13 Jan 2022 20:07:06 -0800
Subject: [PATCH 204/645] Use NotifyEndApplication to re-enable VT mode
 (#16612)

Use NotifyEndApplication to re-enable VT mode instead of doing it in InputLoop.Run, so that we run this code only after invoking native commands
---
 .../host/msh/ConsoleHost.cs                   | 39 +++++++++----------
 .../host/msh/ConsoleHostUserInterface.cs      | 22 +++++++----
 .../engine/NativeCommandProcessor.cs          | 15 ++++---
 3 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
index 56492bc7e45..4703d54d880 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -1071,18 +1071,16 @@ public override void NotifyBeginApplication()
         {
             lock (hostGlobalLock)
             {
-                ++_beginApplicationNotifyCount;
-                if (_beginApplicationNotifyCount == 1)
+                if (++_beginApplicationNotifyCount == 1)
                 {
-                    // save the window title when first notified.
-
+                    // Save the window title when first notified.
                     _savedWindowTitle = ui.RawUI.WindowTitle;
 #if !UNIX
                     if (_initialConsoleMode != ConsoleControl.ConsoleModes.Unknown)
                     {
-                        var activeScreenBufferHandle = ConsoleControl.GetActiveScreenBufferHandle();
-                        _savedConsoleMode = ConsoleControl.GetMode(activeScreenBufferHandle);
-                        ConsoleControl.SetMode(activeScreenBufferHandle, _initialConsoleMode);
+                        var outputHandle = ConsoleControl.GetActiveScreenBufferHandle();
+                        _savedConsoleMode = ConsoleControl.GetMode(outputHandle);
+                        ConsoleControl.SetMode(outputHandle, _initialConsoleMode);
                     }
 #endif
                 }
@@ -1097,17 +1095,26 @@ public override void NotifyEndApplication()
         {
             lock (hostGlobalLock)
             {
-                Dbg.Assert(_beginApplicationNotifyCount > 0, "Not running an executable - NotifyBeginApplication was not called!");
-                --_beginApplicationNotifyCount;
-                if (_beginApplicationNotifyCount == 0)
+                if (--_beginApplicationNotifyCount == 0)
                 {
-                    // restore the window title when the last application started has ended.
-
+                    // Restore the window title when the last application started has ended.
                     ui.RawUI.WindowTitle = _savedWindowTitle;
 #if !UNIX
                     if (_savedConsoleMode != ConsoleControl.ConsoleModes.Unknown)
                     {
                         ConsoleControl.SetMode(ConsoleControl.GetActiveScreenBufferHandle(), _savedConsoleMode);
+                        if (_savedConsoleMode.HasFlag(ConsoleControl.ConsoleModes.VirtualTerminal))
+                        {
+                            // If the console output mode we just set already has 'VirtualTerminal' turned on,
+                            // we don't need to try turn on the VT mode separately.
+                            return;
+                        }
+                    }
+
+                    if (ui.SupportsVirtualTerminal)
+                    {
+                        // Re-enable VT mode if it was previously enabled, as a native command may have turned it off.
+                        ui.TryTurnOnVirtualTerminal();
                     }
 #endif
                 }
@@ -2452,14 +2459,6 @@ internal void Run(bool inputLoopIsNested)
 
                 while (!_parent.ShouldEndSession && !_shouldExit)
                 {
-#if !UNIX
-                    if (ui.SupportsVirtualTerminal)
-                    {
-                        // need to re-enable VT mode if it was previously enabled as native commands may have turned it off
-                        ui.TryTurnOnVtMode();
-                    }
-#endif
-
                     try
                     {
                         _parent._isRunningPromptLoop = true;
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
index 12459ffa3b6..98abed42576 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
@@ -87,11 +87,11 @@ internal ConsoleHostUserInterface(ConsoleHost parent)
 
             if (SupportsVirtualTerminal)
             {
-                SupportsVirtualTerminal = TryTurnOnVtMode();
+                SupportsVirtualTerminal = TryTurnOnVirtualTerminal();
             }
         }
 
-        internal bool TryTurnOnVtMode()
+        internal bool TryTurnOnVirtualTerminal()
         {
 #if UNIX
             return true;
@@ -99,16 +99,22 @@ internal bool TryTurnOnVtMode()
             try
             {
                 // Turn on virtual terminal if possible.
-
                 // This might throw - not sure how exactly (no console), but if it does, we shouldn't fail to start.
-                var handle = ConsoleControl.GetActiveScreenBufferHandle();
-                var m = ConsoleControl.GetMode(handle);
-                if (ConsoleControl.NativeMethods.SetConsoleMode(handle.DangerousGetHandle(), (uint)(m | ConsoleControl.ConsoleModes.VirtualTerminal)))
+                var outputHandle = ConsoleControl.GetActiveScreenBufferHandle();
+                var outputMode = ConsoleControl.GetMode(outputHandle);
+
+                if (outputMode.HasFlag(ConsoleControl.ConsoleModes.VirtualTerminal))
+                {
+                    return true;
+                }
+
+                outputMode |= ConsoleControl.ConsoleModes.VirtualTerminal;
+                if (ConsoleControl.NativeMethods.SetConsoleMode(outputHandle.DangerousGetHandle(), (uint)outputMode))
                 {
                     // We only know if vt100 is supported if the previous call actually set the new flag, older
                     // systems ignore the setting.
-                    m = ConsoleControl.GetMode(handle);
-                    return (m & ConsoleControl.ConsoleModes.VirtualTerminal) != 0;
+                    outputMode = ConsoleControl.GetMode(outputHandle);
+                    return outputMode.HasFlag(ConsoleControl.ConsoleModes.VirtualTerminal);
                 }
             }
             catch
diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index 12c02e60783..efc8b660c37 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -545,15 +545,14 @@ private void InitNativeProcess()
             Exception exceptionToRethrow = null;
             try
             {
-                // If this process is being run standalone, tell the host, which might want
-                // to save off the window title or other such state as might be tweaked by
-                // the native process
+                // Before start the executable, tell the host, which might want to save off the
+                // window title or other such state as might be tweaked by the native process.
+                Command.Context.EngineHostInterface.NotifyBeginApplication();
+                _hasNotifiedBeginApplication = true;
+
                 if (_runStandAlone)
                 {
-                    this.Command.Context.EngineHostInterface.NotifyBeginApplication();
-                    _hasNotifiedBeginApplication = true;
-
-                    // Also, store the Raw UI coordinates so that we can scrape the screen after
+                    // Store the Raw UI coordinates so that we can scrape the screen after
                     // if we are transcribing.
                     if (_isTranscribing && (s_supportScreenScrape == true))
                     {
@@ -1166,7 +1165,7 @@ private void CleanUp()
             // We need to call 'NotifyEndApplication' as appropriate during cleanup
             if (_hasNotifiedBeginApplication)
             {
-                this.Command.Context.EngineHostInterface.NotifyEndApplication();
+                Command.Context.EngineHostInterface.NotifyEndApplication();
             }
 
             try

From 8f0fc9e43a84647bdb7a1b637fd39eac760fdb4a Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 18 Jan 2022 15:58:11 -0800
Subject: [PATCH 205/645] Replace the broken link about pull request (#16771)

---
 docs/maintainers/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/maintainers/README.md b/docs/maintainers/README.md
index 0c28e2cc9de..e592661cf8f 100644
--- a/docs/maintainers/README.md
+++ b/docs/maintainers/README.md
@@ -6,8 +6,8 @@ One of their primary responsibilities is merging pull requests after all require
 They have [write access](https://docs.github.com/en/free-pro-team@latest/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization) to the PowerShell repositories which gives them the power to:
 
 1. `git push` to the official PowerShell repository
-1. Merge [pull requests](https://www.thinkful.com/learn/github-pull-request-tutorial/)
-1. Assign labels, milestones, and people to [issues](https://guides.github.com/features/issues/) and [pull requests](https://www.thinkful.com/learn/github-pull-request-tutorial/)
+1. Merge [pull requests](https://docs.github.com/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)
+1. Assign labels, milestones, and people to [issues](https://guides.github.com/features/issues/) and [pull requests](https://docs.github.com/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)
 
 ## Table of Contents
 

From ee9097602d1778c62f3d71fa9da456a15987790d Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 20 Jan 2022 12:28:41 -0800
Subject: [PATCH 206/645] Update Engine Working Group members (#16780)

---
 docs/community/working-group-definitions.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/community/working-group-definitions.md b/docs/community/working-group-definitions.md
index f3efc89df3c..d02810078e6 100644
--- a/docs/community/working-group-definitions.md
+++ b/docs/community/working-group-definitions.md
@@ -33,7 +33,6 @@ Special consideration should be given to topics like **backwards compatibility**
 
 * @JamesWTruher (PS Standard, module authoring)
 * @adityapatwardhan (SDK)
-* @rjmholt (hosting, WinPS compatibility)
 
 ## Engine
 
@@ -60,9 +59,9 @@ However, it's expected that many issues will require input from both WGs.
 * @BrucePay
 * @daxian-dbw
 * @JamesWTruher
-* @rjmholt
 * @rkeithhill
 * @vexx32
+* @SeeminglyScience
 
 ## Interactive UX
 
@@ -94,7 +93,6 @@ particularly given the long-lasting effects of language decisions.
 ### Members
 
 * @JamesWTruher
-* @rjmholt
 * @daxian-dbw
 * @BrucePay
 

From 2c2722984d9d72a86bfe00c9dca2ccdeff319594 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 20 Jan 2022 15:15:43 -0800
Subject: [PATCH 207/645] Update the expect .NET SDK quality to GA for
 installing dotnet (#16784)

---
 DotnetRuntimeMetadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 96adaddc003..0917e8476c6 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
     "channel": "6.0.1xx",
-    "quality": "signed",
+    "quality": "ga",
     "qualityFallback": "daily",
     "packageVersionPattern": "6.0.0",
     "sdkImageVersion": "6.0.100",

From 3eca7c019ee48aa038272aa905cdd364aec1a04b Mon Sep 17 00:00:00 2001
From: hammy3502 <hammy275@gmail.com>
Date: Thu, 20 Jan 2022 23:23:11 -0500
Subject: [PATCH 208/645] Adds a .ResolvedTarget Property to File-System Items
 to Reflect a Symlink's Target as FileSystemInfo (#16490)

---
 .../engine/TypeTable_Types_Ps1Xml.cs          | 22 ++++++++
 .../namespaces/FileSystemProvider.cs          | 16 ++++++
 .../FileSystemProviderExtended.Tests.ps1      | 54 +++++++++++++++++++
 .../engine/Api/TypeInference.Tests.ps1        |  2 +-
 4 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs b/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
index 648bafe152c..bb267267b31 100644
--- a/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
+++ b/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
@@ -676,6 +676,17 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag<string> errors)
                 typeMembers,
                 isOverride: false);
 
+            newMembers.Add(@"ResolvedTarget");
+            AddMember(
+                errors,
+                typeName,
+                new PSCodeProperty(
+                    @"ResolvedTarget",
+                    GetMethodInfo(typeof(Microsoft.PowerShell.Commands.InternalSymbolicLinkLinkCodeMethods), @"ResolvedTarget"),
+                    setterCodeReference: null),
+                typeMembers,
+                isOverride: false);
+
             newMembers.Add(@"Target");
             AddMember(
                 errors,
@@ -801,6 +812,17 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag<string> errors)
                 typeMembers,
                 isOverride: false);
 
+            newMembers.Add(@"ResolvedTarget");
+            AddMember(
+                errors,
+                typeName,
+                new PSCodeProperty(
+                    @"ResolvedTarget",
+                    GetMethodInfo(typeof(Microsoft.PowerShell.Commands.InternalSymbolicLinkLinkCodeMethods), @"ResolvedTarget"),
+                    setterCodeReference: null),
+                typeMembers,
+                isOverride: false);
+
             newMembers.Add(@"Target");
             AddMember(
                 errors,
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index 1e3ab21ccaf..c57ed5ed2dc 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -8131,6 +8131,22 @@ public static string GetTarget(PSObject instance)
             return null;
         }
 
+        /// <summary>
+        /// Gets the target for a given file or directory, resolving symbolic links.
+        /// </summary>
+        /// <param name="instance">The FileInfo or DirectoryInfo type.</param>
+        /// <returns>The file path the instance points to.</returns>
+        public static string ResolvedTarget(PSObject instance)
+        {
+            if (instance.BaseObject is FileSystemInfo fileSysInfo)
+            {
+                FileSystemInfo linkTarget = fileSysInfo.ResolveLinkTarget(true);
+                return linkTarget is null ? fileSysInfo.FullName : linkTarget.FullName;
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Gets the link type of the specified reparse point.
         /// </summary>
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystemProviderExtended.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystemProviderExtended.Tests.ps1
index e9c490d5392..199210cba6e 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystemProviderExtended.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/FileSystemProviderExtended.Tests.ps1
@@ -658,3 +658,57 @@ Describe "FileSystem Provider Extended Tests for Get-ChildItem cmdlet" -Tags "CI
         }
     }
 }
+
+Describe "Validate Get-Item ResolvedTarget property" -Tag RequireAdminOnWindows {
+    BeforeAll {
+        $rootDir = Join-Path "TestDrive:" "TestDir"
+
+        Push-Location $rootDir
+        $null = New-Item -Path "realDir" -ItemType Directory
+        $null = New-Item -Path "toDel" -ItemType Directory
+        $null = New-Item -Path "brokenLinkedDir" -ItemType SymbolicLink -Value ".\toDel"
+        $null = New-Item -Path "linkedDir" -ItemType SymbolicLink -Value ".\realDir"
+        Remove-Item "toDel"
+        $null = New-Item -Path "realFile.fil" -ItemType File
+        $null = New-Item -Path "toDel.fil" -ItemType File
+        $null = New-Item -Path "brokenLinkedFile.fil" -ItemType SymbolicLink -Value ".\toDel.fil"
+        $null = New-Item -Path "linkedFile.fil" -ItemType SymbolicLink -Value ".\realFile.fil"
+        Remove-Item "toDel.fil"
+    }
+
+    AfterAll {
+        Pop-Location
+    }
+
+    Context 'Get-Item files and folders' {
+        It 'Get-Item "linkedDir"' {
+            $result = Get-Item "linkedDir"
+            $result.ResolvedTarget.EndsWith("realDir") | Should -BeTrue
+        }
+
+        It 'Get-Item "linkedFile.fil"' {
+            $result = Get-Item "linkedFile.fil"
+            $result.ResolvedTarget.EndsWith("realFile.fil") | Should -BeTrue
+        }
+
+        It 'Get-Item "brokenLinkedDir"' {
+            $result = Get-Item "brokenLinkedDir"
+            $result.ResolvedTarget.EndsWith("toDel") | Should -BeTrue
+        }
+
+        It 'Get-Item "brokenLinkedFile.fil"' {
+            $result = Get-Item "brokenLinkedFile.fil"
+            $result.ResolvedTarget.EndsWith("toDel.fil") | Should -BeTrue
+        }
+
+        It 'Get-Item "realDir"' {
+            $result = Get-Item "realDir"
+            $result.ResolvedTarget.EndsWith("realDir") | Should -BeTrue
+        }
+
+        It 'Get-Item "realFile.fil' {
+            $result = Get-Item "realFile.fil"
+            $result.ResolvedTarget.EndsWith("realFile.fil") | Should -BeTrue
+        }
+    }
+}
diff --git a/test/powershell/engine/Api/TypeInference.Tests.ps1 b/test/powershell/engine/Api/TypeInference.Tests.ps1
index 1d65047c34c..56c4ad074bc 100644
--- a/test/powershell/engine/Api/TypeInference.Tests.ps1
+++ b/test/powershell/engine/Api/TypeInference.Tests.ps1
@@ -504,7 +504,7 @@ Describe "Type inference Tests" -tags "CI" {
     It "Infers typeof Select-Object when Parameter is ExcludeProperty" {
         $res = [AstTypeInference]::InferTypeOf( {  [io.fileinfo]::new("file")  |  Select-Object -ExcludeProperty *Time*, E* }.Ast)
         $res.Count | Should -Be 1
-        $res[0].Name | Should -BeExactly "System.Management.Automation.PSObject#Attributes:BaseName:Directory:DirectoryName:FullName:IsReadOnly:Length:LengthString:LinkTarget:LinkType:Mode:ModeWithoutHardLink:Name:NameString:Target:VersionInfo"
+        $res[0].Name | Should -BeExactly "System.Management.Automation.PSObject#Attributes:BaseName:Directory:DirectoryName:FullName:IsReadOnly:Length:LengthString:LinkTarget:LinkType:Mode:ModeWithoutHardLink:Name:NameString:ResolvedTarget:Target:VersionInfo"
         $names = $res[0].Members.Name
         $names -contains "BaseName" | Should -BeTrue
         $names -contains "Name" | Should -BeTrue

From f83660e0e6143ce702b1e009fa62c9869cb5dac4 Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Fri, 21 Jan 2022 13:54:16 +0000
Subject: [PATCH 209/645] Seal `ClientRemotePowerShell` (#15802)

Seal `System.Management.Automation.Runspaces.Internal.ClientRemotePowerShell

Simplify IDisposable implementation
---
 .../remoting/client/ClientRemotePowerShell.cs | 69 ++++++++-----------
 1 file changed, 28 insertions(+), 41 deletions(-)

diff --git a/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs b/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
index 4ea06ea2feb..b464028d851 100644
--- a/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
+++ b/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
@@ -15,7 +15,7 @@ namespace System.Management.Automation.Runspaces.Internal
     /// PowerShell client side proxy base which handles invocation
     /// of powershell on a remote machine.
     /// </summary>
-    internal class ClientRemotePowerShell : IDisposable
+    internal sealed class ClientRemotePowerShell : IDisposable
     {
         #region Tracer
 
@@ -902,28 +902,28 @@ private void HandleRobustConnectionNotification(
 
         #endregion Private Methods
 
-        #region Protected Members
-
-        protected ObjectStreamBase inputstream;
-        protected ObjectStreamBase errorstream;
-        protected PSInformationalBuffers informationalBuffers;
-        protected PowerShell shell;
-        protected Guid clientRunspacePoolId;
-        protected bool noInput;
-        protected PSInvocationSettings settings;
-        protected ObjectStreamBase outputstream;
-        protected string computerName;
-        protected ClientPowerShellDataStructureHandler dataStructureHandler;
-        protected bool stopCalled = false;
-        protected PSHost hostToUse;
-        protected RemoteRunspacePoolInternal runspacePool;
-
-        protected const string WRITE_DEBUG_LINE = "WriteDebugLine";
-        protected const string WRITE_VERBOSE_LINE = "WriteVerboseLine";
-        protected const string WRITE_WARNING_LINE = "WriteWarningLine";
-        protected const string WRITE_PROGRESS = "WriteProgress";
-
-        protected bool initialized = false;
+        #region Private Fields
+
+        private ObjectStreamBase inputstream;
+        private ObjectStreamBase errorstream;
+        private PSInformationalBuffers informationalBuffers;
+        private readonly PowerShell shell;
+        private readonly Guid clientRunspacePoolId;
+        private bool noInput;
+        private PSInvocationSettings settings;
+        private ObjectStreamBase outputstream;
+        private readonly string computerName;
+        private ClientPowerShellDataStructureHandler dataStructureHandler;
+        private bool stopCalled = false;
+        private PSHost hostToUse;
+        private readonly RemoteRunspacePoolInternal runspacePool;
+
+        private const string WRITE_DEBUG_LINE = "WriteDebugLine";
+        private const string WRITE_VERBOSE_LINE = "WriteVerboseLine";
+        private const string WRITE_WARNING_LINE = "WriteWarningLine";
+        private const string WRITE_PROGRESS = "WriteProgress";
+
+        private bool initialized = false;
         /// <summary>
         /// This queue is for the state change events that resulted in closing the underlying
         /// datastructure handler. We cannot send the state back to the upper layers until
@@ -933,33 +933,20 @@ private void HandleRobustConnectionNotification(
 
         private PSConnectionRetryStatus _connectionRetryStatus = PSConnectionRetryStatus.None;
 
-        #endregion Protected Members
+        #endregion Private Fields
 
         #region IDisposable
 
         /// <summary>
-        /// Public interface for dispose.
+        /// Release all resources.
         /// </summary>
         public void Dispose()
         {
-            Dispose(true);
-
-            GC.SuppressFinalize(this);
+            // inputstream.Dispose();
+            // outputstream.Dispose();
+            // errorstream.Dispose();
         }
 
-        /// <summary>
-        /// Release all resources.
-        /// </summary>
-        /// <param name="disposing">If true, release all managed resources.</param>
-        protected void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                // inputstream.Dispose();
-                // outputstream.Dispose();
-                // errorstream.Dispose();
-            }
-        }
         #endregion IDisposable
     }
 

From 0302b1f48e250c9387f976b78c9f4b6434ac9420 Mon Sep 17 00:00:00 2001
From: Brannen Hall <Brannen@HallB.me>
Date: Sat, 22 Jan 2022 00:59:58 -0600
Subject: [PATCH 210/645] Support OpenSSH options for PSRP over SSH commands
 (#12802)

Add an -Options parameter to Invoke-Command and Start-PSSession to pass SSH options

Options parameter added to Invoke-Command
Options parameter added to Start-PSSession
Options parameter added to Enter-PSSession
Options parameter added to SSHConnection Hashtable
---
 .../remoting/commands/InvokeCommandCommand.cs | 19 +++++++
 .../remoting/commands/PSRemotingCmdlet.cs     | 15 +++++-
 .../remoting/commands/PushRunspaceCommand.cs  | 20 ++++++-
 .../remoting/commands/newrunspacecommand.cs   |  6 ++-
 .../remoting/common/RunspaceConnectionInfo.cs | 54 ++++++++++++++++---
 test/SSHRemoting/SSHRemoting.Basic.Tests.ps1  |  7 +++
 6 files changed, 111 insertions(+), 10 deletions(-)

diff --git a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
index a3aca6de70c..c194706151d 100644
--- a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
@@ -858,6 +858,25 @@ public override Hashtable[] SSHConnection
             set;
         }
 
+        /// <summary>
+        /// Hashtable containing options to be passed to OpenSSH.
+        /// </summary>
+        [Parameter(ParameterSetName = InvokeCommandCommand.SSHHostParameterSet)]
+        [Parameter(ParameterSetName = InvokeCommandCommand.FilePathSSHHostParameterSet)]
+        [ValidateNotNullOrEmpty]
+        public override Hashtable Options
+        {
+            get 
+            {
+                return base.Options;
+            }
+
+            set 
+            {
+                base.Options = value;
+            }
+        }
+
         #endregion
 
         #region Remote Debug Parameters
diff --git a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
index 67d0ced9f15..a3475bf9465 100644
--- a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
@@ -287,6 +287,7 @@ internal struct SSHConnection
         public int Port;
         public string Subsystem;
         public int ConnectingTimeout;
+        public Hashtable Options;
     }
 
     /// <summary>
@@ -805,6 +806,13 @@ public virtual Hashtable[] SSHConnection
             set;
         }
 
+        /// <summary>
+        /// Gets or sets the Hashtable containing options to be passed to OpenSSH.
+        /// </summary>
+        [Parameter(ParameterSetName = InvokeCommandCommand.SSHHostParameterSet)]
+        [ValidateNotNullOrEmpty]
+        public virtual Hashtable Options { get; set; }
+
         #endregion
 
         #endregion Properties
@@ -866,6 +874,7 @@ internal static void ValidateSpecifiedAuthentication(PSCredential credential, st
         private const string PortParameter = "Port";
         private const string SubsystemParameter = "Subsystem";
         private const string ConnectingTimeoutParameter = "ConnectingTimeout";
+        private const string OptionsParameter = "Options";
 
         #endregion
 
@@ -969,6 +978,10 @@ internal SSHConnection[] ParseSSHConnectionHashTable()
                     {
                         connectionInfo.ConnectingTimeout = GetSSHConnectionIntParameter(item[paramName]);
                     }
+                    else if (paramName.Equals(OptionsParameter, StringComparison.OrdinalIgnoreCase))
+                    {
+                        connectionInfo.Options = item[paramName] as Hashtable;
+                    }
                     else
                     {
                         throw new PSArgumentException(
@@ -1462,7 +1475,7 @@ protected void CreateHelpersForSpecifiedSSHComputerNames()
             {
                 ParseSshHostName(computerName, out string host, out string userName, out int port);
 
-                var sshConnectionInfo = new SSHConnectionInfo(userName, host, KeyFilePath, port, Subsystem, ConnectingTimeout);
+                var sshConnectionInfo = new SSHConnectionInfo(userName, host, KeyFilePath, port, Subsystem, ConnectingTimeout, Options);
                 var typeTable = TypeTable.LoadDefaultTypeFiles();
                 var remoteRunspace = RunspaceFactory.CreateRunspace(sshConnectionInfo, Host, typeTable) as RemoteRunspace;
                 var pipeline = CreatePipeline(remoteRunspace);
diff --git a/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs b/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
index 996b043d77e..bf8041d2e48 100644
--- a/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
@@ -58,6 +58,24 @@ public class EnterPSSessionCommand : PSRemotingBaseCmdlet
         [ValidateNotNullOrEmpty()]
         public new string HostName { get; set; }
 
+        /// <summary>
+        /// Gets or sets the Hashtable containing options to be passed to OpenSSH.
+        /// </summary>
+        [Parameter(ParameterSetName = PSRemotingBaseCmdlet.SSHHostParameterSet)]
+        [ValidateNotNullOrEmpty]
+        public override Hashtable Options 
+        { 
+            get 
+            {
+                return base.Options;
+            }
+
+            set
+            {
+                base.Options = value;
+            }
+        }
+
         #endregion
 
         /// <summary>
@@ -1262,7 +1280,7 @@ private RemoteRunspace GetRunspaceForContainerSession()
         private RemoteRunspace GetRunspaceForSSHSession()
         {
             ParseSshHostName(HostName, out string host, out string userName, out int port);
-            var sshConnectionInfo = new SSHConnectionInfo(userName, host, KeyFilePath, port, Subsystem, ConnectingTimeout);
+            var sshConnectionInfo = new SSHConnectionInfo(userName, host, KeyFilePath, port, Subsystem, ConnectingTimeout, Options);
             var typeTable = TypeTable.LoadDefaultTypeFiles();
 
             // Use the class _tempRunspace field while the runspace is being opened so that StopProcessing can be handled at that time.
diff --git a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
index d4a0a3e7508..a9ba8007a2b 100644
--- a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
@@ -1093,7 +1093,8 @@ private List<RemoteRunspace> CreateRunspacesForSSHHostParameterSet()
                     this.KeyFilePath,
                     port,
                     Subsystem,
-                    ConnectingTimeout);
+                    ConnectingTimeout,
+                    Options);
                 var typeTable = TypeTable.LoadDefaultTypeFiles();
                 string rsName = GetRunspaceName(index, out int rsIdUnused);
                 index++;
@@ -1120,7 +1121,8 @@ private List<RemoteRunspace> CreateRunspacesForSSHHostHashParameterSet()
                     sshConnection.KeyFilePath,
                     sshConnection.Port,
                     sshConnection.Subsystem,
-                    sshConnection.ConnectingTimeout);
+                    sshConnection.ConnectingTimeout,
+                    sshConnection.Options);
                 var typeTable = TypeTable.LoadDefaultTypeFiles();
                 string rsName = GetRunspaceName(index, out int rsIdUnused);
                 index++;
diff --git a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
index 49763f43a13..1a28cc75980 100644
--- a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel; // Win32Exception
 using System.Diagnostics;
@@ -1969,18 +1970,27 @@ public int ConnectingTimeout
             set;
         }
 
+        /// The SSH options to pass to OpenSSH.
+        /// Gets or sets the SSH options to pass to OpenSSH.
+        /// </summary>
+        private Hashtable Options
+        {
+            get;
+            set;
+        }
+
         #endregion
 
         #region Constructors
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="SSHConnectionInfo" /> class.
         /// </summary>
         private SSHConnectionInfo()
         { }
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="SSHConnectionInfo" /> class.
         /// </summary>
         /// <param name="userName">User Name.</param>
         /// <param name="computerName">Computer Name.</param>
@@ -2001,7 +2011,7 @@ public SSHConnectionInfo(
         }
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="SSHConnectionInfo" /> class.
         /// </summary>
         /// <param name="userName">User Name.</param>
         /// <param name="computerName">Computer Name.</param>
@@ -2018,7 +2028,7 @@ public SSHConnectionInfo(
         }
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="SSHConnectionInfo" /> class.
         /// </summary>
         /// <param name="userName">User Name.</param>
         /// <param name="computerName">Computer Name.</param>
@@ -2055,6 +2065,28 @@ public SSHConnectionInfo(
             ConnectingTimeout = connectingTimeout;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SSHConnectionInfo" /> class.
+        /// </summary>
+        /// <param name="userName">User Name.</param>
+        /// <param name="computerName">Computer Name.</param>
+        /// <param name="keyFilePath">Key File Path.</param>
+        /// <param name="port">Port number for connection (default 22).</param>
+        /// <param name="subsystem">Subsystem to use (default 'powershell').</param>
+        /// <param name="connectingTimeout">Timeout time for terminating connection attempt.</param>
+        /// <param name="options">Options for the SSH connection.</param>
+        public SSHConnectionInfo(
+            string userName,
+            string computerName,
+            string keyFilePath,
+            int port,
+            string subsystem,
+            int connectingTimeout,
+            Hashtable options) : this(userName, computerName, keyFilePath, port, subsystem, connectingTimeout)
+        {
+           Options = options;
+        }
+
         #endregion
 
         #region Overrides
@@ -2111,6 +2143,7 @@ internal override RunspaceConnectionInfo InternalCopy()
             newCopy.Port = Port;
             newCopy.Subsystem = Subsystem;
             newCopy.ConnectingTimeout = ConnectingTimeout;
+            newCopy.Options = Options;
 
             return newCopy;
         }
@@ -2163,9 +2196,9 @@ internal int StartSSHProcess(
             //
             // Local ssh invoked as:
             //   windows:
-            //     ssh.exe [-i identity_file] [-l login_name] [-p port] -s <destination> <command>
+            //     ssh.exe [-i identity_file] [-l login_name] [-p port] [-o option] -s <destination> <command>
             //   linux|macos:
-            //     ssh [-i identity_file] [-l login_name] [-p port] -s <destination> <command>
+            //     ssh [-i identity_file] [-l login_name] [-p port] [-o option] -s <destination> <command>
             // where <command> is interpreted as the subsystem due to the -s flag.
             //
             // Remote sshd configured for PowerShell Remoting Protocol (PSRP) over Secure Shell Protocol (SSH)
@@ -2216,6 +2249,15 @@ internal int StartSSHProcess(
                 startInfo.ArgumentList.Add(string.Format(CultureInfo.InvariantCulture, @"-p {0}", this.Port));
             }
 
+            // pass "-o option=value" command line argument to ssh if options are provided
+            if (this.Options != null) 
+            {
+                foreach (DictionaryEntry pair in this.Options) 
+                {
+                    startInfo.ArgumentList.Add(string.Format(CultureInfo.InvariantCulture, @"-o {0}={1}", pair.Key, pair.Value));
+                }
+            }
+
             // pass "-s destination command" command line arguments to ssh where command is the subsystem to invoke on the destination
             // note that ssh expects IPv6 addresses to not be enclosed in square brackets so trim them if present
             startInfo.ArgumentList.Add(string.Format(CultureInfo.InvariantCulture, @"-s {0} {1}", this.ComputerName.TrimStart('[').TrimEnd(']'), this.Subsystem));
diff --git a/test/SSHRemoting/SSHRemoting.Basic.Tests.ps1 b/test/SSHRemoting/SSHRemoting.Basic.Tests.ps1
index 7383cc2b8a1..29e7096d49a 100644
--- a/test/SSHRemoting/SSHRemoting.Basic.Tests.ps1
+++ b/test/SSHRemoting/SSHRemoting.Basic.Tests.ps1
@@ -179,6 +179,13 @@ Describe "SSHRemoting Basic Tests" -tags CI {
             Write-Verbose -Verbose "It Complete"
         }
 
+        It "Verifies explicit Options parameter" {
+            $options = @{"Port"="22"}
+            $script:session = New-PSSession -HostName localhost -Options $options -ErrorVariable err
+            $err | Should -HaveCount 0
+            VerifySession $script:session
+        }
+
         It "Verifies explicit Subsystem parameter" {
             Write-Verbose -Verbose "It Starting: Verifies explicit Subsystem parameter"
             $portNum = 22

From ae38dad04ffeff01f069b0b10edb8225fed10cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hong=20Minhee=20=28=E6=B4=AA=20=E6=B0=91=E6=86=99=29?=
 <hong.minhee@gmail.com>
Date: Tue, 25 Jan 2022 02:37:56 +0900
Subject: [PATCH 211/645] Let macOS installer run without Rosetta on Apple
 Silicon (#16742)

---
 tools/packaging/packaging.psm1         | 47 ++++++++++++++++++++++++--
 tools/packaging/packaging.strings.psd1 |  2 +-
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index bca41d3c816..39028c2673c 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -504,6 +504,29 @@ function Start-PSPackage {
                     }
                 }
             }
+            'osxpkg' {
+                $HostArchitecture = "x86_64"
+                if ($MacOSRuntime -match "-arm64") {
+                    $HostArchitecture = "arm64"
+                }
+                Write-Verbose "HostArchitecture = $HostArchitecture" -Verbose
+
+                $Arguments = @{
+                    Type = 'osxpkg'
+                    PackageSourcePath = $Source
+                    Name = $Name
+                    Version = $Version
+                    Force = $Force
+                    NoSudo = $NoSudo
+                    LTS = $LTS
+                    HostArchitecture = $HostArchitecture
+                }
+
+
+                if ($PSCmdlet.ShouldProcess("Create macOS Package")) {
+                    New-UnixPackage @Arguments
+                }
+            }
             default {
                 $Arguments = @{
                     Type = $_
@@ -803,6 +826,19 @@ function New-UnixPackage {
             $Dict = New-Object "System.Management.Automation.RuntimeDefinedParameterDictionary"
             $Dict.Add("Distribution", $Parameter) > $null
             return $Dict
+        } elseif ($Type -eq "osxpkg") {
+            # Add a dynamic parameter '-HostArchitecture' when the specified package type is 'osxpkg'.
+            # The '-HostArchitecture' parameter is used to indicate which Mac processor this package is targeting,
+            # Intel (x86_64) or Apple Silicon (arm64).
+            $ParameterAttr = New-Object "System.Management.Automation.ParameterAttribute"
+            $ValidateSetAttr = New-Object "System.Management.Automation.ValidateSetAttribute" -ArgumentList "x86_64", "arm64"
+            $Attributes = New-Object "System.Collections.ObjectModel.Collection``1[System.Attribute]"
+            $Attributes.Add($ParameterAttr) > $null
+            $Attributes.Add($ValidateSetAttr) > $null
+            $Parameter = New-Object "System.Management.Automation.RuntimeDefinedParameter" -ArgumentList ("HostArchitecture", [string], $Attributes)
+            $Dict = New-Object "System.Management.Automation.RuntimeDefinedParameterDictionary"
+            $Dict.Add("HostArchitecture", $Parameter) > $null
+            return $Dict
         }
     }
 
@@ -856,6 +892,7 @@ function New-UnixPackage {
                     throw ($ErrorMessage -f "macOS")
                 }
 
+                $HostArchitecture = $PSBoundParameters['HostArchitecture']
                 $DebDistro = 'macOS'
             }
         }
@@ -1013,7 +1050,7 @@ function New-UnixPackage {
         if ($Environment.IsMacOS) {
             if ($PSCmdlet.ShouldProcess("Add distribution information and Fix PackageName"))
             {
-                $createdPackage = New-MacOsDistributionPackage -FpmPackage $createdPackage -IsPreview:$IsPreview
+                $createdPackage = New-MacOsDistributionPackage -FpmPackage $createdPackage -HostArchitecture $HostArchitecture -IsPreview:$IsPreview
             }
         }
 
@@ -1063,6 +1100,11 @@ function New-MacOsDistributionPackage
     param(
         [Parameter(Mandatory,HelpMessage='The FileInfo of the file created by FPM')]
         [System.IO.FileInfo]$FpmPackage,
+
+        [Parameter(HelpMessage='x86_64 for Intel or arm64 for Apple Silicon')]
+        [ValidateSet("x86_64", "arm64")]
+        [string] $HostArchitecture = "x86_64",
+
         [Switch] $IsPreview
     )
 
@@ -1112,7 +1154,8 @@ function New-MacOsDistributionPackage
     # 2 - package path
     # 3 - minimum os version
     # 4 - Package Identifier
-    $PackagingStrings.OsxDistributionTemplate -f "PowerShell - $packageVersion", $packageVersion, $packageName, '10.14', $packageId | Out-File -Encoding ascii -FilePath $distributionXmlPath -Force
+    # 5 - host architecture (x86_64 for Intel or arm64 for Apple Silicon)
+    $PackagingStrings.OsxDistributionTemplate -f "PowerShell - $packageVersion", $packageVersion, $packageName, '10.14', $packageId, $HostArchitecture | Out-File -Encoding ascii -FilePath $distributionXmlPath -Force
 
     Write-Log "Applying distribution.xml to package..."
     Push-Location $tempDir
diff --git a/tools/packaging/packaging.strings.psd1 b/tools/packaging/packaging.strings.psd1
index 75068371efa..b70592c313d 100644
--- a/tools/packaging/packaging.strings.psd1
+++ b/tools/packaging/packaging.strings.psd1
@@ -125,7 +125,7 @@ open {0}
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <installer-gui-script minSpecVersion="1">
     <title>{0}</title>
-    <options hostArchitectures="x86_64"/>
+    <options hostArchitectures="{5}"/>
     <options customize="never" rootVolumeOnly="true"/>
     <background file="macDialog.png" scaling="tofit" alignment="bottomleft"/>
     <allowed-os-versions>

From 0c6005637c8752379831dc1e224bab2f1586b292 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Tue, 25 Jan 2022 14:05:11 -0800
Subject: [PATCH 212/645] Fix build for new `InvokeCommand` attributes (#16800)

---
 tools/packaging/packaging.psm1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 39028c2673c..7b8c18b9e31 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -2337,6 +2337,8 @@ function CleanupGeneratedSourceCode
         '[Microsoft.PowerShell.Commands.SetStrictModeCommand.ArgumentToPSVersionTransformationAttribute]'
         '[Microsoft.PowerShell.Commands.HttpVersionCompletionsAttribute]'
         '[System.Management.Automation.ArgumentToVersionTransformationAttribute]'
+        '[Microsoft.PowerShell.Commands.InvokeCommandCommand.ArgumentToPSVersionTransformationAttribute]'
+        '[Microsoft.PowerShell.Commands.InvokeCommandCommand.ValidateVersionAttribute]'
         )
 
     $patternsToReplace = @(

From 5e005b8a264686f1952e7912d10e792c2b70730a Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 26 Jan 2022 11:20:08 -0800
Subject: [PATCH 213/645] Remove all references to `cmake` for the builds in
 this repo (#16578)

---
 build.psm1                                        | 15 ++++-----------
 docs/building/linux.md                            |  4 +---
 docs/building/macos.md                            |  2 +-
 test/perf/benchmarks/assets/compiler.test.ps1     | 11 ++++-------
 .../microsoft_powershell_alpine3/Dockerfile       | 14 --------------
 5 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile

diff --git a/build.psm1 b/build.psm1
index 4330011863e..f32382ad51e 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1930,11 +1930,7 @@ function Start-PSBootstrap {
             $Deps = @()
             if ($environment.IsLinux -and $environment.IsUbuntu) {
                 # Build tools
-                $Deps += "curl", "g++", "cmake", "make"
-
-                if ($BuildLinuxArm) {
-                    $Deps += "gcc-arm-linux-gnueabihf", "g++-arm-linux-gnueabihf"
-                }
+                $Deps += "curl", "wget"
 
                 # .NET Core required runtime libraries
                 $Deps += "libunwind8"
@@ -1960,7 +1956,7 @@ function Start-PSBootstrap {
                 }
             } elseif ($environment.IsLinux -and $environment.IsRedHatFamily) {
                 # Build tools
-                $Deps += "which", "curl", "gcc-c++", "cmake", "make"
+                $Deps += "which", "curl", "wget"
 
                 # .NET Core required runtime libraries
                 $Deps += "libicu", "libunwind"
@@ -1984,7 +1980,7 @@ function Start-PSBootstrap {
                 }
             } elseif ($environment.IsLinux -and $environment.IsSUSEFamily) {
                 # Build tools
-                $Deps += "gcc", "cmake", "make"
+                $Deps += "wget"
 
                 # Packaging tools
                 if ($Package) { $Deps += "ruby-devel", "rpmbuild", "groff", 'libffi-devel' }
@@ -2009,9 +2005,6 @@ function Start-PSBootstrap {
                     $PackageManager = "$sudo port"
                 }
 
-                # Build tools
-                $Deps += "cmake"
-
                 # wget for downloading dotnet
                 $Deps += "wget"
 
@@ -2022,7 +2015,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', 'build-base', 'git', 'curl', 'wget'
 
                 Start-NativeExecution {
                     Invoke-Expression "apk add $Deps"
diff --git a/docs/building/linux.md b/docs/building/linux.md
index fdf355fcde1..658a0250fcf 100644
--- a/docs/building/linux.md
+++ b/docs/building/linux.md
@@ -18,8 +18,7 @@ refer to the [Working with the PowerShell Repository](../git/README.md),
 
 ### Toolchain Setup
 
-We use the [.NET Command-Line Interface][dotnet-cli] (`dotnet`) to build the managed components,
-and [CMake][] to build the native components.
+We use the [.NET Command-Line Interface][dotnet-cli] (`dotnet`) to build the managed components.
 
 Installing the toolchain is as easy as running `Start-PSBootstrap` in PowerShell.
 Of course, this requires a self-hosted copy of PowerShell on Linux.
@@ -55,7 +54,6 @@ The `Start-PSBootstrap` function does the following:
 If you want to use `dotnet` outside of `Start-PSBuild`, add `~/.dotnet` to your `PATH` environment variable.
 
 [dotnet-cli]: https://docs.microsoft.com/dotnet/core/tools/
-[CMake]: https://cmake.org/cmake/help/v2.8.12/cmake.html
 
 ## Build using our module
 
diff --git a/docs/building/macos.md b/docs/building/macos.md
index 8898a917877..63f1b4c9f82 100644
--- a/docs/building/macos.md
+++ b/docs/building/macos.md
@@ -14,7 +14,7 @@ From `pwsh.exe`, run `Import-Module ./build.psm1` and use `Start-PSBootstrap` to
 
 The `Start-PSBootstrap` function does the following:
 
-- Uses `brew` or `port` to install CMake, OpenSSL, and GNU WGet
+- Uses `brew` or `port` to install OpenSSL, and GNU WGet
 - Uninstalls any prior versions of .NET CLI
 - Downloads and installs .NET Core SDK to `~/.dotnet`
 
diff --git a/test/perf/benchmarks/assets/compiler.test.ps1 b/test/perf/benchmarks/assets/compiler.test.ps1
index c7ca697f2cc..5105ae9b408 100644
--- a/test/perf/benchmarks/assets/compiler.test.ps1
+++ b/test/perf/benchmarks/assets/compiler.test.ps1
@@ -1149,7 +1149,7 @@ function Start-PSBootstrap {
             $Deps = @()
             if ($environment.IsLinux -and $environment.IsUbuntu) {
                 # Build tools
-                $Deps += "curl", "g++", "cmake", "make"
+                $Deps += "curl", "g++", "make"
 
                 if ($BuildLinuxArm) {
                     $Deps += "gcc-arm-linux-gnueabihf", "g++-arm-linux-gnueabihf"
@@ -1179,7 +1179,7 @@ function Start-PSBootstrap {
                 }
             } elseif ($environment.IsLinux -and $environment.IsRedHatFamily) {
                 # Build tools
-                $Deps += "which", "curl", "gcc-c++", "cmake", "make"
+                $Deps += "which", "curl", "gcc-c++", "make"
 
                 # .NET Core required runtime libraries
                 $Deps += "libicu", "libunwind"
@@ -1203,7 +1203,7 @@ function Start-PSBootstrap {
                 }
             } elseif ($environment.IsLinux -and $environment.IsSUSEFamily) {
                 # Build tools
-                $Deps += "gcc", "cmake", "make"
+                $Deps += "gcc", "make"
 
                 # Packaging tools
                 if ($Package) { $Deps += "ruby-devel", "rpmbuild", "groff", 'libffi-devel' }
@@ -1228,9 +1228,6 @@ function Start-PSBootstrap {
                     $PackageManager = "$sudo port"
                 }
 
-                # Build tools
-                $Deps += "cmake"
-
                 # .NET Core required runtime libraries
                 $Deps += "openssl"
 
@@ -1238,7 +1235,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'
+                $Deps += 'libunwind', 'libcurl', 'bash', 'clang', 'build-base', 'git', 'curl'
 
                 Start-NativeExecution {
                     Invoke-Expression "apk add $Deps"
diff --git a/tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile b/tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile
deleted file mode 100644
index fb1070fcd52..00000000000
--- a/tools/releaseBuild/Images/microsoft_powershell_alpine3/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Docker image file that describes an Centos7 image with PowerShell installed from Microsoft YUM Repo
-
-FROM mcr.microsoft.com/powershell:alpine-3.12
-LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>"
-
-# Install dependencies and clean up
-RUN apk update \
-    && apk add libunwind libcurl cmake clang build-base git bash curl
-
-COPY PowerShellPackage.ps1 /
-
-ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-
-ENTRYPOINT [ "pwsh" ]

From d45ff6a20ab2bac98f1088b90284f8e24a8b5d40 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 26 Jan 2022 11:47:14 -0800
Subject: [PATCH 214/645] Switch to our custom images for build and release
 (#16801)

---
 build.psm1                                         |  2 +-
 tools/packaging/packaging.psm1                     | 14 +++++++++++---
 tools/releaseBuild/azureDevOps/releaseBuild.yml    |  2 +-
 tools/releaseBuild/azureDevOps/releasePipeline.yml | 10 +++++-----
 .../azureDevOps/templates/checkAzureContainer.yml  |  2 +-
 .../azureDevOps/templates/compliance.yml           |  2 +-
 .../templates/compliance/compliance.yml            |  2 +-
 .../templates/compliance/generateNotice.yml        |  2 +-
 tools/releaseBuild/azureDevOps/templates/json.yml  |  2 +-
 tools/releaseBuild/azureDevOps/templates/linux.yml |  4 ++--
 .../azureDevOps/templates/mac-file-signing.yml     |  2 +-
 .../azureDevOps/templates/mac-package-signing.yml  |  2 +-
 tools/releaseBuild/azureDevOps/templates/nuget.yml |  2 +-
 .../azureDevOps/templates/release-MsixBundle.yml   |  2 +-
 .../templates/release-UpdateDepsJson.yml           |  2 +-
 .../azureDevOps/templates/vpackReleaseJob.yml      |  2 +-
 .../templates/windows-component-governance.yml     |  2 +-
 .../azureDevOps/templates/windows-hosted-build.yml |  2 +-
 .../templates/windows-package-signing.yml          |  2 +-
 .../azureDevOps/templates/windows-packaging.yml    |  2 +-
 tools/releaseBuild/azureDevOps/vpackRelease.yml    |  2 +-
 21 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/build.psm1 b/build.psm1
index f32382ad51e..a4c16b852c2 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1938,7 +1938,7 @@ function Start-PSBootstrap {
                 elseif ($environment.IsUbuntu18) { $Deps += "libicu60"}
 
                 # Packaging tools
-                if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev" }
+                if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev", "rpm" }
 
                 # Install dependencies
                 # change the fontend from apt-get to noninteractive
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 7b8c18b9e31..e190e049e4c 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -1019,7 +1019,15 @@ function New-UnixPackage {
         try {
             if ($PSCmdlet.ShouldProcess("Create $type package")) {
                 Write-Log "Creating package with fpm..."
-                $Output = Start-NativeExecution { fpm $Arguments }
+                try {
+                    $Output = Start-NativeExecution { fpm $Arguments }
+                }
+                catch {
+                    Write-Verbose -Message "!!!Handling error in FPM!!!" -Verbose -ErrorAction SilentlyContinue
+                    Write-Verbose -Message "$Output" -Verbose -ErrorAction SilentlyContinue
+                    Get-Error -InputObject $_
+                    throw
+                }
             }
         } finally {
             if ($Environment.IsMacOS) {
@@ -4149,7 +4157,7 @@ function Invoke-AzDevOpsLinuxPackageCreation {
         }
     }
     catch {
-        Get-Error
+        Get-Error -InputObject $_
         throw
     }
 }
@@ -4230,7 +4238,7 @@ function Invoke-AzDevOpsLinuxPackageBuild {
         }
     }
     catch {
-        Get-Error
+        Get-Error -InputObject $_
         throw
     }
 }
diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index 49fcb751472..97cb0d02eac 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -207,7 +207,7 @@ stages:
         pool:
           name: PowerShell1ES
           demands:
-          - ImageOverride -equals MMS2019TLS
+          - ImageOverride -equals PSMMS2019-Secure
         steps:
         - checkout: self
           clean: true
diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index 7915ab537b9..49cc3536c20 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -179,7 +179,7 @@ stages:
 
     pool: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure
 
     variables:
     - group: 'Staging_ACR'
@@ -195,7 +195,7 @@ stages:
 
     pool: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure
 
     variables:
     - group: 'Azure Blob variable group'
@@ -231,7 +231,7 @@ stages:
 
     pool: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure
 
     steps:
     - template: templates/release-ReleaseToNuGet.yml
@@ -240,7 +240,7 @@ stages:
 
     pool: PowerShell1ES
       demands:
-      - ImageOverride -equals MMSUbuntu20.04TLS
+      - ImageOverride -equals PSMMSUbuntu20.04-Secure
 
     variables:
     - group: 'AzDevOpsArtifacts'
@@ -337,7 +337,7 @@ stages:
 
     pool: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure
 
     variables:
     - group: 'Azure Blob variable group'
diff --git a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
index f9a2ee2dc64..49082849e9b 100644
--- a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
+++ b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   steps:
   - checkout: self
     clean: true
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml
index 9eebd8be888..0c4a162bb11 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance.yml
@@ -18,7 +18,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   # APIScan can take a long time
   timeoutInMinutes: 180
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
index 92d5a7daec4..e81bdcf3709 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
@@ -19,7 +19,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   # APIScan can take a long time
   timeoutInMinutes: 180
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
index d904531d6c7..0e63dd9007b 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
@@ -16,7 +16,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   timeoutInMinutes: 15
 
diff --git a/tools/releaseBuild/azureDevOps/templates/json.yml b/tools/releaseBuild/azureDevOps/templates/json.yml
index cbea46d9eea..714978022a5 100644
--- a/tools/releaseBuild/azureDevOps/templates/json.yml
+++ b/tools/releaseBuild/azureDevOps/templates/json.yml
@@ -15,7 +15,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   steps:
   #- task: <task type name>@<version>
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index dc415c36c78..3d9625201a0 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMSUbuntu20.04TLS
+    - ImageOverride -equals PSMMSUbuntu20.04-Secure
   dependsOn: ${{ parameters.parentJob }}
   variables:
     - name: runCodesignValidationInjection
@@ -151,7 +151,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   variables:
     - name: buildName
       value: ${{ parameters.buildName }}
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
index 648708fa4be..a5c5a0811ec 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
@@ -9,7 +9,7 @@ jobs:
     pool:
       name: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure
 
     variables:
       - group: ESRP
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
index b1cf9917424..e41d0609d4c 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
@@ -9,7 +9,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   variables:
     - group: ESRP
     - name: runCodesignValidationInjection
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index b868c9dbdf7..ac4b181b7b8 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   timeoutInMinutes: 90
 
diff --git a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
index 1b424568994..607fda3ad40 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
@@ -4,7 +4,7 @@ jobs:
 
   pool: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   variables:
     - group: msixTools
diff --git a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
index f0c43c4b93f..bd465fedd27 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
@@ -4,7 +4,7 @@ jobs:
 
   pool: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   variables:
   - group: 'Azure Blob variable group'
diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
index de6252bc6e3..10bc19044fb 100644
--- a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+++ b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@@ -10,7 +10,7 @@ jobs:
   condition: succeeded()
   pool: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   steps:
   - checkout: self
     clean: true
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
index 5719b4f272c..53947655d90 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml
@@ -12,7 +12,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
 
   steps:
   - checkout: self
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
index 5d5484b14d8..16554ae7d41 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -16,7 +16,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   variables:
     - name: runCodesignValidationInjection
       value: false
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
index 8a45af1bc05..66bf7af7b3d 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -10,7 +10,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   variables:
     - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
       value: 1
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index 6b0d28b96f2..a93908a8f6c 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -16,7 +16,7 @@ jobs:
   pool:
     name: PowerShell1ES
     demands:
-    - ImageOverride -equals MMS2019TLS
+    - ImageOverride -equals PSMMS2019-Secure
   variables:
     - name: BuildConfiguration
       value: ${{ parameters.BuildConfiguration }}
diff --git a/tools/releaseBuild/azureDevOps/vpackRelease.yml b/tools/releaseBuild/azureDevOps/vpackRelease.yml
index 03482479cbb..875e2d25c3c 100644
--- a/tools/releaseBuild/azureDevOps/vpackRelease.yml
+++ b/tools/releaseBuild/azureDevOps/vpackRelease.yml
@@ -27,7 +27,7 @@ stages:
 
     pool: PowerShell1ES
       demands:
-      - ImageOverride -equals MMS2019TLS
+      - ImageOverride -equals PSMMS2019-Secure
 
     steps:
     - checkout: self

From 9f722ef95072fddd975b1b7b584bf11b2e857a69 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Thu, 27 Jan 2022 21:53:52 +0500
Subject: [PATCH 215/645] Use more efficient platform detection API (#16760)

* Use more efficient platform detection API

Use static and const new OperatingSystem class API to avoid string comparisons and extra allocations.

* Remove unused variable
---
 .../commands/management/ComputerUnix.cs                    | 2 +-
 .../commands/utility/UnblockFile.cs                        | 2 +-
 src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs | 2 +-
 .../CoreCLR/CorePsAssemblyLoadContext.cs                   | 6 +++---
 src/System.Management.Automation/CoreCLR/CorePsPlatform.cs | 6 +++---
 .../namespaces/FileSystemProvider.cs                       | 7 ++-----
 .../security/SecuritySupport.cs                            | 2 +-
 src/powershell/Program.cs                                  | 3 ++-
 test/perf/benchmarks/Engine.ScriptBlock.cs                 | 4 ++--
 9 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ComputerUnix.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ComputerUnix.cs
index fb01823790f..a11fb0270c9 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/ComputerUnix.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/ComputerUnix.cs
@@ -67,7 +67,7 @@ public sealed class StopComputerCommand : CommandLineCmdletBase
         protected override void BeginProcessing()
         {
             var args = "-P now";
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            if (Platform.IsMacOS)
             {
                 args = "now";
             }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UnblockFile.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UnblockFile.cs
index 5c297ed86d5..6633a66f96f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UnblockFile.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UnblockFile.cs
@@ -137,7 +137,7 @@ protected override void ProcessRecord()
                 }
             }
 #else
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            if (Platform.IsLinux)
             {
                 string errorMessage = UnblockFileStrings.LinuxNotSupported;
                 Exception e = new PlatformNotSupportedException(errorMessage);
diff --git a/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs b/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
index 3b253582b63..33675e30b44 100644
--- a/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
+++ b/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
@@ -26,7 +26,7 @@ public static class EntryPoint
         public static int Main(string[] args)
         {
             var currentPath = new FileInfo(System.Reflection.Assembly.GetEntryAssembly().Location).Directory.FullName;
-            var isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+            var isWindows = Platform.IsWindows;
 
             string platformFolder = isWindows ? WinFolderName : UnixFolderName;
 
diff --git a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
index 43e6ad17eb4..fad311df98d 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
@@ -540,17 +540,17 @@ private static string GetNativeDllSubFolderName(out string ext)
             ext = string.Empty;
             var processArch = RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant();
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (Platform.IsWindows)
             {
                 folderName = "win-" + processArch;
                 ext = ".dll";
             }
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            else if (Platform.IsLinux)
             {
                 folderName = "linux-" + processArch;
                 ext = ".so";
             }
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            else if (Platform.IsMacOS)
             {
                 folderName = "osx-x64";
                 ext = ".dylib";
diff --git a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
index 45be8721b7f..1986c4c63be 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
@@ -22,7 +22,7 @@ public static bool IsLinux
         {
             get
             {
-                return RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+                return OperatingSystem.IsLinux();
             }
         }
 
@@ -33,7 +33,7 @@ public static bool IsMacOS
         {
             get
             {
-                return RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+                return OperatingSystem.IsMacOS();
             }
         }
 
@@ -44,7 +44,7 @@ public static bool IsWindows
         {
             get
             {
-                return RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+                return OperatingSystem.IsWindows();
             }
         }
 
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index c57ed5ed2dc..15d742e40bc 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -469,9 +469,7 @@ protected override ProviderInfo Start(ProviderInfo providerInfo)
 #if !UNIX
             // The placeholder mode management APIs Rtl(Set|Query)(Process|Thread)PlaceholderCompatibilityMode
             // are only supported starting with Windows 10 version 1803 (build 17134)
-            Version minBuildForPlaceHolderAPIs = new Version(10, 0, 17134, 0);
-
-            if (Environment.OSVersion.Version >= minBuildForPlaceHolderAPIs)
+            if (OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134, 0))
             {
                 // let's be safe, don't change the PlaceHolderCompatibilityMode if the current one is not what we expect
                 if (NativeMethods.RtlQueryProcessPlaceholderCompatibilityMode() == NativeMethods.PHCM_DISGUISE_PLACEHOLDER)
@@ -2724,8 +2722,7 @@ private static bool WinCreateSymbolicLink(string path, string strTargetPath, boo
             // The new AllowUnprivilegedCreate is only available on Win10 build 14972 or newer
             var flags = isDirectory ? NativeMethods.SymbolicLinkFlags.Directory : NativeMethods.SymbolicLinkFlags.File;
 
-            Version minBuildOfDeveloperMode = new Version(10, 0, 14972, 0);
-            if (Environment.OSVersion.Version >= minBuildOfDeveloperMode)
+            if (OperatingSystem.IsWindowsVersionAtLeast(10, 0, 14972, 0))
             {
                 flags |= NativeMethods.SymbolicLinkFlags.AllowUnprivilegedCreate;
             }
diff --git a/src/System.Management.Automation/security/SecuritySupport.cs b/src/System.Management.Automation/security/SecuritySupport.cs
index 7b5087411ec..6321d301ced 100644
--- a/src/System.Management.Automation/security/SecuritySupport.cs
+++ b/src/System.Management.Automation/security/SecuritySupport.cs
@@ -1213,7 +1213,7 @@ private void ResolveFromStoreById(ResolutionPurpose purpose, out ErrorRecord err
                     storeCU.Open(OpenFlags.ReadOnly);
                     X509Certificate2Collection storeCerts = storeCU.Certificates;
 
-                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                    if (Platform.IsWindows)
                     {
                         using (var storeLM = new X509Store("my", StoreLocation.LocalMachine))
                         {
diff --git a/src/powershell/Program.cs b/src/powershell/Program.cs
index 3fee683618f..d085db22b98 100644
--- a/src/powershell/Program.cs
+++ b/src/powershell/Program.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.IO;
+using System.Management.Automation;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
@@ -89,7 +90,7 @@ private static void AttemptExecPwshLogin(string[] args)
                 return;
             }
 
-            bool isLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+            bool isLinux = Platform.IsLinux;
 
             // The first byte (ASCII char) of the name of this process, used to detect '-' for login
             byte procNameFirstByte;
diff --git a/test/perf/benchmarks/Engine.ScriptBlock.cs b/test/perf/benchmarks/Engine.ScriptBlock.cs
index ad373dd5f99..1f9ac989428 100644
--- a/test/perf/benchmarks/Engine.ScriptBlock.cs
+++ b/test/perf/benchmarks/Engine.ScriptBlock.cs
@@ -36,7 +36,7 @@ public IEnumerable<string> ValuesForScript()
             yield return @"[System.IO.Path]::HasExtension('')";
 
             // Test on COM method invocation.
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (Platform.IsWindows)
             {
                 yield return @"$sh=New-Object -ComObject Shell.Application; $sh.Namespace('c:\')";
                 yield return @"$fs=New-Object -ComObject scripting.filesystemobject; $fs.Drives";
@@ -54,7 +54,7 @@ public void GlobalSetup()
             // believe that there is no need to run many ops in each interation. However, the subsequent runs
             // of this method is much faster than the first run, and this causes 'MinIterationTime' warnings
             // to our benchmarks and make the benchmark results not reliable.
-            // Calling this method once in 'GlobalSetup' is a workaround. 
+            // Calling this method once in 'GlobalSetup' is a workaround.
             // See https://github.com/dotnet/BenchmarkDotNet/issues/837#issuecomment-828600157
             scriptBlock.Invoke();
         }

From 8c532529693dbccb46fb4edf9d69b0667f524630 Mon Sep 17 00:00:00 2001
From: "Joel Sallow (/u/ta11ow)" <32407840+vexx32@users.noreply.github.com>
Date: Thu, 27 Jan 2022 12:55:54 -0500
Subject: [PATCH 216/645] Add support to allow invoking method with generic
 type arguments (#12412)

---
 .../CommandCompletion/CompletionAnalysis.cs   |   8 +
 .../engine/CoreAdapter.cs                     |  73 +++++--
 .../engine/MshMemberInfo.cs                   |  60 ++++--
 .../engine/parser/Compiler.cs                 |  66 ++++--
 .../engine/parser/Parser.cs                   | 147 ++++++++++---
 .../engine/parser/ast.cs                      | 177 +++++++++++++++-
 .../resources/ExtendedTypeSystem.resx         |   6 +
 .../TabCompletion/TabCompletion.Tests.ps1     |  16 ++
 .../Parser/MethodInvocation.Tests.ps1         | 193 ++++++++++++++++++
 9 files changed, 653 insertions(+), 93 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index 18bd6cbed3d..081fbd07a74 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -2107,6 +2107,14 @@ private List<CompletionResult> GetResultForIdentifier(CompletionContext completi
             result = CompletionCompleters.CompleteCommandArgument(completionContext);
             replacementIndex = completionContext.ReplacementIndex;
             replacementLength = completionContext.ReplacementLength;
+
+            if (result.Count == 0
+                && completionContext.TokenAtCursor.TokenFlags.HasFlag(TokenFlags.TypeName)
+                && lastAst?.Find(a => a is MemberExpressionAst, searchNestedScriptBlocks: false) is not null)
+            {
+                result = CompletionCompleters.CompleteType(completionContext.TokenAtCursor.Text).ToList();
+            }
+
             return result;
         }
 
diff --git a/src/System.Management.Automation/engine/CoreAdapter.cs b/src/System.Management.Automation/engine/CoreAdapter.cs
index 1a623e92f1e..b9e8979852a 100644
--- a/src/System.Management.Automation/engine/CoreAdapter.cs
+++ b/src/System.Management.Automation/engine/CoreAdapter.cs
@@ -1394,32 +1394,37 @@ private static MethodInformation FindBestMethodImpl(
             // be turned into an array.
             // We also skip the optimization if the number of arguments and parameters is different
             // so we let the loop deal with possible optional parameters.
-            if ((methods.Length == 1) &&
-                (!methods[0].hasVarArgs) &&
-                (!methods[0].isGeneric) &&
-                (methods[0].method == null || !(methods[0].method.DeclaringType.IsGenericTypeDefinition)) &&
+            if (methods.Length == 1
+                && !methods[0].hasVarArgs
                 // generic methods need to be double checked in a loop below - generic methods can be rejected if type inference fails
-                (methods[0].parameters.Length == arguments.Length))
+                && !methods[0].isGeneric
+                && (methods[0].method is null || !methods[0].method.DeclaringType.IsGenericTypeDefinition)
+                && methods[0].parameters.Length == arguments.Length)
             {
                 return methods[0];
             }
 
             Type[] argumentTypes = arguments.Select(EffectiveArgumentType).ToArray();
+            Type[] genericParameters = invocationConstraints?.GenericTypeParameters ?? Array.Empty<Type>();
             List<OverloadCandidate> candidates = new List<OverloadCandidate>();
             for (int i = 0; i < methods.Length; i++)
             {
-                MethodInformation method = methods[i];
+                MethodInformation methodInfo = methods[i];
 
-                if (method.method != null && method.method.DeclaringType.IsGenericTypeDefinition)
+                if (methodInfo.method?.DeclaringType.IsGenericTypeDefinition == true
+                    || (!methodInfo.isGeneric && genericParameters.Length > 0))
                 {
-                    continue; // skip methods defined by an *open* generic type
+                    // If method is defined by an *open* generic type, or
+                    // if generic parameters were provided and this method isn't generic, skip it.
+                    continue;
                 }
 
-                if (method.isGeneric)
+                if (methodInfo.isGeneric)
                 {
                     Type[] argumentTypesForTypeInference = new Type[argumentTypes.Length];
                     Array.Copy(argumentTypes, argumentTypesForTypeInference, argumentTypes.Length);
-                    if (invocationConstraints != null && invocationConstraints.ParameterTypes != null)
+
+                    if (invocationConstraints?.ParameterTypes is not null)
                     {
                         int parameterIndex = 0;
                         foreach (Type typeConstraintFromCallSite in invocationConstraints.ParameterTypes)
@@ -1433,20 +1438,36 @@ private static MethodInformation FindBestMethodImpl(
                         }
                     }
 
-                    method = TypeInference.Infer(method, argumentTypesForTypeInference);
-                    if (method == null)
+                    if (genericParameters.Length > 0 && methodInfo.method is MethodInfo originalMethod)
+                    {
+                        try
+                        {
+                            methodInfo = new MethodInformation(
+                                originalMethod.MakeGenericMethod(genericParameters),
+                                parametersToIgnore: 0);
+                        }
+                        catch (ArgumentException)
+                        {
+                            // Just skip this possibility if the generic type parameters can't be used to make
+                            // a valid generic method here.
+                            continue;
+                        }
+                    }
+
+                    methodInfo = TypeInference.Infer(methodInfo, argumentTypesForTypeInference);
+                    if (methodInfo is null)
                     {
                         // Skip generic methods for which we cannot infer type arguments
                         continue;
                     }
                 }
 
-                if (!IsInvocationTargetConstraintSatisfied(method, invocationConstraints))
+                if (!IsInvocationTargetConstraintSatisfied(methodInfo, invocationConstraints))
                 {
                     continue;
                 }
 
-                ParameterInformation[] parameters = method.parameters;
+                ParameterInformation[] parameters = methodInfo.parameters;
                 if (arguments.Length != parameters.Length)
                 {
                     // Skip methods w/ an incorrect # of arguments.
@@ -1454,7 +1475,7 @@ private static MethodInformation FindBestMethodImpl(
                     if (arguments.Length > parameters.Length)
                     {
                         // If too many args,it's only OK if the method is varargs.
-                        if (!method.hasVarArgs)
+                        if (!methodInfo.hasVarArgs)
                         {
                             continue;
                         }
@@ -1462,12 +1483,12 @@ private static MethodInformation FindBestMethodImpl(
                     else
                     {
                         // Too few args, OK if there are optionals, or varargs with the param array omitted
-                        if (!method.hasOptional && (!method.hasVarArgs || (arguments.Length + 1) != parameters.Length))
+                        if (!methodInfo.hasOptional && (!methodInfo.hasVarArgs || (arguments.Length + 1) != parameters.Length))
                         {
                             continue;
                         }
 
-                        if (method.hasOptional)
+                        if (methodInfo.hasOptional)
                         {
                             // Count optionals.  This code is rarely hit, mainly when calling code in the
                             // assembly Microsoft.VisualBasic.  If it were more frequent, the optional count
@@ -1490,7 +1511,7 @@ private static MethodInformation FindBestMethodImpl(
                     }
                 }
 
-                OverloadCandidate candidate = new OverloadCandidate(method, arguments.Length);
+                OverloadCandidate candidate = new OverloadCandidate(methodInfo, arguments.Length);
                 for (int j = 0; candidate != null && j < parameters.Length; j++)
                 {
                     ParameterInformation parameter = parameters[j];
@@ -1590,6 +1611,22 @@ private static MethodInformation FindBestMethodImpl(
                         methods[0].method.DeclaringType.FullName);
                     return null;
                 }
+                else if (genericParameters.Length != 0 && genericParameters.Contains(null))
+                {
+                    errorId = "TypeNotFoundForGenericMethod";
+                    errorMsg = ExtendedTypeSystem.MethodGenericArgumentTypeNotFoundException;
+                    return null;
+                }
+                else if (genericParameters.Length != 0)
+                {
+                    errorId = "MethodCountCouldNotFindBestGeneric";
+                    errorMsg = string.Format(
+                        ExtendedTypeSystem.MethodGenericArgumentCountException,
+                        methods[0].method.Name,
+                        genericParameters.Length,
+                        arguments.Length);
+                    return null;
+                }
                 else
                 {
                     errorId = "MethodCountCouldNotFindBest";
diff --git a/src/System.Management.Automation/engine/MshMemberInfo.cs b/src/System.Management.Automation/engine/MshMemberInfo.cs
index 73ee243f6e8..ef6d185a606 100644
--- a/src/System.Management.Automation/engine/MshMemberInfo.cs
+++ b/src/System.Management.Automation/engine/MshMemberInfo.cs
@@ -1909,9 +1909,18 @@ internal class PSMethodInvocationConstraints
         internal PSMethodInvocationConstraints(
             Type methodTargetType,
             Type[] parameterTypes)
+            : this(methodTargetType, genericTypeParameters: null, parameterTypes)
         {
-            this.MethodTargetType = methodTargetType;
+        }
+
+        internal PSMethodInvocationConstraints(
+            Type methodTargetType,
+            Type[] genericTypeParameters,
+            Type[] parameterTypes)
+        {
+            MethodTargetType = methodTargetType;
             _parameterTypes = parameterTypes;
+            GenericTypeParameters = genericTypeParameters;
         }
 
         /// <remarks>
@@ -1926,6 +1935,11 @@ internal PSMethodInvocationConstraints(
 
         private readonly Type[] _parameterTypes;
 
+        /// <summary>
+        /// Gets the generic type parameters for the method invocation.
+        /// </summary>
+        public Type[] GenericTypeParameters { get; }
+
         internal static bool EqualsForCollection<T>(ICollection<T> xs, ICollection<T> ys)
         {
             if (xs == null)
@@ -1946,8 +1960,6 @@ internal static bool EqualsForCollection<T>(ICollection<T> xs, ICollection<T> ys
             return xs.SequenceEqual(ys);
         }
 
-        // TODO: IEnumerable<Type> genericTypeParameters { get; private set; }
-
         public bool Equals(PSMethodInvocationConstraints other)
         {
             if (other is null)
@@ -1970,6 +1982,11 @@ public bool Equals(PSMethodInvocationConstraints other)
                 return false;
             }
 
+            if (!EqualsForCollection(GenericTypeParameters, other.GenericTypeParameters))
+            {
+                return false;
+            }
+
             return true;
         }
 
@@ -1994,18 +2011,7 @@ public override bool Equals(object obj)
         }
 
         public override int GetHashCode()
-        {
-            // algorithm based on https://stackoverflow.com/questions/263400/what-is-the-best-algorithm-for-an-overridden-system-object-gethashcode
-            unchecked
-            {
-                int result = 61;
-
-                result = result * 397 + (MethodTargetType != null ? MethodTargetType.GetHashCode() : 0);
-                result = result * 397 + ParameterTypes.SequenceGetHashCode();
-
-                return result;
-            }
-        }
+            => HashCode.Combine(MethodTargetType, ParameterTypes, GenericTypeParameters);
 
         public override string ToString()
         {
@@ -2018,6 +2024,22 @@ public override string ToString()
                 separator = " ";
             }
 
+            if (GenericTypeParameters != null)
+            {
+                sb.Append(separator);
+                sb.Append("genericTypeParams: ");
+
+                separator = string.Empty;
+                foreach (Type parameter in GenericTypeParameters)
+                {
+                    sb.Append(separator);
+                    sb.Append(ToStringCodeMethods.Type(parameter, dropNamespaces: true));
+                    separator = ", ";
+                }
+
+                separator = " ";
+            }
+
             if (_parameterTypes != null)
             {
                 sb.Append(separator);
@@ -5035,7 +5057,7 @@ internal struct Enumerator : IEnumerator<T>
             private readonly PSMemberInfoInternalCollection<T> _allMembers;
 
             /// <summary>
-            /// Constructs this instance to enumerate over members.
+            /// Initializes a new instance of the <see cref="Enumerator"/> class to enumerate over members.
             /// </summary>
             /// <param name="integratingCollection">Members we are enumerating.</param>
             internal Enumerator(PSMemberInfoIntegratingCollection<T> integratingCollection)
@@ -5063,8 +5085,8 @@ internal Enumerator(PSMemberInfoIntegratingCollection<T> integratingCollection)
             /// Moves to the next element in the enumeration.
             /// </summary>
             /// <returns>
-            /// false if there are no more elements to enumerate
-            /// true otherwise
+            /// If there are no more elements to enumerate, returns false.
+            /// Returns true otherwise.
             /// </returns>
             public bool MoveNext()
             {
@@ -5093,7 +5115,7 @@ public bool MoveNext()
             }
 
             /// <summary>
-            /// Current PSMemberInfo in the enumeration.
+            /// Gets the current PSMemberInfo in the enumeration.
             /// </summary>
             /// <exception cref="ArgumentException">For invalid arguments.</exception>
             T IEnumerator<T>.Current
diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index b8ca57b4b05..5f7c54d00c2 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -1174,24 +1174,34 @@ internal static Type GetTypeConstraintForMethodResolution(ExpressionAst expr)
             return firstConvert?.Type.TypeName.GetReflectionType();
         }
 
-        internal static PSMethodInvocationConstraints CombineTypeConstraintForMethodResolution(Type targetType, Type argType)
+        internal static PSMethodInvocationConstraints CombineTypeConstraintForMethodResolution(
+            Type targetType,
+            Type argType,
+            Type[] genericArguments = null)
         {
-            if (targetType == null && argType == null)
+            if (targetType is null
+                && argType is null
+                && (genericArguments is null || genericArguments.Length == 0))
             {
                 return null;
             }
 
-            return new PSMethodInvocationConstraints(targetType, new[] { argType });
+            return new PSMethodInvocationConstraints(targetType, genericArguments, new[] { argType });
         }
 
-        internal static PSMethodInvocationConstraints CombineTypeConstraintForMethodResolution(Type targetType, Type[] argTypes)
+        internal static PSMethodInvocationConstraints CombineTypeConstraintForMethodResolution(
+            Type targetType,
+            Type[] argTypes,
+            Type[] genericArguments = null)
         {
-            if (targetType == null && (argTypes == null || argTypes.Length == 0))
+            if (targetType is null
+                && (argTypes is null || argTypes.Length == 0)
+                && (genericArguments is null || genericArguments.Length == 0))
             {
                 return null;
             }
 
-            return new PSMethodInvocationConstraints(targetType, argTypes);
+            return new PSMethodInvocationConstraints(targetType, genericArguments, argTypes);
         }
 
         internal static Expression ConvertValue(TypeConstraintAst typeConstraint, Expression expr)
@@ -6338,17 +6348,47 @@ public object VisitMemberExpression(MemberExpressionAst memberExpressionAst)
 
         internal static PSMethodInvocationConstraints GetInvokeMemberConstraints(InvokeMemberExpressionAst invokeMemberExpressionAst)
         {
-            var arguments = invokeMemberExpressionAst.Arguments;
+            ReadOnlyCollection<ExpressionAst> arguments = invokeMemberExpressionAst.Arguments;
+            Type[] argumentTypes = null;
+            if (arguments is not null)
+            {
+                argumentTypes = new Type[arguments.Count];
+                for (var i = 0; i < arguments.Count; i++)
+                {
+                    argumentTypes[i] = GetTypeConstraintForMethodResolution(arguments[i]);
+                }
+            }
+
             var targetTypeConstraint = GetTypeConstraintForMethodResolution(invokeMemberExpressionAst.Expression);
-            return CombineTypeConstraintForMethodResolution(
-                    targetTypeConstraint,
-                    arguments?.Select(Compiler.GetTypeConstraintForMethodResolution).ToArray());
+
+            ReadOnlyCollection<ITypeName> genericArguments = invokeMemberExpressionAst.GenericTypeArguments;
+            Type[] genericTypeArguments = null;
+            if (genericArguments is not null)
+            {
+                genericTypeArguments = new Type[genericArguments.Count];
+                for (var i = 0; i < genericArguments.Count; i++)
+                {
+                    genericTypeArguments[i] = genericArguments[i].GetReflectionType();
+                }
+            }
+
+            return CombineTypeConstraintForMethodResolution(targetTypeConstraint, argumentTypes, genericTypeArguments);
         }
 
         internal static PSMethodInvocationConstraints GetInvokeMemberConstraints(BaseCtorInvokeMemberExpressionAst invokeMemberExpressionAst)
         {
             Type targetTypeConstraint = null;
-            var arguments = invokeMemberExpressionAst.Arguments;
+            ReadOnlyCollection<ExpressionAst> arguments = invokeMemberExpressionAst.Arguments;
+            Type[] argumentTypes = null;
+            if (arguments is not null)
+            {
+                argumentTypes = new Type[arguments.Count];
+                for (var i = 0; i < arguments.Count; i++)
+                {
+                    argumentTypes[i] = GetTypeConstraintForMethodResolution(arguments[i]);
+                }
+            }
+
             TypeDefinitionAst typeDefinitionAst = Ast.GetAncestorTypeDefinitionAst(invokeMemberExpressionAst);
             if (typeDefinitionAst != null)
             {
@@ -6359,9 +6399,7 @@ internal static PSMethodInvocationConstraints GetInvokeMemberConstraints(BaseCto
                 Diagnostics.Assert(false, "BaseCtorInvokeMemberExpressionAst must be used only inside TypeDefinitionAst");
             }
 
-            return CombineTypeConstraintForMethodResolution(
-                    targetTypeConstraint,
-                    arguments?.Select(Compiler.GetTypeConstraintForMethodResolution).ToArray());
+            return CombineTypeConstraintForMethodResolution(targetTypeConstraint, argumentTypes, genericArguments: null);
         }
 
         internal Expression InvokeMember(
diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
index e3d08ca38ab..a855be0b0a7 100644
--- a/src/System.Management.Automation/engine/parser/Parser.cs
+++ b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -1358,7 +1358,7 @@ private ITypeName FinishTypeNameRule(Token typeName, bool unBracketedGenericArg
 
                     case TokenKind.LBracket:
                     case TokenKind.Identifier:
-                        return GenericTypeArgumentsRule(typeName, token, unBracketedGenericArg);
+                        return GenericTypeNameRule(typeName, token, unBracketedGenericArg);
 
                     default:
                         // ErrorRecovery: sync to ']', and return non-null to avoid cascading errors.
@@ -1438,7 +1438,7 @@ private ITypeName GetSingleGenericArgument(Token firstToken)
             return typeName;
         }
 
-        private ITypeName GenericTypeArgumentsRule(Token genericTypeName, Token firstToken, bool unBracketedGenericArg)
+        private List<ITypeName> GenericTypeArgumentsRule(Token firstToken, out Token lastToken)
         {
             Diagnostics.Assert(firstToken.Kind == TokenKind.Identifier || firstToken.Kind == TokenKind.LBracket, "unexpected first token");
             RuntimeHelpers.EnsureSufficientExecutionStack();
@@ -1447,20 +1447,18 @@ private ITypeName GenericTypeArgumentsRule(Token genericTypeName, Token firstTok
             ITypeName typeName = GetSingleGenericArgument(firstToken);
             genericArguments.Add(typeName);
 
-            Token commaOrRBracketToken;
-            Token token;
             while (true)
             {
                 SkipNewlines();
-                commaOrRBracketToken = NextToken();
-                if (commaOrRBracketToken.Kind != TokenKind.Comma)
+                lastToken = NextToken();
+                if (lastToken.Kind != TokenKind.Comma)
                 {
                     break;
                 }
 
                 SkipNewlines();
 
-                token = PeekToken();
+                Token token = PeekToken();
                 if (token.Kind == TokenKind.Identifier || token.Kind == TokenKind.LBracket)
                 {
                     SkipToken();
@@ -1468,43 +1466,55 @@ private ITypeName GenericTypeArgumentsRule(Token genericTypeName, Token firstTok
                 }
                 else
                 {
-                    ReportIncompleteInput(After(commaOrRBracketToken),
+                    ReportIncompleteInput(
+                        After(lastToken),
                         nameof(ParserStrings.MissingTypename),
                         ParserStrings.MissingTypename);
-                    typeName = new TypeName(commaOrRBracketToken.Extent, ":ErrorTypeName:");
+                    typeName = new TypeName(lastToken.Extent, ":ErrorTypeName:");
                 }
 
                 genericArguments.Add(typeName);
             }
 
-            if (commaOrRBracketToken.Kind != TokenKind.RBracket)
+            return genericArguments;
+        }
+
+        private ITypeName GenericTypeNameRule(Token genericTypeName, Token firstToken, bool unbracketedGenericArg)
+        {
+            List<ITypeName> genericArguments = GenericTypeArgumentsRule(firstToken, out Token rBracketToken);
+
+            if (rBracketToken.Kind != TokenKind.RBracket)
             {
                 // ErrorRecovery: pretend we had the closing bracket and just continue on.
-
-                UngetToken(commaOrRBracketToken);
-                ReportIncompleteInput(Before(commaOrRBracketToken),
+                UngetToken(rBracketToken);
+                ReportIncompleteInput(
+                    Before(rBracketToken),
                     nameof(ParserStrings.EndSquareBracketExpectedAtEndOfAttribute),
                     ParserStrings.EndSquareBracketExpectedAtEndOfAttribute);
-                commaOrRBracketToken = null;
+                rBracketToken = null;
             }
 
             var openGenericType = new TypeName(genericTypeName.Extent, genericTypeName.Text);
-            var result = new GenericTypeName(ExtentOf(genericTypeName.Extent, ExtentFromFirstOf(commaOrRBracketToken, genericArguments.LastOrDefault(), firstToken)),
-                openGenericType, genericArguments);
-            token = PeekToken();
+            var result = new GenericTypeName(
+                ExtentOf(genericTypeName.Extent, ExtentFromFirstOf(rBracketToken, genericArguments.LastOrDefault(), firstToken)),
+                openGenericType,
+                genericArguments);
+
+            Token token = PeekToken();
             if (token.Kind == TokenKind.LBracket)
             {
                 SkipToken();
                 return CompleteArrayTypeName(result, openGenericType, NextToken());
             }
 
-            if (token.Kind == TokenKind.Comma && !unBracketedGenericArg)
+            if (token.Kind == TokenKind.Comma && !unbracketedGenericArg)
             {
                 SkipToken();
                 string assemblyNameSpec = _tokenizer.GetAssemblyNameSpec();
                 if (string.IsNullOrEmpty(assemblyNameSpec))
                 {
-                    ReportError(After(token),
+                    ReportError(
+                        After(token),
                         nameof(ParserStrings.MissingAssemblyNameSpecification),
                         ParserStrings.MissingAssemblyNameSpecification);
                 }
@@ -7735,6 +7745,7 @@ private ExpressionAst MemberAccessRule(ExpressionAst targetExpr, Token operatorT
             // On entry, we've verified that operatorToken is not preceded by whitespace.
 
             CommandElementAst member = MemberNameRule();
+            List<ITypeName> genericTypeArguments = null;
 
             if (member == null)
             {
@@ -7747,34 +7758,106 @@ private ExpressionAst MemberAccessRule(ExpressionAst targetExpr, Token operatorT
                 member = GetSingleCommandArgument(CommandArgumentContext.CommandArgument) ??
                     new ErrorExpressionAst(ExtentOf(targetExpr, operatorToken));
             }
-            else
+            else if (_ungotToken == null)
             {
+                // Member name may be an incomplete token like `$a.$(Command-Name`; we do not look for generic args or
+                // invocation token(s) if the member name token is recognisably incomplete.
+                genericTypeArguments = GenericMethodArgumentsRule(out Token rBracket);
                 Token lParen = NextInvokeMemberToken();
+
                 if (lParen != null)
                 {
+                    // When we reach here, we either had a legit section of generic arguments (in which case, `rBracket`
+                    // won't be null), or we saw `lParen` directly following the member token (in which case, `rBracket`
+                    // will be null).
+                    int endColumnNumber = rBracket is null ? member.Extent.EndColumnNumber : rBracket.Extent.EndColumnNumber;
+
                     Diagnostics.Assert(lParen.Kind == TokenKind.LParen || lParen.Kind == TokenKind.LCurly, "token kind incorrect");
-                    Diagnostics.Assert(member.Extent.EndColumnNumber == lParen.Extent.StartColumnNumber,
-                                       "member and paren must be adjacent");
-                    return MemberInvokeRule(targetExpr, lParen, operatorToken, member);
+                    Diagnostics.Assert(
+                        endColumnNumber == lParen.Extent.StartColumnNumber,
+                        "member and paren must be adjacent when the method is not generic");
+                    return MemberInvokeRule(targetExpr, lParen, operatorToken, member, genericTypeArguments);
                 }
             }
 
             return new MemberExpressionAst(
-                    ExtentOf(targetExpr, member),
-                    targetExpr,
-                    member,
-                    @static: operatorToken.Kind == TokenKind.ColonColon,
-                    nullConditional: operatorToken.Kind == TokenKind.QuestionDot);
+                ExtentOf(targetExpr, member),
+                targetExpr,
+                member,
+                @static: operatorToken.Kind == TokenKind.ColonColon,
+                nullConditional: operatorToken.Kind == TokenKind.QuestionDot,
+                genericTypeArguments);
+        }
+
+        private List<ITypeName> GenericMethodArgumentsRule(out Token rBracketToken)
+        {
+            List<ITypeName> genericTypes = null;
+
+            int resyncIndex = _tokenizer.GetRestorePoint();
+            Token lBracket = NextToken();
+            rBracketToken = null;
+
+            if (lBracket.Kind != TokenKind.LBracket)
+            {
+                // We cannot avoid this Resync(); if we use PeekToken() to try to avoid a Resync(), the method called
+                // after this [`NextInvokeMemberToken()` or `NextMemberAccessToken()`] will note that an _ungotToken
+                // is present and assume an error state. That will cause any property accesses or non-generic method
+                // calls to throw a parse error.
+                Resync(resyncIndex);
+                return null;
+            }
+
+            // This is either a InvokeMember expression with generic type arguments, or some sort of collection index
+            // on a property.
+            TokenizerMode oldTokenizerMode = _tokenizer.Mode;
+            try
+            {
+                // Switch to typename mode to avoid aggressive argument tokenization.
+                SetTokenizerMode(TokenizerMode.TypeName);
+
+                SkipNewlines();
+                Token firstToken = NextToken();
+                if (firstToken.Kind == TokenKind.Identifier || firstToken.Kind == TokenKind.LBracket)
+                {
+                    resyncIndex = -1;
+                    genericTypes = GenericTypeArgumentsRule(firstToken, out rBracketToken);
+
+                    if (rBracketToken.Kind != TokenKind.RBracket)
+                    {
+                        UngetToken(rBracketToken);
+                        ReportIncompleteInput(
+                            Before(rBracketToken),
+                            nameof(ParserStrings.EndSquareBracketExpectedAtEndOfType),
+                            ParserStrings.EndSquareBracketExpectedAtEndOfType);
+                        rBracketToken = null;
+                    }
+                }
+            }
+            finally
+            {
+                SetTokenizerMode(oldTokenizerMode);
+            }
+
+            if (resyncIndex > 0)
+            {
+                Resync(resyncIndex);
+            }
+
+            return genericTypes;
         }
 
-        private ExpressionAst MemberInvokeRule(ExpressionAst targetExpr, Token lBracket, Token operatorToken, CommandElementAst member)
+        private ExpressionAst MemberInvokeRule(
+            ExpressionAst targetExpr,
+            Token lBracket,
+            Token operatorToken,
+            CommandElementAst member,
+            IList<ITypeName> genericTypes)
         {
             // G  invocation-expression: target-expression passed as a parameter. lBracket can be '(' or '{'.
             // G      target-expression   member-name   invoke-param-list
             // G  invoke-param-list:
             // G      '('   invoke-param-paren-list
             // G      script-block
-
             IScriptExtent lastExtent = null;
 
             List<ExpressionAst> arguments;
@@ -7785,6 +7868,7 @@ private ExpressionAst MemberInvokeRule(ExpressionAst targetExpr, Token lBracket,
             else
             {
                 arguments = new List<ExpressionAst>();
+
                 // handle the construct $x.methodName{2+2} as through it had been written $x.methodName({2+2})
                 SkipNewlines();
                 ExpressionAst argument = ScriptBlockExpressionRule(lBracket);
@@ -7798,7 +7882,8 @@ private ExpressionAst MemberInvokeRule(ExpressionAst targetExpr, Token lBracket,
                 member,
                 arguments,
                 operatorToken.Kind == TokenKind.ColonColon,
-                operatorToken.Kind == TokenKind.QuestionDot);
+                operatorToken.Kind == TokenKind.QuestionDot,
+                genericTypes);
         }
 
         private List<ExpressionAst> InvokeParamParenListRule(Token lParen, out IScriptExtent lastExtent)
diff --git a/src/System.Management.Automation/engine/parser/ast.cs b/src/System.Management.Automation/engine/parser/ast.cs
index b40a8e66a1e..8671f3c58f2 100644
--- a/src/System.Management.Automation/engine/parser/ast.cs
+++ b/src/System.Management.Automation/engine/parser/ast.cs
@@ -8001,7 +8001,7 @@ internal bool IsRef()
     public class MemberExpressionAst : ExpressionAst, ISupportsAssignment
     {
         /// <summary>
-        /// Construct an ast to reference a property.
+        /// Initializes a new instance of the <see cref="MemberExpressionAst"/> class.
         /// </summary>
         /// <param name="extent">
         /// The extent of the expression, starting with the expression before the operator '.' or '::' and ending after
@@ -8012,10 +8012,16 @@ public class MemberExpressionAst : ExpressionAst, ISupportsAssignment
         /// <param name="static">True if the '::' operator was used, false if '.' is used.
         /// True if the member access is for a static member, using '::', false if accessing a member on an instance using '.'.
         /// </param>
+        /// <param name="genericTypes">The generic type arguments passed to the member.</param>
         /// <exception cref="PSArgumentNullException">
         /// If <paramref name="extent"/>, <paramref name="expression"/>, or <paramref name="member"/> is null.
         /// </exception>
-        public MemberExpressionAst(IScriptExtent extent, ExpressionAst expression, CommandElementAst member, bool @static)
+        public MemberExpressionAst(
+            IScriptExtent extent,
+            ExpressionAst expression,
+            CommandElementAst member,
+            bool @static,
+            IList<ITypeName> genericTypes)
             : base(extent)
         {
             if (expression == null || member == null)
@@ -8028,6 +8034,35 @@ public MemberExpressionAst(IScriptExtent extent, ExpressionAst expression, Comma
             this.Member = member;
             SetParent(member);
             this.Static = @static;
+
+            if (genericTypes is not null && genericTypes.Count > 0)
+            {
+                this.GenericTypeArguments = new ReadOnlyCollection<ITypeName>(genericTypes);
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MemberExpressionAst"/> class.
+        /// </summary>
+        /// <param name="extent">
+        /// The extent of the expression, starting with the expression before the operator '.' or '::' and ending after
+        /// membername or expression naming the member.
+        /// </param>
+        /// <param name="expression">The expression before the member access operator '.' or '::'.</param>
+        /// <param name="member">The name or expression naming the member to access.</param>
+        /// <param name="static">True if the '::' operator was used, false if '.' is used.
+        /// True if the member access is for a static member, using '::', false if accessing a member on an instance using '.'.
+        /// </param>
+        /// <exception cref="PSArgumentNullException">
+        /// If <paramref name="extent"/>, <paramref name="expression"/>, or <paramref name="member"/> is null.
+        /// </exception>
+        public MemberExpressionAst(
+            IScriptExtent extent,
+            ExpressionAst expression,
+            CommandElementAst member,
+            bool @static)
+            : this(extent, expression, member, @static, genericTypes: null)
+        {
         }
 
         /// <summary>
@@ -8041,15 +8076,46 @@ public MemberExpressionAst(IScriptExtent extent, ExpressionAst expression, Comma
         /// <param name="member">The name or expression naming the member to access.</param>
         /// <param name="static">True if the '::' operator was used, false if '.' or '?.' is used.</param>
         /// <param name="nullConditional">True if '?.' used.</param>
+        /// <param name="genericTypes">The generic type arguments passed to the member.</param>
         /// <exception cref="PSArgumentNullException">
         /// If <paramref name="extent"/>, <paramref name="expression"/>, or <paramref name="member"/> is null.
         /// </exception>
-        public MemberExpressionAst(IScriptExtent extent, ExpressionAst expression, CommandElementAst member, bool @static, bool nullConditional)
-            : this(extent, expression, member, @static)
+        public MemberExpressionAst(
+            IScriptExtent extent,
+            ExpressionAst expression,
+            CommandElementAst member,
+            bool @static,
+            bool nullConditional,
+            IList<ITypeName> genericTypes)
+            : this(extent, expression, member, @static, genericTypes)
         {
             this.NullConditional = nullConditional;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MemberExpressionAst"/> class.
+        /// </summary>
+        /// <param name="extent">
+        /// The extent of the expression, starting with the expression before the operator '.', '::' or '?.' and ending after
+        /// membername or expression naming the member.
+        /// </param>
+        /// <param name="expression">The expression before the member access operator '.', '::' or '?.'.</param>
+        /// <param name="member">The name or expression naming the member to access.</param>
+        /// <param name="static">True if the '::' operator was used, false if '.' or '?.' is used.</param>
+        /// <param name="nullConditional">True if '?.' used.</param>
+        /// <exception cref="PSArgumentNullException">
+        /// If <paramref name="extent"/>, <paramref name="expression"/>, or <paramref name="member"/> is null.
+        /// </exception>
+        public MemberExpressionAst(
+            IScriptExtent extent,
+            ExpressionAst expression,
+            CommandElementAst member,
+            bool @static,
+            bool nullConditional)
+            : this(extent, expression, member, @static, nullConditional, genericTypes: null)
+        {
+        }
+
         /// <summary>
         /// The expression that produces the value to retrieve the member from.  This property is never null.
         /// </summary>
@@ -8070,6 +8136,11 @@ public MemberExpressionAst(IScriptExtent extent, ExpressionAst expression, Comma
         /// </summary>
         public bool NullConditional { get; protected set; }
 
+        /// <summary>
+        /// Gets a list of generic type arguments passed to this member.
+        /// </summary>
+        public ReadOnlyCollection<ITypeName> GenericTypeArguments { get; }
+
         /// <summary>
         /// Copy the MemberExpressionAst instance.
         /// </summary>
@@ -8077,7 +8148,14 @@ public override Ast Copy()
         {
             var newExpression = CopyElement(this.Expression);
             var newMember = CopyElement(this.Member);
-            return new MemberExpressionAst(this.Extent, newExpression, newMember, this.Static, this.NullConditional);
+
+            return new MemberExpressionAst(
+                this.Extent,
+                newExpression,
+                newMember,
+                this.Static,
+                this.NullConditional,
+                this.GenericTypeArguments);
         }
 
         #region Visitors
@@ -8113,7 +8191,7 @@ IAssignableValue ISupportsAssignment.GetAssignableValue()
     public class InvokeMemberExpressionAst : MemberExpressionAst, ISupportsAssignment
     {
         /// <summary>
-        /// Construct an instance of a method invocation expression.
+        /// Initializes a new instance of the <see cref="InvokeMemberExpressionAst"/> class.
         /// </summary>
         /// <param name="extent">
         /// The extent of the expression, starting with the expression before the invocation operator and ending with the
@@ -8125,11 +8203,18 @@ public class InvokeMemberExpressionAst : MemberExpressionAst, ISupportsAssignmen
         /// <param name="static">
         /// True if the invocation is for a static method, using '::', false if invoking a method on an instance using '.'.
         /// </param>
+        /// <param name="genericTypes">The generic type arguments passed to the method.</param>
         /// <exception cref="PSArgumentNullException">
         /// If <paramref name="extent"/> is null.
         /// </exception>
-        public InvokeMemberExpressionAst(IScriptExtent extent, ExpressionAst expression, CommandElementAst method, IEnumerable<ExpressionAst> arguments, bool @static)
-            : base(extent, expression, method, @static)
+        public InvokeMemberExpressionAst(
+            IScriptExtent extent,
+            ExpressionAst expression,
+            CommandElementAst method,
+            IEnumerable<ExpressionAst> arguments,
+            bool @static,
+            IList<ITypeName> genericTypes)
+            : base(extent, expression, method, @static, genericTypes)
         {
             if (arguments != null && arguments.Any())
             {
@@ -8138,6 +8223,32 @@ public InvokeMemberExpressionAst(IScriptExtent extent, ExpressionAst expression,
             }
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvokeMemberExpressionAst"/> class.
+        /// </summary>
+        /// <param name="extent">
+        /// The extent of the expression, starting with the expression before the invocation operator and ending with the
+        /// closing paren after the arguments.
+        /// </param>
+        /// <param name="expression">The expression before the invocation operator ('.', '::').</param>
+        /// <param name="method">The method to invoke.</param>
+        /// <param name="arguments">The arguments to pass to the method.</param>
+        /// <param name="static">
+        /// True if the invocation is for a static method, using '::', false if invoking a method on an instance using '.'.
+        /// </param>
+        /// <exception cref="PSArgumentNullException">
+        /// If <paramref name="extent"/> is null.
+        /// </exception>
+        public InvokeMemberExpressionAst(
+            IScriptExtent extent,
+            ExpressionAst expression,
+            CommandElementAst method,
+            IEnumerable<ExpressionAst> arguments,
+            bool @static)
+            : this(extent, expression, method, arguments, @static, genericTypes: null)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="InvokeMemberExpressionAst"/> class.
         /// </summary>
@@ -8152,15 +8263,51 @@ public InvokeMemberExpressionAst(IScriptExtent extent, ExpressionAst expression,
         /// True if the invocation is for a static method, using '::', false if invoking a method on an instance using '.' or '?.'.
         /// </param>
         /// <param name="nullConditional">True if the operator used is '?.'.</param>
+        /// <param name="genericTypes">The generic type arguments passed to the method.</param>
         /// <exception cref="PSArgumentNullException">
         /// If <paramref name="extent"/> is null.
         /// </exception>
-        public InvokeMemberExpressionAst(IScriptExtent extent, ExpressionAst expression, CommandElementAst method, IEnumerable<ExpressionAst> arguments, bool @static, bool nullConditional)
-            : this(extent, expression, method, arguments, @static)
+        public InvokeMemberExpressionAst(
+            IScriptExtent extent,
+            ExpressionAst expression,
+            CommandElementAst method,
+            IEnumerable<ExpressionAst> arguments,
+            bool @static,
+            bool nullConditional,
+            IList<ITypeName> genericTypes)
+            : this(extent, expression, method, arguments, @static, genericTypes)
         {
             this.NullConditional = nullConditional;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvokeMemberExpressionAst"/> class.
+        /// </summary>
+        /// <param name="extent">
+        /// The extent of the expression, starting with the expression before the invocation operator and ending with the
+        /// closing paren after the arguments.
+        /// </param>
+        /// <param name="expression">The expression before the invocation operator ('.', '::' or '?.').</param>
+        /// <param name="method">The method to invoke.</param>
+        /// <param name="arguments">The arguments to pass to the method.</param>
+        /// <param name="static">
+        /// True if the invocation is for a static method, using '::', false if invoking a method on an instance using '.' or '?.'.
+        /// </param>
+        /// <param name="nullConditional">True if the operator used is '?.'.</param>
+        /// <exception cref="PSArgumentNullException">
+        /// If <paramref name="extent"/> is null.
+        /// </exception>
+        public InvokeMemberExpressionAst(
+            IScriptExtent extent,
+            ExpressionAst expression,
+            CommandElementAst method,
+            IEnumerable<ExpressionAst> arguments,
+            bool @static,
+            bool nullConditional)
+            : this(extent, expression, method, arguments, @static, nullConditional, genericTypes: null)
+        {
+        }
+
         /// <summary>
         /// The non-empty collection of arguments to pass when invoking the method, or null if no arguments were specified.
         /// </summary>
@@ -8174,7 +8321,15 @@ public override Ast Copy()
             var newExpression = CopyElement(this.Expression);
             var newMethod = CopyElement(this.Member);
             var newArguments = CopyElements(this.Arguments);
-            return new InvokeMemberExpressionAst(this.Extent, newExpression, newMethod, newArguments, this.Static, this.NullConditional);
+
+            return new InvokeMemberExpressionAst(
+                this.Extent,
+                newExpression,
+                newMethod,
+                newArguments,
+                this.Static,
+                this.NullConditional,
+                this.GenericTypeArguments);
         }
 
         #region Visitors
diff --git a/src/System.Management.Automation/resources/ExtendedTypeSystem.resx b/src/System.Management.Automation/resources/ExtendedTypeSystem.resx
index 6a697cba888..d617cbf7a38 100644
--- a/src/System.Management.Automation/resources/ExtendedTypeSystem.resx
+++ b/src/System.Management.Automation/resources/ExtendedTypeSystem.resx
@@ -156,6 +156,12 @@
   <data name="MethodArgumentCountException" xml:space="preserve">
     <value>Cannot find an overload for "{0}" and the argument count: "{1}".</value>
   </data>
+  <data name="MethodGenericArgumentCountException" xml:space="preserve">
+    <value>Could not find a suitable generic method overload for "{0}" with "{1}" type parameters, and the argument count: "{2}".</value>
+  </data>
+  <data name="MethodGenericArgumentTypeNotFoundException" xml:space="preserve">
+    <value>One or more of the generic type parameters provided for the method "{0}" refers to a type which cannot be found.</value>
+  </data>
   <data name="MethodAmbiguousException" xml:space="preserve">
     <value>Multiple ambiguous overloads found for "{0}" and the argument count: "{1}".</value>
   </data>
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 6513bd87253..b1e4b68a9b9 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -43,6 +43,22 @@ Describe "TabCompletion" -Tags CI {
         $res.CompletionMatches[0].CompletionText | Should -BeExactly 'CompareTo('
     }
 
+    It 'should complete generic type parameters for static methods' {
+        $script = '[array]::Empty[pscu'
+
+        $results = TabExpansion2 -inputScript $script -cursorColumn $script.Length
+        $results.CompletionMatches.CompletionText | Should -Contain 'pscustomobject'
+    }
+
+    It 'should complete generic type parameters for instance methods' {
+        $script = '
+            $dict = [System.Collections.Concurrent.ConcurrentDictionary[string, int]]::new()
+            $dict.AddOrUpdate[pscu'
+
+        $results = TabExpansion2 -inputScript $script -cursorColumn $script.Length
+        $results.CompletionMatches.CompletionText | Should -Contain 'pscustomobject'
+    }
+
     It 'Should complete Magic foreach' {
         $res = TabExpansion2 -inputScript '(1..10).Fo' -cursorColumn '(1..10).Fo'.Length
         $res.CompletionMatches[0].CompletionText | Should -BeExactly 'ForEach('
diff --git a/test/powershell/Language/Parser/MethodInvocation.Tests.ps1 b/test/powershell/Language/Parser/MethodInvocation.Tests.ps1
index f28b6801389..e6a91891174 100644
--- a/test/powershell/Language/Parser/MethodInvocation.Tests.ps1
+++ b/test/powershell/Language/Parser/MethodInvocation.Tests.ps1
@@ -81,3 +81,196 @@ namespace MSFT_716893
         ([MSFT_716893.IInterface1]$proxy).BaseOperation(22) | Should -Be "3 - 22"
     }
 }
+
+Describe 'Generic Method invocation' -Tags 'CI' {
+
+    BeforeAll {
+        $EmptyArrayCases = @(
+            @{
+                Script       = '[Array]::Empty[string]()'
+                ExpectedType = [string[]]
+            }
+            @{
+                Script       = '[Array]::Empty[System.Collections.Generic.Dictionary[System.Numerics.BigInteger, System.Collections.Generic.List[string[,]]]]()'
+                ExpectedType = [System.Collections.Generic.Dictionary[System.Numerics.BigInteger, System.Collections.Generic.List[string[, ]]][]]
+            }
+            @{
+                Script       = '[Array]::$("Empty")[[System.Collections.Generic.Dictionary[[System.String, System.Private.CoreLib],[System.Numerics.BigInteger, System.Runtime.Numerics]], System.Private.CoreLib]]()'
+                ExpectedType = [System.Collections.Generic.Dictionary`2[[System.String, System.Private.CoreLib], [System.Numerics.BigInteger, System.Runtime.Numerics]][], System.Private.CoreLib]
+            }
+        )
+
+        $ExpectedParseErrors = @(
+            @{
+                Script         = '$object.Method[incompl'
+                ExpectedErrors = 'EndSquareBracketExpectedAtEndOfType'
+                ErrorCount     = 1
+            }
+            @{
+                Script         = '[type]::Member[incompl'
+                ExpectedErrors = 'EndSquareBracketExpectedAtEndOfType'
+                ErrorCount     = 1
+            }
+            @{
+                Script         = '$object.Method[Type1[Type2'
+                ExpectedErrors = 'UnexpectedToken','EndSquareBracketExpectedAtEndOfType'
+                ErrorCount     = 2
+            }
+            @{
+                Script         = '[array]::empty[type]]()'
+                ExpectedErrors = 'UnexpectedToken', 'ExpectedExpression'
+                ErrorCount     = 2
+            }
+            @{
+                Script         = '$object.Method[type,]()'
+                ExpectedErrors = 'MissingTypeName'
+                ErrorCount     = 1
+            }
+            @{
+                Script         = '$object.Method[]()'
+                ExpectedErrors = 'MissingArrayIndexExpression', 'UnexpectedToken', 'ExpectedExpression'
+                ErrorCount     = 3
+            }
+            @{
+                Script         = '$object.Method[,]()'
+                ExpectedErrors = 'MissingExpressionAfterOperator', 'UnexpectedToken', 'ExprectedExpression'
+                ErrorCount     = 3
+            }
+            @{
+                Script         = '$object.Method[,type]()'
+                ExpectedErrors = 'MissingExpressionAfterOperator', 'UnexpectedToken', 'ExpectedExpression'
+                ErrorCount     = 3
+            }
+            @{
+                Script         = '$object.Method[type()'
+                ExpectedErrors = 'UnexpectedToken', 'ExpectedExpression'
+                ErrorCount     = 2
+            }
+            @{
+                Script         = '$object.Method[type)'
+                ExpectedErrors = 'EndSquareBracketExpectedAtEndOfType', 'UnexpectedToken'
+                ErrorCount     = 2
+            }
+        )
+    }
+
+    It 'does not throw a parse error for "<Script>"' -TestCases $EmptyArrayCases {
+        param($Script)
+
+        { [scriptblock]::Create($script) } | Should -Not -Throw
+    }
+
+    It 'reports a parse error for "<Script>"' -TestCases $ExpectedParseErrors {
+        param($Script, $ExpectedError, $ErrorCount)
+
+        $parseErrors = $null
+        [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$null, [ref]$parseErrors)
+
+        $parseErrors.Count | Should -Be $ErrorCount
+        $parseErrors.ErrorId | Should -BeIn $ExpectedError
+    }
+
+    It 'can call a generic method "<Script>" with no arguments' -TestCases $EmptyArrayCases {
+        param($Script, $ExpectedType)
+
+        $Result = & [scriptblock]::Create($Script)
+        $Result.GetType() | Should -Be $ExpectedType
+
+        $Result.Length | Should -Be 0
+    }
+
+    It 'can call generic instance methods' {
+        $dictionary = [System.Collections.Concurrent.ConcurrentDictionary[string, int]]::new()
+
+        $addEntryScript = {
+            param($key, $float)
+
+            if ($float -gt 0.5) {
+                return 10
+            }
+            else {
+                return 1
+            }
+        }
+
+        $updateEntryScript = {
+            param($key, $currentValue, $float)
+
+            if ($currentValue / $float -gt 2) {
+                return 5
+            }
+            else {
+                return 0
+            }
+        }
+
+        $FloatValue = 0.4
+        $Key = 'Test'
+
+        # Add entry
+        $dictionary.AddOrUpdate[float]($Key, $addEntryScript, $updateEntryScript, $FloatValue)
+        $dictionary.$Key | Should -Be 1
+
+        # Update entry
+        $dictionary.AddOrUpdate[float]($Key, $addEntryScript, $updateEntryScript, $FloatValue)
+        $dictionary.$Key | Should -Be 5
+    }
+
+    It 'can call generic static methods with arguments' {
+        [System.Linq.Enumerable]::Select[int, int](
+            [int[]](0..10),
+            [func[int, int]] { $args[0] + 2 }
+        ) | Should -Be @(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12)
+    }
+
+    It 'gives a runtime error if too many type parameters are given' {
+        try {
+            [array]::Empty[string, int]()
+        }
+        catch {
+            $_.Exception.Message | Should -BeExactly 'Could not find a suitable generic method overload for "Empty" with "2" type parameters, and the argument count: "0".'
+            $_.FullyQualifiedErrorId | Should -BeExactly 'MethodCountCouldNotFindBestGeneric'
+        }
+    }
+
+    It 'gives a runtime error if a nonexistent type is specified' {
+        try {
+            [array]::Empty[thisdoesnotexist]()
+        }
+        catch {
+            $_.Exception.Message | Should -BeExactly 'One or more of the generic type parameters provided for the method "Empty" refers to a type which cannot be found.'
+            $_.FullyQualifiedErrorId | Should -BeExactly 'TypeNotFoundForGenericMethod'
+        }
+    }
+
+    It 'lists the same method group information with and without type parameters' {
+        $dict = [System.Collections.Concurrent.ConcurrentDictionary[string, int]]::new()
+        $noTypeParams = $dict.AddOrUpdate
+        $typeParams = $dict.AddOrUpdate[string]
+        $extraTypeParams = $dict.AddOrUpdate[string, int]
+
+        $typeParams.OverloadDefinitions | Should -BeExactly $noTypeParams.OverloadDefinitions
+        $extraTypeParams.OverloadDefinitions | Should -BeExactly $typeParams.OverloadDefinitions
+    }
+
+    It 'successfully invokes common Linq generic methods' {
+        [System.Collections.Generic.List[int]]$list = @( 1, 2, 3, 4, 5 )
+        $result = [System.Linq.Enumerable]::Select[int, float](
+            $list,
+            [Func[int, float]]{
+                param($item)
+                [math]::Pow($item, 3)
+            }
+        )
+
+        $result.GetType().Name | Should -BeExactly 'SelectListIterator`2'
+        $typeArgs = $result.GetType().GenericTypeArguments
+        $typeArgs[0] | Should -Be ([int])
+        $typeArgs[1] | Should -Be ([float])
+
+        $resultList = $result.ToList()
+        $resultList.GetType().Name | Should -Be 'List`1'
+        $resultList.GetType().GenericTypeArguments | Should -Be ([float])
+        $resultList | Should -Be @( 1, 8, 27, 64, 125)
+    }
+}

From 0b80b506569b4138f01a69c22bad073e9b5bea20 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 27 Jan 2022 10:45:38 -0800
Subject: [PATCH 217/645] Add Linux package dependencies for packaging (#16807)

---
 build.psm1                                    | 59 ++++++++++++++-----
 .../PowerShellPackage.ps1                     |  2 +-
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/build.psm1 b/build.psm1
index a4c16b852c2..f56c8542b5c 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1894,6 +1894,43 @@ function Get-RedHatPackageManager {
     }
 }
 
+function Install-GlobalGem {
+    param(
+        [Parameter()]
+        [string]
+        $Sudo = "",
+
+        [Parameter(Mandatory)]
+        [string]
+        $GemName,
+
+        [Parameter(Mandatory)]
+        [string]
+        $GemVersion
+    )
+    try {
+        # We cannot guess if the user wants to run gem install as root on linux and windows,
+        # but macOs usually requires sudo
+        $gemsudo = ''
+        if($environment.IsMacOS -or $env:TF_BUILD) {
+            $gemsudo = $sudo
+        }
+
+        Start-NativeExecution ([ScriptBlock]::Create("$gemsudo gem install $GemName -v $GemVersion --no-document"))
+
+    } catch {
+        Write-Warning "Installation of gem $GemName $GemVersion failed! Must resolve manually."
+        $logs = Get-ChildItem "/var/lib/gems/*/extensions/x86_64-linux/*/$GemName-*/gem_make.out" | Select-Object -ExpandProperty FullName
+        foreach ($log in $logs) {
+            Write-Verbose "Contents of: $log" -Verbose
+            Get-Content -Raw -Path $log -ErrorAction Ignore | ForEach-Object { Write-Verbose $_ -Verbose }
+            Write-Verbose "END Contents of: $log" -Verbose
+        }
+
+        throw
+    }
+}
+
 function Start-PSBootstrap {
     [CmdletBinding()]
     param(
@@ -1938,7 +1975,7 @@ function Start-PSBootstrap {
                 elseif ($environment.IsUbuntu18) { $Deps += "libicu60"}
 
                 # Packaging tools
-                if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev", "rpm" }
+                if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev", "rpm", "g++", "make" }
 
                 # Install dependencies
                 # change the fontend from apt-get to noninteractive
@@ -1962,7 +1999,7 @@ function Start-PSBootstrap {
                 $Deps += "libicu", "libunwind"
 
                 # Packaging tools
-                if ($Package) { $Deps += "ruby-devel", "rpm-build", "groff", 'libffi-devel' }
+                if ($Package) { $Deps += "ruby-devel", "rpm-build", "groff", 'libffi-devel', "gcc-c++" }
 
                 $PackageManager = Get-RedHatPackageManager
 
@@ -1983,7 +2020,7 @@ function Start-PSBootstrap {
                 $Deps += "wget"
 
                 # Packaging tools
-                if ($Package) { $Deps += "ruby-devel", "rpmbuild", "groff", 'libffi-devel' }
+                if ($Package) { $Deps += "ruby-devel", "rpmbuild", "groff", 'libffi-devel', "gcc" }
 
                 $PackageManager = "zypper --non-interactive install"
                 $baseCommand = "$sudo $PackageManager"
@@ -2024,19 +2061,9 @@ function Start-PSBootstrap {
 
             # Install [fpm](https://github.com/jordansissel/fpm) and [ronn](https://github.com/rtomayko/ronn)
             if ($Package) {
-                try {
-                    # We cannot guess if the user wants to run gem install as root on linux and windows,
-                    # but macOs usually requires sudo
-                    $gemsudo = ''
-                    if($environment.IsMacOS -or $env:TF_BUILD) {
-                        $gemsudo = $sudo
-                    }
-                    Start-NativeExecution ([ScriptBlock]::Create("$gemsudo gem install ffi -v 1.12.0 --no-document"))
-                    Start-NativeExecution ([ScriptBlock]::Create("$gemsudo gem install fpm -v 1.11.0 --no-document"))
-                    Start-NativeExecution ([ScriptBlock]::Create("$gemsudo gem install ronn -v 0.7.3 --no-document"))
-                } catch {
-                    Write-Warning "Installation of fpm and ronn gems failed! Must resolve manually."
-                }
+                Install-GlobalGem -Sudo $sudo -GemName "ffi" -GemVersion "1.12.0"
+                Install-GlobalGem -Sudo $sudo -GemName "fpm" -GemVersion "1.11.0"
+                Install-GlobalGem -Sudo $sudo -GemName "ronn" -GemVersion "0.7.3"
             }
         }
 
diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
index 40fe755cd68..ae0bc4f2b10 100644
--- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
+++ b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
@@ -77,7 +77,7 @@ try
     Sync-PSTags -AddRemoteIfMissing
 
     Write-Verbose "Bootstrapping powershell build..." -Verbose
-    Start-PSBootstrap -Force -Package
+    Start-PSBootstrap -Force -Package -ErrorAction Stop
 
     if ($PSCmdlet.ParameterSetName -eq 'packageSigned')
     {

From 0ef30e54c70b9d5d69a35d1aeecdf2820cc1ab3b Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Sat, 29 Jan 2022 01:04:34 +0900
Subject: [PATCH 218/645] Fix typo in PowerShellExecutionHelper.cs (#16776)

---
 .../utils/PowerShellExecutionHelper.cs                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/utils/PowerShellExecutionHelper.cs b/src/System.Management.Automation/utils/PowerShellExecutionHelper.cs
index dcfc2682bcd..87e5c6b8742 100644
--- a/src/System.Management.Automation/utils/PowerShellExecutionHelper.cs
+++ b/src/System.Management.Automation/utils/PowerShellExecutionHelper.cs
@@ -116,7 +116,7 @@ internal Collection<PSObject> ExecuteCommand(string command, bool isScript, out
                 // results = this.ExecuteCommand(cmd);
 
                 // If this pipeline has been stopped lets set a flag to cancel all future tab completion calls
-                // untill the next completion
+                // until the next completion
                 if (IsStopped)
                 {
                     results = new Collection<PSObject>();
@@ -147,7 +147,7 @@ internal Collection<PSObject> ExecuteCurrentPowerShell(out Exception exceptionTh
                 results = CurrentPowerShell.Invoke(input);
 
                 // If this pipeline has been stopped lets set a flag to cancel all future tab completion calls
-                // untill the next completion
+                // until the next completion
                 if (IsStopped)
                 {
                     results = new Collection<PSObject>();

From 0bb206aeee3d3fb7f1511488a527a69d213b040b Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Mon, 31 Jan 2022 09:47:27 -0800
Subject: [PATCH 219/645] Improve logic for updating .NET in CI (#16808)

---
 .github/workflows/daily.yml   |  2 +-
 tools/UpdateDotnetRuntime.ps1 | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 87ea7725cb9..ee430ac6c7a 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -46,7 +46,7 @@ jobs:
         if: failure()
         with:
           webhook_url: ${{ secrets.PS_BUILD_TEAMS_CHANNEL }}
-          overwrite: "{title: `Failure in updating .NET build. Look at ${workflow_link}`}"
+          overwrite: "{title: `Failure in .github/daily.yml updating .NET build. Look at ${workflow_link}`}"
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         id: cpr
diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index 7fe58363920..6747368a4c6 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -189,36 +189,41 @@ function Get-DotnetUpdate {
     try {
 
         try {
-            $latestSDKVersionString = Invoke-RestMethod -Uri "http://aka.ms/dotnet/$channel/$quality/productVersion.txt" -ErrorAction Stop | ForEach-Object { $_.Trim() }
+            $URL = "http://aka.ms/dotnet/$channel/$quality/productVersion.txt"
+            $latestSDKVersionString = Invoke-RestMethod -Uri $URL -ErrorAction Stop | ForEach-Object { $_.Trim() }
             $selectedQuality = $quality
         } catch {
             if ($_.exception.Response.StatusCode -eq 'NotFound') {
-                Write-Verbose "Build not found for Channel: $Channel and Quality: $Quality" -Verbose
+                Write-Verbose -Verbose -Message "No build at '$URL' found!"
             } else {
                 throw $_
             }
         }
+        $latestSDKversion = $latestSDKVersionString -as "System.Management.Automation.SemanticVersion"
 
-        if (-not $latestSDKVersionString -or -not $latestSDKVersionString.StartsWith($sdkImageVersion)) {
+        if (-not $latestSDKVersion) {
             # we did not get a version number so fall back to daily
-            $latestSDKVersionString = Invoke-RestMethod -Uri "http://aka.ms/dotnet/$channel/$qualityFallback/productVersion.txt" -ErrorAction Stop | ForEach-Object { $_.Trim() }
+            $URL = "http://aka.ms/dotnet/$channel/$qualityFallback/productVersion.txt"
+            $latestSDKVersionString = Invoke-RestMethod -Uri $URL -ErrorAction Stop | ForEach-Object { $_.Trim() }
             $selectedQuality = $qualityFallback
 
-            if (-not $latestSDKVersionString.StartsWith($sdkImageVersion)) {
-                throw "No build found!"
+            $latestSDKversion = $latestSDKVersionString -as "System.Management.Automation.SemanticVersion"
+            if (-not $latestSDKVersion) {
+                throw "No build at '$URL' found!"
             }
         }
 
-        $latestSDKversion = [System.Management.Automation.SemanticVersion] $latestSDKVersionString
-
         $currentVersion = [System.Management.Automation.SemanticVersion] (( Get-Content -Path "$PSScriptRoot/../global.json" -Raw | ConvertFrom-Json).sdk.version)
 
-        if ($latestSDKversion -gt $currentVersion) {
+        if ($latestSDKversion -gt $currentVersion -and $null -ne $latestSDKversion.PreReleaseLabel) {
             $shouldUpdate = $true
             $newVersion = $latestSDKversion
         } else {
             $shouldUpdate = $false
-            $newVersion = $null
+            $newVersion = $latestSDKVersionString
+            if ($null -eq $currentVersion.PreReleaseLabel) {
+                $Message = "$latestSDKversion is not preview, update manually."
+            }
         }
     } catch {
         Write-Verbose -Verbose "Error occured: $_.message"
@@ -356,3 +361,6 @@ if ($dotnetUpdate.ShouldUpdate) {
 
     Update-DevContainer
 }
+else {
+    Write-Verbose -Verbose -Message $dotnetUpdate.Message
+}

From 8af0834d6698b87d856da458598280271b2f6491 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Mon, 31 Jan 2022 12:13:32 -0800
Subject: [PATCH 220/645] Add SBOM manifest to nuget packages (#16711)

---
 build.psm1                                    |   2 +-
 tools/cgmanifest.json                         |   2 +-
 tools/packaging/packaging.psd1                |   2 +
 tools/packaging/packaging.psm1                | 477 +++++++++++-------
 .../azureDevOps/templates/nuget-pkg-sbom.yml  |  70 +++
 .../azureDevOps/templates/nuget.yml           |  16 +-
 6 files changed, 389 insertions(+), 180 deletions(-)
 create mode 100644 tools/releaseBuild/azureDevOps/templates/nuget-pkg-sbom.yml

diff --git a/build.psm1 b/build.psm1
index f56c8542b5c..49609675a20 100644
--- a/build.psm1
+++ b/build.psm1
@@ -2278,7 +2278,7 @@ function Find-Dotnet() {
         $dotnetCLIInstalledVersion = Get-LatestInstalledSDK
         Pop-Location
 
-        Write-Verbose "dotnetCLIInstalledVersion = $dotnetCLIInstalledVersion; chosenDotNetVersion = $chosenDotNetVersion"
+        Write-Verbose -Message "Find-DotNet: dotnetCLIInstalledVersion = $dotnetCLIInstalledVersion; chosenDotNetVersion = $chosenDotNetVersion"
 
         if ($dotnetCLIInstalledVersion -ne $chosenDotNetVersion) {
             Write-Warning "The 'dotnet' in the current path can't find SDK version ${dotnetCLIRequiredVersion}, prepending $dotnetPath to PATH."
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 15bcbacc172..e8caa3fbdcb 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -685,7 +685,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "StyleCop.Analyzers.Unstable",
-          "Version": "1.2.0.376"
+          "Version": "1.2.0.406"
         }
       },
       "DevelopmentDependency": true
diff --git a/tools/packaging/packaging.psd1 b/tools/packaging/packaging.psd1
index 8de303ef45c..e9dec523acd 100644
--- a/tools/packaging/packaging.psd1
+++ b/tools/packaging/packaging.psd1
@@ -15,6 +15,8 @@
         'New-DotnetSdkContainerFxdPackage'
         'New-ExePackage'
         'New-GlobalToolNupkg'
+        'New-ILNugetPackageSource'
+        'New-ILNugetPackageFromSource'
         'New-ILNugetPackage'
         'New-MSIPatch'
         'New-PSBuildZip'
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index e190e049e4c..e84857354a6 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -1750,6 +1750,9 @@ function New-PdbZipPackage
 function CreateNugetPlatformFolder
 {
     param(
+        [Parameter(Mandatory = $true)]
+        [string] $FileName,
+
         [Parameter(Mandatory = $true)]
         [string] $Platform,
 
@@ -1761,46 +1764,192 @@ function CreateNugetPlatformFolder
     )
 
     $destPath = New-Item -ItemType Directory -Path (Join-Path $PackageRuntimesFolder "$Platform/lib/$script:netCoreRuntime")
-    $fullPath = Join-Path $PlatformBinPath $file
+    $fullPath = Join-Path $PlatformBinPath $FileName
 
     if (-not(Test-Path $fullPath)) {
         throw "File not found: $fullPath"
     }
 
     Copy-Item -Path $fullPath -Destination $destPath
-    Write-Log "Copied $file to $Platform"
+    Write-Log "Copied $FileName to $Platform at path: $destPath"
 }
 
 <#
 .SYNOPSIS
-Creates NuGet packages containing linux, osx and Windows runtime assemblies.
+Creates a CGManifest file containing package dependencies for specified file.
+
+.PARAMETER FilePath
+File path name of CGManifest file to be created.
+
+.PARAMETER Dependencies
+Array list of dependency tuples:
+[tuple[ [tuple[string, string]], [tuple[string, string]] ] []]
+["Id", "Microsoft.PowerShell.SecretStore"], ["Version", "1.1.1.0"]
+#>
+function New-CGManifest
+{
+    param (
+        [parameter(Mandatory = $true)]
+        [string] $FilePath,
+
+        [parameter(Mandatory = $false)]
+        [tuple[ [tuple[string, string]], [tuple[string, string]] ] []] $Dependencies
+    )
+
+    Write-Verbose -Verbose -Message "Creating CGManifest for SBOM: $Filepath"
+
+    $Registrations = @()
+
+    foreach ($dependency in $Dependencies) {
+        $component = @{
+            Component = @{
+                Type = "nuget";
+                NuGet = @{
+                    Name = ($dependency.Item1.Item2); Version = ($dependency.Item2.Item2)
+                }
+            };
+            DevelopmentDependency = "true"
+        }
+
+        $Registrations += $component
+    }
+
+    $manifest = @{ Registrations = $Registrations }
+    $jsonManifest = $manifest | ConvertTo-Json -Depth 10
+
+    $jsonManifest | Out-File -FilePath $FilePath
+}
+
+function New-FileDependencies
+{
+    param (
+        [parameter(Mandatory = $true)]
+        [string] $FileBaseName,
+
+        [parameter(Mandatory = $true)]
+        [string] $PackageVersion
+    )
+
+    # Filed a tracking bug for automating generation of dependecy list: https://github.com/PowerShell/PowerShell/issues/6247
+    $deps = [System.Collections.ArrayList]::new()
+
+    switch ($FileBaseName) {
+        'Microsoft.Management.Infrastructure.CimCmdlets' {
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
+        }
+
+        'Microsoft.PowerShell.Commands.Diagnostics' {
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
+        }
+
+        'Microsoft.PowerShell.Commands.Management' {
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Security'), [tuple]::Create('version', $PackageVersion))) > $null
+            foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $FileBaseName))
+            {
+                $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
+            }
+        }
+
+        'Microsoft.PowerShell.Commands.Utility' {
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
+
+            foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $FileBaseName))
+            {
+                $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
+            }
+        }
+
+        'Microsoft.PowerShell.ConsoleHost' {
+            $deps.Add([tuple]::Create( [tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
+            foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $FileBaseName))
+            {
+                $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
+            }
+        }
+
+        'Microsoft.PowerShell.CoreCLR.Eventing' {
+            foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $FileBaseName))
+            {
+                $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
+            }
+        }
+
+        'Microsoft.PowerShell.SDK' {
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Commands.Management'), [tuple]::Create('version', $PackageVersion))) > $null
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Commands.Utility'), [tuple]::Create('version', $PackageVersion))) > $null
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.ConsoleHost'), [tuple]::Create('version', $PackageVersion))) > $null
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Security'), [tuple]::Create('version', $PackageVersion))) > $null
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
+            foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $FileBaseName))
+            {
+                $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
+            }
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.WSMan.Management'), [tuple]::Create('version', $PackageVersion))) > $null
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Commands.Diagnostics'), [tuple]::Create('version', $PackageVersion))) > $null
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.Management.Infrastructure.CimCmdlets'), [tuple]::Create('version', $PackageVersion))) > $null
+        }
+
+        'Microsoft.PowerShell.Security' {
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
+        }
+
+        'Microsoft.WSMan.Management' {
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.WSMan.Runtime'), [tuple]::Create('version', $PackageVersion))) > $null
+            foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $FileBaseName))
+            {
+                $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
+            }
+        }
+
+        'Microsoft.WSMan.Runtime' {
+            ## No dependencies
+        }
+
+        'System.Management.Automation' {
+            $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.CoreCLR.Eventing'), [tuple]::Create('version', $PackageVersion))) > $null
+            foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $FileBaseName))
+            {
+                $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
+            }
+        }
+    }
+
+    Write-Output $deps
+}
+
+<#
+.SYNOPSIS
+Creates nuget package sources for a single provided binary file.
 
 .DESCRIPTION
-Creates a NuGet package of IL assemblies for unix and windows.
-The packages for Microsoft.PowerShell.Commands.Diagnostics, Microsoft.PowerShell.Commands.Management,
-Microsoft.PowerShell.Commands.Utility, Microsoft.PowerShell.ConsoleHost, Microsoft.PowerShell.CoreCLR.Eventing,
-Microsoft.PowerShell.SDK, Microsoft.PowerShell.Security, Microsoft.WSMan.Management, Microsoft.WSMan.Runtime,
-System.Management.Automation are created.
+Creates IL assemblies, for a single binary file, to be packaged in a NuGet file.
+Includes runtime assemblies for linux and Windows runtime assemblies.
+
+.PARAMETER FileName
+File name of binary to create nuget sources for.
 
 .PARAMETER PackagePath
-Path where the package will be created.
+Path where the package source files will be created.
 
 .PARAMETER PackageVersion
 Version of the created package.
 
 .PARAMETER WinFxdBinPath
-Path to folder containing Windows framework dependent assemblies.
+Path to source folder containing Windows framework dependent assemblies.
 
 .PARAMETER LinuxFxdBinPath
-Path to folder containing Linux framework dependent assemblies.
+Path to source folder containing Linux framework dependent assemblies.
 
 .PARAMETER GenAPIToolPath
 Path to the GenAPI.exe tool.
 #>
-function New-ILNugetPackage
+function New-ILNugetPackageSource
 {
     [CmdletBinding(SupportsShouldProcess = $true)]
-    param(
+    param (
+        [Parameter(Mandatory = $true)]
+        [string] $FileName,
 
         [Parameter(Mandatory = $true)]
         [string] $PackagePath,
@@ -1815,12 +1964,20 @@ function New-ILNugetPackage
         [string] $LinuxFxdBinPath,
 
         [Parameter(Mandatory = $true)]
-        [string] $GenAPIToolPath
+        [string] $GenAPIToolPath,
+
+        [Parameter(Mandatory = $true)]
+        [string] $CGManifestPath
     )
 
-    if (-not $Environment.IsWindows)
+    if (! $Environment.IsWindows)
+    {
+        throw "New-ILNugetPackageSource can be only executed on Windows platform."
+    }
+
+    if (! $PSCmdlet.ShouldProcess("Create nuget packages at: $PackagePath"))
     {
-        throw "New-ILNugetPackage can be only executed on Windows platform."
+        return
     }
 
     $fileList = @(
@@ -1843,191 +2000,166 @@ function New-ILNugetPackage
         "Microsoft.WSMan.Management.dll",
         "Microsoft.WSMan.Runtime.dll")
 
-    if ($PSCmdlet.ShouldProcess("Create nuget packages at: $PackagePath"))
-    {
-        $refBinPath = New-TempFolder
-        $SnkFilePath = "$RepoRoot\src\signing\visualstudiopublic.snk"
+    $refBinPath = New-TempFolder
+    $SnkFilePath = "$RepoRoot\src\signing\visualstudiopublic.snk"
 
-        New-ReferenceAssembly -linux64BinPath $LinuxFxdBinPath -RefAssemblyDestinationPath $refBinPath -RefAssemblyVersion $PackageVersion -SnkFilePath $SnkFilePath -GenAPIToolPath $GenAPIToolPath
+    New-ReferenceAssembly -linux64BinPath $LinuxFxdBinPath -RefAssemblyDestinationPath $refBinPath -RefAssemblyVersion $PackageVersion -SnkFilePath $SnkFilePath -GenAPIToolPath $GenAPIToolPath
 
-        foreach ($file in $fileList)
-        {
-            $tmpPackageRoot = New-TempFolder
-            # Remove '.dll' at the end
-            $fileBaseName = [System.IO.Path]::GetFileNameWithoutExtension($file)
-            $filePackageFolder = New-Item (Join-Path $tmpPackageRoot $fileBaseName) -ItemType Directory -Force
-            $packageRuntimesFolder = New-Item (Join-Path $filePackageFolder.FullName 'runtimes') -ItemType Directory
+    if (! (Test-Path $PackagePath)) {
+        $null = New-Item -Path $PackagePath -ItemType Directory
+    }
 
-            #region ref
-            $refFolder = New-Item (Join-Path $filePackageFolder.FullName "ref/$script:netCoreRuntime") -ItemType Directory -Force
-            CopyReferenceAssemblies -assemblyName $fileBaseName -refBinPath $refBinPath -refNugetPath $refFolder -assemblyFileList $fileList
-            #endregion ref
+    # Remove '.dll' at the end
+    $fileBaseName = [System.IO.Path]::GetFileNameWithoutExtension($FileName)
+    $filePackageFolder = New-Item (Join-Path $PackagePath $fileBaseName) -ItemType Directory -Force
+    $packageRuntimesFolder = New-Item (Join-Path $filePackageFolder.FullName 'runtimes') -ItemType Directory
 
-            $packageRuntimesFolderPath = $packageRuntimesFolder.FullName
+    Write-Verbose -Verbose "New-ILNugetPackageSource: Creating package source folder for file: $FileName at: $filePackageFolder"
 
-            CreateNugetPlatformFolder -Platform 'win' -PackageRuntimesFolder $packageRuntimesFolderPath -PlatformBinPath $WinFxdBinPath
+    #region ref
+    $refFolder = New-Item (Join-Path $filePackageFolder.FullName "ref/$script:netCoreRuntime") -ItemType Directory -Force
+    CopyReferenceAssemblies -assemblyName $fileBaseName -refBinPath $refBinPath -refNugetPath $refFolder -assemblyFileList $fileList
+    #endregion ref
 
-            if ($linuxExceptionList -notcontains $file )
-            {
-                CreateNugetPlatformFolder -Platform 'unix' -PackageRuntimesFolder $packageRuntimesFolderPath -PlatformBinPath $LinuxFxdBinPath
-            }
+    $packageRuntimesFolderPath = $packageRuntimesFolder.FullName
 
-            if ($file -eq "Microsoft.PowerShell.SDK.dll")
-            {
-                # Copy the '$PSHOME\ref' folder to the NuGet package, so 'dotnet publish' can deploy the 'ref' folder to the publish folder.
-                # This is to make 'Add-Type' work in application that hosts PowerShell.
-
-                $contentFolder = New-Item (Join-Path $filePackageFolder "contentFiles\any\any") -ItemType Directory -Force
-                $dotnetRefAsmFolder = Join-Path -Path $WinFxdBinPath -ChildPath "ref"
-                Copy-Item -Path $dotnetRefAsmFolder -Destination $contentFolder -Recurse -Force
-                Write-Log "Copied the reference assembly folder to contentFiles for the SDK package"
-
-                # Copy the built-in module folders to the NuGet package, so 'dotnet publish' can deploy those modules to the $pshome module path.
-                # This is for enabling applications that hosts PowerShell to ship the built-in modules.
-
-                $winBuiltInModules = @(
-                    "CimCmdlets",
-                    "Microsoft.PowerShell.Diagnostics",
-                    "Microsoft.PowerShell.Host",
-                    "Microsoft.PowerShell.Management",
-                    "Microsoft.PowerShell.Security",
-                    "Microsoft.PowerShell.Utility",
-                    "Microsoft.WSMan.Management",
-                    "PSDiagnostics"
-                )
-
-                $unixBuiltInModules = @(
-                    "Microsoft.PowerShell.Host",
-                    "Microsoft.PowerShell.Management",
-                    "Microsoft.PowerShell.Security",
-                    "Microsoft.PowerShell.Utility"
-                )
-
-                $winModuleFolder = New-Item (Join-Path $contentFolder "runtimes\win\lib\$script:netCoreRuntime\Modules") -ItemType Directory -Force
-                $unixModuleFolder = New-Item (Join-Path $contentFolder "runtimes\unix\lib\$script:netCoreRuntime\Modules") -ItemType Directory -Force
-
-                foreach ($module in $winBuiltInModules) {
-                    $source = Join-Path $WinFxdBinPath "Modules\$module"
-                    Copy-Item -Path $source -Destination $winModuleFolder -Recurse -Force
-                }
+    CreateNugetPlatformFolder -FileName $FileName -Platform 'win' -PackageRuntimesFolder $packageRuntimesFolderPath -PlatformBinPath $WinFxdBinPath
 
-                foreach ($module in $unixBuiltInModules) {
-                    $source = Join-Path $LinuxFxdBinPath "Modules\$module"
-                    Copy-Item -Path $source -Destination $unixModuleFolder -Recurse -Force
-                }
+    if ($linuxExceptionList -notcontains $FileName )
+    {
+        CreateNugetPlatformFolder -FileName $FileName -Platform 'unix' -PackageRuntimesFolder $packageRuntimesFolderPath -PlatformBinPath $LinuxFxdBinPath
+    }
 
-                Write-Log "Copied the built-in modules to contentFiles for the SDK package"
-            }
+    if ($FileName -eq "Microsoft.PowerShell.SDK.dll")
+    {
+        # Copy the '$PSHOME\ref' folder to the NuGet package, so 'dotnet publish' can deploy the 'ref' folder to the publish folder.
+        # This is to make 'Add-Type' work in application that hosts PowerShell.
+
+        $contentFolder = New-Item (Join-Path $filePackageFolder "contentFiles\any\any") -ItemType Directory -Force
+        $dotnetRefAsmFolder = Join-Path -Path $WinFxdBinPath -ChildPath "ref"
+        Copy-Item -Path $dotnetRefAsmFolder -Destination $contentFolder -Recurse -Force
+        Write-Log "Copied the reference assembly folder to contentFiles for the SDK package"
+
+        # Copy the built-in module folders to the NuGet package, so 'dotnet publish' can deploy those modules to the $pshome module path.
+        # This is for enabling applications that hosts PowerShell to ship the built-in modules.
+
+        $winBuiltInModules = @(
+            "CimCmdlets",
+            "Microsoft.PowerShell.Diagnostics",
+            "Microsoft.PowerShell.Host",
+            "Microsoft.PowerShell.Management",
+            "Microsoft.PowerShell.Security",
+            "Microsoft.PowerShell.Utility",
+            "Microsoft.WSMan.Management",
+            "PSDiagnostics"
+        )
 
-            #region nuspec
-            # filed a tracking bug for automating generation of dependecy list: https://github.com/PowerShell/PowerShell/issues/6247
-            $deps = [System.Collections.ArrayList]::new()
+        $unixBuiltInModules = @(
+            "Microsoft.PowerShell.Host",
+            "Microsoft.PowerShell.Management",
+            "Microsoft.PowerShell.Security",
+            "Microsoft.PowerShell.Utility"
+        )
 
-            switch ($fileBaseName) {
-                'Microsoft.Management.Infrastructure.CimCmdlets' {
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
-                }
+        $winModuleFolder = New-Item (Join-Path $contentFolder "runtimes\win\lib\$script:netCoreRuntime\Modules") -ItemType Directory -Force
+        $unixModuleFolder = New-Item (Join-Path $contentFolder "runtimes\unix\lib\$script:netCoreRuntime\Modules") -ItemType Directory -Force
 
-                'Microsoft.PowerShell.Commands.Diagnostics' {
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
-                }
+        foreach ($module in $winBuiltInModules) {
+            $source = Join-Path $WinFxdBinPath "Modules\$module"
+            Copy-Item -Path $source -Destination $winModuleFolder -Recurse -Force
+        }
 
-                'Microsoft.PowerShell.Commands.Management' {
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Security'), [tuple]::Create('version', $PackageVersion))) > $null
-                    foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
-                    {
-                        $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
-                    }
-                }
+        foreach ($module in $unixBuiltInModules) {
+            $source = Join-Path $LinuxFxdBinPath "Modules\$module"
+            Copy-Item -Path $source -Destination $unixModuleFolder -Recurse -Force
+        }
 
-                'Microsoft.PowerShell.Commands.Utility' {
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
+        Write-Log "Copied the built-in modules to contentFiles for the SDK package"
+    }
 
-                    foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
-                    {
-                        $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
-                    }
-                }
+    # Create a CGManifest file that lists all dependencies for this package, which is used when creating the SBOM.
+    if (! (Test-Path -Path $CGManifestPath)) {
+        $null = New-Item -Path $CGManifestPath -ItemType Directory
+    }
+    $deps = New-FileDependencies -FileBaseName $fileBaseName -PackageVersion $PackageVersion
+    New-CGManifest -FilePath (Join-Path -Path $CGManifestPath -ChildPath "CGManifest.json") -Dependencies $deps
 
-                'Microsoft.PowerShell.ConsoleHost' {
-                    $deps.Add([tuple]::Create( [tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
-                    foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
-                    {
-                        $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
-                    }
-                }
+    if (Test-Path $refBinPath) {
+        Remove-Item $refBinPath -Recurse -Force -ErrorAction SilentlyContinue
+    }
+}
 
-                'Microsoft.PowerShell.CoreCLR.Eventing' {
-                    foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
-                    {
-                        $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
-                    }
-                }
+<#
+.SYNOPSIS
+Creates a nuget package file from the provided source path.
 
-                'Microsoft.PowerShell.SDK' {
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Commands.Management'), [tuple]::Create('version', $PackageVersion))) > $null
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Commands.Utility'), [tuple]::Create('version', $PackageVersion))) > $null
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.ConsoleHost'), [tuple]::Create('version', $PackageVersion))) > $null
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Security'), [tuple]::Create('version', $PackageVersion))) > $null
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
-                    foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
-                    {
-                        $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
-                    }
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.WSMan.Management'), [tuple]::Create('version', $PackageVersion))) > $null
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Commands.Diagnostics'), [tuple]::Create('version', $PackageVersion))) > $null
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.Management.Infrastructure.CimCmdlets'), [tuple]::Create('version', $PackageVersion))) > $null
-                }
+.PARAMETER FileName
+File name of binary to create nuget package for.
 
-                'Microsoft.PowerShell.Security' {
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
-                }
+.PARAMETER PackagePath
+Path for the source files and the created NuGet package file.
+#>
+function New-ILNugetPackageFromSource
+{
+    [CmdletBinding(SupportsShouldProcess = $true)]
+    param (
+        [Parameter(Mandatory = $true)]
+        [string] $FileName,
 
-                'Microsoft.WSMan.Management' {
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.WSMan.Runtime'), [tuple]::Create('version', $PackageVersion))) > $null
-                    foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
-                    {
-                        $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
-                    }
-                }
+        [Parameter(Mandatory = $true)]
+        [string] $PackageVersion,
 
-                'Microsoft.WSMan.Runtime' {
-                    ## No dependencies
-                }
+        [Parameter(Mandatory = $true)]
+        [string] $PackagePath
+    )
 
-                'System.Management.Automation' {
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.CoreCLR.Eventing'), [tuple]::Create('version', $PackageVersion))) > $null
-                    foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
-                    {
-                        $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
-                    }
-                }
-            }
+    if (! $Environment.IsWindows)
+    {
+        throw "New-ILNugetPackageFromSource can be only executed on Windows platform."
+    }
 
-            New-NuSpec -PackageId $fileBaseName -PackageVersion $PackageVersion -Dependency $deps -FilePath (Join-Path $filePackageFolder.FullName "$fileBaseName.nuspec")
+    if (! $PSCmdlet.ShouldProcess("Create nuget package for file $FileName at: $PackagePath"))
+    {
+        return
+    }
 
-            # Copy icon file to package
-            Copy-Item -Path $iconPath -Destination "$($filePackageFolder.Fullname)/$iconFileName" -Verbose
+    $fileBaseName = [System.IO.Path]::GetFileNameWithoutExtension($FileName)
 
-            New-NugetPackage -NuSpecPath $filePackageFolder.FullName -PackageDestinationPath $PackagePath
-        }
+    $deps = New-FileDependencies -FileBaseName $fileBaseName -PackageVersion $PackageVersion
 
-        if (Test-Path $refBinPath)
-        {
-            Remove-Item $refBinPath -Recurse -Force -ErrorAction SilentlyContinue
-        }
+    $srcFilePackagePath = Join-Path $PackagePath $fileBaseName
 
-        if (Test-Path $tmpPackageRoot)
-        {
-            Remove-Item $tmpPackageRoot -Recurse -Force -ErrorAction SilentlyContinue
-        }
+    Write-Verbose -Verbose "New-ILNugetPackageFromSource: Creating nuget package for file: $FileName from source path: $srcFilePackagePath"
+
+    if (! (Test-Path $srcFilePackagePath)) {
+        $msg = "Expected nuget source path $srcFilePackagePath for file $fileBaseName does not exist."
+        Write-Verbose -Verbose -Message $msg
+        throw $msg
     }
+
+    # Remove the CGManifest file used to create the SBOM.
+    $cgManifestPath = Join-Path -Path $PackagePath -ChildPath 'CGManifest'
+    $cgManifestFilePath = Join-Path -Path $cgManifestPath -ChildPath 'CGManifest.json'
+    if (Test-Path -Path $cgManifestFilePath)
+    {
+        Write-Verbose -Verbose "Removing CGManifest file: $cgManifestFilePath"
+        Remove-Item -Path $cgManifestFilePath -Force -ErrorAction Continue
+    }
+
+    New-NuSpec -PackageId $fileBaseName -PackageVersion $PackageVersion -Dependency $deps -FilePath (Join-Path $srcFilePackagePath "$fileBaseName.nuspec")
+
+    # Copy icon file to package
+    Copy-Item -Path $iconPath -Destination "$srcFilePackagePath/$iconFileName" -Verbose
+
+    New-NugetPackage -NuSpecPath $srcFilePackagePath -PackageDestinationPath $PackagePath
+
+    # Remove file nuget package source directory
+    Remove-Item $srcFilePackagePath -Recurse -Force -ErrorAction SilentlyContinue
 }
 
 <#
   Copy the generated reference assemblies to the 'ref/net6.0' folder properly.
-  This is a helper function used by 'New-ILNugetPackage'
+  This is a helper function used by 'New-ILNugetPackageSource'.
 #>
 function CopyReferenceAssemblies
 {
@@ -2132,7 +2264,7 @@ function New-NuSpec {
         [Parameter(Mandatory = $false)]
         # An array of tuples of tuples to define the dependencies.
         # First tuple defines 'id' and value eg: ["id", "System.Data.SqlClient"]
-        # Second tuple defines 'version' and vale eg: ["version", "4.4.2"]
+        # Second tuple defines 'version' and value eg: ["version", "4.4.2"]
         # Both these tuples combined together define one dependency.
         # An array represents all the dependencies.
         [tuple[ [tuple[string, string]], [tuple[string, string]] ] []] $Dependency,
@@ -2234,6 +2366,9 @@ function New-ReferenceAssembly
         "Microsoft.PowerShell.ConsoleHost"
     )
 
+    # Ensure needed dotNet version is available.  Find-DotNet does this, and is part of build.psm1 which should already be imported.
+    Find-DotNet -Verbose
+
     foreach ($assemblyName in $assemblyNames) {
 
         Write-Log "Building reference assembly for '$assemblyName'"
@@ -2481,7 +2616,7 @@ function GenerateBuildArguments
 Create a NuGet package from a nuspec.
 
 .DESCRIPTION
-Creates a NuGet using the nuspec using at the specified folder.
+Creates a NuGet using the nuspec at the specified folder.
 It is expected that the lib / ref / runtime folders are welformed.
 The genereated NuGet package is copied over to the $PackageDestinationPath
 
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget-pkg-sbom.yml b/tools/releaseBuild/azureDevOps/templates/nuget-pkg-sbom.yml
new file mode 100644
index 00000000000..fe8c1a872ff
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/nuget-pkg-sbom.yml
@@ -0,0 +1,70 @@
+parameters:
+  - name: PackageVersion
+  - name: PackagePath
+  - name: WinFxdPath
+  - name: LinuxFxdPath
+  - name: GenAPIToolPath
+  - name: ListOfFiles
+    type: object
+    default:
+    - Microsoft.Management.Infrastructure.CimCmdlets.dll
+    - Microsoft.PowerShell.Commands.Diagnostics.dll
+    - Microsoft.PowerShell.Commands.Management.dll
+    - Microsoft.PowerShell.Commands.Utility.dll
+    - Microsoft.PowerShell.ConsoleHost.dll
+    - Microsoft.PowerShell.CoreCLR.Eventing.dll
+    - Microsoft.PowerShell.Security.dll
+    - Microsoft.PowerShell.SDK.dll
+    - Microsoft.WSMan.Management.dll
+    - Microsoft.WSMan.Runtime.dll
+    - System.Management.Automation.dll
+
+steps:
+- ${{ each value in parameters.ListOfFiles }}:
+  - pwsh: |
+      $FileName = '${{ value }}'
+      $FileBaseName = [System.IO.Path]::GetFileNameWithoutExtension($FileName)
+      $FilePackagePath = Join-Path -Path '${{ parameters.PackagePath }}' -ChildPath $FileBaseName
+      $CGManifestPath = Join-Path -Path '${{ parameters.PackagePath }}' -ChildPath 'CGManifest'
+      Write-Verbose -Verbose "FileName to package: $FileName"
+      Write-Verbose -Verbose "FilePackage path: $FilePackagePath"
+      Write-Verbose -Verbose "CGManifest path: $CGManifestPath"
+      # Set SBOM package name
+      $vstsCommandString = "vso[task.setvariable variable=SbomFilePackageName]${FileBaseName}"
+      Write-Host "sending " + $vstsCommandString
+      Write-Host "##$vstsCommandString"
+      # Set SBOM package path variable
+      $vstsCommandString = "vso[task.setvariable variable=SbomFilePackagePath]${FilePackagePath}"
+      Write-Host "sending " + $vstsCommandString
+      Write-Host "##$vstsCommandString"
+      # Set CGManifest path variable
+      $vstsCommandString = "vso[task.setvariable variable=CGManifestPath]${CGManifestPath}"
+      Write-Host "sending " + $vstsCommandString
+      Write-Host "##$vstsCommandString"
+      # Create Nuget package sources
+      Import-Module -Name $env:REPOROOT\build.psm1
+      Import-Module -Name $env:REPOROOT\tools\packaging
+      Find-DotNet
+      New-ILNugetPackageSource -File $FileName -PackagePath '${{ parameters.PackagePath }}' -PackageVersion '${{ parameters.PackageVersion }}' -WinFxdBinPath '${{ parameters.WinFxdPath }}' -LinuxFxdBinPath '${{ parameters.LinuxFxdPath }}' -GenAPIToolPath '${{ parameters.GenAPIToolPath }}' -CGManifestPath $CGManifestPath
+    displayName: 'Create NuGet Package source for single file'
+
+  - template: Sbom.yml@ComplianceRepo
+    parameters:
+      BuildDropPath: $(SbomFilePackagePath)
+      Build_Repository_Uri: 'https://github.com/powershell/powershell'
+      PackageName: $(SbomFilePackageName)
+      PackageVersion: ${{ parameters.PackageVersion }}
+      sourceScanPath: $(CGManifestPath)
+      displayName: SBOM for NuGetPkg
+
+  - pwsh: |
+      $FileName = '${{ value }}'
+      $FileBaseName = [System.IO.Path]::GetFileNameWithoutExtension($FileName)
+      $FilePackagePath = Join-Path -Path '${{ parameters.PackagePath }}' -ChildPath $FileBaseName
+      Write-Verbose -Verbose "FileName to package: $FileName"
+      Write-Verbose -Verbose "FilePackage path: $FilePackagePath"
+      Import-Module -Name $env:REPOROOT\build.psm1
+      Import-Module -Name $env:REPOROOT\tools\packaging
+      Find-DotNet
+      New-ILNugetPackageFromSource -FileName $FileName -PackageVersion '${{ parameters.PackageVersion }}' -PackagePath '${{ parameters.PackagePath }}'
+    displayName: 'Create NuGet Package for single file'
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index ac4b181b7b8..ed717fb90c7 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -118,12 +118,14 @@ jobs:
   - task: NuGetToolInstaller@1
     displayName: 'Install NuGet.exe'
 
-  - pwsh: |
-      Import-Module $env:REPOROOT\build.psm1
-      Import-Module $env:REPOROOT\tools\packaging
-      Find-Dotnet
-      New-ILNugetPackage -PackagePath "$(PackagePath)" -PackageVersion "$(Version)" -WinFxdBinPath '$(winFxdPath)' -LinuxFxdBinPath '$(linuxFxdPath)' -GenAPIToolPath "$(GenAPIToolPath)"
-    displayName: 'Create Nuget Package Folders'
+  # Create nuget packages along with SBOM manifests.
+  - template: nuget-pkg-sbom.yml
+    parameters:
+      PackageVersion: $(Version)
+      PackagePath: $(PackagePath)
+      WinFxdPath: $(winFxdPath)
+      LinuxFxdPath: $(linuxFxdPath)
+      GenAPIToolPath: $(GenAPIToolPath)
 
   - pwsh: |
       Get-ChildItem $(linuxFxdPath)
@@ -253,4 +255,4 @@ jobs:
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
-      sourceScanPath: '$(repoRoot)\tools'
+      sourceScanPath: '$(PackagePath)'

From 46e5af73810d8a9a8a208fa70a8aa6bcd8f5a31b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 31 Jan 2022 16:36:49 -0800
Subject: [PATCH 221/645] Update .NET SDK to 6.0.101 and fix
 `Microsoft.PowerShell.GlobalTool.Shim.csproj` (#16821)

---
 assets/wix/files.wxs                                 | 12 ++++++------
 global.json                                          |  2 +-
 .../GlobalToolShim.cs                                |  2 +-
 tools/packaging/packaging.psm1                       |  6 ++++++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 78b21b8d643..14b2204c159 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3137,8 +3137,8 @@
           <Component Id="cmp408A3AF905EB47ADA35FBC5A6B1465A0">
             <File Id="fil2146848B6ACB45FCA8E9C8FEE3BECDD8" KeyPath="yes" Source="$(var.ProductSourcePath)\_manifest\spdx_2.2\manifest.spdx.json" />
           </Component>
-          <Component Id="cmp58D994EAF5F64D618ABC0E63DCD48C05">
-            <File Id="filFB88509DC8C044A28FF3B7CF61B1CE4F" KeyPath="yes" Source="$(var.ProductSourcePath)\_manifest\spdx_2.2\manifest.spdx.json.sha256" />
+          <Component Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9">
+            <File Id="fil5B154D0E36C747769E1387D3A3E9AC7E" KeyPath="yes" Source="$(var.ProductSourcePath)\_manifest\spdx_2.2\manifest.spdx.json.sha256" />
           </Component>
         </Directory>
       </Directory>
@@ -3154,8 +3154,8 @@
       <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="cmpC100F34A32A0436A973FE7F9A02F5A78">
+        <File Id="filC8B8F95747F64A97B511342C7F154B54" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.121.56705.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4164,7 +4164,6 @@
       <ComponentRef Id="cmp5492F78ACB1A4391BBED371FDFC06B9E" />
       <ComponentRef Id="cmp22840874A8C84AA796496634FBEBF09C" />
       <ComponentRef Id="cmp0173AE0CBFA44C269D93361F6C98F99B" />
-      <ComponentRef Id="cmpFB17CABA17334B2BBA1ED6CBF757B310" />
       <ComponentRef Id="cmpD55F08F6CF51498E9E8551067BA57040" />
       <ComponentRef Id="cmp777DF202EF2542F2ACFCCF0481E8D6EE" />
       <ComponentRef Id="cmpF24D3B9F29F84B4D9C47577B7926FC2E" />
@@ -4173,7 +4172,8 @@
       <ComponentRef Id="cmp0C4751F9D5C14419A45F234152D21DA9" />
       <ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
       <ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
-      <ComponentRef Id="cmp58D994EAF5F64D618ABC0E63DCD48C05" />
+      <ComponentRef Id="cmpC100F34A32A0436A973FE7F9A02F5A78" />
+      <ComponentRef Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 047020849f2..e52d340bc63 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.100"
+    "version": "6.0.101"
   }
 }
diff --git a/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs b/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
index 33675e30b44..c8e95628687 100644
--- a/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
+++ b/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
@@ -26,7 +26,7 @@ public static class EntryPoint
         public static int Main(string[] args)
         {
             var currentPath = new FileInfo(System.Reflection.Assembly.GetEntryAssembly().Location).Directory.FullName;
-            var isWindows = Platform.IsWindows;
+            var isWindows = OperatingSystem.IsWindows();
 
             string platformFolder = isWindows ? WinFolderName : UnixFolderName;
 
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index e84857354a6..929d7868a44 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -221,6 +221,12 @@ function Start-PSPackage {
                 $createdSpdxPath = New-Item -Path $manifestSpdxPath -Force
                 Write-Verbose -Verbose "Created manifest.spdx.json file: $createdSpdxPath"
             }
+
+            $manifestSpdxPathSha = (Join-Path -Path $Source "_manifest\spdx_2.2\manifest.spdx.json.sha256")
+            if (-not (Test-Path -Path $manifestSpdxPathSha)) {
+                $createdSpdxPathSha = New-Item -Path $manifestSpdxPathSha -Force
+                Write-Verbose -Verbose "Created manifest.spdx.json.sha256 file: $createdSpdxPathSha"
+            }
         }
 
         # If building a symbols package, we add a zip of the parent to publish

From 7d3260fe0d1c939363566fa3871a35a9dcfff548 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Tue, 1 Feb 2022 05:14:23 +0100
Subject: [PATCH 222/645] Add completion for loop labels after Break/Continue
 (#16438)

Adds completion for loop labels after labeled control flow statements such as Break and Continue.
The completion will look for any loops with a label that surrounds the Break/Continue keywords.
The tooltips for the completion entries shows the relevant loop.
---
 .../CommandCompletion/CompletionAnalysis.cs   | 50 ++++++++++++++++
 .../TabCompletion/TabCompletion.Tests.ps1     | 57 +++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index 081fbd07a74..7e3e52472c5 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -850,6 +850,16 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                                         result = GetResultForEnumPropertyValueOfDSCResource(completionContext, string.Empty, ref replacementIndex, ref replacementLength, out unused);
                                         break;
                                     }
+                                case TokenKind.Break:
+                                case TokenKind.Continue:
+                                    {
+                                        if ((lastAst is BreakStatementAst breakStatement && breakStatement.Label is null)
+                                            || (lastAst is ContinueStatementAst continueStatement && continueStatement.Label is null))
+                                        {
+                                            result = CompleteLoopLabel(completionContext);
+                                        }
+                                        break;
+                                    }
                                 default:
                                     break;
                             }
@@ -1759,6 +1769,11 @@ private List<CompletionResult> GetResultForIdentifier(CompletionContext completi
             var tokenAtCursorText = tokenAtCursor.Text;
             completionContext.WordToComplete = tokenAtCursorText;
 
+            if (lastAst.Parent is BreakStatementAst || lastAst.Parent is ContinueStatementAst)
+            {
+                return CompleteLoopLabel(completionContext);
+            }
+
             var strConst = lastAst as StringConstantExpressionAst;
             if (strConst != null)
             {
@@ -2213,5 +2228,40 @@ private static List<CompletionResult> CompleteFileNameAsCommand(CompletionContex
 
             return result;
         }
+
+        /// <summary>
+        /// Complete loop labels after labeled control flow statements such as Break and Continue.
+        /// </summary>
+        private static List<CompletionResult> CompleteLoopLabel(CompletionContext completionContext)
+        {
+            var result = new List<CompletionResult>();
+            foreach (Ast ast in completionContext.RelatedAsts)
+            {
+                if (ast is LabeledStatementAst labeledStatement
+                    && labeledStatement.Label is not null
+                    && (completionContext.WordToComplete is null || labeledStatement.Label.StartsWith(completionContext.WordToComplete, StringComparison.OrdinalIgnoreCase)))
+                {
+                    result.Add(new CompletionResult(labeledStatement.Label, labeledStatement.Label, CompletionResultType.Text, labeledStatement.Extent.Text));
+                }
+                else if (ast is ErrorStatementAst errorStatement)
+                {
+                    // Handles incomplete do/switch loops (other labeled statements do not need this special treatment)
+                    // The regex looks for the loopLabel of errorstatements that look like do/switch loops
+                    // For example in ":Label do " it will find "Label".
+                    var labelMatch = Regex.Match(errorStatement.Extent.Text, @"(?<=^:)\w+(?=\s+(do|switch)\b(?!-))", RegexOptions.IgnoreCase);
+                    if (labelMatch.Success)
+                    {
+                        result.Add(new CompletionResult(labelMatch.Value, labelMatch.Value, CompletionResultType.Text, errorStatement.Extent.Text));
+                    }
+                }
+            }
+
+            if (result.Count == 0)
+            {
+                return null;
+            }
+
+            return result;
+        }
     }
 }
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index b1e4b68a9b9..d2fa38dd2bd 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -1179,6 +1179,63 @@ dir -Recurse `
             $res.CompletionMatches | Should -HaveCount 2
             [string]::Join(',', ($res.CompletionMatches.completiontext | Sort-Object)) | Should -BeExactly "1.0,1.1"
         }
+        It '<Intent>' -TestCases @(
+            @{
+                Intent = 'Complete loop labels with no input'
+                Expected = 'Outer','Inner'
+                TestString = ':Outer while ($true){:Inner while ($true){ break ^ }}'
+            }
+            @{
+                Intent = 'Complete loop labels that are accessible'
+                Expected = 'Outer'
+                TestString = ':Outer do {:Inner while ($true){ break } continue ^ } until ($false)'
+            }
+            @{
+                Intent = 'Complete loop labels with partial input'
+                Expected = 'Outer'
+                TestString = ':Outer do {:Inner while ($true){ break } continue o^ut } while ($true)'
+            }
+            @{
+                Intent = 'Complete loop label for incomplete switch'
+                Expected = 'Outer'
+                TestString = ':Outer switch ($x){"randomValue"{ continue ^'
+            }
+            @{
+                Intent = 'Complete loop label for incomplete do loop'
+                Expected = 'Outer'
+                TestString = ':Outer do {:Inner while ($true){ break } continue ^'
+            }
+            @{
+                Intent = 'Complete loop label for incomplete for loop'
+                Expected = 'forLoop'
+                TestString = ':forLoop for ($i = 0; $i -lt $SomeCollection.Count; $i++) {continue ^'
+            }
+            @{
+                Intent = 'Complete loop label for incomplete while loop'
+                Expected = 'WhileLoop'
+                TestString = ':WhileLoop while ($true){ break ^'
+            }
+            @{
+                Intent = 'Complete loop label for incomplete foreach loop'
+                Expected = 'foreachLoop'
+                TestString = ':foreachLoop foreach ($x in $y) { break ^'
+            }
+            @{
+                Intent = 'Not Complete loop labels with colon'
+                Expected = $null
+                TestString = ':Outer foreach ($x in $y){:Inner for ($i = 0; $i -lt $X.Count; $i++){ break :O^}}'
+            }
+            @{
+                Intent = 'Not Complete loop labels if cursor is in front of existing label'
+                Expected = $null
+                TestString = ':Outer switch ($x){"Value1"{break ^ Outer}}'
+            }
+        ){
+            param($Expected, $TestString)
+            $CursorIndex = $TestString.IndexOf('^')
+            $res = TabExpansion2 -cursorColumn $CursorIndex -inputScript $TestString.Remove($CursorIndex, 1)
+            $res.CompletionMatches.CompletionText | Should -BeExactly $Expected
+        }
     }
 
     Context "Module completion for 'using module'" {

From 79e3fa96d9936c41930b0be187837386dbdaec81 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 09:13:48 -0800
Subject: [PATCH 223/645] Bump the package `path-parse` from `1.0.6` to `1.0.7`
 (#16820)

---
 test/common/markdown-lint/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/common/markdown-lint/yarn.lock b/test/common/markdown-lint/yarn.lock
index b3af62fe76e..3d6f0d7da34 100644
--- a/test/common/markdown-lint/yarn.lock
+++ b/test/common/markdown-lint/yarn.lock
@@ -1634,9 +1634,9 @@ path-is-absolute@^1.0.0:
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-root-regex@^0.1.0:
   version "0.1.2"

From 47b4aa577c8874c6a3adf3a955a46fa60d0f75c6 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 1 Feb 2022 16:09:58 -0800
Subject: [PATCH 224/645] Update `markdownlint` to the latest version (#16825)

---
 test/common/markdown-lint/package.json |  2 +-
 test/common/markdown-lint/yarn.lock    | 28 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/common/markdown-lint/package.json b/test/common/markdown-lint/package.json
index 416b07882b2..f04a98e44fa 100644
--- a/test/common/markdown-lint/package.json
+++ b/test/common/markdown-lint/package.json
@@ -6,7 +6,7 @@
     "main": "gulpfile.js",
     "dependencies": {
         "gulp": "^4.0.2",
-        "markdownlint": "^0.22.0",
+        "markdownlint": "^0.25.1",
         "through2": "^4.0.2"
     },
     "resolutions": {
diff --git a/test/common/markdown-lint/yarn.lock b/test/common/markdown-lint/yarn.lock
index 3d6f0d7da34..1549bed02b4 100644
--- a/test/common/markdown-lint/yarn.lock
+++ b/test/common/markdown-lint/yarn.lock
@@ -528,10 +528,10 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-entities@~2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"
-  integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
+entities@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
 
 error-ex@^1.2.0:
   version "1.3.2"
@@ -1362,23 +1362,23 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-markdown-it@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.0.2.tgz#4401beae8df8aa2221fc6565a7188e60a06ef0ed"
-  integrity sha512-4Lkvjbv2kK+moL9TbeV+6/NHx+1Q+R/NIdUlFlkqkkzUcTod4uiyTJRiBidKR9qXSdkNFkgv+AELY8KN9vSgVA==
+markdown-it@12.3.2:
+  version "12.3.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
+  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
   dependencies:
     argparse "^2.0.1"
-    entities "~2.0.0"
+    entities "~2.1.0"
     linkify-it "^3.0.1"
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
-markdownlint@^0.22.0:
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.22.0.tgz#4ed95b61c17ae9f4dfca6a01f038c744846c0a72"
-  integrity sha512-J4B+iMc12pOdp/wfYi03W2qfAfEyiZzq3qvQh/8vOMNU8vXYY6Jg440EY7dWTBCqROhb1i4nAn3BTByJ5kdx1w==
+markdownlint@^0.25.1:
+  version "0.25.1"
+  resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.25.1.tgz#df04536607ebeeda5ccd5e4f38138823ed623788"
+  integrity sha512-AG7UkLzNa1fxiOv5B+owPsPhtM4D6DoODhsJgiaNg1xowXovrYgOnLqAgOOFQpWOlHFVQUzjMY5ypNNTeov92g==
   dependencies:
-    markdown-it "12.0.2"
+    markdown-it "12.3.2"
 
 matchdep@^2.0.0:
   version "2.0.0"

From e840db81abea459cc63daf5e70183c1e4551f6c0 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 2 Feb 2022 14:51:22 -0800
Subject: [PATCH 225/645] Add experimental json update automation (#16833)

* Add experimental json update automation

* Add dummy trigger

* Address CR comment
---
 .github/workflows/exp-json.yml | 82 ++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 .github/workflows/exp-json.yml

diff --git a/.github/workflows/exp-json.yml b/.github/workflows/exp-json.yml
new file mode 100644
index 00000000000..5af333cd9ea
--- /dev/null
+++ b/.github/workflows/exp-json.yml
@@ -0,0 +1,82 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+name: PowerShell Experimental Features Json Update
+on:
+    workflow_dispatch:
+    schedule:
+    # At 13:00 UTC every day.
+    - cron:  '0 13 * * *'
+
+defaults:
+  run:
+    shell: pwsh
+
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+
+jobs:
+  create-expjson-windows:
+    name: Update experimental features json
+    timeout-minutes: 15
+    runs-on: windows-latest
+    if: github.repository == 'PowerShell/PowerShell'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Create experimental features file
+        run: |
+          Import-Module ./build.psm1 -Force
+          Import-Module ./.github/workflows/GHWorkflowHelper -Force
+          Start-PSBootstrap
+          Start-PSBuild -Clean -SkipExperimentalFeatureGeneration
+          $pwsh = Get-PSOutput
+
+          $getExpFeatureJsonScript = @'
+            [System.Collections.ArrayList] $expFeatures = Get-ExperimentalFeature | Where-Object Name -NE PS7DscSupport | ForEach-Object -MemberName Name
+
+            # Make sure ExperimentalFeatures from modules in PSHome are added
+            # https://github.com/PowerShell/PowerShell/issues/10550
+            $ExperimentalFeaturesFromGalleryModulesInPSHome = @()
+            $ExperimentalFeaturesFromGalleryModulesInPSHome | ForEach-Object {
+                if (!$expFeatures.Contains($_)) {
+                    $null = $expFeatures.Add($_)
+                }
+            }
+
+            ConvertTo-Json $expFeatures
+          '@
+
+          $expFeaturesJson = & pwsh -c $getExpFeatureJsonScript
+          $expFeaturesJson | Out-File ./experimental-feature-windows-new.json -Force
+
+          if (Test-Path ./experimental-feature-windows.json) {
+            $currentExpFeatures =  Get-Content ./experimental-feature-windows.json -Raw | ConvertFrom-Json
+            $newExpFeatures =  Get-Content ./experimental-feature-windows-new.json -Raw | ConvertFrom-Json
+
+            if (-not (Compare-Object $currentExpFeatures $newExpFeatures)) {
+                Write-Verbose -Verbose "No changes to experimental features json file"
+                Set-GWVariable -Name CREATE_EXP_JSON_PR -Value 'false'
+                exit 0
+            }
+          }
+
+          Move-Item ./experimental-feature-windows-new.json ./experimental-feature-windows.json -Verbose
+          Set-GWVariable -Name CREATE_EXP_JSON_PR -Value 'true'
+
+      - name: Upload experimental features windows
+        uses: actions/upload-artifact@v2
+        with:
+          name: experimental-feature-windows-new.json
+          path: experimental-feature-windows-new.json
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        id: cpr
+        if: env.CREATE_EXP_JSON_PR == 'true'
+        with:
+          commit-message: "Update experimental-feature-windows.json"
+          title: "Update experimental-feature-windows.json"
+          base: master
+          branch: expjson_update_windows

From b7f8556bcd3564003b462a66ec46b90ae67076ec Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 2 Feb 2022 15:20:41 -0800
Subject: [PATCH 226/645] Remove WiX install (#16834)

---
 .../azureDevOps/releasePipeline.yml           |  3 +-
 .../templates/windows-packaging.yml           | 36 ++++---------------
 2 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index 49cc3536c20..c1e3315082d 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -177,7 +177,8 @@ stages:
   - deployment: AzureBlobPublic
     displayName: Make Azure Blob Public
 
-    pool: PowerShell1ES
+    pool:
+      name: PowerShell1ES
       demands:
       - ImageOverride -equals PSMMS2019-Secure
 
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index a93908a8f6c..956eb19d855 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -42,7 +42,7 @@ jobs:
 
   - template: shouldSign.yml
 
-  - powershell: |
+  - pwsh: |
       $pkgFilter = if ( '$(Architecture)' -eq 'arm' ) { "arm32" } else { '$(Architecture)' }
       if ($env:BuildConfiguration -eq 'minSize') { $pkgFilter += '-gc' }
 
@@ -60,25 +60,6 @@ jobs:
   - template: cloneToOfficialPath.yml
 
   - pwsh: |
-      # cleanup previous install
-      if((Test-Path "${env:ProgramFiles(x86)}\WiX Toolset xcopy")) {
-        Remove-Item "${env:ProgramFiles(x86)}\WiX Toolset xcopy" -Recurse -Force
-      }
-
-      $toolsDir = New-Item -ItemType Directory -Path '$(Build.ArtifactStagingDirectory)\tools'
-      $wixUri = 'https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip'
-      Invoke-RestMethod -Uri $wixUri -OutFile '$(Build.ArtifactStagingDirectory)\tools\wix.zip' -MaximumRetryCount 5 -RetryIntervalSec 10
-
-      Import-Module '$(PowerShellRoot)/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/wix.psm1'
-      Install-WixZip -zipPath '$(Build.ArtifactStagingDirectory)\tools\wix.zip'
-
-      $msixUrl = '$(makeappUrl)'
-      Invoke-RestMethod -Uri $msixUrl -OutFile '\makeappx.zip'
-      Expand-Archive '\makeappx.zip' -destination '\' -Force
-
-    displayName: Install packaging tools
-
-  - powershell: |
       $zipPathString = '$(System.ArtifactsDirectory)\Symbols\results\*$(PkgFilter).zip'
       Write-Verbose -Verbose "Zip Path: $zipPathString"
       $zipPath = Get-Item $zipPathString
@@ -208,12 +189,12 @@ jobs:
         shouldSign: $(SHOULD_SIGN)
         displayName: Sign ThirdParty binaries
 
-  - powershell: |
+  - pwsh: |
       Get-ChildItem '$(System.ArtifactsDirectory)\thirdPartySigned\*'
     displayName: Capture ThirdParty Signed files
     condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
 
-  - powershell: |
+  - pwsh: |
       Import-Module $(PowerShellRoot)/build.psm1 -Force
       Import-Module $(PowerShellRoot)/tools/packaging -Force
       $signedFilesPath = '$(System.ArtifactsDirectory)\thirdPartySigned'
@@ -231,7 +212,7 @@ jobs:
       PackageVersion: $(Version)
       sourceScanPath: '$(PowerShellRoot)\tools'
 
-  - powershell: |
+  - pwsh: |
       Import-Module $(PowerShellRoot)/build.psm1 -Force
       Import-Module $(PowerShellRoot)/tools/packaging -Force
 
@@ -272,7 +253,7 @@ jobs:
       $(PowerShellRoot)/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 -BuildZip $signedPkg -location '$(PowerShellRoot)' -destination '$(System.ArtifactsDirectory)\pkgSigned' -Runtime $runtime -ReleaseTag '$(ReleaseTagVar)' @params
     displayName: 'Build Windows Universal - $(Architecture) Package'
 
-  - powershell: |
+  - pwsh: |
       Get-ChildItem '$(System.ArtifactsDirectory)\pkgSigned' | ForEach-Object {
         $packagePath = $_.FullName
         Write-Host "Uploading $packagePath"
@@ -363,17 +344,12 @@ jobs:
       sourceScanPath: '$(PowerShellRoot)\tools'
       snapshotForceEnabled: true
 
-  - powershell: |
+  - pwsh: |
       if ((Test-Path "\PowerShell")) {
         Remove-Item -Path "\PowerShell" -Force -Recurse -Verbose
       }
       else {
         Write-Verbose -Verbose -Message "No cleanup required."
       }
-
-      if((Test-Path "${env:ProgramFiles(x86)}\WiX Toolset xcopy")) {
-        Write-Verbose -Verbose "Cleaning up Wix tools"
-        Remove-Item "${env:ProgramFiles(x86)}\WiX Toolset xcopy" -Recurse -Force
-      }
     displayName: Clean up local Clone
     condition: always()

From bbb11dd07a194a33d29fbe7b1dcd359e3631732a Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 3 Feb 2022 19:39:08 +0000
Subject: [PATCH 227/645] Fix the clean block for generated proxy function
 (#16827)

---
 .../engine/CommandMetadata.cs                       |  4 +++-
 .../Language/Scripting/PipelineBehaviour.Tests.ps1  | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/CommandMetadata.cs b/src/System.Management.Automation/engine/CommandMetadata.cs
index bbe2b6666b2..a9094f54b36 100644
--- a/src/System.Management.Automation/engine/CommandMetadata.cs
+++ b/src/System.Management.Automation/engine/CommandMetadata.cs
@@ -1128,7 +1128,9 @@ internal string GetCleanBlock()
             //  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()
+    if ($null -ne $steppablePipeline) {
+        $steppablePipeline.Clean()
+    }
 ";
         }
 
diff --git a/test/powershell/Language/Scripting/PipelineBehaviour.Tests.ps1 b/test/powershell/Language/Scripting/PipelineBehaviour.Tests.ps1
index 9551343da85..0478492c910 100644
--- a/test/powershell/Language/Scripting/PipelineBehaviour.Tests.ps1
+++ b/test/powershell/Language/Scripting/PipelineBehaviour.Tests.ps1
@@ -478,6 +478,19 @@ Describe 'Function Pipeline Behaviour' -Tag 'CI' {
             ## Dispose the steppable pipeline.
             $step.Dispose()
         }
+
+        It "Clean block runs fine in a proxy function when a dynamic parameter fails to bind" {
+            $function:TestProxyGci = [scriptblock]::Create(
+                [Management.Automation.ProxyCommand]::Create(
+                (Get-Command Get-ChildItem)))
+
+            ## The proxy function 'TestProxyGci' contains the 'dynamicparam' block, which will
+            ## run during parameter binding. However, the parameter binding failed, and thus
+            ## the 'begin', 'process', and 'end' blocks will not run, so '$steppablePipeline'
+            ## in the proxy function is null (never created). The 'clean' block will run anyway,
+            ## but it should skip calling '$steppablePipeline.Clean()' in this case. 
+            { TestProxyGci -Attributes } | Should -Throw -ErrorId 'MissingArgument,TestProxyGci'
+        }
     }
 
     Context "'exit' statement in command" {

From 35ad64e11b393857b17d2855b73e21844c8bdd02 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 3 Feb 2022 19:58:02 +0000
Subject: [PATCH 228/645] Add a couple fixes to generic method invocation
 (#16822)

---
 .../engine/CoreAdapter.cs                     |  93 +++++---
 .../engine/MshMemberInfo.cs                   |  40 ++--
 .../engine/parser/Compiler.cs                 |  22 +-
 .../resources/ExtendedTypeSystem.resx         |   3 -
 .../Parser/MethodInvocation.Tests.ps1         | 217 ++++++++++--------
 5 files changed, 205 insertions(+), 170 deletions(-)

diff --git a/src/System.Management.Automation/engine/CoreAdapter.cs b/src/System.Management.Automation/engine/CoreAdapter.cs
index b9e8979852a..c685fa4613b 100644
--- a/src/System.Management.Automation/engine/CoreAdapter.cs
+++ b/src/System.Management.Automation/engine/CoreAdapter.cs
@@ -1377,6 +1377,27 @@ internal static MethodInformation FindBestMethod(
             return methodInfo;
         }
 
+        private static Type[] ResolveGenericTypeParameters(object[] genericTypeParameters)
+        {
+            if (genericTypeParameters is null || genericTypeParameters.Length == 0)
+            {
+                return null;
+            }
+
+            Type[] genericParamTypes = new Type[genericTypeParameters.Length];
+            for (int i = 0; i < genericTypeParameters.Length; i++)
+            {
+                genericParamTypes[i] = genericTypeParameters[i] switch
+                {
+                    Type paramType => paramType,
+                    ITypeName paramTypeName => TypeOps.ResolveTypeName(paramTypeName, paramTypeName.Extent),
+                    _ => throw new ArgumentException("Unexpected value"),
+                };
+            }
+
+            return genericParamTypes;
+        }
+
         private static MethodInformation FindBestMethodImpl(
             MethodInformation[] methods,
             PSMethodInvocationConstraints invocationConstraints,
@@ -1404,15 +1425,15 @@ private static MethodInformation FindBestMethodImpl(
                 return methods[0];
             }
 
-            Type[] argumentTypes = arguments.Select(EffectiveArgumentType).ToArray();
-            Type[] genericParameters = invocationConstraints?.GenericTypeParameters ?? Array.Empty<Type>();
-            List<OverloadCandidate> candidates = new List<OverloadCandidate>();
+            Type[] genericParamTypes = ResolveGenericTypeParameters(invocationConstraints?.GenericTypeParameters);
+            var candidates = new List<OverloadCandidate>();
+
             for (int i = 0; i < methods.Length; i++)
             {
                 MethodInformation methodInfo = methods[i];
 
                 if (methodInfo.method?.DeclaringType.IsGenericTypeDefinition == true
-                    || (!methodInfo.isGeneric && genericParameters.Length > 0))
+                    || (!methodInfo.isGeneric && genericParamTypes is not null))
                 {
                     // If method is defined by an *open* generic type, or
                     // if generic parameters were provided and this method isn't generic, skip it.
@@ -1421,29 +1442,16 @@ private static MethodInformation FindBestMethodImpl(
 
                 if (methodInfo.isGeneric)
                 {
-                    Type[] argumentTypesForTypeInference = new Type[argumentTypes.Length];
-                    Array.Copy(argumentTypes, argumentTypesForTypeInference, argumentTypes.Length);
-
-                    if (invocationConstraints?.ParameterTypes is not null)
-                    {
-                        int parameterIndex = 0;
-                        foreach (Type typeConstraintFromCallSite in invocationConstraints.ParameterTypes)
-                        {
-                            if (typeConstraintFromCallSite != null)
-                            {
-                                argumentTypesForTypeInference[parameterIndex] = typeConstraintFromCallSite;
-                            }
-
-                            parameterIndex++;
-                        }
-                    }
-
-                    if (genericParameters.Length > 0 && methodInfo.method is MethodInfo originalMethod)
+                    if (genericParamTypes is not null)
                     {
                         try
                         {
+                            // This cast is safe, because
+                            // 1. Only ConstructorInfo and MethodInfo derive from MethodBase
+                            // 2. ConstructorInfo.IsGenericMethod is always false
+                            var originalMethod = (MethodInfo)methodInfo.method;
                             methodInfo = new MethodInformation(
-                                originalMethod.MakeGenericMethod(genericParameters),
+                                originalMethod.MakeGenericMethod(genericParamTypes),
                                 parametersToIgnore: 0);
                         }
                         catch (ArgumentException)
@@ -1453,12 +1461,29 @@ private static MethodInformation FindBestMethodImpl(
                             continue;
                         }
                     }
-
-                    methodInfo = TypeInference.Infer(methodInfo, argumentTypesForTypeInference);
-                    if (methodInfo is null)
+                    else
                     {
-                        // Skip generic methods for which we cannot infer type arguments
-                        continue;
+                        // Infer the generic method when generic parameter types are not specified.
+                        Type[] argumentTypes = arguments.Select(EffectiveArgumentType).ToArray();
+                        Type[] paramConstraintTypes = invocationConstraints?.ParameterTypes;
+
+                        if (paramConstraintTypes is not null)
+                        {
+                            for (int k = 0; k < paramConstraintTypes.Length; k++)
+                            {
+                                if (paramConstraintTypes[k] is not null)
+                                {
+                                    argumentTypes[k] = paramConstraintTypes[k];
+                                }
+                            }
+                        }
+
+                        methodInfo = TypeInference.Infer(methodInfo, argumentTypes);
+                        if (methodInfo is null)
+                        {
+                            // Skip generic methods for which we cannot infer type arguments
+                            continue;
+                        }
                     }
                 }
 
@@ -1602,7 +1627,7 @@ private static MethodInformation FindBestMethodImpl(
 
             if (candidates.Count == 0)
             {
-                if ((methods.Length > 0) && (methods.All(static m => m.method != null && m.method.DeclaringType.IsGenericTypeDefinition && m.method.IsStatic)))
+                if (methods.Length > 0 && methods.All(static m => m.method != null && m.method.DeclaringType.IsGenericTypeDefinition && m.method.IsStatic))
                 {
                     errorId = "CannotInvokeStaticMethodOnUninstantiatedGenericType";
                     errorMsg = string.Format(
@@ -1611,19 +1636,13 @@ private static MethodInformation FindBestMethodImpl(
                         methods[0].method.DeclaringType.FullName);
                     return null;
                 }
-                else if (genericParameters.Length != 0 && genericParameters.Contains(null))
-                {
-                    errorId = "TypeNotFoundForGenericMethod";
-                    errorMsg = ExtendedTypeSystem.MethodGenericArgumentTypeNotFoundException;
-                    return null;
-                }
-                else if (genericParameters.Length != 0)
+                else if (genericParamTypes is not null)
                 {
                     errorId = "MethodCountCouldNotFindBestGeneric";
                     errorMsg = string.Format(
                         ExtendedTypeSystem.MethodGenericArgumentCountException,
                         methods[0].method.Name,
-                        genericParameters.Length,
+                        genericParamTypes.Length,
                         arguments.Length);
                     return null;
                 }
diff --git a/src/System.Management.Automation/engine/MshMemberInfo.cs b/src/System.Management.Automation/engine/MshMemberInfo.cs
index ef6d185a606..4856b08fb75 100644
--- a/src/System.Management.Automation/engine/MshMemberInfo.cs
+++ b/src/System.Management.Automation/engine/MshMemberInfo.cs
@@ -1909,17 +1909,17 @@ internal class PSMethodInvocationConstraints
         internal PSMethodInvocationConstraints(
             Type methodTargetType,
             Type[] parameterTypes)
-            : this(methodTargetType, genericTypeParameters: null, parameterTypes)
+            : this(methodTargetType, parameterTypes, genericTypeParameters: null)
         {
         }
 
         internal PSMethodInvocationConstraints(
             Type methodTargetType,
-            Type[] genericTypeParameters,
-            Type[] parameterTypes)
+            Type[] parameterTypes,
+            object[] genericTypeParameters)
         {
             MethodTargetType = methodTargetType;
-            _parameterTypes = parameterTypes;
+            ParameterTypes = parameterTypes;
             GenericTypeParameters = genericTypeParameters;
         }
 
@@ -1931,14 +1931,12 @@ internal PSMethodInvocationConstraints(
         /// <remarks>
         /// If <see langword="null"/> then there are no constraints
         /// </remarks>
-        public IEnumerable<Type> ParameterTypes => _parameterTypes;
-
-        private readonly Type[] _parameterTypes;
+        public Type[] ParameterTypes { get; }
 
         /// <summary>
         /// Gets the generic type parameters for the method invocation.
         /// </summary>
-        public Type[] GenericTypeParameters { get; }
+        public object[] GenericTypeParameters { get; }
 
         internal static bool EqualsForCollection<T>(ICollection<T> xs, ICollection<T> ys)
         {
@@ -1977,7 +1975,7 @@ public bool Equals(PSMethodInvocationConstraints other)
                 return false;
             }
 
-            if (!EqualsForCollection(_parameterTypes, other._parameterTypes))
+            if (!EqualsForCollection(ParameterTypes, other.ParameterTypes))
             {
                 return false;
             }
@@ -2017,35 +2015,47 @@ public override string ToString()
         {
             StringBuilder sb = new StringBuilder();
             string separator = string.Empty;
-            if (MethodTargetType != null)
+            if (MethodTargetType is not null)
             {
                 sb.Append("this: ");
                 sb.Append(ToStringCodeMethods.Type(MethodTargetType, dropNamespaces: true));
                 separator = " ";
             }
 
-            if (GenericTypeParameters != null)
+            if (GenericTypeParameters is not null)
             {
                 sb.Append(separator);
                 sb.Append("genericTypeParams: ");
 
                 separator = string.Empty;
-                foreach (Type parameter in GenericTypeParameters)
+                foreach (object parameter in GenericTypeParameters)
                 {
                     sb.Append(separator);
-                    sb.Append(ToStringCodeMethods.Type(parameter, dropNamespaces: true));
+
+                    switch (parameter)
+                    {
+                        case Type paramType:
+                            sb.Append(ToStringCodeMethods.Type(paramType, dropNamespaces: true));
+                            break;
+                        case ITypeName paramTypeName:
+                            sb.Append(paramTypeName.ToString());
+                            break;
+                        default:
+                            throw new ArgumentException("Unexpected value");
+                    }
+
                     separator = ", ";
                 }
 
                 separator = " ";
             }
 
-            if (_parameterTypes != null)
+            if (ParameterTypes is not null)
             {
                 sb.Append(separator);
                 sb.Append("args: ");
                 separator = string.Empty;
-                foreach (var p in _parameterTypes)
+                foreach (var p in ParameterTypes)
                 {
                     sb.Append(separator);
                     sb.Append(ToStringCodeMethods.Type(p, dropNamespaces: true));
diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index 5f7c54d00c2..0a68cb7951f 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -1174,25 +1174,20 @@ internal static Type GetTypeConstraintForMethodResolution(ExpressionAst expr)
             return firstConvert?.Type.TypeName.GetReflectionType();
         }
 
-        internal static PSMethodInvocationConstraints CombineTypeConstraintForMethodResolution(
-            Type targetType,
-            Type argType,
-            Type[] genericArguments = null)
+        internal static PSMethodInvocationConstraints CombineTypeConstraintForMethodResolution(Type targetType, Type argType)
         {
-            if (targetType is null
-                && argType is null
-                && (genericArguments is null || genericArguments.Length == 0))
+            if (targetType is null && argType is null)
             {
                 return null;
             }
 
-            return new PSMethodInvocationConstraints(targetType, genericArguments, new[] { argType });
+            return new PSMethodInvocationConstraints(targetType, new[] { argType });
         }
 
         internal static PSMethodInvocationConstraints CombineTypeConstraintForMethodResolution(
             Type targetType,
             Type[] argTypes,
-            Type[] genericArguments = null)
+            object[] genericArguments = null)
         {
             if (targetType is null
                 && (argTypes is null || argTypes.Length == 0)
@@ -1201,7 +1196,7 @@ internal static PSMethodInvocationConstraints CombineTypeConstraintForMethodReso
                 return null;
             }
 
-            return new PSMethodInvocationConstraints(targetType, genericArguments, argTypes);
+            return new PSMethodInvocationConstraints(targetType, argTypes, genericArguments);
         }
 
         internal static Expression ConvertValue(TypeConstraintAst typeConstraint, Expression expr)
@@ -6362,13 +6357,14 @@ internal static PSMethodInvocationConstraints GetInvokeMemberConstraints(InvokeM
             var targetTypeConstraint = GetTypeConstraintForMethodResolution(invokeMemberExpressionAst.Expression);
 
             ReadOnlyCollection<ITypeName> genericArguments = invokeMemberExpressionAst.GenericTypeArguments;
-            Type[] genericTypeArguments = null;
+            object[] genericTypeArguments = null;
             if (genericArguments is not null)
             {
-                genericTypeArguments = new Type[genericArguments.Count];
+                genericTypeArguments = new object[genericArguments.Count];
                 for (var i = 0; i < genericArguments.Count; i++)
                 {
-                    genericTypeArguments[i] = genericArguments[i].GetReflectionType();
+                    Type type = genericArguments[i].GetReflectionType();
+                    genericTypeArguments[i] = (object)type ?? genericArguments[i];
                 }
             }
 
diff --git a/src/System.Management.Automation/resources/ExtendedTypeSystem.resx b/src/System.Management.Automation/resources/ExtendedTypeSystem.resx
index d617cbf7a38..86b3f826324 100644
--- a/src/System.Management.Automation/resources/ExtendedTypeSystem.resx
+++ b/src/System.Management.Automation/resources/ExtendedTypeSystem.resx
@@ -159,9 +159,6 @@
   <data name="MethodGenericArgumentCountException" xml:space="preserve">
     <value>Could not find a suitable generic method overload for "{0}" with "{1}" type parameters, and the argument count: "{2}".</value>
   </data>
-  <data name="MethodGenericArgumentTypeNotFoundException" xml:space="preserve">
-    <value>One or more of the generic type parameters provided for the method "{0}" refers to a type which cannot be found.</value>
-  </data>
   <data name="MethodAmbiguousException" xml:space="preserve">
     <value>Multiple ambiguous overloads found for "{0}" and the argument count: "{1}".</value>
   </data>
diff --git a/test/powershell/Language/Parser/MethodInvocation.Tests.ps1 b/test/powershell/Language/Parser/MethodInvocation.Tests.ps1
index e6a91891174..e60f8a2b148 100644
--- a/test/powershell/Language/Parser/MethodInvocation.Tests.ps1
+++ b/test/powershell/Language/Parser/MethodInvocation.Tests.ps1
@@ -1,86 +1,5 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
-if ( $IsCoreCLR ) {
-    return
-}
-
-Describe "Interface inheritance with remoting proxies" -Tags "CI" {
-    $src = @"
-using System;
-using System.ServiceModel;
-
-namespace MSFT_716893
-{
-    [ServiceContract]
-    public interface IInterface1
-    {
-        [OperationContract]string BaseOperation(int i);
-    }
-
-    [ServiceContract]
-    public interface IInterface2 : IInterface1
-    {
-        [OperationContract(Name="op1")]string Operation(string a);
-        [OperationContract(Name="op2")]string Operation(string a, string b);
-    }
-
-    public class ServiceImplementation : IInterface2
-    {
-        public string Operation(string a) { return "1 - " + a; }
-        public string Operation(string a, string b) { return "2 - " + a + " " + b; }
-        public string BaseOperation(int i) { return "3 - " + i; }
-    }
-
-    public static class Service
-    {
-        static ServiceHost serviceHost;
-
-        public static void Init()
-        {
-            Uri baseAddress = new Uri("http://localhost:8080/service");
-            serviceHost = new ServiceHost(typeof(ServiceImplementation), baseAddress);
-            serviceHost.Open();
-        }
-
-        public static IInterface1 GetProxy()
-        {
-            ChannelFactory<IInterface2> factory = new ChannelFactory<IInterface2>(
-                serviceHost.Description.Endpoints[0].Binding,
-                serviceHost.Description.Endpoints[0].Address);
-            return factory.CreateChannel();
-        }
-
-        public static void Close()
-        {
-            serviceHost.Close();
-        }
-    }
-}
-"@
-
-    Add-Type -TypeDefinition $src -ReferencedAssemblies System.ServiceModel.dll
-
-    BeforeEach {
-        [MSFT_716893.Service]::Init()
-        $proxy = [MSFT_716893.Service]::GetProxy()
-    }
-
-    AfterEach {
-        [MSFT_716893.Service]::Close()
-    }
-
-    It "Direct invocation" {
-        $proxy.Operation("a") | Should -Be "1 - a"
-        $proxy.Operation("a", "b") | Should -Be "2 - a b"
-        $proxy.BaseOperation(42) | Should -Be "3 - 42"
-    }
-
-    It "Invocation via method constraints" {
-        ([MSFT_716893.IInterface2]$proxy).Operation("c") | Should -Be "1 - c"
-        ([MSFT_716893.IInterface2]$proxy).Operation("d", "e") | Should -Be "2 - d e"
-        ([MSFT_716893.IInterface1]$proxy).BaseOperation(22) | Should -Be "3 - 22"
-    }
-}
 
 Describe 'Generic Method invocation' -Tags 'CI' {
 
@@ -95,7 +14,7 @@ Describe 'Generic Method invocation' -Tags 'CI' {
                 ExpectedType = [System.Collections.Generic.Dictionary[System.Numerics.BigInteger, System.Collections.Generic.List[string[, ]]][]]
             }
             @{
-                Script       = '[Array]::$("Empty")[[System.Collections.Generic.Dictionary[[System.String, System.Private.CoreLib],[System.Numerics.BigInteger, System.Runtime.Numerics]], System.Private.CoreLib]]()'
+                Script       = '[Array]::$("Empty")[[System.Collections.Generic.Dictionary`2[[System.String, System.Private.CoreLib],[System.Numerics.BigInteger, System.Runtime.Numerics]], System.Private.CoreLib]]()'
                 ExpectedType = [System.Collections.Generic.Dictionary`2[[System.String, System.Private.CoreLib], [System.Numerics.BigInteger, System.Runtime.Numerics]][], System.Private.CoreLib]
             }
         )
@@ -103,52 +22,52 @@ Describe 'Generic Method invocation' -Tags 'CI' {
         $ExpectedParseErrors = @(
             @{
                 Script         = '$object.Method[incompl'
-                ExpectedErrors = 'EndSquareBracketExpectedAtEndOfType'
+                ExpectedErrors = @('EndSquareBracketExpectedAtEndOfType')
                 ErrorCount     = 1
             }
             @{
                 Script         = '[type]::Member[incompl'
-                ExpectedErrors = 'EndSquareBracketExpectedAtEndOfType'
+                ExpectedErrors = @('EndSquareBracketExpectedAtEndOfType')
                 ErrorCount     = 1
             }
             @{
                 Script         = '$object.Method[Type1[Type2'
-                ExpectedErrors = 'UnexpectedToken','EndSquareBracketExpectedAtEndOfType'
+                ExpectedErrors = @('EndSquareBracketExpectedAtEndOfAttribute','EndSquareBracketExpectedAtEndOfType')
                 ErrorCount     = 2
             }
             @{
                 Script         = '[array]::empty[type]]()'
-                ExpectedErrors = 'UnexpectedToken', 'ExpectedExpression'
+                ExpectedErrors = @('UnexpectedToken', 'ExpectedExpression')
                 ErrorCount     = 2
             }
             @{
                 Script         = '$object.Method[type,]()'
-                ExpectedErrors = 'MissingTypeName'
+                ExpectedErrors = @('MissingTypename')
                 ErrorCount     = 1
             }
             @{
                 Script         = '$object.Method[]()'
-                ExpectedErrors = 'MissingArrayIndexExpression', 'UnexpectedToken', 'ExpectedExpression'
+                ExpectedErrors = @('MissingArrayIndexExpression', 'UnexpectedToken', 'ExpectedExpression')
                 ErrorCount     = 3
             }
             @{
                 Script         = '$object.Method[,]()'
-                ExpectedErrors = 'MissingExpressionAfterOperator', 'UnexpectedToken', 'ExprectedExpression'
+                ExpectedErrors = @('MissingExpressionAfterOperator', 'UnexpectedToken', 'ExpectedExpression')
                 ErrorCount     = 3
             }
             @{
                 Script         = '$object.Method[,type]()'
-                ExpectedErrors = 'MissingExpressionAfterOperator', 'UnexpectedToken', 'ExpectedExpression'
+                ExpectedErrors = @('MissingExpressionAfterOperator', 'UnexpectedToken', 'ExpectedExpression')
                 ErrorCount     = 3
             }
             @{
                 Script         = '$object.Method[type()'
-                ExpectedErrors = 'UnexpectedToken', 'ExpectedExpression'
-                ErrorCount     = 2
+                ExpectedErrors = @('EndSquareBracketExpectedAtEndOfType', 'UnexpectedToken', 'ExpectedExpression')
+                ErrorCount     = 3
             }
             @{
                 Script         = '$object.Method[type)'
-                ExpectedErrors = 'EndSquareBracketExpectedAtEndOfType', 'UnexpectedToken'
+                ExpectedErrors = @('EndSquareBracketExpectedAtEndOfType', 'UnexpectedToken')
                 ErrorCount     = 2
             }
         )
@@ -161,22 +80,25 @@ Describe 'Generic Method invocation' -Tags 'CI' {
     }
 
     It 'reports a parse error for "<Script>"' -TestCases $ExpectedParseErrors {
-        param($Script, $ExpectedError, $ErrorCount)
+        param($Script, $ExpectedErrors, $ErrorCount)
 
         $parseErrors = $null
         [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$null, [ref]$parseErrors)
 
         $parseErrors.Count | Should -Be $ErrorCount
-        $parseErrors.ErrorId | Should -BeIn $ExpectedError
+
+        for ($i = 0; $i -lt $ErrorCount; $i++) {
+            $parseErrors[$i].ErrorId | Should -BeExactly $ExpectedErrors[$i]
+        }
     }
 
     It 'can call a generic method "<Script>" with no arguments' -TestCases $EmptyArrayCases {
         param($Script, $ExpectedType)
 
-        $Result = & [scriptblock]::Create($Script)
-        $Result.GetType() | Should -Be $ExpectedType
-
-        $Result.Length | Should -Be 0
+        $command = "`$r = $Script; `$r.GetType(); `$r.Length"
+        $result = Invoke-Expression -Command $command
+        $result[0] | Should -Be $ExpectedType
+        $result[1] | Should -Be 0
     }
 
     It 'can call generic instance methods' {
@@ -228,7 +150,6 @@ Describe 'Generic Method invocation' -Tags 'CI' {
             [array]::Empty[string, int]()
         }
         catch {
-            $_.Exception.Message | Should -BeExactly 'Could not find a suitable generic method overload for "Empty" with "2" type parameters, and the argument count: "0".'
             $_.FullyQualifiedErrorId | Should -BeExactly 'MethodCountCouldNotFindBestGeneric'
         }
     }
@@ -238,8 +159,8 @@ Describe 'Generic Method invocation' -Tags 'CI' {
             [array]::Empty[thisdoesnotexist]()
         }
         catch {
-            $_.Exception.Message | Should -BeExactly 'One or more of the generic type parameters provided for the method "Empty" refers to a type which cannot be found.'
-            $_.FullyQualifiedErrorId | Should -BeExactly 'TypeNotFoundForGenericMethod'
+            $_.Exception.Message | Should -BeLike "*[thisdoesnotexist]*"
+            $_.FullyQualifiedErrorId | Should -BeExactly 'TypeNotFound'
         }
     }
 
@@ -273,4 +194,96 @@ Describe 'Generic Method invocation' -Tags 'CI' {
         $resultList.GetType().GenericTypeArguments | Should -Be ([float])
         $resultList | Should -Be @( 1, 8, 27, 64, 125)
     }
+
+    It 'can use type that is loaded at runtime' {
+        Add-Type -TypeDefinition "public class GenericTypeTest {}"
+        $r = [Array]::Empty[GenericTypeTest]()
+
+        $r.GetType() | Should -Be ([GenericTypeTest[]])
+        $r.Length | Should -Be 0
+    }
+}
+
+Describe "Interface inheritance with remoting proxies" -Tags "CI" {
+
+    if ( $IsCoreCLR ) {
+        Write-Verbose -Verbose "Skip this test because it's .NET Framework dependency."
+        return
+    }
+
+    $src = @"
+using System;
+using System.ServiceModel;
+
+namespace MSFT_716893
+{
+    [ServiceContract]
+    public interface IInterface1
+    {
+        [OperationContract]string BaseOperation(int i);
+    }
+
+    [ServiceContract]
+    public interface IInterface2 : IInterface1
+    {
+        [OperationContract(Name="op1")]string Operation(string a);
+        [OperationContract(Name="op2")]string Operation(string a, string b);
+    }
+
+    public class ServiceImplementation : IInterface2
+    {
+        public string Operation(string a) { return "1 - " + a; }
+        public string Operation(string a, string b) { return "2 - " + a + " " + b; }
+        public string BaseOperation(int i) { return "3 - " + i; }
+    }
+
+    public static class Service
+    {
+        static ServiceHost serviceHost;
+
+        public static void Init()
+        {
+            Uri baseAddress = new Uri("http://localhost:8080/service");
+            serviceHost = new ServiceHost(typeof(ServiceImplementation), baseAddress);
+            serviceHost.Open();
+        }
+
+        public static IInterface1 GetProxy()
+        {
+            ChannelFactory<IInterface2> factory = new ChannelFactory<IInterface2>(
+                serviceHost.Description.Endpoints[0].Binding,
+                serviceHost.Description.Endpoints[0].Address);
+            return factory.CreateChannel();
+        }
+
+        public static void Close()
+        {
+            serviceHost.Close();
+        }
+    }
+}
+"@
+
+    Add-Type -TypeDefinition $src -ReferencedAssemblies System.ServiceModel.dll
+
+    BeforeEach {
+        [MSFT_716893.Service]::Init()
+        $proxy = [MSFT_716893.Service]::GetProxy()
+    }
+
+    AfterEach {
+        [MSFT_716893.Service]::Close()
+    }
+
+    It "Direct invocation" {
+        $proxy.Operation("a") | Should -Be "1 - a"
+        $proxy.Operation("a", "b") | Should -Be "2 - a b"
+        $proxy.BaseOperation(42) | Should -Be "3 - 42"
+    }
+
+    It "Invocation via method constraints" {
+        ([MSFT_716893.IInterface2]$proxy).Operation("c") | Should -Be "1 - c"
+        ([MSFT_716893.IInterface2]$proxy).Operation("d", "e") | Should -Be "2 - d e"
+        ([MSFT_716893.IInterface1]$proxy).BaseOperation(22) | Should -Be "3 - 22"
+    }
 }

From ce684c3abc11182a2c5a487939dff88ca321283b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 3 Feb 2022 17:21:51 -0800
Subject: [PATCH 229/645] Fix automation to update experimental json files in
 GitHub action (#16837)

---
 .github/workflows/exp-json.yml | 107 ++++++++++++++++++++++++++-------
 1 file changed, 84 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/exp-json.yml b/.github/workflows/exp-json.yml
index 5af333cd9ea..43532515923 100644
--- a/.github/workflows/exp-json.yml
+++ b/.github/workflows/exp-json.yml
@@ -17,21 +17,29 @@ env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
 
 jobs:
-  create-expjson-windows:
-    name: Update experimental features json
+  create-expjson:
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest]
     timeout-minutes: 15
-    runs-on: windows-latest
+    runs-on: ${{ matrix.os }}
+    env:
+      OS_TITLE: ${{ matrix.os }}
     if: github.repository == 'PowerShell/PowerShell'
+    name: Update experimental features json
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
       - name: Create experimental features file
         run: |
           Import-Module ./build.psm1 -Force
-          Import-Module ./.github/workflows/GHWorkflowHelper -Force
           Start-PSBootstrap
-          Start-PSBuild -Clean -SkipExperimentalFeatureGeneration
-          $pwsh = Get-PSOutput
+          Start-PSBuild -Clean -PSModuleRestore
+          $builtPwsh = Get-PSOutput
+
+          Write-Verbose -Verbose "PWSH path: $builtPwsh"
 
           $getExpFeatureJsonScript = @'
             [System.Collections.ArrayList] $expFeatures = Get-ExperimentalFeature | Where-Object Name -NE PS7DscSupport | ForEach-Object -MemberName Name
@@ -48,28 +56,81 @@ jobs:
             ConvertTo-Json $expFeatures
           '@
 
-          $expFeaturesJson = & pwsh -c $getExpFeatureJsonScript
-          $expFeaturesJson | Out-File ./experimental-feature-windows-new.json -Force
+          $expFeaturesJson = & $builtPwsh -c $getExpFeatureJsonScript
+          $osname = $env:OS_TITLE -like 'windows*' ? 'windows' : 'linux'
+          $fileNamePrefix = "experimental-feature-$osname"
+          $newFileName = "${fileNamePrefix}-new.json"
+
+          Write-Verbose -Verbose 'Experimental features found'
+          $expFeaturesJson | Out-String | Write-Verbose -Verbose
+          $expFeaturesJson | Out-File $newFileName -Force
 
-          if (Test-Path ./experimental-feature-windows.json) {
-            $currentExpFeatures =  Get-Content ./experimental-feature-windows.json -Raw | ConvertFrom-Json
-            $newExpFeatures =  Get-Content ./experimental-feature-windows-new.json -Raw | ConvertFrom-Json
+      - name: Upload experimental features windows
+        uses: actions/upload-artifact@v2
+        with:
+          name: experimentalJson
+          path: experimental-feature-*-new.json
 
-            if (-not (Compare-Object $currentExpFeatures $newExpFeatures)) {
-                Write-Verbose -Verbose "No changes to experimental features json file"
-                Set-GWVariable -Name CREATE_EXP_JSON_PR -Value 'false'
-                exit 0
+  compare-expjson-files:
+    runs-on: ubuntu-latest
+    name: Compare experimental json files and create PR
+    needs: create-expjson
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: experimentalJson
+      - name: Compare json files
+        run: |
+          Import-Module ./.github/workflows/GHWorkflowHelper -Force
+
+          function ShouldCreatePR($currentFile, $newFile) {
+            if (Test-Path $currentFile) {
+              $currentExpFeatures =  Get-Content $currentFile -Raw | ConvertFrom-Json
+              $newExpFeatures =  Get-Content $newFile -Raw | ConvertFrom-Json
+
+              if (-not (Compare-Object $currentExpFeatures $newExpFeatures)) {
+                  Write-Verbose -Verbose "No changes to experimental features json file"
+                  return $false
+              }
             }
+
+            return $true
           }
 
-          Move-Item ./experimental-feature-windows-new.json ./experimental-feature-windows.json -Verbose
-          Set-GWVariable -Name CREATE_EXP_JSON_PR -Value 'true'
+          $currentWinFile = "experimental-feature-windows.json"
+          $currentLinuxFile = "experimental-feature-linux.json"
+          $newWinFile = "experimental-feature-windows-new.json"
+          $newLinuxFile = "experimental-feature-linux-new.json"
 
-      - name: Upload experimental features windows
-        uses: actions/upload-artifact@v2
-        with:
-          name: experimental-feature-windows-new.json
-          path: experimental-feature-windows-new.json
+          $createPrWin = ShouldCreatePR $currentWinFile $newWinFile
+          Write-Verbose -Verbose "Create PR Windows == $createPrWin"
+
+          $createPrLinux = ShouldCreatePR $currentLinuxFile $newLinuxFile
+          Write-Verbose -Verbose "Create PR Windows == $createPrLinux"
+
+          $createPr = $createPrWin -or $createPrLinux
+          Write-Verbose -Verbose "Create PR == $createPr"
+
+          if ($createPrWin) {
+            Move-Item $newWinFile $currentWinFile -Verbose
+          }
+          else {
+            Remove-Item $newWinFile -Verbose
+          }
+
+          if ($createPrLinux) {
+            Move-Item $newLinuxFile $currentLinuxFile -Verbose
+          }
+          else {
+            Remove-Item $newLinuxFile -Verbose
+          }
+
+          Set-GWVariable -Name CREATE_EXP_JSON_PR -Value $createPR
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
@@ -77,6 +138,6 @@ jobs:
         if: env.CREATE_EXP_JSON_PR == 'true'
         with:
           commit-message: "Update experimental-feature-windows.json"
-          title: "Update experimental-feature-windows.json"
+          title: "Update experimental-feature json files"
           base: master
           branch: expjson_update_windows

From 434b238d1a81590185f899545f0ffb2223743147 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 3 Feb 2022 17:25:49 -0800
Subject: [PATCH 230/645] Update experimental feature json files (#16838)

---
 experimental-feature-linux.json   | 14 ++++++++++++++
 experimental-feature-windows.json | 14 ++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 experimental-feature-linux.json
 create mode 100644 experimental-feature-windows.json

diff --git a/experimental-feature-linux.json b/experimental-feature-linux.json
new file mode 100644
index 00000000000..12df4c5db5c
--- /dev/null
+++ b/experimental-feature-linux.json
@@ -0,0 +1,14 @@
+[
+  "PSAMSIMethodInvocationLogging",
+  "PSAnsiRenderingFileInfo",
+  "PSCleanBlock",
+  "PSCommandNotFoundSuggestion",
+  "PSExec",
+  "PSLoadAssemblyFromNativeCode",
+  "PSNativeCommandArgumentPassing",
+  "PSNativeCommandErrorActionPreference",
+  "PSNativePSPathResolution",
+  "PSRemotingSSHTransportErrorHandling",
+  "PSStrictModeAssignment",
+  "PSSubsystemPluginModel"
+]
diff --git a/experimental-feature-windows.json b/experimental-feature-windows.json
new file mode 100644
index 00000000000..12df4c5db5c
--- /dev/null
+++ b/experimental-feature-windows.json
@@ -0,0 +1,14 @@
+[
+  "PSAMSIMethodInvocationLogging",
+  "PSAnsiRenderingFileInfo",
+  "PSCleanBlock",
+  "PSCommandNotFoundSuggestion",
+  "PSExec",
+  "PSLoadAssemblyFromNativeCode",
+  "PSNativeCommandArgumentPassing",
+  "PSNativeCommandErrorActionPreference",
+  "PSNativePSPathResolution",
+  "PSRemotingSSHTransportErrorHandling",
+  "PSStrictModeAssignment",
+  "PSSubsystemPluginModel"
+]

From bcc1f10b6712e1b898c16e056b4ca3b95f14d634 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 4 Feb 2022 15:21:42 -0800
Subject: [PATCH 231/645] Ensure alpine and arm SKUs have
 `powershell.config.json` file with experimental features enabled (#16823)

---
 build.psm1 | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 49609675a20..bd425ff9bf4 100644
--- a/build.psm1
+++ b/build.psm1
@@ -619,40 +619,33 @@ Fix steps:
 
     # publish powershell.config.json
     $config = @{}
-    if ($environment.IsWindows) {
+
+    if ($Options.Runtime -like "*win*") {
+        # Execution Policy is only supported on Windows
         $config = @{ "Microsoft.PowerShell:ExecutionPolicy" = "RemoteSigned";
-                     "WindowsPowerShellCompatibilityModuleDenyList" = @("PSScheduledJob","BestPractices","UpdateServices") }
+            "WindowsPowerShellCompatibilityModuleDenyList"  = @("PSScheduledJob", "BestPractices", "UpdateServices")
+        }
     }
 
-    # When building preview, we want the configuration to enable all experiemental features by default
-    # ARM is cross compiled, so we can't run pwsh to enumerate Experimental Features
     if (-not $SkipExperimentalFeatureGeneration -and
         (Test-IsPreview $psVersion) -and
-        -not (Test-IsReleaseCandidate $psVersion) -and
-        -not $Runtime.Contains("arm") -and
-        -not ($Runtime -like 'fxdependent*')) {
-
-        $json = & $publishPath\pwsh -noprofile -command {
-            # Special case for DSC code in PS;
-            # this experimental feature requires new DSC module that is not inbox,
-            # so we don't want default DSC use case be broken
-            [System.Collections.ArrayList] $expFeatures = Get-ExperimentalFeature | Where-Object Name -NE PS7DscSupport | ForEach-Object -MemberName Name
-
-            $expFeatures | Out-String | Write-Verbose -Verbose
-
-            # Make sure ExperimentalFeatures from modules in PSHome are added
-            # https://github.com/PowerShell/PowerShell/issues/10550
-            $ExperimentalFeaturesFromGalleryModulesInPSHome = @()
-            $ExperimentalFeaturesFromGalleryModulesInPSHome | ForEach-Object {
-                if (!$expFeatures.Contains($_)) {
-                    $null = $expFeatures.Add($_)
-                }
-            }
+        -not (Test-IsReleaseCandidate $psVersion)
+    ) {
 
-            ConvertTo-Json $expFeatures
+        $ExperimentalFeatureJsonFilePath = if ($Options.Runtime -like "*win*") {
+            "$PSScriptRoot/experimental-feature-windows.json"
+        } else {
+            "$PSScriptRoot/experimental-feature-linux.json"
+        }
+
+        if (-not (Test-Path $ExperimentalFeatureJsonFilePath)) {
+            throw "ExperimentalFeatureJsonFilePath: $ExperimentalFeatureJsonFilePath does not exist"
         }
 
+        $json = Get-Content -Raw $ExperimentalFeatureJsonFilePath
         $config += @{ ExperimentalFeatures = ([string[]] ($json | ConvertFrom-Json)) }
+    } else {
+        Write-Warning -Message "Experimental features are not enabled in powershell.config.json file"
     }
 
     if ($config.Count -gt 0) {

From a5d41c22871c4835de2a0f8ba17d553fa777c6a3 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Sat, 5 Feb 2022 20:13:14 +0500
Subject: [PATCH 232/645] Use `FindFirstFileW` instead of `FindFirstFileExW` to
 correctly handle Unicode file names on FAT32 (#16840)

---
 .../namespaces/FileSystemProvider.cs          | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index 15d742e40bc..fd855643703 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -8073,23 +8073,10 @@ protected override bool ReleaseHandle()
             private static extern bool FindClose(IntPtr handle);
         }
 
-        [DllImport(PinvokeDllNames.FindFirstFileDllName, EntryPoint = "FindFirstFileExW", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern SafeFindHandle FindFirstFileEx(string lpFileName, FINDEX_INFO_LEVELS fInfoLevelId, ref WIN32_FIND_DATA lpFindFileData, FINDEX_SEARCH_OPS fSearchOp, IntPtr lpSearchFilter, int dwAdditionalFlags);
-
-        internal enum FINDEX_INFO_LEVELS : uint
-        {
-            FindExInfoStandard = 0x0u,
-            FindExInfoBasic = 0x1u,
-            FindExInfoMaxInfoLevel = 0x2u,
-        }
-
-        internal enum FINDEX_SEARCH_OPS : uint
-        {
-            FindExSearchNameMatch = 0x0u,
-            FindExSearchLimitToDirectories = 0x1u,
-            FindExSearchLimitToDevices = 0x2u,
-            FindExSearchMaxSearchOp = 0x3u,
-        }
+        // We use 'FindFirstFileW' instead of 'FindFirstFileExW' because the latter doesn't work correctly with Unicode file names on FAT32.
+        // See https://github.com/PowerShell/PowerShell/issues/16804
+        [DllImport(PinvokeDllNames.FindFirstFileDllName, EntryPoint = "FindFirstFileW", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern SafeFindHandle FindFirstFile(string lpFileName, ref WIN32_FIND_DATA lpFindFileData);
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
         internal unsafe struct WIN32_FIND_DATA
@@ -8278,7 +8265,7 @@ internal static bool IsReparsePointLikeSymlink(FileSystemInfo fileInfo)
                 fullPath = PathUtils.EnsureExtendedPrefix(fullPath);
             }
 
-            using (SafeFindHandle handle = FindFirstFileEx(fullPath, FINDEX_INFO_LEVELS.FindExInfoBasic, ref data, FINDEX_SEARCH_OPS.FindExSearchNameMatch, IntPtr.Zero, 0))
+            using (SafeFindHandle handle = FindFirstFile(fullPath, ref data))
             {
                 if (handle.IsInvalid)
                 {

From 30eac0a11e3479cf4feac76c7fa4b8d621eaabe2 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 7 Feb 2022 17:34:52 -0800
Subject: [PATCH 233/645] Update to use `windows-latest` as the build agent
 image (#16831)

---
 .vsts-ci/templates/ci-build.yml               |  2 +-
 .vsts-ci/templates/credscan.yml               |  4 ++--
 .vsts-ci/templates/nanoserver.yml             |  2 +-
 .vsts-ci/templates/verify-xunit.yml           |  2 +-
 .vsts-ci/templates/windows-test.yml           |  4 ++--
 .vsts-ci/windows-daily.yml                    |  2 +-
 .../windows/templates/windows-packaging.yml   |  4 ++--
 .../CompatiblePSEditions.Module.Tests.ps1     |  9 ++++++++
 .../CredSSP.Tests.ps1                         | 21 +++++++++++++------
 9 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/.vsts-ci/templates/ci-build.yml b/.vsts-ci/templates/ci-build.yml
index cbbd5349417..e64ab4967a2 100644
--- a/.vsts-ci/templates/ci-build.yml
+++ b/.vsts-ci/templates/ci-build.yml
@@ -1,5 +1,5 @@
 parameters:
-  pool: 'vs2017-win2016'
+  pool: 'windows-latest'
   jobName: 'win_build'
   displayName: Windows Build
 
diff --git a/.vsts-ci/templates/credscan.yml b/.vsts-ci/templates/credscan.yml
index f6ed5b8fd23..60094ff3d77 100644
--- a/.vsts-ci/templates/credscan.yml
+++ b/.vsts-ci/templates/credscan.yml
@@ -1,12 +1,12 @@
 parameters:
-  pool: 'Hosted VS2017'
+  pool: 'windows-latest'
   jobName: 'credscan'
   displayName: Secret Scan
 
 jobs:
 - job: ${{ parameters.jobName }}
   pool:
-    name: ${{ parameters.pool }}
+    vmImage: ${{ parameters.pool }}
 
   displayName: ${{ parameters.displayName }}
 
diff --git a/.vsts-ci/templates/nanoserver.yml b/.vsts-ci/templates/nanoserver.yml
index c989d01c2f8..ae9f639b3b2 100644
--- a/.vsts-ci/templates/nanoserver.yml
+++ b/.vsts-ci/templates/nanoserver.yml
@@ -1,5 +1,5 @@
 parameters:
-  vmImage: 'windows-2019'
+  vmImage: 'windows-latest'
   jobName: 'Nanoserver_Tests'
   continueOnError: false
 
diff --git a/.vsts-ci/templates/verify-xunit.yml b/.vsts-ci/templates/verify-xunit.yml
index 9e09584d5c3..d2799f53ae0 100644
--- a/.vsts-ci/templates/verify-xunit.yml
+++ b/.vsts-ci/templates/verify-xunit.yml
@@ -1,6 +1,6 @@
 parameters:
   parentJobs: []
-  pool: 'vs2017-win2016'
+  pool: 'windows-latest'
   jobName: 'xunit_verify'
 
 jobs:
diff --git a/.vsts-ci/templates/windows-test.yml b/.vsts-ci/templates/windows-test.yml
index b316f8f360e..475c40c665c 100644
--- a/.vsts-ci/templates/windows-test.yml
+++ b/.vsts-ci/templates/windows-test.yml
@@ -1,5 +1,5 @@
 parameters:
-  pool: 'Hosted VS2017'
+  pool: 'windows-latest'
   parentJobs: []
   purpose: ''
   tagSet: 'CI'
@@ -9,7 +9,7 @@ jobs:
   dependsOn:
     ${{ parameters.parentJobs }}
   pool:
-    name: ${{ parameters.pool }}
+    vmImage: ${{ parameters.pool }}
 
   displayName: Windows Test - ${{ parameters.purpose }} - ${{ parameters.tagSet }}
 
diff --git a/.vsts-ci/windows-daily.yml b/.vsts-ci/windows-daily.yml
index 9171112b362..55470e6dd53 100644
--- a/.vsts-ci/windows-daily.yml
+++ b/.vsts-ci/windows-daily.yml
@@ -53,7 +53,7 @@ stages:
   jobs:
   - job: win_test
     pool:
-      vmImage: vs2017-win2016
+      vmImage: windows-latest
     displayName: Windows Test
     timeoutInMinutes: 90
 
diff --git a/.vsts-ci/windows/templates/windows-packaging.yml b/.vsts-ci/windows/templates/windows-packaging.yml
index 88a557ca032..832fe73af5e 100644
--- a/.vsts-ci/windows/templates/windows-packaging.yml
+++ b/.vsts-ci/windows/templates/windows-packaging.yml
@@ -1,6 +1,6 @@
 parameters:
   - name: pool
-    default: 'Hosted VS2017'
+    default: 'windows-latest'
   - name: jobName
     default: 'win_packaging'
   - name: runtimePrefix
@@ -24,7 +24,7 @@ jobs:
       value: $(Agent.BuildDirectory)\$(complianceRepoFolder)
 
   pool:
-    name: ${{ parameters.pool }}
+    vmImage: ${{ parameters.pool }}
 
   displayName: Windows Packaging - ${{ parameters.architecture }} - ${{ parameters.channel }}
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
index f9094254ec3..61f9f8e0f9f 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
@@ -600,9 +600,14 @@ Describe "Additional tests for Import-Module with WinCompat" -Tag "Feature" {
 
         It "NoClobber WinCompat import works for an engine module through -UseWindowsPowerShell parameter" {
 
+            # pre-test cleanup
+            Get-Module -Name Microsoft.PowerShell.Management | Remove-Module
+            Import-Module -Name Microsoft.PowerShell.Management # import the one that comes with PSCore
+
             Import-Module Microsoft.PowerShell.Management -UseWindowsPowerShell
 
             $modules = Get-Module -Name Microsoft.PowerShell.Management
+
             $modules.Count | Should -Be 2
             $proxyModule = $modules | Where-Object {$_.ModuleType -eq 'Script'}
             $coreModule = $modules | Where-Object {$_.ModuleType -eq 'Manifest'}
@@ -703,6 +708,10 @@ Remove-Module $desktopModuleToUse
             Restore-ModulePath
         }
 
+        BeforeEach {
+            Get-PSSession -Name WinPSCompatSession -ErrorAction SilentlyContinue | Remove-PSSession
+        }
+
         AfterEach {
             Get-Module $allModules | Remove-Module -Force
         }
diff --git a/test/powershell/Modules/Microsoft.WSMan.Management/CredSSP.Tests.ps1 b/test/powershell/Modules/Microsoft.WSMan.Management/CredSSP.Tests.ps1
index e440c8093f8..0f13e8e6aad 100644
--- a/test/powershell/Modules/Microsoft.WSMan.Management/CredSSP.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.WSMan.Management/CredSSP.Tests.ps1
@@ -1,5 +1,8 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
+
+Import-Module HelpersCommon
+
 Describe "CredSSP cmdlet tests" -Tags 'Feature','RequireAdminOnWindows' {
 
     BeforeAll {
@@ -44,21 +47,27 @@ Describe "CredSSP cmdlet tests" -Tags 'Feature','RequireAdminOnWindows' {
     }
 
     It "Enable-WSManCredSSP works: <description>" -Skip:($NotEnglish -or $IsToBeSkipped) -TestCases @(
-        @{params=@{Role="Client";DelegateComputer="*"};description="client"},
-        @{params=@{Role="Server"};description="server"}
+        @{ params = @{ Role="Client"; DelegateComputer="*" }; description = "client"; expected = "The machine is configured to allow delegating fresh credentials to the following target\(s\):wsman/\*" },
+        @{ params = @{ Role="Server" };                       description = "server"; expected = "This computer is configured to receive credentials from a remote client computer" }
     ) {
-        param ($params)
+        param ($params, $description, $expected)
+
         $c = Enable-WSManCredSSP @params -Force
         $c.CredSSP | Should -BeTrue
 
-        $c = Get-WSManCredSSP
         if ($params.Role -eq "Client")
         {
-            $c[0] | Should -Match "The machine is configured to allow delegating fresh credentials to the following target\(s\):wsman/\*"
+            Wait-UntilTrue -IntervalInMilliseconds 500 -sb {
+                $c = Get-WSManCredSSP
+                $c[0] -match $expected
+            } | Should -BeTrue -Because "WSManCredSSP should have been enabled to allow delegating fresh credentials to wsman/*, but it was not."
         }
         else
         {
-            $c[1] | Should -Match "This computer is configured to receive credentials from a remote client computer"
+            Wait-UntilTrue -IntervalInMilliseconds 500 -sb {
+                $c = Get-WSManCredSSP
+                $c[1] -match $expected
+            } | Should -BeTrue -Because "WSManCredSSP should have been enabled to allow receiving credentials from a remote client computer, but it was not."
         }
     }
 

From 7dd0c43fb391c322d2ed01f1df26154a765455f8 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Tue, 8 Feb 2022 09:56:17 -0800
Subject: [PATCH 234/645] Add newly joined members to their respective Working
 Groups (#16849)

---
 .spelling                                   | 7 ++++++-
 docs/community/working-group-definitions.md | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.spelling b/.spelling
index a66b32d744b..7c136a35594 100644
--- a/.spelling
+++ b/.spelling
@@ -1433,5 +1433,10 @@ PkgES
 benchmarked
 BenchmarkDotNet
  - docs/community/working-group-definitions.md
-TobiasPSP
+gaelcolas
 jdhitsolutions
+jhoneill
+kilasuit
+michaeltlombardi
+SeeminglyScience
+TobiasPSP
diff --git a/docs/community/working-group-definitions.md b/docs/community/working-group-definitions.md
index d02810078e6..2a64a5ac6b2 100644
--- a/docs/community/working-group-definitions.md
+++ b/docs/community/working-group-definitions.md
@@ -20,6 +20,8 @@ Today, DSC is integrated into the PowerShell language, and we need to manage it
 * @TravisEz13
 * @theJasonHelmick
 * @anmenaga
+* @gaelcolas
+* @michaeltlombardi
 
 ## Developer Experience
 
@@ -33,6 +35,8 @@ Special consideration should be given to topics like **backwards compatibility**
 
 * @JamesWTruher (PS Standard, module authoring)
 * @adityapatwardhan (SDK)
+* @michaeltlombardi
+* @SeeminglyScience
 
 ## Engine
 
@@ -81,6 +85,8 @@ These topics include (but are not limited to):
 * @daxian-dbw (PSReadline / IntelliSense)
 * @adityapatwardhan (Markdown / help system)
 * @JamesWTruher (cmdlet design)
+* @SeeminglyScience
+* @kilasuit
 
 ## Language
 
@@ -95,6 +101,7 @@ particularly given the long-lasting effects of language decisions.
 * @JamesWTruher
 * @daxian-dbw
 * @BrucePay
+* @SeeminglyScience
 
 ## Remoting
 
@@ -136,6 +143,8 @@ These modules include:
 * PowerShell Committee as interim members
 * @jdhitsolutions
 * @TobiasPSP
+* @doctordns
+* @jhoneill
 
 ## Security
 

From cf75ac58f703d0c92132ae3fafe16dad93f86dc7 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Wed, 9 Feb 2022 09:03:39 -0800
Subject: [PATCH 235/645] Refactor Global Tool packaging to include SBOM
 generation (#16860)

* Refactor Global Tool packaging to include SBOM generation

* PR review comments, also fix verbose messages.
---
 tools/packaging/packaging.psd1                |   5 +-
 tools/packaging/packaging.psm1                | 362 ++++++++++++------
 .../templates/global-tool-pkg-sbom.yml        |  63 +++
 .../azureDevOps/templates/nuget.yml           |  18 +-
 4 files changed, 320 insertions(+), 128 deletions(-)
 create mode 100644 tools/releaseBuild/azureDevOps/templates/global-tool-pkg-sbom.yml

diff --git a/tools/packaging/packaging.psd1 b/tools/packaging/packaging.psd1
index e9dec523acd..6482b866d43 100644
--- a/tools/packaging/packaging.psd1
+++ b/tools/packaging/packaging.psd1
@@ -14,10 +14,11 @@
         'Invoke-AzDevOpsLinuxPackageCreation'
         'New-DotnetSdkContainerFxdPackage'
         'New-ExePackage'
-        'New-GlobalToolNupkg'
+        'Start-PrepForGlobalToolNupkg'
+        'New-GlobalToolNupkgSource'
+        'New-GlobalToolNupkgFromSource'
         'New-ILNugetPackageSource'
         'New-ILNugetPackageFromSource'
-        'New-ILNugetPackage'
         'New-MSIPatch'
         'New-PSBuildZip'
         'New-PSSignedBuildZip'
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 929d7868a44..3c9091a990a 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -4049,11 +4049,10 @@ function ReduceFxDependentPackage
 
 <#
 .SYNOPSIS
-Create a Global tool nuget package for PowerShell.
+Performs clean up work for preparation to running New-GlobalToolNupkgSource package source creation.
 
 .DESCRIPTION
-If the UnifiedPackage switch is present, then create a packag with both Windows and Unix runtimes.
-Else create two packages, one for Windows and other for Linux.
+Unnecessary package source files are removed.
 
 .PARAMETER LinuxBinPath
 Path to the folder containing the fxdependent package for Linux.
@@ -4061,28 +4060,19 @@ Path to the folder containing the fxdependent package for Linux.
 .PARAMETER WindowsBinPath
 Path to the folder containing the fxdependent package for Windows.
 
-.PARAMETER PackageVersion
-Version for the NuGet package that will be generated.
-
-.PARAMETER DestinationPath
-Path to the folder where the generated packages will be copied to.
-
-.PARAMETER UnifiedPackage
-Create package with both Windows and Unix runtimes.
+.PARAMETER WindowsDesktopBinPath
+Path to the folder containing desktop framework package for Windows.
 #>
-function New-GlobalToolNupkg
+function Start-PrepForGlobalToolNupkg
 {
     [CmdletBinding()]
     param(
         [Parameter(Mandatory)] [string] $LinuxBinPath,
         [Parameter(Mandatory)] [string] $WindowsBinPath,
-        [Parameter(Mandatory)] [string] $WindowsDesktopBinPath,
-        [Parameter(Mandatory)] [string] $PackageVersion,
-        [Parameter(Mandatory)] [string] $DestinationPath,
-        [Parameter(ParameterSetName="UnifiedPackage")] [switch] $UnifiedPackage
+        [Parameter(Mandatory)] [string] $WindowsDesktopBinPath
     )
 
-    $packageInfo = @()
+    Write-Log "Start-PrepForGlobalToolNupkg: Running clean up for New-GlobalToolNupkg package creation."
 
     $libCryptoPath = Join-Path $LinuxBinPath 'libcrypto.so.1.0.0'
     $libSSLPath = Join-Path $LinuxBinPath 'libssl.so.1.0.0'
@@ -4095,135 +4085,275 @@ function New-GlobalToolNupkg
         Remove-Item -Path $libSSLPath -Verbose -Force
     }
 
-    ## Remove unnecessary xml files
+    # Remove unnecessary xml files
     Get-ChildItem -Path $LinuxBinPath, $WindowsBinPath, $WindowsDesktopBinPath -Filter *.xml | Remove-Item -Verbose
+}
 
-    if ($UnifiedPackage)
-    {
-        Write-Log "Creating a unified package"
-        $packageInfo += @{ RootFolder = (New-TempFolder); PackageName = "PowerShell"; Type = "Unified"}
-        $ShimDllPath = Join-Path $WindowsDesktopBinPath "Microsoft.PowerShell.GlobalTool.Shim.dll"
-    }
-    else
+<#
+.SYNOPSIS
+Create a single PowerShell Global tool nuget package NuSpec source directory for the provied
+package type.
+
+.DESCRIPTION
+A single NuSpec source directory is created for the individual package type, and the created
+directory path is set to the environement variable name: "GlobaToolNuSpecSourcePath_${PackageType}".
+
+.PARAMETER PackageType
+Global tool package type to create.
+
+.PARAMETER LinuxBinPath
+Path to the folder containing the fxdependent package for Linux.
+
+.PARAMETER WindowsBinPath
+Path to the folder containing the fxdependent package for Windows.
+
+.PARAMETER WindowsDesktopBinPath
+Path to the folder containing desktop framework package for Windows.
+
+.PARAMETER PackageVersion
+Version for the NuGet package that will be generated.
+#>
+function New-GlobalToolNupkgSource
+{
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory)] [string] $PackageType,
+        [Parameter(Mandatory)] [string] $LinuxBinPath,
+        [Parameter(Mandatory)] [string] $WindowsBinPath,
+        [Parameter(Mandatory)] [string] $WindowsDesktopBinPath,
+        [Parameter(Mandatory)] [string] $PackageVersion
+    )
+
+    if ($PackageType -ne "Unified")
     {
-        Write-Log "Reducing size of Linux package"
+        Write-Log "New-GlobalToolNupkgSource: Reducing package size for non-unified packages."
+
+        Write-Log "New-GlobalToolNupkgSource: Reducing size of Linux package"
         ReduceFxDependentPackage -Path $LinuxBinPath
 
-        Write-Log "Reducing size of Windows package"
+        Write-Log "New-GlobalToolNupkgSource: Reducing size of Windows package"
         ReduceFxDependentPackage -Path $WindowsBinPath -KeepWindowsRuntimes
 
-        Write-Log "Reducing size of WindowsDesktop package"
+        Write-Log "New-GlobalToolNupkgSource: Reducing size of WindowsDesktop package"
         ReduceFxDependentPackage -Path $WindowsDesktopBinPath -KeepWindowsRuntimes
+    }
 
-        Write-Log "Creating a Linux and Windows packages"
-        $packageInfo += @{ RootFolder = (New-TempFolder); PackageName = "PowerShell.Linux.Alpine"; Type = "PowerShell.Linux.Alpine"}
-        $packageInfo += @{ RootFolder = (New-TempFolder); PackageName = "PowerShell.Linux.x64"; Type = "PowerShell.Linux.x64"}
-        $packageInfo += @{ RootFolder = (New-TempFolder); PackageName = "PowerShell.Linux.arm32"; Type = "PowerShell.Linux.arm32"}
-        $packageInfo += @{ RootFolder = (New-TempFolder); PackageName = "PowerShell.Linux.arm64"; Type = "PowerShell.Linux.arm64"}
+    Write-Log "New-GlobalToolNupkgSource: Creating package: $PackageType"
 
-        $packageInfo += @{ RootFolder = (New-TempFolder); PackageName = "PowerShell.Windows.x64"; Type = "PowerShell.Windows.x64"}
-        $packageInfo += @{ RootFolder = (New-TempFolder); PackageName = "PowerShell.Windows.arm32"; Type = "PowerShell.Windows.arm32"}
-    }
+    switch ($PackageType)
+    {
+        "Unified"
+        {
+            $ShimDllPath = Join-Path $WindowsDesktopBinPath "Microsoft.PowerShell.GlobalTool.Shim.dll"
+
+            $PackageName = "PowerShell"
+            $RootFolder = New-TempFolder
+
+            Copy-Item -Path $iconPath -Destination "$RootFolder/$iconFileName" -Verbose
+
+            $ridFolder = New-Item -Path (Join-Path $RootFolder "tools/$script:netCoreRuntime/any") -ItemType Directory
+            $winFolder = New-Item (Join-Path $ridFolder "win") -ItemType Directory
+            $unixFolder = New-Item (Join-Path $ridFolder "unix") -ItemType Directory
 
-    $packageInfo | ForEach-Object {
-        $ridFolder = New-Item -Path (Join-Path $_.RootFolder "tools/$script:netCoreRuntime/any") -ItemType Directory
+            Write-Log "New-GlobalToolNupkgSource: Copying runtime assemblies from $WindowsDesktopBinPath"
+            Copy-Item "$WindowsDesktopBinPath\*" -Destination $winFolder -Recurse
 
-        # Add the icon file to the package
-        Copy-Item -Path $iconPath -Destination "$($_.RootFolder)/$iconFileName" -Verbose
+            Write-Log "New-GlobalToolNupkgSource: Copying runtime assemblies from $LinuxBinPath"
+            Copy-Item "$LinuxBinPath\*" -Destination $unixFolder -Recurse
 
-        $packageType = $_.Type
+            Write-Log "New-GlobalToolNupkgSource: Copying shim dll from $ShimDllPath"
+            Copy-Item $ShimDllPath -Destination $ridFolder
 
-        switch ($packageType)
+            $shimConfigFile = Join-Path (Split-Path $ShimDllPath -Parent) 'Microsoft.PowerShell.GlobalTool.Shim.runtimeconfig.json'
+            Write-Log "New-GlobalToolNupkgSource: Copying shim config file from $shimConfigFile"
+            Copy-Item $shimConfigFile -Destination $ridFolder -ErrorAction Stop
+
+            $toolSettings = $packagingStrings.GlobalToolSettingsFile -f (Split-Path $ShimDllPath -Leaf)
+        }
+
+        "PowerShell.Linux.Alpine"
         {
-            "Unified"
-            {
-                $winFolder = New-Item (Join-Path $ridFolder "win") -ItemType Directory
-                $unixFolder = New-Item (Join-Path $ridFolder "unix") -ItemType Directory
+            $PackageName = "PowerShell.Linux.Alpine"
+            $RootFolder = New-TempFolder
 
-                Write-Log "Copying runtime assemblies from $WindowsDesktopBinPath"
-                Copy-Item "$WindowsDesktopBinPath\*" -Destination $winFolder -Recurse
+            Copy-Item -Path $iconPath -Destination "$RootFolder/$iconFileName" -Verbose
 
-                Write-Log "Copying runtime assemblies from $LinuxBinPath"
-                Copy-Item "$LinuxBinPath\*" -Destination $unixFolder -Recurse
+            $ridFolder = New-Item -Path (Join-Path $RootFolder "tools/$script:netCoreRuntime/any") -ItemType Directory
 
-                Write-Log "Copying shim dll from $ShimDllPath"
-                Copy-Item $ShimDllPath -Destination $ridFolder
+            Write-Log "New-GlobalToolNupkgSource: Copying runtime assemblies from $LinuxBinPath for $PackageType"
+            Copy-Item "$LinuxBinPath/*" -Destination $ridFolder -Recurse
+            Remove-Item -Path $ridFolder/runtimes/linux-arm -Recurse -Force
+            Remove-Item -Path $ridFolder/runtimes/linux-arm64 -Recurse -Force
+            Remove-Item -Path $ridFolder/runtimes/osx -Recurse -Force
+            $toolSettings = $packagingStrings.GlobalToolSettingsFile -f "pwsh.dll"
+        }
 
-                $shimConfigFile = Join-Path (Split-Path $ShimDllPath -Parent) 'Microsoft.PowerShell.GlobalTool.Shim.runtimeconfig.json'
-                Write-Log "Copying shim config file from $shimConfigFile"
-                Copy-Item $shimConfigFile -Destination $ridFolder -ErrorAction Stop
+        "PowerShell.Linux.x64"
+        {
+            $PackageName = "PowerShell.Linux.x64"
+            $RootFolder = New-TempFolder
 
-                $toolSettings = $packagingStrings.GlobalToolSettingsFile -f (Split-Path $ShimDllPath -Leaf)
-            }
+            Copy-Item -Path $iconPath -Destination "$RootFolder/$iconFileName" -Verbose
 
-            "PowerShell.Linux.Alpine"
-            {
-                Write-Log "Copying runtime assemblies from $LinuxBinPath for $packageType"
-                Copy-Item "$LinuxBinPath/*" -Destination $ridFolder -Recurse
-                Remove-Item -Path $ridFolder/runtimes/linux-arm -Recurse -Force
-                Remove-Item -Path $ridFolder/runtimes/linux-arm64 -Recurse -Force
-                Remove-Item -Path $ridFolder/runtimes/osx -Recurse -Force
-                $toolSettings = $packagingStrings.GlobalToolSettingsFile -f "pwsh.dll"
-            }
+            $ridFolder = New-Item -Path (Join-Path $RootFolder "tools/$script:netCoreRuntime/any") -ItemType Directory
 
-            "PowerShell.Linux.x64"
-            {
-                Write-Log "Copying runtime assemblies from $LinuxBinPath for $packageType"
-                Copy-Item "$LinuxBinPath/*" -Destination $ridFolder -Recurse
-                Remove-Item -Path $ridFolder/runtimes/linux-arm -Recurse -Force
-                Remove-Item -Path $ridFolder/runtimes/linux-arm64 -Recurse -Force
-                Remove-Item -Path $ridFolder/runtimes/linux-musl-x64 -Recurse -Force
-                Remove-Item -Path $ridFolder/runtimes/osx -Recurse -Force
-                $toolSettings = $packagingStrings.GlobalToolSettingsFile -f "pwsh.dll"
-            }
+            Write-Log "New-GlobalToolNupkgSource: Copying runtime assemblies from $LinuxBinPath for $PackageType"
+            Copy-Item "$LinuxBinPath/*" -Destination $ridFolder -Recurse
+            Remove-Item -Path $ridFolder/runtimes/linux-arm -Recurse -Force
+            Remove-Item -Path $ridFolder/runtimes/linux-arm64 -Recurse -Force
+            Remove-Item -Path $ridFolder/runtimes/linux-musl-x64 -Recurse -Force
+            Remove-Item -Path $ridFolder/runtimes/osx -Recurse -Force
+            $toolSettings = $packagingStrings.GlobalToolSettingsFile -f "pwsh.dll"
+        }
 
-            "PowerShell.Linux.arm32"
-            {
-                Write-Log "Copying runtime assemblies from $LinuxBinPath for $packageType"
-                Copy-Item "$LinuxBinPath/*" -Destination $ridFolder -Recurse
-                Remove-Item -Path $ridFolder/runtimes/linux-arm64 -Recurse -Force
-                Remove-Item -Path $ridFolder/runtimes/linux-musl-x64 -Recurse -Force
-                Remove-Item -Path $ridFolder/runtimes/linux-x64 -Recurse -Force
-                Remove-Item -Path $ridFolder/runtimes/osx -Recurse -Force
-                $toolSettings = $packagingStrings.GlobalToolSettingsFile -f "pwsh.dll"
-            }
+        "PowerShell.Linux.arm32"
+        {
+            $PackageName = "PowerShell.Linux.arm32"
+            $RootFolder = New-TempFolder
 
-            "PowerShell.Linux.arm64"
-            {
-                Write-Log "Copying runtime assemblies from $LinuxBinPath for $packageType"
-                Copy-Item "$LinuxBinPath/*" -Destination $ridFolder -Recurse
-                Remove-Item -Path $ridFolder/runtimes/linux-arm -Recurse -Force
-                Remove-Item -Path $ridFolder/runtimes/linux-musl-x64 -Recurse -Force
-                Remove-Item -Path $ridFolder/runtimes/linux-x64 -Recurse -Force
-                Remove-Item -Path $ridFolder/runtimes/osx -Recurse -Force
-                $toolSettings = $packagingStrings.GlobalToolSettingsFile -f "pwsh.dll"
-            }
+            Copy-Item -Path $iconPath -Destination "$RootFolder/$iconFileName" -Verbose
 
-            "PowerShell.Windows.x64"
-            {
-                Write-Log "Copying runtime assemblies from $WindowsDesktopBinPath for $packageType"
-                Copy-Item "$WindowsDesktopBinPath/*" -Destination $ridFolder -Recurse
-                Remove-Item -Path $ridFolder/runtimes/win-arm -Recurse -Force
-                $toolSettings = $packagingStrings.GlobalToolSettingsFile -f "pwsh.dll"
-            }
+            $ridFolder = New-Item -Path (Join-Path $RootFolder "tools/$script:netCoreRuntime/any") -ItemType Directory
 
-            "PowerShell.Windows.arm32"
-            {
-                Write-Log "Copying runtime assemblies from $WindowsBinPath for $packageType"
-                Copy-Item "$WindowsBinPath/*" -Destination $ridFolder -Recurse
-                Remove-Item -Path $ridFolder/runtimes/win-x64 -Recurse -Force
-                $toolSettings = $packagingStrings.GlobalToolSettingsFile -f "pwsh.dll"
-            }
+            Write-Log "New-GlobalToolNupkgSource: Copying runtime assemblies from $LinuxBinPath for $PackageType"
+            Copy-Item "$LinuxBinPath/*" -Destination $ridFolder -Recurse
+            Remove-Item -Path $ridFolder/runtimes/linux-arm64 -Recurse -Force
+            Remove-Item -Path $ridFolder/runtimes/linux-musl-x64 -Recurse -Force
+            Remove-Item -Path $ridFolder/runtimes/linux-x64 -Recurse -Force
+            Remove-Item -Path $ridFolder/runtimes/osx -Recurse -Force
+            $toolSettings = $packagingStrings.GlobalToolSettingsFile -f "pwsh.dll"
         }
 
-        $packageName = $_.PackageName
-        $nuSpec = $packagingStrings.GlobalToolNuSpec -f $packageName, $PackageVersion, $iconFileName
-        $nuSpec | Out-File -FilePath (Join-Path $_.RootFolder "$packageName.nuspec") -Encoding ascii
-        $toolSettings | Out-File -FilePath (Join-Path $ridFolder "DotnetToolSettings.xml") -Encoding ascii
+        "PowerShell.Linux.arm64"
+        {
+            $PackageName = "PowerShell.Linux.arm64"
+            $RootFolder = New-TempFolder
+
+            Copy-Item -Path $iconPath -Destination "$RootFolder/$iconFileName" -Verbose
+
+            $ridFolder = New-Item -Path (Join-Path $RootFolder "tools/$script:netCoreRuntime/any") -ItemType Directory
+
+            Write-Log "New-GlobalToolNupkgSource: Copying runtime assemblies from $LinuxBinPath for $PackageType"
+            Copy-Item "$LinuxBinPath/*" -Destination $ridFolder -Recurse
+            Remove-Item -Path $ridFolder/runtimes/linux-arm -Recurse -Force
+            Remove-Item -Path $ridFolder/runtimes/linux-musl-x64 -Recurse -Force
+            Remove-Item -Path $ridFolder/runtimes/linux-x64 -Recurse -Force
+            Remove-Item -Path $ridFolder/runtimes/osx -Recurse -Force
+            $toolSettings = $packagingStrings.GlobalToolSettingsFile -f "pwsh.dll"
+        }
+
+        "PowerShell.Windows.x64"
+        {
+            $PackageName = "PowerShell.Windows.x64"
+            $RootFolder = New-TempFolder
+
+            Copy-Item -Path $iconPath -Destination "$RootFolder/$iconFileName" -Verbose
+
+            $ridFolder = New-Item -Path (Join-Path $RootFolder "tools/$script:netCoreRuntime/any") -ItemType Directory
+
+            Write-Log "New-GlobalToolNupkgSource: Copying runtime assemblies from $WindowsDesktopBinPath for $PackageType"
+            Copy-Item "$WindowsDesktopBinPath/*" -Destination $ridFolder -Recurse
+            Remove-Item -Path $ridFolder/runtimes/win-arm -Recurse -Force
+            $toolSettings = $packagingStrings.GlobalToolSettingsFile -f "pwsh.dll"
+        }
+
+        "PowerShell.Windows.arm32"
+        {
+            $PackageName = "PowerShell.Windows.arm32"
+            $RootFolder = New-TempFolder
+
+            Copy-Item -Path $iconPath -Destination "$RootFolder/$iconFileName" -Verbose
+
+            $ridFolder = New-Item -Path (Join-Path $RootFolder "tools/$script:netCoreRuntime/any") -ItemType Directory
+
+            Write-Log "New-GlobalToolNupkgSource: Copying runtime assemblies from $WindowsBinPath for $PackageType"
+            Copy-Item "$WindowsBinPath/*" -Destination $ridFolder -Recurse
+            Remove-Item -Path $ridFolder/runtimes/win-x64 -Recurse -Force
+            $toolSettings = $packagingStrings.GlobalToolSettingsFile -f "pwsh.dll"
+        }
+
+        default { throw "New-GlobalToolNupkgSource: Unkown package type: $PackageType" }
+    }
+
+    $nuSpec = $packagingStrings.GlobalToolNuSpec -f $PackageName, $PackageVersion, $iconFileName
+    $nuSpec | Out-File -FilePath (Join-Path $RootFolder "$PackageName.nuspec") -Encoding ascii
+    $toolSettings | Out-File -FilePath (Join-Path $ridFolder "DotnetToolSettings.xml") -Encoding ascii
+
+    # Source created.
+    Write-Log "New-GlobalToolNupkgSource: Global tool package ($PackageName) source created at: $RootFolder"
+
+    # Set VSTS environment variable for package NuSpec source path.
+    $pkgNuSpecSourcePathVar = "GlobalToolNuSpecSourcePath"
+    Write-Log "New-GlobalToolNupkgSource: Creating NuSpec source path VSTS variable: $pkgNuSpecSourcePathVar"
+    Write-Host "##vso[task.setvariable variable=$pkgNuSpecSourcePathVar]$RootFolder"
 
-        Write-Log "Creating a package: $packageName"
-        New-NugetPackage -NuSpecPath $_.RootFolder -PackageDestinationPath $DestinationPath
+    # Set VSTS environment variable for package Name.
+    $pkgNameVar = "GlobalToolPkgName"
+    Write-Log "New-GlobalToolNupkgSource: Creating current package name variable: $pkgNameVar"
+    Write-Host "##vso[task.setvariable variable=$pkgNameVar]$PackageName"
+
+    # Set VSTS environment variable for CGManifest file path.
+    $globalToolCGManifestPFilePath = Join-Path -Path "$env:REPOROOT" -ChildPath "tools\cgmanifest.json"
+    $globalToolCGManifestFilePath = Resolve-Path -Path $globalToolCGManifestPFilePath -ErrorAction SilentlyContinue
+    if (($null -eq $globalToolCGManifestFilePath) -or (! (Test-Path -Path $globalToolCGManifestFilePath)))
+    {
+        throw "New-GlobalToolNupkgSource: Invalid build source CGManifest file path: $globalToolCGManifestPFilePath"
+    }
+    $globalToolCGManifestSourceRoot = New-TempFolder
+    Write-Log "New-GlobalToolNupkgSource: Creating new CGManifest.json file at: $globalToolCGManifestSourceRoot"
+    Copy-Item -Path $globalToolCGManifestFilePath -Destination $globalToolCGManifestSourceRoot -Force
+
+    $globalToolCGManifestPathVar = "GlobalToolCGManifestPath"
+    Write-Log "New-GlobalToolNupkgSource: Creating CGManifest path variable, $globalToolCGManifestPathVar, for path: $globalToolCGManifestSourceRoot"
+    Write-Host "##vso[task.setvariable variable=$globalToolCGManifestPathVar]$globalToolCGManifestSourceRoot"
+}
+
+<#
+.SYNOPSIS
+Create a single PowerShell Global tool nuget package from the provied package source folder.
+
+.DESCRIPTION
+Creates a single PowerShell Global tool nuget package based on the provided package NuSpec source
+folder (created by New-GlobalNupkgSource), and places the created package in the provided destination
+folder.
+
+.PARAMETER PackageNuSpecPath
+Location of NuSpec path containing source for package creation.
+
+.PARAMETER PackageName
+Name of Global Tool package being created.
+
+.PARAMETER DestinationPath
+Path to the folder where the generated package is placed.
+#>
+function New-GlobalToolNupkgFromSource
+{
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)] [string] $PackageNuSpecPath,
+        [Parameter(Mandatory)] [string] $PackageName,
+        [Parameter(Mandatory)] [string] $DestinationPath,
+        [Parameter(Mandatory)] [string] $CGManifestPath
+    )
+
+    if (! (Test-Path -Path $PackageNuSpecPath))
+    {
+        throw "New-GlobalToolNupkgFromSource: failed because NuSpec path does not exist: $PackageNuSpecPath"
+    }
+
+    Write-Log "New-GlobalToolNupkgFromSource: Creating package: $PackageName"
+    New-NugetPackage -NuSpecPath $PackageNuSpecPath -PackageDestinationPath $DestinationPath
+
+    Write-Log "New-GlobalToolNupkgFromSource: Removing GlobalTool NuSpec source directory: $PackageNuSpecPath"
+    Remove-Item -Path $PackageNuSpecPath -Recurse -Force -ErrorAction SilentlyContinue
+
+    Write-Log "New-GlobalToolNupkgFromSource: Removing GlobalTool CGManifest source directory: $CGManifestPath"
+    if (! (Test-Path -Path $CGManifestPath))
+    {
+        Write-Verbose -Verbose -Message "New-GlobalToolNupkgFromSource: CGManifest file does not exist: $CGManifestPath"
+        return
     }
+    Remove-Item -Path $CGManifestPath -Recurse -Force -ErrorAction SilentlyContinue
 }
 
 ${mainLinuxBuildFolder} = 'pwshLinuxBuild'
diff --git a/tools/releaseBuild/azureDevOps/templates/global-tool-pkg-sbom.yml b/tools/releaseBuild/azureDevOps/templates/global-tool-pkg-sbom.yml
new file mode 100644
index 00000000000..4f3f06f942f
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/global-tool-pkg-sbom.yml
@@ -0,0 +1,63 @@
+parameters:
+  - name: PackageVersion
+  - name: LinuxBinPath
+  - name: WindowsBinPath
+  - name: WindowsDesktopBinPath
+  - name: DestinationPath
+  - name: ListOfPackageTypes
+    type: object
+    default:
+    - Unified
+    - PowerShell.Linux.Alpine
+    - PowerShell.Linux.x64
+    - PowerShell.Linux.arm32
+    - PowerShell.Linux.arm64
+    - PowerShell.Windows.x64
+    - PowerShell.Windows.arm32
+
+steps:
+
+- pwsh: |
+    Write-Verbose -Verbose 'LinuxBinPath path: ${{ parameters.LinuxBinPath }}'
+    Write-Verbose -Verbose 'WindowsBinPath path: ${{ parameters.WindowsBinPath }}'
+    Write-Verbose -Verbose 'WindowsDesktopBinPath path: ${{ parameters.WindowsDesktopBinPath }}'
+
+    Import-Module -Name $env:REPOROOT\build.psm1
+    Import-Module -Name $env:REPOROOT\tools\packaging
+    Start-PrepForGlobalToolNupkg -LinuxBinPath '${{ parameters.LinuxBinPath }}' -WindowsBinPath '${{ parameters.WindowsBinPath }}' -WindowsDesktopBinPath '${{ parameters.WindowsDesktopBinPath }}'
+  displayName: 'Preparation for Global Tools package creation.'
+
+# NOTE: The Unified package must always be created first, and so must always be first in ListOfPackageTypes.
+- ${{ each value in parameters.ListOfPackageTypes }}:
+  - pwsh: |
+      $PackageType = '${{ value }}'
+
+      Write-Verbose -Verbose "PackageType: $PackageType"
+      Write-Verbose -Verbose 'Destination path: ${{ parameters.PackagePath }}'
+
+      # Create global tool NuSpec source for package.
+      Import-Module -Name $env:REPOROOT\build.psm1
+      Import-Module -Name $env:REPOROOT\tools\packaging
+      New-GlobalToolNupkgSource -PackageType $PackageType -PackageVersion '${{ parameters.PackageVersion }}' -LinuxBinPath '${{ parameters.LinuxBinPath }}' -WindowsBinPath '${{ parameters.WindowsBinPath }}' -WindowsDesktopBinPath '${{ parameters.WindowsDesktopBinPath }}'
+    displayName: 'Create global tool NuSpec source for package.'
+
+  - pwsh: |
+      Get-ChildItem -Path env:
+    displayName: 'Capture environment variables after Global Tool package source is created.'
+
+  # NOTE: The above 'New-GlobalToolNupkgSource' task function sets the 'GlobalToolNuSpecSourcePath', 'GlobalToolPkgName',
+  #       and 'GlobalToolCGManifestPath' environment variables.
+  - template: Sbom.yml@ComplianceRepo
+    parameters:
+      BuildDropPath: $(GlobalToolNuSpecSourcePath)
+      Build_Repository_Uri: 'https://github.com/powershell/powershell'
+      PackageName: $(GlobalToolPkgName)
+      PackageVersion: ${{ parameters.PackageVersion }}
+      sourceScanPath: $(GlobalToolCGManifestPath)
+      displayName: SBOM for Global Tool package
+
+  - pwsh: |
+      Import-Module -Name $env:REPOROOT\build.psm1
+      Import-Module -Name $env:REPOROOT\tools\packaging
+      New-GlobalToolNupkgFromSource -PackageNuSpecPath "$env:GlobalToolNuSpecSourcePath" -PackageName "$env:GlobalToolPkgName" -DestinationPath '${{ parameters.DestinationPath }}' -CGManifestPath "$env:GlobalToolCGManifestPath"
+    displayName: 'Create global tool NuSpec package from NuSpec source.'
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index ed717fb90c7..7e7801afb8a 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -133,16 +133,14 @@ jobs:
       Get-ChildItem $(winFxdWinDesktopPath)
     displayName: Capture fxd folders
 
-  - pwsh: |
-      Import-Module $env:REPOROOT\build.psm1
-      Import-Module $env:REPOROOT\tools\packaging
-      Find-Dotnet
-      # Create unified package first
-      New-GlobalToolNupkg -UnifiedPackage -LinuxBinPath "$(linuxFxdPath)" -WindowsBinPath "$(winFxdPath)" -WindowsDesktopBinPath "$(winFxdWinDesktopPath)" -PackageVersion "$(Version)" -DestinationPath "$(PackagePath)\globaltool"
-
-      # Create packages for dotnet sdk
-      New-GlobalToolNupkg -LinuxBinPath "$(linuxFxdPath)" -WindowsBinPath "$(winFxdPath)" -WindowsDesktopBinPath "$(winFxdWinDesktopPath)" -PackageVersion "$(Version)" -DestinationPath "$(PackagePath)\globaltool"
-    displayName: 'Create Global tool packages'
+  # Create Global Tool packages along with SBOM manifests
+  - template: global-tool-pkg-sbom.yml
+    parameters:
+      PackageVersion: $(Version)
+      LinuxBinPath: $(linuxFxdPath)
+      WindowsBinPath: $(winFxdPath)
+      WindowsDesktopBinPath: $(winFxdWinDesktopPath)
+      DestinationPath: $(PackagePath)\globaltool
 
   - pwsh: |
       Get-ChildItem "$(PackagePath)" -Recurse

From a9a235d469ee240ba2316b8f6da1cd15e87510d5 Mon Sep 17 00:00:00 2001
From: ayousuf23 <72010390+ayousuf23@users.noreply.github.com>
Date: Wed, 9 Feb 2022 15:59:29 -0500
Subject: [PATCH 236/645] Prevent tab completion if the word to complete is a
 single dash (#16781)

* added code to prevent tab completion if the word to complete is a single dash

* added a test for testing tab completion if the word to complete is a single dash

* Minor update and add comment

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
---
 .../engine/CommandCompletion/CompletionCompleters.cs       | 3 ++-
 test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index d8360e714d8..f0157ae8b1b 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -1329,7 +1329,8 @@ internal static List<CompletionResult> CompleteCommandArgument(CompletionContext
                         context.Options.Remove("LiteralPaths");
                 }
 
-                if (context.WordToComplete != string.Empty && context.WordToComplete.Contains('-'))
+                // The word to complete contains a dash and it's not the first character. We try command names in this case.
+                if (context.WordToComplete.IndexOf('-') > 0)
                 {
                     var commandResults = CompleteCommand(context);
                     if (commandResults != null)
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index d2fa38dd2bd..e05ba3352bf 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -1435,6 +1435,13 @@ dir -Recurse `
             $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length
             $res.CompletionMatches | Should -BeNullOrEmpty
         }
+
+        It "A single dash should not complete to anything" {
+            function test-{}
+            $inputStr = 'git -'
+            $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length
+            $res.CompletionMatches | Should -BeNullOrEmpty
+        }
     }
 
     Context "Tab completion error tests" {

From add08d399ff5c58b5f4718b41f774819fd52e17e Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Thu, 10 Feb 2022 15:40:20 -0800
Subject: [PATCH 237/645] Add warning messages when package precheck fails
 (#16867)

---
 tools/packaging/packaging.psm1 | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 3c9091a990a..1437c5383ec 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -159,6 +159,23 @@ function Start-PSPackage {
             # also ensure `Start-PSPackage` does what the user asks/expects, because once packages
             # are generated, it'll be hard to verify if they were built from the correct content.
 
+            Write-Warning -Message "Start-PSPackage: The build PreCheck has failed."
+            if (-not $Script:Options) {
+                Write-Warning -Message "Start-PSPackage: builid options variable is null indicating Start-PSBuild hasn't been run yet."
+            }
+            if (-not $PSModuleRestoreCorrect) {
+                Write-Warning -Message "Start-PSPackage: PSModuleRestoreCorrect variable is null indicating build -PSModuleRestore was not performed."
+            }
+            if ($Script:Options.Configuration -ne $Configuration) {
+                Write-Warning -Message "Start-PSPackage: Build configuration is incorrect: Expected: $Configuration Actual: $($Script:Options.Configuration)"
+            }
+            if ($Script:Options.Framework -ne $script:netCoreRuntime) {
+                Write-Warning -Message "Start-PSPackage: Build .NET version is incorrect: Expected: $($script:netCoreRuntime) Actual: $($Script:Options.Framework)"
+            }
+            if (($Type -notlike 'fxdependent*' -and $Type -ne 'tar-alpine') -and ($Script:Options.Runtime -ne $Runtime)) {
+                Write-Warning -Message "Start-PSPackage: Build RID does not match expected RID: Expected: $Runtime Actual: $($Script:Options.Runtime)"
+            }
+
             $params = @('-Clean')
 
             if (!$IncludeSymbols.IsPresent) {

From 77caf718cd04f3a35eb74af236908bc9f54e2057 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 16 Feb 2022 09:56:41 -0800
Subject: [PATCH 238/645] Update projects and scripts to use .NET 7 preview 1
 pre-release builds (#16856)

* Update script to consume .NET 7 builds

* Update target framework

* Add dotnet metadata override value

* Update dependencies

* Update analyzer

* Conditionally add output argument

* Update files.wxs

* Fix tests

* Update Microsoft.PowerShell.Native to 7.3.0-preview.1

* Disable psget tests

* Update to latest build for .NET 7 preview 1

* Disable ready to run

* Update version of `Microsoft.AspNetCore.Mvc.NewtonsoftJson` package

* Update cgmanifest and startup test
---
 Analyzers.props                               |  4 +--
 DotnetRuntimeMetadata.json                    | 12 ++++----
 PowerShell.Common.props                       |  5 ++--
 assets/wix/files.wxs                          | 14 ++++++++--
 build.psm1                                    | 21 ++++++--------
 global.json                                   |  2 +-
 nuget.config                                  |  3 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  6 ++--
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           |  8 +++---
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 src/Modules/PSGalleryModules.csproj           |  2 +-
 src/ResGen/ResGen.csproj                      |  2 +-
 .../System.Management.Automation.csproj       | 20 ++++++-------
 .../engine/Modules/ModuleCmdletBase.cs        |  2 ++
 src/TypeCatalogGen/TypeCatalogGen.csproj      |  2 +-
 test/Test.Common.props                        |  2 +-
 .../ResultsComparer/ResultsComparer.csproj    |  2 +-
 test/powershell/Host/Startup.Tests.ps1        |  5 ++--
 .../PackageManagement.Tests.ps1               | 15 ++++++++--
 .../PowerShellGet/PowerShellGet.Tests.ps1     | 28 +++++++++++++++++++
 .../Get-ExperimentalFeature.Tests.ps1         |  4 +--
 test/tools/OpenCover/OpenCover.psm1           |  4 +--
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/WebListener.csproj     |  4 +--
 tools/UpdateDotnetRuntime.ps1                 |  2 +-
 tools/cgmanifest.json                         |  6 ++--
 tools/findMissingNotices.ps1                  |  4 +--
 tools/packaging/packaging.psm1                |  8 +++---
 tools/packaging/packaging.strings.psd1        |  2 +-
 tools/packaging/projects/nuget/package.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  4 +--
 .../Microsoft.PowerShell.ConsoleHost.csproj   |  2 +-
 .../System.Management.Automation.csproj       |  4 +--
 .../templates/release-SDKTests.yml            |  2 +-
 36 files changed, 127 insertions(+), 84 deletions(-)

diff --git a/Analyzers.props b/Analyzers.props
index dacf53c4625..8c69e56237e 100644
--- a/Analyzers.props
+++ b/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="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22068.2" PrivateAssets="all" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 0917e8476c6..92f5825c978 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,13 +1,13 @@
 {
   "sdk": {
-    "channel": "6.0.1xx",
-    "quality": "ga",
+    "channel": "7.0.1xx-preview1",
+    "quality": "signed",
     "qualityFallback": "daily",
-    "packageVersionPattern": "6.0.0",
-    "sdkImageVersion": "6.0.100",
-    "nextChannel": "6.0.1xx",
+    "packageVersionPattern": "7.0.0-preview.1",
+    "sdkImageVersion": "7.0.100",
+    "nextChannel": "7.0.1xx-preview1",
     "azureFeed": "",
-    "sdkImageOverride": ""
+    "sdkImageOverride": "7.0.100-preview.1.22110.4"
   },
   "internalfeed" : {
     "url": ""
diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 4054cd5b19a..39e799d5a34 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -135,10 +135,11 @@
     <Company>Microsoft Corporation</Company>
     <Copyright>(c) Microsoft Corporation.</Copyright>
 
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <LangVersion>10.0</LangVersion>
+    <!-- disable ReadyToRun due to issue: https://github.com/dotnet/runtime/issues/65412
     <PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
-    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
+    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols-->
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 14b2204c159..9bbc1715145 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1638,6 +1638,9 @@
         <Component Id="cmpA75DEF5617C54DA1937CB37D5824BF79">
           <File Id="fil3EE6096BD3C8407685E881F3CE6BF5C1" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Security.Cryptography.OpenSsl.dll" />
         </Component>
+        <Component Id="cmpE5993DB9118640FD8C180A2D61C89C01">
+          <File Id="fil7381E5F4FBC64B60A8B7D7841B89F4C6" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Security.Cryptography.dll" />
+        </Component>
       </Directory>
       <Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
         <Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
@@ -3154,8 +3157,11 @@
       <Component Id="cmp22840874A8C84AA796496634FBEBF09C">
         <File Id="fil2067B616D1FA4B30932A0240ABE06089" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
       </Component>
-      <Component Id="cmpC100F34A32A0436A973FE7F9A02F5A78">
-        <File Id="filC8B8F95747F64A97B511342C7F154B54" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.121.56705.dll" />
+      <Component Id="cmpAC388473B5C048E3AB478DCC0B3C61FE">
+        <File Id="fil2D3CF7A46E0842BABB83B0A8787FED26" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.7608.dll" />
+      </Component>
+      <Component Id="cmpE0DEAA289B2D4594A0C4791B2808C97C">
+        <File Id="fil530EAD567BDB402FA6F02AFAA696D721" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4172,8 +4178,10 @@
       <ComponentRef Id="cmp0C4751F9D5C14419A45F234152D21DA9" />
       <ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
       <ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
-      <ComponentRef Id="cmpC100F34A32A0436A973FE7F9A02F5A78" />
       <ComponentRef Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9" />
+      <ComponentRef Id="cmpAC388473B5C048E3AB478DCC0B3C61FE" />
+      <ComponentRef Id="cmpE5993DB9118640FD8C180A2D61C89C01" />
+      <ComponentRef Id="cmpE0DEAA289B2D4594A0C4791B2808C97C" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/build.psm1 b/build.psm1
index bd425ff9bf4..3e33ed87de9 100644
--- a/build.psm1
+++ b/build.psm1
@@ -541,7 +541,9 @@ Fix steps:
 
             try {
                 Push-Location $globalToolSrcFolder
-                $Arguments += "--output", $publishPath
+                if ($Arguments -notcontains '--output') {
+                    $Arguments += "--output", $publishPath
+                }
                 Write-Log -message "Run dotnet $Arguments from $PWD to build global tool entry point"
                 Start-NativeExecution { dotnet $Arguments }
             }
@@ -801,8 +803,8 @@ function New-PSOptions {
         [ValidateSet("Debug", "Release", "CodeCoverage", '')]
         [string]$Configuration,
 
-        [ValidateSet("net6.0")]
-        [string]$Framework = "net6.0",
+        [ValidateSet("net7.0")]
+        [string]$Framework = "net7.0",
 
         # These are duplicated from Start-PSBuild
         # We do not use ValidateScript since we want tab completion
@@ -1745,11 +1747,6 @@ function Install-Dotnet {
 
     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" }
@@ -1818,13 +1815,11 @@ function Install-Dotnet {
         $installScript = "dotnet-install.ps1"
         Invoke-WebRequest -Uri $installObtainUrl/$installScript -OutFile $installScript
         if (-not $environment.IsCoreCLR) {
-            $installArgs = @{
-                Quality = $Quality
-            }
-
+            $installArgs = @{}
             if ($Version) {
                 $installArgs += @{ Version = $Version }
             } elseif ($Channel) {
+                $installArgs += @{ Quality = $Quality }
                 $installArgs += @{ Channel = $Channel }
             }
 
@@ -1850,7 +1845,7 @@ function Install-Dotnet {
             $fullDotnetInstallPath = Join-Path -Path (Convert-Path -Path $PWD.Path) -ChildPath $installScript
 
             if ($Version) {
-                $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version, '-Quality', $Quality)
+                $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version)
             }
             elseif ($Channel) {
                 $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Channel', $Channel, '-Quality', $Quality)
diff --git a/global.json b/global.json
index e52d340bc63..9b02b7b47f7 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.101"
+    "version": "7.0.100-preview.1"
   }
 }
diff --git a/nuget.config b/nuget.config
index 5a541e6ff31..aca42b62494 100644
--- a/nuget.config
+++ b/nuget.config
@@ -2,11 +2,10 @@
 <configuration>
   <packageSources>
     <clear />
+    <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/7.0.100-preview.1.22110.4-shipping/nuget/v2" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
   </disabledPackageSources>
 </configuration>
-
-
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 7ab8ecf2825..2d5c09d969a 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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="7.0.0-preview.1.22076.8" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index bd73e6c005b..bef64daef17 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
-    <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.1.0-3.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.1.22076.8" />
     <PackageReference Include="NJsonSchema" Version="10.5.2" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index c2dba27c14f..5b615fd1ae8 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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="7.0.0-preview.1.22076.8" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index b79ab533b88..3a36a1b19d5 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- 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="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.1.22076.8" />
     <!-- 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" />
@@ -30,7 +30,7 @@
     <PackageReference Include="System.Private.ServiceModel" Version="4.9.0" />
     <!-- 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="7.0.0-preview.1.22076.8" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index d6b7c281f9e..a18bc1305fd 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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="7.0.0-preview.1.22076.8" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj
index ca1c34df8b5..f41e3740bc0 100644
--- a/src/Modules/PSGalleryModules.csproj
+++ b/src/Modules/PSGalleryModules.csproj
@@ -5,7 +5,7 @@
     <Company>Microsoft Corporation</Company>
     <Copyright>(c) Microsoft Corporation.</Copyright>
 
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
diff --git a/src/ResGen/ResGen.csproj b/src/ResGen/ResGen.csproj
index 5c736ad9ed9..f86d5328ba8 100644
--- a/src/ResGen/ResGen.csproj
+++ b/src/ResGen/ResGen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Generates C# typed bindings for .resx files</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>resgen</AssemblyName>
     <OutputType>Exe</OutputType>
     <TieredCompilation>true</TieredCompilation>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 1f298d296ab..f6f6ab1adb0 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,19 +16,19 @@
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.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="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.1.22076.8" />
     <!--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="System.Management" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.1.22076.8" />
     <!-- 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.3.0-preview.1" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index a4d1a7057f1..53dc8d058c0 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -1890,7 +1890,9 @@ internal PSModuleInfo LoadModuleManifest(
             else if ((requiredProcessorArchitecture != ProcessorArchitecture.None) &&
                      (requiredProcessorArchitecture != ProcessorArchitecture.MSIL))
             {
+                #pragma warning disable SYSLIB0037
                 ProcessorArchitecture currentArchitecture = typeof(object).Assembly.GetName().ProcessorArchitecture;
+                #pragma warning restore SYSLIB0037
 
                 if (currentArchitecture != requiredProcessorArchitecture)
                 {
diff --git a/src/TypeCatalogGen/TypeCatalogGen.csproj b/src/TypeCatalogGen/TypeCatalogGen.csproj
index e81e027ea75..170819a6bf9 100644
--- a/src/TypeCatalogGen/TypeCatalogGen.csproj
+++ b/src/TypeCatalogGen/TypeCatalogGen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Generates CorePsTypeCatalog.cs given powershell.inc</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyName>TypeCatalogGen</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/test/Test.Common.props b/test/Test.Common.props
index a1b4b8686d6..cdfe931012c 100644
--- a/test/Test.Common.props
+++ b/test/Test.Common.props
@@ -6,7 +6,7 @@
     <Company>Microsoft Corporation</Company>
     <Copyright>(c) Microsoft Corporation.</Copyright>
 
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <LangVersion>9.0</LangVersion>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
index 838d6ccd673..5274b08d613 100644
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@@ -6,7 +6,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
     <PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
diff --git a/test/powershell/Host/Startup.Tests.ps1 b/test/powershell/Host/Startup.Tests.ps1
index bb775d0ca2f..54d8d9a5226 100644
--- a/test/powershell/Host/Startup.Tests.ps1
+++ b/test/powershell/Host/Startup.Tests.ps1
@@ -44,14 +44,12 @@ Describe "Validate start of console host" -Tag CI {
             'System.Reflection.Primitives.dll'
             'System.Runtime.dll'
             'System.Runtime.InteropServices.dll'
-            'System.Runtime.InteropServices.RuntimeInformation.dll'
             'System.Runtime.Loader.dll'
             'System.Runtime.Numerics.dll'
             'System.Runtime.Serialization.Formatters.dll'
             'System.Runtime.Serialization.Primitives.dll'
             'System.Security.AccessControl.dll'
-            'System.Security.Cryptography.Encoding.dll'
-            'System.Security.Cryptography.Primitives.dll'
+            'System.Security.Cryptography.dll'
             'System.Security.Cryptography.X509Certificates.dll'
             'System.Security.Principal.Windows.dll'
             'System.Text.Encoding.Extensions.dll'
@@ -75,6 +73,7 @@ Describe "Validate start of console host" -Tag CI {
         else {
             $allowedAssemblies += @(
                 'System.Net.Sockets.dll'
+                'System.Reflection.Emit.dll'
             )
         }
 
diff --git a/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1 b/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
index ef0a1f17d5f..5070cf9e8b8 100644
--- a/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
+++ b/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
@@ -19,13 +19,24 @@ $InternalSource = 'OneGetTestSource'
 Describe "PackageManagement Acceptance Test" -Tags "Feature" {
 
  BeforeAll{
-    Register-PackageSource -Name Nugettest -provider NuGet -Location https://www.nuget.org/api/v2 -Force
-    Register-PackageSource -Name $InternalSource -Location $InternalGallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue
+
+    # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+    # These should be re-enabled when the issue is fixed
+    $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+    $PSDefaultParameterValues["it:pending"] = $true
+
+    # The cmdlets in the if block fail due the to above issue, hence putting them in a if ($false)
+    if ($false) {
+        Register-PackageSource -Name Nugettest -provider NuGet -Location https://www.nuget.org/api/v2 -Force
+        Register-PackageSource -Name $InternalSource -Location $InternalGallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue
+    }
+
     $SavedProgressPreference = $ProgressPreference
     $ProgressPreference = "SilentlyContinue"
  }
  AfterAll {
      $ProgressPreference = $SavedProgressPreference
+     $global:PSDefaultParameterValues = $originalDefaultParameterValues
  }
     It "get-packageprovider" {
 
diff --git a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1 b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
index e178d0a77e3..dcecd602d47 100644
--- a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
+++ b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
@@ -111,6 +111,12 @@ function Remove-InstalledModules
 Describe "PowerShellGet - Module tests" -tags "Feature" {
 
     BeforeAll {
+        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+        # These should be re-enabled when the issue is fixed
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        $PSDefaultParameterValues["it:pending"] = $true
+        return
+
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -141,6 +147,7 @@ Describe "PowerShellGet - Module tests" -tags "Feature" {
     }
 
     AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledModules
     }
 }
@@ -148,6 +155,12 @@ Describe "PowerShellGet - Module tests" -tags "Feature" {
 Describe "PowerShellGet - Module tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
 
     BeforeAll {
+        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+        # These should be re-enabled when the issue is fixed
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        $PSDefaultParameterValues["it:pending"] = $true
+        return
+
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -172,6 +185,7 @@ Describe "PowerShellGet - Module tests (Admin)" -Tags @('Feature', 'RequireAdmin
     }
 
     AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledModules
     }
 }
@@ -184,6 +198,12 @@ function Remove-InstalledScripts
 Describe "PowerShellGet - Script tests" -tags "Feature" {
 
     BeforeAll {
+        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+        # These should be re-enabled when the issue is fixed
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        $PSDefaultParameterValues["it:pending"] = $true
+        return
+
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -210,6 +230,7 @@ Describe "PowerShellGet - Script tests" -tags "Feature" {
     }
 
     AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledScripts
     }
 }
@@ -217,6 +238,12 @@ Describe "PowerShellGet - Script tests" -tags "Feature" {
 Describe "PowerShellGet - Script tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
 
     BeforeAll {
+        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+        # These should be re-enabled when the issue is fixed
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        $PSDefaultParameterValues["it:pending"] = $true
+        return
+
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -237,6 +264,7 @@ Describe "PowerShellGet - Script tests (Admin)" -Tags @('Feature', 'RequireAdmin
     }
 
     AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledScripts
     }
 }
diff --git a/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1 b/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
index af18672cf27..02c4ad856b7 100644
--- a/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
+++ b/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
@@ -167,7 +167,7 @@ Describe "Default enablement of Experimental Features" -Tags CI {
     It "On stable builds, Experimental Features are not enabled" -Skip:($isPreview) {
         foreach ($expFeature in Get-ExperimentalFeature)
         {
-            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net6.0\win7-x64\publish)
+            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win7-x64\publish)
             # is launched from another pwsh (with $PSHOME like C:\program files\powershell\7)
             # resulting in combined PSModulePath which is used by Get-ExperimentalFeature to enum module-scoped exp.features from both pwsh locations.
             # So we need to exclude parent's modules' exp.features from verification using filtering on $PSHOME.
@@ -184,7 +184,7 @@ Describe "Default enablement of Experimental Features" -Tags CI {
 
         foreach ($expFeature in Get-ExperimentalFeature)
         {
-            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net6.0\win7-x64\publish)
+            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win7-x64\publish)
             # is launched from another pwsh (with $PSHOME like C:\program files\powershell\7)
             # resulting in combined PSModulePath which is used by Get-ExperimentalFeature to enum module-scoped exp.features from both pwsh locations.
             # So we need to exclude parent's modules' exp.features from verification using filtering on $PSHOME.
diff --git a/test/tools/OpenCover/OpenCover.psm1 b/test/tools/OpenCover/OpenCover.psm1
index d0def0abf6c..f9130df5ae9 100644
--- a/test/tools/OpenCover/OpenCover.psm1
+++ b/test/tools/OpenCover/OpenCover.psm1
@@ -615,7 +615,7 @@ function Install-OpenCover
 .Description
    Invoke-OpenCover runs tests under OpenCover by executing tests on PowerShell located at $PowerShellExeDirectory.
 .EXAMPLE
-   Invoke-OpenCover -TestPath $PWD/test/powershell -PowerShellExeDirectory $PWD/src/powershell-win-core/bin/CodeCoverage/net6.0/win7-x64
+   Invoke-OpenCover -TestPath $PWD/test/powershell -PowerShellExeDirectory $PWD/src/powershell-win-core/bin/CodeCoverage/7.0/win7-x64
 #>
 function Invoke-OpenCover
 {
@@ -624,7 +624,7 @@ function Invoke-OpenCover
         [parameter()]$OutputLog = "$HOME/Documents/OpenCover.xml",
         [parameter()]$TestPath = "${script:psRepoPath}/test/powershell",
         [parameter()]$OpenCoverPath = "$HOME/OpenCover",
-        [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net6.0/win7-x64/publish",
+        [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net7.0/win7-x64/publish",
         [parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml",
         [parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml",
         [parameter()]$PesterLogFormat = "NUnitXml",
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 491a77f0c80..c49ec96994b 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.1.22076.8" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index bbc07be5259..c425f0002c3 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.1.22109.13" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.1.22076.8" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index 6747368a4c6..40b83623375 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -342,7 +342,7 @@ if ($dotnetUpdate.ShouldUpdate) {
         Import-Module "$PSScriptRoot/../build.psm1" -Force
         Import-Module "$PSScriptRoot/packaging" -Force
         Start-PSBootstrap -Package
-        Start-PSBuild -Clean -Configuration Release -CrossGen -InteractiveAuth:$InteractiveAuth
+        Start-PSBuild -Clean -Configuration Release -InteractiveAuth:$InteractiveAuth
 
         $publishPath = Split-Path (Get-PSOutput)
         Remove-Item -Path "$publishPath\*.pdb"
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index e8caa3fbdcb..a0adf38355e 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -55,7 +55,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Analyzers",
-          "Version": "3.3.2"
+          "Version": "3.3.3"
         }
       },
       "DevelopmentDependency": true
@@ -845,7 +845,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.DirectoryServices.Protocols",
-          "Version": "6.0.0"
+          "Version": "6.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -1405,7 +1405,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Web.Services.Description",
-          "Version": "4.9.0"
+          "Version": "4.9.0-rc2.21473.1"
         }
       },
       "DevelopmentDependency": false
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index 315a83284d7..658e95212db 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -177,8 +177,8 @@ function Get-CGRegistrations {
 
     $registrationChanged = $false
 
-    $dotnetTargetName = 'net6.0'
-    $dotnetTargetNameWin7 = 'net6.0-windows7.0'
+    $dotnetTargetName = 'net7.0'
+    $dotnetTargetNameWin7 = 'net7.0-windows7.0'
     $unixProjectName = 'powershell-unix'
     $windowsProjectName = 'powershell-win-core'
     $actualRuntime = $Runtime
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 1437c5383ec..9383b0dc052 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -8,7 +8,7 @@ $packagingStrings = Import-PowerShellDataFile "$PSScriptRoot\packaging.strings.p
 Import-Module "$PSScriptRoot\..\Xml" -ErrorAction Stop -Force
 $DebianDistributions = @("deb")
 $RedhatDistributions = @("rh")
-$script:netCoreRuntime = 'net6.0'
+$script:netCoreRuntime = 'net7.0'
 $script:iconFileName = "Powershell_black_64.png"
 $script:iconPath = Join-Path -path $PSScriptRoot -ChildPath "../../assets/$iconFileName" -Resolve
 
@@ -2181,7 +2181,7 @@ function New-ILNugetPackageFromSource
 }
 
 <#
-  Copy the generated reference assemblies to the 'ref/net6.0' folder properly.
+  Copy the generated reference assemblies to the 'ref/net7.0' folder properly.
   This is a helper function used by 'New-ILNugetPackageSource'.
 #>
 function CopyReferenceAssemblies
@@ -3131,7 +3131,7 @@ function New-MSIPatch
         # This example shows how to produce a Debug-x64 installer for development purposes.
         cd $RootPathOfPowerShellRepo
         Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
-        New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net6.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
+        New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
 #>
 function New-MSIPackage
 {
@@ -3522,7 +3522,7 @@ function Start-MsiBuild {
         # This example shows how to produce a Debug-x64 installer for development purposes.
         cd $RootPathOfPowerShellRepo
         Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
-        New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net6.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
+        New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
 #>
 function New-MSIXPackage
 {
diff --git a/tools/packaging/packaging.strings.psd1 b/tools/packaging/packaging.strings.psd1
index b70592c313d..b0753a0a4fd 100644
--- a/tools/packaging/packaging.strings.psd1
+++ b/tools/packaging/packaging.strings.psd1
@@ -166,7 +166,7 @@ open {0}
             <files include="**/*" buildAction="None" copyToOutput="true" flatten="false" />
         </contentFiles>
         <dependencies>
-            <group targetFramework="net6.0"></group>
+            <group targetFramework="net7.0"></group>
         </dependencies>
     </metadata>
 </package>
diff --git a/tools/packaging/projects/nuget/package.csproj b/tools/packaging/projects/nuget/package.csproj
index cee634e2ffa..d82205451ac 100644
--- a/tools/packaging/projects/nuget/package.csproj
+++ b/tools/packaging/projects/nuget/package.csproj
@@ -11,6 +11,6 @@
     <NuspecProperties>runtime=$(RID);version=$(SemVer);PackageName=$(PackageName)</NuspecProperties>
     <NuspecBasePath>$(StagingPath)</NuspecBasePath>
     <IsTool>True</IsTool>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 53eee6e16db..e8efd4c4aee 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Version>$(RefAsmVersion)</Version>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@@ -14,7 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
     <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
   </ItemGroup>
 </Project>
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
index a95a2a47cac..4394e1148d1 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Version>$(RefAsmVersion)</Version>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
index e382b8cbb33..5793e09c887 100644
--- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Version>$(RefAsmVersion)</Version>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@@ -9,6 +9,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
   </ItemGroup>
 </Project>
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
index 572f909583d..55b21ac8156 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@@ -104,7 +104,7 @@ jobs:
         $localLocation = "$(Pipeline.Workspace)/releasePipeline/finalResults"
         $xmlElement = @"
           <add key=`"local`" value=`"$localLocation`" />
-          <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v2" />
+          <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/7.0.100-preview.1.22101.1-shipping/nuget/v2" />
         </packageSources>
         "@
 

From fbae40df83e0fd2d73a87cfa5d2d036066536fdb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Feb 2022 11:01:54 -0800
Subject: [PATCH 239/645] Bump NJsonSchema from 10.5.2 to 10.6.9 (#16888)

* Bump NJsonSchema from 10.5.2 to 10.6.9

Bumps [NJsonSchema](https://github.com/RicoSuter/NJsonSchema) from 10.5.2 to 10.6.9.
- [Release notes](https://github.com/RicoSuter/NJsonSchema/releases)
- [Commits](https://github.com/RicoSuter/NJsonSchema/compare/v10.5.2...v10.6.9)

---
updated-dependencies:
- dependency-name: NJsonSchema
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update cgmanifest.json

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .../Microsoft.PowerShell.Commands.Utility.csproj              | 2 +-
 tools/cgmanifest.json                                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index bef64daef17..c91fa2e60fe 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -34,7 +34,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0-3.final" />
     <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.1.22076.8" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="NJsonSchema" Version="10.5.2" />
+    <PackageReference Include="NJsonSchema" Version="10.6.9" />
   </ItemGroup>
 
 </Project>
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index a0adf38355e..6a4ca73ef6d 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -235,7 +235,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Namotion.Reflection",
-          "Version": "2.0.3"
+          "Version": "2.0.10"
         }
       },
       "DevelopmentDependency": false
@@ -255,7 +255,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "NJsonSchema",
-          "Version": "10.5.2"
+          "Version": "10.6.9"
         }
       },
       "DevelopmentDependency": false

From 132268936683f28286698b04620bb8447dacdc9d Mon Sep 17 00:00:00 2001
From: Travis Plunk <tplunk@microsoft.com>
Date: Wed, 16 Feb 2022 20:18:14 +0000
Subject: [PATCH 240/645] Merged PR 19189: Fix pool syntax for deployments

fix pool for deployments
---
 tools/releaseBuild/azureDevOps/releasePipeline.yml   | 12 ++++++++----
 .../azureDevOps/templates/release-MsixBundle.yml     |  3 ++-
 .../azureDevOps/templates/release-UpdateDepsJson.yml |  3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index c1e3315082d..25f6fda0eff 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -194,7 +194,8 @@ stages:
   - job: GitHubDraft
     displayName: Create GitHub Draft release
 
-    pool: PowerShell1ES
+    pool:
+      name: PowerShell1ES
       demands:
       - ImageOverride -equals PSMMS2019-Secure
 
@@ -230,7 +231,8 @@ stages:
   jobs:
   - job: PublishNuget
 
-    pool: PowerShell1ES
+    pool:
+      name: PowerShell1ES
       demands:
       - ImageOverride -equals PSMMS2019-Secure
 
@@ -239,7 +241,8 @@ stages:
 
   - job: PublishPkgsMsftCom
 
-    pool: PowerShell1ES
+    pool:
+      name: PowerShell1ES
       demands:
       - ImageOverride -equals PSMMSUbuntu20.04-Secure
 
@@ -336,7 +339,8 @@ stages:
   - deployment: UploadJson
     displayName: Upload BuildInfoJson
 
-    pool: PowerShell1ES
+    pool:
+      name: PowerShell1ES
       demands:
       - ImageOverride -equals PSMMS2019-Secure
 
diff --git a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
index 607fda3ad40..10eb0df4056 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
@@ -2,7 +2,8 @@ jobs:
 - job: CreateMSIXBundle
   displayName: Create .msixbundle file
 
-  pool: PowerShell1ES
+  pool:
+    name: PowerShell1ES
     demands:
     - ImageOverride -equals PSMMS2019-Secure
 
diff --git a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
index bd465fedd27..799e220626d 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
@@ -2,7 +2,8 @@ jobs:
 - job: UpdateDepsFiles
   displayName: Update deps files
 
-  pool: PowerShell1ES
+  pool:
+    name: PowerShell1ES
     demands:
     - ImageOverride -equals PSMMS2019-Secure
 

From e3d92642571862317396172fc848436300647116 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Wed, 16 Feb 2022 15:49:16 -0800
Subject: [PATCH 241/645] Use Start-PSBootStrap for installing .NET during
 nuget packaging

---
 tools/releaseBuild/azureDevOps/templates/nuget.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index 7e7801afb8a..49e3e6f18c9 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -51,10 +51,11 @@ jobs:
       Write-Host "##$vstsCommandString"
     displayName: 'Find SDK version from global.json'
 
-  - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK from global.json'
-    inputs:
-      useGlobalJson: true
+  - pwsh: |
+      Import-Module "$env:REPOROOT/build.psm1" -Force
+      # We just need .NET but we fixed this in an urgent situation.
+      Start-PSBootStrap -Verbose
+    displayName: Bootstrap
 
   - task: DownloadBuildArtifacts@0
     displayName: 'Download PowerShell build artifacts - finalResults'

From 9759535261827aecb653e4f36ee73d782ab2ce50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Feb 2022 09:09:28 -0800
Subject: [PATCH 242/645] Bump `Microsoft.NET.Test.Sdk` from 17.0.0 to 17.1.0
 (#16891)

---
 test/xUnit/xUnit.tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index 7c69afb0903..d5ab90cddee 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="XunitXml.TestLogger" Version="3.0.70" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
   </ItemGroup>
 
   <ItemGroup>

From d8175fc1e0da1020563b4ad205a67226b32d8858 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Thu, 17 Feb 2022 11:28:52 -0800
Subject: [PATCH 243/645] Install and Find AzCopy

---
 build.psm1                                    | 26 +++++++++++++++++++
 .../templates/release-CreateGitHubDraft.yml   | 11 +++++++-
 .../templates/release-MsixBundle.yml          |  8 +++++-
 .../templates/release-ValidatePackageBOM.yml  |  8 +++++-
 .../release-ValidatePackageNames.yml          |  8 +++++-
 .../azureDevOps/templates/vpackReleaseJob.yml | 11 ++++++--
 6 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 3e33ed87de9..0e5b11ad2eb 100644
--- a/build.psm1
+++ b/build.psm1
@@ -3218,3 +3218,29 @@ function Set-CorrectLocale
     # Output the locale to log it
     locale
 }
+
+function Install-AzCopy {
+    $testPath = "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe"
+    if (Test-Path $testPath) {
+        Write-Verbose "AzCopy already installed" -Verbose
+        return
+    }
+
+    $destination = "$env:TEMP\azcopy81.msi"
+    Invoke-WebRequest "https://aka.ms/downloadazcopy" -OutFile $destination
+    Start-Process -FilePath $destination -ArgumentList "/quiet" -Wait
+}
+
+function Find-AzCopy {
+    $searchPaths = "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe"
+
+    foreach ($filter in $searchPaths) {
+        $azCopy = Get-ChildItem -Path $filter -Recurse -ErrorAction SilentlyContinue | Select-Object -ExpandProperty FullName -First 1
+        if ($azCopy) {
+            return $azCopy
+        }
+    }
+
+    $azCopy = Get-Command -Name azCopy -ErrorAction Stop | Select-Object -First 1
+    return $azCopy.Path
+}
diff --git a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
index 6e968cca572..ce6eff7cb2a 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
@@ -1,10 +1,19 @@
 steps:
+- checkout: self
+  clean: true
+
 - download: none
 
 - template: release-SetReleaseTagAndContainerName.yml
 
 - pwsh: |
-    $azcopy = "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe"
+    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
+    Install-AzCopy
+  displayName: Install AzCopy
+
+- pwsh: |
+    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
+    $azcopy = Find-AzCopy
     & $azcopy /Source:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) /Dest:$(System.ArtifactsDirectory) /S /SourceKey:$(StorageAccountKey)
   displayName: Download Azure Artifacts
 
diff --git a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
index 10eb0df4056..c883bc0ff0b 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
@@ -65,10 +65,16 @@ jobs:
         Write-Host "##$vstsCommandString"
       displayName: Create MsixBundle
 
+    - pwsh: |
+        Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
+        Install-AzCopy
+      displayName: Install AzCopy
+
     - pwsh: |
         ## We use AzCopy v8.1 in our release pipeline, see the documentation at:
         ## https://docs.microsoft.com/en-us/previous-versions/azure/storage/storage-use-azcopy
 
-        $azcopy = "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe"
+        Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
+        $azcopy = Find-AzCopy
         & $azcopy /Source:$(BundleDir) /Dest:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion)-private /DestKey:$(StorageAccountKey) /Pattern:*.msixbundle /Y
       displayName: Upload MSIX Bundle package to Az Blob
diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml
index 65eed1ef9e0..4778ebcaa1c 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml
@@ -15,7 +15,13 @@ steps:
   displayName: Set Release Name
 
 - pwsh: |
-    $azcopy = "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe"
+    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
+    Install-AzCopy
+  displayName: Install AzCopy
+
+- pwsh: |
+    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
+    $azcopy = Find-AzCopy
 
     & $azcopy /Source:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) /Dest:$(System.ArtifactsDirectory) /S /SourceKey:$(StorageAccountKey)
   displayName: Download Azure Artifacts
diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
index 44040f9ebb0..fa80c1d0c84 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
@@ -12,7 +12,13 @@ steps:
   displayName: Set Release Name
 
 - pwsh: |
-    $azcopy = "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe"
+    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
+    Install-AzCopy
+  displayName: Install AzCopy
+
+- pwsh: |
+    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
+    $azcopy = Find-AzCopy
 
     & $azcopy /Source:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) /Dest:$(System.ArtifactsDirectory) /S /SourceKey:$(StorageAccountKey)
   displayName: Download Azure Artifacts
diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
index 10bc19044fb..ffa7aa2a0e3 100644
--- a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+++ b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@@ -8,7 +8,8 @@ jobs:
 
   displayName: Build and Publish VPack - ${{ parameters.architecture }}
   condition: succeeded()
-  pool: PowerShell1ES
+  pool:
+    name: PowerShell1ES
     demands:
     - ImageOverride -equals PSMMS2019-Secure
   steps:
@@ -20,7 +21,13 @@ jobs:
       ReleaseTagVar: $(ReleaseTagVar)
 
   - pwsh: |
-      $azcopy = "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe"
+      Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
+      Install-AzCopy
+    displayName: Install AzCopy
+
+  - pwsh: |
+      Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
+      $azcopy = Find-AzCopy
 
       Write-Host "running: $azcopy /Source:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) /Dest:$(System.ArtifactsDirectory) /S /SourceKey:****** /Pattern:PowerShell-$(Version)-win-${{ parameters.architecture }}.zip /Z:$(AGENT.TEMPDIRECTORY)"
       & $azcopy /Source:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) /Dest:$(System.ArtifactsDirectory) /S /SourceKey:$(StorageAccountKey) /Pattern:PowerShell-$(Version)-win-${{ parameters.architecture }}.zip /Z:$(AGENT.TEMPDIRECTORY)

From 5d41c1f738280c6ad3294f4c14ad05861df77102 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 17 Feb 2022 14:39:06 -0800
Subject: [PATCH 244/645] Update readme and metadata for preview.2 release
 (#16895)

---
 README.md           | 28 ++++++++++++++--------------
 tools/metadata.json |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 0c0163fc0f5..4fd7459ebfd 100644
--- a/README.md
+++ b/README.md
@@ -93,20 +93,20 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 [rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-linux-arm64.tar.gz
 [rl-snap]: https://snapcraft.io/powershell
 
-[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/PowerShell-7.3.0-preview.1-win-x64.msi
-[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/PowerShell-7.3.0-preview.1-win-x86.msi
-[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-preview_7.3.0-preview.1-1.deb_amd64.deb
-[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-preview-7.3.0_preview.1-1.rh.x86_64.rpm
-[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-osx-x64.pkg
-[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-osx-arm64.pkg
-[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/PowerShell-7.3.0-preview.1-win-arm64.zip
-[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/PowerShell-7.3.0-preview.1-win-x86.zip
-[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/PowerShell-7.3.0-preview.1-win-x64.zip
-[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-osx-x64.tar.gz
-[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-osx-arm64.tar.gz
-[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-linux-x64.tar.gz
-[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-linux-arm32.tar.gz
-[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.1/powershell-7.3.0-preview.1-linux-arm64.tar.gz
+[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/PowerShell-7.3.0-preview.2-win-x64.msi
+[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/PowerShell-7.3.0-preview.2-win-x86.msi
+[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-preview_7.3.0-preview.2-1.deb_amd64.deb
+[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-preview-7.3.0_preview.1-1.rh.x86_64.rpm
+[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-osx-x64.pkg
+[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-osx-arm64.pkg
+[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/PowerShell-7.3.0-preview.2-win-arm64.zip
+[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/PowerShell-7.3.0-preview.2-win-x86.zip
+[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/PowerShell-7.3.0-preview.2-win-x64.zip
+[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-osx-x64.tar.gz
+[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-osx-arm64.tar.gz
+[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-linux-x64.tar.gz
+[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-linux-arm32.tar.gz
+[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-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
diff --git a/tools/metadata.json b/tools/metadata.json
index 053c8063c42..c1ab6c3eeb7 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,6 +1,6 @@
 {
   "StableReleaseTag": "v7.2.1",
-  "PreviewReleaseTag": "v7.3.0-preview.1",
+  "PreviewReleaseTag": "v7.3.0-preview.2",
   "ServicingReleaseTag": "v7.0.8",
   "ReleaseTag": "v7.2.1",
   "LTSReleaseTag" : ["v7.2.1", "v7.0.8"],

From abf3a89ce28f0fbfa22f572f9c516619c818c0f0 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Thu, 17 Feb 2022 17:57:06 -0800
Subject: [PATCH 245/645] Revert .NET 7 changes

---
 Analyzers.props                               |  4 +--
 DotnetRuntimeMetadata.json                    | 12 ++++----
 PowerShell.Common.props                       |  5 ++--
 assets/wix/files.wxs                          | 14 ++--------
 build.psm1                                    | 21 ++++++++------
 global.json                                   |  2 +-
 nuget.config                                  |  3 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  6 ++--
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           |  8 +++---
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 src/Modules/PSGalleryModules.csproj           |  2 +-
 src/ResGen/ResGen.csproj                      |  2 +-
 .../System.Management.Automation.csproj       | 20 ++++++-------
 .../engine/Modules/ModuleCmdletBase.cs        |  2 --
 src/TypeCatalogGen/TypeCatalogGen.csproj      |  2 +-
 test/Test.Common.props                        |  2 +-
 .../ResultsComparer/ResultsComparer.csproj    |  2 +-
 test/powershell/Host/Startup.Tests.ps1        |  5 ++--
 .../PackageManagement.Tests.ps1               | 15 ++--------
 .../PowerShellGet/PowerShellGet.Tests.ps1     | 28 -------------------
 .../Get-ExperimentalFeature.Tests.ps1         |  4 +--
 test/tools/OpenCover/OpenCover.psm1           |  4 +--
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/WebListener.csproj     |  4 +--
 tools/UpdateDotnetRuntime.ps1                 |  2 +-
 tools/cgmanifest.json                         |  6 ++--
 tools/findMissingNotices.ps1                  |  4 +--
 tools/packaging/packaging.psm1                |  8 +++---
 tools/packaging/packaging.strings.psd1        |  2 +-
 tools/packaging/projects/nuget/package.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  4 +--
 .../Microsoft.PowerShell.ConsoleHost.csproj   |  2 +-
 .../System.Management.Automation.csproj       |  4 +--
 .../templates/release-SDKTests.yml            |  2 +-
 36 files changed, 84 insertions(+), 127 deletions(-)

diff --git a/Analyzers.props b/Analyzers.props
index 8c69e56237e..dacf53c4625 100644
--- a/Analyzers.props
+++ b/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="7.0.0-preview1.22068.2" PrivateAssets="all" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="all" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 92f5825c978..0917e8476c6 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,13 +1,13 @@
 {
   "sdk": {
-    "channel": "7.0.1xx-preview1",
-    "quality": "signed",
+    "channel": "6.0.1xx",
+    "quality": "ga",
     "qualityFallback": "daily",
-    "packageVersionPattern": "7.0.0-preview.1",
-    "sdkImageVersion": "7.0.100",
-    "nextChannel": "7.0.1xx-preview1",
+    "packageVersionPattern": "6.0.0",
+    "sdkImageVersion": "6.0.100",
+    "nextChannel": "6.0.1xx",
     "azureFeed": "",
-    "sdkImageOverride": "7.0.100-preview.1.22110.4"
+    "sdkImageOverride": ""
   },
   "internalfeed" : {
     "url": ""
diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 39e799d5a34..4054cd5b19a 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -135,11 +135,10 @@
     <Company>Microsoft Corporation</Company>
     <Copyright>(c) Microsoft Corporation.</Copyright>
 
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>10.0</LangVersion>
-    <!-- disable ReadyToRun due to issue: https://github.com/dotnet/runtime/issues/65412
     <PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
-    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols-->
+    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 9bbc1715145..14b2204c159 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1638,9 +1638,6 @@
         <Component Id="cmpA75DEF5617C54DA1937CB37D5824BF79">
           <File Id="fil3EE6096BD3C8407685E881F3CE6BF5C1" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Security.Cryptography.OpenSsl.dll" />
         </Component>
-        <Component Id="cmpE5993DB9118640FD8C180A2D61C89C01">
-          <File Id="fil7381E5F4FBC64B60A8B7D7841B89F4C6" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Security.Cryptography.dll" />
-        </Component>
       </Directory>
       <Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
         <Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
@@ -3157,11 +3154,8 @@
       <Component Id="cmp22840874A8C84AA796496634FBEBF09C">
         <File Id="fil2067B616D1FA4B30932A0240ABE06089" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
       </Component>
-      <Component Id="cmpAC388473B5C048E3AB478DCC0B3C61FE">
-        <File Id="fil2D3CF7A46E0842BABB83B0A8787FED26" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.7608.dll" />
-      </Component>
-      <Component Id="cmpE0DEAA289B2D4594A0C4791B2808C97C">
-        <File Id="fil530EAD567BDB402FA6F02AFAA696D721" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.dll" />
+      <Component Id="cmpC100F34A32A0436A973FE7F9A02F5A78">
+        <File Id="filC8B8F95747F64A97B511342C7F154B54" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.121.56705.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4178,10 +4172,8 @@
       <ComponentRef Id="cmp0C4751F9D5C14419A45F234152D21DA9" />
       <ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
       <ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
+      <ComponentRef Id="cmpC100F34A32A0436A973FE7F9A02F5A78" />
       <ComponentRef Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9" />
-      <ComponentRef Id="cmpAC388473B5C048E3AB478DCC0B3C61FE" />
-      <ComponentRef Id="cmpE5993DB9118640FD8C180A2D61C89C01" />
-      <ComponentRef Id="cmpE0DEAA289B2D4594A0C4791B2808C97C" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/build.psm1 b/build.psm1
index 0e5b11ad2eb..1cc49b68ef0 100644
--- a/build.psm1
+++ b/build.psm1
@@ -541,9 +541,7 @@ Fix steps:
 
             try {
                 Push-Location $globalToolSrcFolder
-                if ($Arguments -notcontains '--output') {
-                    $Arguments += "--output", $publishPath
-                }
+                $Arguments += "--output", $publishPath
                 Write-Log -message "Run dotnet $Arguments from $PWD to build global tool entry point"
                 Start-NativeExecution { dotnet $Arguments }
             }
@@ -803,8 +801,8 @@ function New-PSOptions {
         [ValidateSet("Debug", "Release", "CodeCoverage", '')]
         [string]$Configuration,
 
-        [ValidateSet("net7.0")]
-        [string]$Framework = "net7.0",
+        [ValidateSet("net6.0")]
+        [string]$Framework = "net6.0",
 
         # These are duplicated from Start-PSBuild
         # We do not use ValidateScript since we want tab completion
@@ -1747,6 +1745,11 @@ function Install-Dotnet {
 
     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" }
@@ -1815,11 +1818,13 @@ function Install-Dotnet {
         $installScript = "dotnet-install.ps1"
         Invoke-WebRequest -Uri $installObtainUrl/$installScript -OutFile $installScript
         if (-not $environment.IsCoreCLR) {
-            $installArgs = @{}
+            $installArgs = @{
+                Quality = $Quality
+            }
+
             if ($Version) {
                 $installArgs += @{ Version = $Version }
             } elseif ($Channel) {
-                $installArgs += @{ Quality = $Quality }
                 $installArgs += @{ Channel = $Channel }
             }
 
@@ -1845,7 +1850,7 @@ function Install-Dotnet {
             $fullDotnetInstallPath = Join-Path -Path (Convert-Path -Path $PWD.Path) -ChildPath $installScript
 
             if ($Version) {
-                $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version)
+                $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version, '-Quality', $Quality)
             }
             elseif ($Channel) {
                 $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Channel', $Channel, '-Quality', $Quality)
diff --git a/global.json b/global.json
index 9b02b7b47f7..e52d340bc63 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100-preview.1"
+    "version": "6.0.101"
   }
 }
diff --git a/nuget.config b/nuget.config
index aca42b62494..5a541e6ff31 100644
--- a/nuget.config
+++ b/nuget.config
@@ -2,10 +2,11 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/7.0.100-preview.1.22110.4-shipping/nuget/v2" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
   </disabledPackageSources>
 </configuration>
+
+
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 2d5c09d969a..7ab8ecf2825 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index c91fa2e60fe..97f3f308d45 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0-3.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
+    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
     <PackageReference Include="NJsonSchema" Version="10.6.9" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 5b615fd1ae8..c2dba27c14f 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 3a36a1b19d5..b79ab533b88 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.1.22076.8" />
+    <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" />
     <!-- 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" />
@@ -30,7 +30,7 @@
     <PackageReference Include="System.Private.ServiceModel" Version="4.9.0" />
     <!-- 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="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index a18bc1305fd..d6b7c281f9e 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj
index f41e3740bc0..ca1c34df8b5 100644
--- a/src/Modules/PSGalleryModules.csproj
+++ b/src/Modules/PSGalleryModules.csproj
@@ -5,7 +5,7 @@
     <Company>Microsoft Corporation</Company>
     <Copyright>(c) Microsoft Corporation.</Copyright>
 
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
diff --git a/src/ResGen/ResGen.csproj b/src/ResGen/ResGen.csproj
index f86d5328ba8..5c736ad9ed9 100644
--- a/src/ResGen/ResGen.csproj
+++ b/src/ResGen/ResGen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Generates C# typed bindings for .resx files</Description>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>resgen</AssemblyName>
     <OutputType>Exe</OutputType>
     <TieredCompilation>true</TieredCompilation>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index f6f6ab1adb0..1f298d296ab 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,19 +16,19 @@
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.1.22076.8" />
+    <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="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.1.22076.8" />
+    <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" />
     <!-- 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.3.0-preview.1" />
+    <PackageReference Include="Microsoft.PowerShell.Native" Version="7.2.0" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index 53dc8d058c0..a4d1a7057f1 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -1890,9 +1890,7 @@ internal PSModuleInfo LoadModuleManifest(
             else if ((requiredProcessorArchitecture != ProcessorArchitecture.None) &&
                      (requiredProcessorArchitecture != ProcessorArchitecture.MSIL))
             {
-                #pragma warning disable SYSLIB0037
                 ProcessorArchitecture currentArchitecture = typeof(object).Assembly.GetName().ProcessorArchitecture;
-                #pragma warning restore SYSLIB0037
 
                 if (currentArchitecture != requiredProcessorArchitecture)
                 {
diff --git a/src/TypeCatalogGen/TypeCatalogGen.csproj b/src/TypeCatalogGen/TypeCatalogGen.csproj
index 170819a6bf9..e81e027ea75 100644
--- a/src/TypeCatalogGen/TypeCatalogGen.csproj
+++ b/src/TypeCatalogGen/TypeCatalogGen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Generates CorePsTypeCatalog.cs given powershell.inc</Description>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyName>TypeCatalogGen</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/test/Test.Common.props b/test/Test.Common.props
index cdfe931012c..a1b4b8686d6 100644
--- a/test/Test.Common.props
+++ b/test/Test.Common.props
@@ -6,7 +6,7 @@
     <Company>Microsoft Corporation</Company>
     <Copyright>(c) Microsoft Corporation.</Copyright>
 
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>9.0</LangVersion>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
index 5274b08d613..838d6ccd673 100644
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@@ -6,7 +6,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
+    <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
diff --git a/test/powershell/Host/Startup.Tests.ps1 b/test/powershell/Host/Startup.Tests.ps1
index 54d8d9a5226..bb775d0ca2f 100644
--- a/test/powershell/Host/Startup.Tests.ps1
+++ b/test/powershell/Host/Startup.Tests.ps1
@@ -44,12 +44,14 @@ Describe "Validate start of console host" -Tag CI {
             'System.Reflection.Primitives.dll'
             'System.Runtime.dll'
             'System.Runtime.InteropServices.dll'
+            'System.Runtime.InteropServices.RuntimeInformation.dll'
             'System.Runtime.Loader.dll'
             'System.Runtime.Numerics.dll'
             'System.Runtime.Serialization.Formatters.dll'
             'System.Runtime.Serialization.Primitives.dll'
             'System.Security.AccessControl.dll'
-            'System.Security.Cryptography.dll'
+            'System.Security.Cryptography.Encoding.dll'
+            'System.Security.Cryptography.Primitives.dll'
             'System.Security.Cryptography.X509Certificates.dll'
             'System.Security.Principal.Windows.dll'
             'System.Text.Encoding.Extensions.dll'
@@ -73,7 +75,6 @@ Describe "Validate start of console host" -Tag CI {
         else {
             $allowedAssemblies += @(
                 'System.Net.Sockets.dll'
-                'System.Reflection.Emit.dll'
             )
         }
 
diff --git a/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1 b/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
index 5070cf9e8b8..ef0a1f17d5f 100644
--- a/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
+++ b/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
@@ -19,24 +19,13 @@ $InternalSource = 'OneGetTestSource'
 Describe "PackageManagement Acceptance Test" -Tags "Feature" {
 
  BeforeAll{
-
-    # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
-    # These should be re-enabled when the issue is fixed
-    $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-    $PSDefaultParameterValues["it:pending"] = $true
-
-    # The cmdlets in the if block fail due the to above issue, hence putting them in a if ($false)
-    if ($false) {
-        Register-PackageSource -Name Nugettest -provider NuGet -Location https://www.nuget.org/api/v2 -Force
-        Register-PackageSource -Name $InternalSource -Location $InternalGallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue
-    }
-
+    Register-PackageSource -Name Nugettest -provider NuGet -Location https://www.nuget.org/api/v2 -Force
+    Register-PackageSource -Name $InternalSource -Location $InternalGallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue
     $SavedProgressPreference = $ProgressPreference
     $ProgressPreference = "SilentlyContinue"
  }
  AfterAll {
      $ProgressPreference = $SavedProgressPreference
-     $global:PSDefaultParameterValues = $originalDefaultParameterValues
  }
     It "get-packageprovider" {
 
diff --git a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1 b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
index dcecd602d47..e178d0a77e3 100644
--- a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
+++ b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
@@ -111,12 +111,6 @@ function Remove-InstalledModules
 Describe "PowerShellGet - Module tests" -tags "Feature" {
 
     BeforeAll {
-        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
-        # These should be re-enabled when the issue is fixed
-        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-        $PSDefaultParameterValues["it:pending"] = $true
-        return
-
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -147,7 +141,6 @@ Describe "PowerShellGet - Module tests" -tags "Feature" {
     }
 
     AfterAll {
-        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledModules
     }
 }
@@ -155,12 +148,6 @@ Describe "PowerShellGet - Module tests" -tags "Feature" {
 Describe "PowerShellGet - Module tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
 
     BeforeAll {
-        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
-        # These should be re-enabled when the issue is fixed
-        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-        $PSDefaultParameterValues["it:pending"] = $true
-        return
-
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -185,7 +172,6 @@ Describe "PowerShellGet - Module tests (Admin)" -Tags @('Feature', 'RequireAdmin
     }
 
     AfterAll {
-        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledModules
     }
 }
@@ -198,12 +184,6 @@ function Remove-InstalledScripts
 Describe "PowerShellGet - Script tests" -tags "Feature" {
 
     BeforeAll {
-        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
-        # These should be re-enabled when the issue is fixed
-        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-        $PSDefaultParameterValues["it:pending"] = $true
-        return
-
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -230,7 +210,6 @@ Describe "PowerShellGet - Script tests" -tags "Feature" {
     }
 
     AfterAll {
-        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledScripts
     }
 }
@@ -238,12 +217,6 @@ Describe "PowerShellGet - Script tests" -tags "Feature" {
 Describe "PowerShellGet - Script tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
 
     BeforeAll {
-        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
-        # These should be re-enabled when the issue is fixed
-        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-        $PSDefaultParameterValues["it:pending"] = $true
-        return
-
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -264,7 +237,6 @@ Describe "PowerShellGet - Script tests (Admin)" -Tags @('Feature', 'RequireAdmin
     }
 
     AfterAll {
-        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledScripts
     }
 }
diff --git a/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1 b/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
index 02c4ad856b7..af18672cf27 100644
--- a/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
+++ b/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
@@ -167,7 +167,7 @@ Describe "Default enablement of Experimental Features" -Tags CI {
     It "On stable builds, Experimental Features are not enabled" -Skip:($isPreview) {
         foreach ($expFeature in Get-ExperimentalFeature)
         {
-            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win7-x64\publish)
+            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net6.0\win7-x64\publish)
             # is launched from another pwsh (with $PSHOME like C:\program files\powershell\7)
             # resulting in combined PSModulePath which is used by Get-ExperimentalFeature to enum module-scoped exp.features from both pwsh locations.
             # So we need to exclude parent's modules' exp.features from verification using filtering on $PSHOME.
@@ -184,7 +184,7 @@ Describe "Default enablement of Experimental Features" -Tags CI {
 
         foreach ($expFeature in Get-ExperimentalFeature)
         {
-            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win7-x64\publish)
+            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net6.0\win7-x64\publish)
             # is launched from another pwsh (with $PSHOME like C:\program files\powershell\7)
             # resulting in combined PSModulePath which is used by Get-ExperimentalFeature to enum module-scoped exp.features from both pwsh locations.
             # So we need to exclude parent's modules' exp.features from verification using filtering on $PSHOME.
diff --git a/test/tools/OpenCover/OpenCover.psm1 b/test/tools/OpenCover/OpenCover.psm1
index f9130df5ae9..d0def0abf6c 100644
--- a/test/tools/OpenCover/OpenCover.psm1
+++ b/test/tools/OpenCover/OpenCover.psm1
@@ -615,7 +615,7 @@ function Install-OpenCover
 .Description
    Invoke-OpenCover runs tests under OpenCover by executing tests on PowerShell located at $PowerShellExeDirectory.
 .EXAMPLE
-   Invoke-OpenCover -TestPath $PWD/test/powershell -PowerShellExeDirectory $PWD/src/powershell-win-core/bin/CodeCoverage/7.0/win7-x64
+   Invoke-OpenCover -TestPath $PWD/test/powershell -PowerShellExeDirectory $PWD/src/powershell-win-core/bin/CodeCoverage/net6.0/win7-x64
 #>
 function Invoke-OpenCover
 {
@@ -624,7 +624,7 @@ function Invoke-OpenCover
         [parameter()]$OutputLog = "$HOME/Documents/OpenCover.xml",
         [parameter()]$TestPath = "${script:psRepoPath}/test/powershell",
         [parameter()]$OpenCoverPath = "$HOME/OpenCover",
-        [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net7.0/win7-x64/publish",
+        [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net6.0/win7-x64/publish",
         [parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml",
         [parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml",
         [parameter()]$PesterLogFormat = "NUnitXml",
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index c49ec96994b..491a77f0c80 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index c425f0002c3..bbc07be5259 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.1.22109.13" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index 40b83623375..6747368a4c6 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -342,7 +342,7 @@ if ($dotnetUpdate.ShouldUpdate) {
         Import-Module "$PSScriptRoot/../build.psm1" -Force
         Import-Module "$PSScriptRoot/packaging" -Force
         Start-PSBootstrap -Package
-        Start-PSBuild -Clean -Configuration Release -InteractiveAuth:$InteractiveAuth
+        Start-PSBuild -Clean -Configuration Release -CrossGen -InteractiveAuth:$InteractiveAuth
 
         $publishPath = Split-Path (Get-PSOutput)
         Remove-Item -Path "$publishPath\*.pdb"
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 6a4ca73ef6d..25713c3c135 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -55,7 +55,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Analyzers",
-          "Version": "3.3.3"
+          "Version": "3.3.2"
         }
       },
       "DevelopmentDependency": true
@@ -845,7 +845,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.DirectoryServices.Protocols",
-          "Version": "6.0.1"
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -1405,7 +1405,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Web.Services.Description",
-          "Version": "4.9.0-rc2.21473.1"
+          "Version": "4.9.0"
         }
       },
       "DevelopmentDependency": false
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index 658e95212db..315a83284d7 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -177,8 +177,8 @@ function Get-CGRegistrations {
 
     $registrationChanged = $false
 
-    $dotnetTargetName = 'net7.0'
-    $dotnetTargetNameWin7 = 'net7.0-windows7.0'
+    $dotnetTargetName = 'net6.0'
+    $dotnetTargetNameWin7 = 'net6.0-windows7.0'
     $unixProjectName = 'powershell-unix'
     $windowsProjectName = 'powershell-win-core'
     $actualRuntime = $Runtime
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 9383b0dc052..1437c5383ec 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -8,7 +8,7 @@ $packagingStrings = Import-PowerShellDataFile "$PSScriptRoot\packaging.strings.p
 Import-Module "$PSScriptRoot\..\Xml" -ErrorAction Stop -Force
 $DebianDistributions = @("deb")
 $RedhatDistributions = @("rh")
-$script:netCoreRuntime = 'net7.0'
+$script:netCoreRuntime = 'net6.0'
 $script:iconFileName = "Powershell_black_64.png"
 $script:iconPath = Join-Path -path $PSScriptRoot -ChildPath "../../assets/$iconFileName" -Resolve
 
@@ -2181,7 +2181,7 @@ function New-ILNugetPackageFromSource
 }
 
 <#
-  Copy the generated reference assemblies to the 'ref/net7.0' folder properly.
+  Copy the generated reference assemblies to the 'ref/net6.0' folder properly.
   This is a helper function used by 'New-ILNugetPackageSource'.
 #>
 function CopyReferenceAssemblies
@@ -3131,7 +3131,7 @@ function New-MSIPatch
         # This example shows how to produce a Debug-x64 installer for development purposes.
         cd $RootPathOfPowerShellRepo
         Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
-        New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
+        New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net6.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
 #>
 function New-MSIPackage
 {
@@ -3522,7 +3522,7 @@ function Start-MsiBuild {
         # This example shows how to produce a Debug-x64 installer for development purposes.
         cd $RootPathOfPowerShellRepo
         Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
-        New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
+        New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net6.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
 #>
 function New-MSIXPackage
 {
diff --git a/tools/packaging/packaging.strings.psd1 b/tools/packaging/packaging.strings.psd1
index b0753a0a4fd..b70592c313d 100644
--- a/tools/packaging/packaging.strings.psd1
+++ b/tools/packaging/packaging.strings.psd1
@@ -166,7 +166,7 @@ open {0}
             <files include="**/*" buildAction="None" copyToOutput="true" flatten="false" />
         </contentFiles>
         <dependencies>
-            <group targetFramework="net7.0"></group>
+            <group targetFramework="net6.0"></group>
         </dependencies>
     </metadata>
 </package>
diff --git a/tools/packaging/projects/nuget/package.csproj b/tools/packaging/projects/nuget/package.csproj
index d82205451ac..cee634e2ffa 100644
--- a/tools/packaging/projects/nuget/package.csproj
+++ b/tools/packaging/projects/nuget/package.csproj
@@ -11,6 +11,6 @@
     <NuspecProperties>runtime=$(RID);version=$(SemVer);PackageName=$(PackageName)</NuspecProperties>
     <NuspecBasePath>$(StagingPath)</NuspecBasePath>
     <IsTool>True</IsTool>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index e8efd4c4aee..53eee6e16db 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>$(RefAsmVersion)</Version>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@@ -14,7 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
     <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
   </ItemGroup>
 </Project>
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
index 4394e1148d1..a95a2a47cac 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>$(RefAsmVersion)</Version>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
index 5793e09c887..e382b8cbb33 100644
--- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>$(RefAsmVersion)</Version>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@@ -9,6 +9,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
   </ItemGroup>
 </Project>
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
index 55b21ac8156..572f909583d 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@@ -104,7 +104,7 @@ jobs:
         $localLocation = "$(Pipeline.Workspace)/releasePipeline/finalResults"
         $xmlElement = @"
           <add key=`"local`" value=`"$localLocation`" />
-          <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/7.0.100-preview.1.22101.1-shipping/nuget/v2" />
+          <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v2" />
         </packageSources>
         "@
 

From 3a49e1f6fef45c1c2f75c05ba0e720b21200785a Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Thu, 17 Feb 2022 17:57:21 -0800
Subject: [PATCH 246/645] Update to the latest .NET 6

Update to the latest .NET 6
---
 Analyzers.props                               |  2 +-
 global.json                                   |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  2 +-
 tools/cgmanifest.json                         | 48 +++++++++----------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Analyzers.props b/Analyzers.props
index dacf53c4625..d2527a40b7a 100644
--- a/Analyzers.props
+++ b/Analyzers.props
@@ -2,6 +2,6 @@
   <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="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
index e52d340bc63..572a2a6fa06 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.101"
+    "version": "6.0.200"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 97f3f308d45..f11e1edc63b 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
     <PackageReference Include="System.Threading.AccessControl" Version="6.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
     <PackageReference Include="NJsonSchema" Version="10.6.9" />
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 25713c3c135..f83a3199565 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -55,7 +55,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Analyzers",
-          "Version": "3.3.2"
+          "Version": "3.3.3"
         }
       },
       "DevelopmentDependency": true
@@ -65,7 +65,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Common",
-          "Version": "4.0.1"
+          "Version": "4.1.0"
         }
       },
       "DevelopmentDependency": false
@@ -75,7 +75,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.CSharp",
-          "Version": "4.0.1"
+          "Version": "4.1.0"
         }
       },
       "DevelopmentDependency": false
@@ -504,8 +504,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -514,7 +514,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
+          "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
           "Version": "6.0.0"
         }
       },
@@ -524,8 +524,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
-          "Version": "6.0.0"
+          "Name": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -604,8 +604,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win.System.Diagnostics.Debug",
-          "Version": "4.3.0"
+          "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -614,8 +614,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win.System.Runtime.Extensions",
-          "Version": "4.3.0"
+          "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -624,8 +624,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win7.System.Private.Uri",
-          "Version": "4.3.0"
+          "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -634,8 +634,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets",
-          "Version": "1.0.1"
+          "Name": "runtime.win.System.Diagnostics.Debug",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -644,8 +644,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets",
-          "Version": "1.0.1"
+          "Name": "runtime.win.System.Runtime.Extensions",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -654,8 +654,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets",
+          "Version": "1.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -664,8 +664,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets",
+          "Version": "1.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -674,8 +674,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.win7.System.Private.Uri",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false

From 10bbd74d8c6d579a2efee1f453e11d5330498d95 Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Thu, 17 Feb 2022 18:21:10 -0800
Subject: [PATCH 247/645] update wxs file

---
 assets/wix/files.wxs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 14b2204c159..fa44cc0e8b3 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3154,8 +3154,8 @@
       <Component Id="cmp22840874A8C84AA796496634FBEBF09C">
         <File Id="fil2067B616D1FA4B30932A0240ABE06089" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
       </Component>
-      <Component Id="cmpC100F34A32A0436A973FE7F9A02F5A78">
-        <File Id="filC8B8F95747F64A97B511342C7F154B54" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.121.56705.dll" />
+      <Component Id="cmp037C557288DD4F6CBA05E6D562F34759">
+        <File Id="fil17EAEAF558ED429CB9297130A55C96D0" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.222.6406.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4172,8 +4172,8 @@
       <ComponentRef Id="cmp0C4751F9D5C14419A45F234152D21DA9" />
       <ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
       <ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
-      <ComponentRef Id="cmpC100F34A32A0436A973FE7F9A02F5A78" />
       <ComponentRef Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9" />
+      <ComponentRef Id="cmp037C557288DD4F6CBA05E6D562F34759" />
     </ComponentGroup>
   </Fragment>
 </Wix>

From 31c14f2ad3714c262108acf6613ab023bc971012 Mon Sep 17 00:00:00 2001
From: ayousuf23 <72010390+ayousuf23@users.noreply.github.com>
Date: Mon, 21 Feb 2022 13:02:30 -0500
Subject: [PATCH 248/645] Updated background invocation `&` operator to use
 `-WorkingDirectory` when starting a new job (#16180)

---
 .../engine/runtime/Operations/MiscOps.cs      | 31 ++++++++++++-------
 .../Microsoft.PowerShell.Core/Job.Tests.ps1   | 12 ++++++-
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
index 62468dcfc3f..72a676dad1c 100644
--- a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
+++ b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
@@ -531,12 +531,8 @@ internal static void InvokePipelineInBackground(
                 var pipelineOffset = pipelineAst.Extent.StartOffset;
                 var variables = pipelineAst.FindAll(static x => x is VariableExpressionAst, true);
 
-                // Used to make sure that the job runs in the current directory
-                const string cmdPrefix = @"Microsoft.PowerShell.Management\Set-Location -LiteralPath $using:pwd ; ";
-
-                // Minimize allocations by initializing the stringbuilder to the size of the source string + prefix + space for ${using:} * 2
-                System.Text.StringBuilder updatedScriptblock = new System.Text.StringBuilder(cmdPrefix.Length + scriptblockBodyString.Length + 18);
-                updatedScriptblock.Append(cmdPrefix);
+                // Minimize allocations by initializing the stringbuilder to the size of the source string + space for ${using:} * 2
+                System.Text.StringBuilder updatedScriptblock = new System.Text.StringBuilder(scriptblockBodyString.Length + 18);
                 int position = 0;
 
                 // Prefix variables in the scriptblock with $using:
@@ -568,14 +564,25 @@ internal static void InvokePipelineInBackground(
                 var sb = ScriptBlock.Create(updatedScriptblock.ToString());
                 var commandInfo = new CmdletInfo("Start-Job", typeof(StartJobCommand));
                 commandProcessor = context.CommandDiscovery.LookupCommandProcessor(commandInfo, CommandOrigin.Internal, false, context.EngineSessionState);
-                var parameter = CommandParameterInternal.CreateParameterWithArgument(
+
+                var workingDirectoryParameter = CommandParameterInternal.CreateParameterWithArgument(
                     parameterAst: pipelineAst,
-                    "ScriptBlock",
-                    null,
+                    parameterName: "WorkingDirectory",
+                    parameterText: null,
                     argumentAst: pipelineAst,
-                    sb,
-                    false);
-                commandProcessor.AddParameter(parameter);
+                    value: context.SessionState.Path.CurrentLocation.Path,
+                    spaceAfterParameter: false);
+
+                var scriptBlockParameter = CommandParameterInternal.CreateParameterWithArgument(
+                    parameterAst: pipelineAst,
+                    parameterName: "ScriptBlock",
+                    parameterText: null,
+                    argumentAst: pipelineAst,
+                    value: sb,
+                    spaceAfterParameter: false);
+
+                commandProcessor.AddParameter(workingDirectoryParameter);
+                commandProcessor.AddParameter(scriptBlockParameter);
                 pipelineProcessor.Add(commandProcessor);
                 pipelineProcessor.LinkPipelineSuccessOutput(outputPipe ?? new Pipe(new List<object>()));
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Job.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Job.Tests.ps1
index 90477267b4e..2cf4f04dde0 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Job.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Job.Tests.ps1
@@ -178,7 +178,7 @@ Describe "Debug-job test" -Tag "Feature" {
     }
 }
 
-Describe "Ampersand background test" -Tag "CI","Slow" {
+Describe "Ampersand background test" -Tag "CI", "Slow" {
     Context "Simple background job" {
         AfterEach {
             Get-Job | Remove-Job -Force
@@ -218,6 +218,16 @@ Describe "Ampersand background test" -Tag "CI","Slow" {
             $j = Get-Location | ForEach-Object -MemberName Path &
             Receive-Job -Wait $j | Should -Be ($PWD.Path)
         }
+        It "Make sure Set-Location is not used in the job's script block to set the working directory" {
+            $j = (Get-Variable -Value ExecutionContext).SessionState.PSVariable.Get("MyInvocation").Value.MyCommand.ScriptBlock & 
+            (Receive-Job -Wait $j).ToString() | Should -BeExactly "(Get-Variable -Value ExecutionContext).SessionState.PSVariable.Get(`"MyInvocation`").Value.MyCommand.ScriptBlock"
+        }
+        It "Test that changing working directory also changes background job's working directory" {
+            Set-Location ..
+            $WorkingDirectory = (Get-Location).ToString()
+            $BackgroundJob = (Get-Location &) 
+            (Receive-Job -Wait $BackgroundJob).ToString() | Should -BeExactly $WorkingDirectory
+        }
         It "Test that output redirection is done in the background job" {
             $j = Write-Output hello > $TESTDRIVE/hello.txt &
             Receive-Job -Wait $j | Should -BeNullOrEmpty

From 102e8285bb1e277b6ab4d76461a12cbeb82a8bfa Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 23 Feb 2022 11:36:46 -0800
Subject: [PATCH 249/645] Bump PSReadLine from 2.1.0 to 2.2.2 (#16910)

---
 assets/wix/files.wxs                          | 30 +++++++++++++++++--
 src/Modules/PSGalleryModules.csproj           |  2 +-
 .../Modules/PSReadLine/PSReadLine.Tests.ps1   |  4 +--
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 9bbc1715145..a9f2465288c 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1835,9 +1835,29 @@
           <Component Id="cmpC0582B8F392548248FA3DE3080069F68">
             <File Id="fil1A3F0A1371A643AFAA4F896D9D5CBF70" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PSReadLine\Microsoft.PowerShell.PSReadLine2.dll" />
           </Component>
-          <Component Id="cmp6EEA835AD77246C8A01C0F3B8BB0568E">
-            <File Id="fil0A748F74DB0245539BF6ECEBFDB3C884" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PSReadLine\PSReadLine.cat" />
+          <Component Id="cmp3F48AB8F48674965B721E9D5DE5AC19F">
+            <File Id="fil27BA768E05A441E293BDC9F6481C272F" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PSReadLine\Microsoft.PowerShell.Pager.dll" />
           </Component>
+          <Directory Name="net6plus" Id="dir9F34466EDEF54D2BA03545D2BB152347">
+            <Component Id="cmp9207ABECCDB7479392AFC35A6133994E">
+              <File Id="fil07E2CE764A83431CAFEF1132FEDBE039" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PSReadLine\net6plus\Microsoft.PowerShell.PSReadLine.Polyfiller.dll" />
+            </Component>
+          </Directory>
+          <Directory Name="net461" Id="dir0BE8A79265FB414097A6FEEC3FD1A9DA">
+            <Component Id="cmpFDAD012AF60E4E3A9281239CB2D1814A">
+              <File Id="fil73F9E4ADB9644EA298A91C82BF1AE025" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PSReadLine\net461\Microsoft.PowerShell.PSReadLine.Polyfiller.dll" />
+            </Component>
+          </Directory>
+          <Directory Name="_manifest" Id="dirAB7C5C1B9B094AFDB92B0579CB436378">
+            <Directory Name="spdx_2.2" Id="dirC34C47323EC444F9ABBAD517851610A8">
+              <Component Id="cmp6BFA61E2CB7C40E2A92575EBFC772B96">
+                <File Id="fil7BAA3CF9CFB04BCF910EA3F975E30C36" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PSReadLine\_manifest\spdx_2.2\manifest.spdx.json" />
+              </Component>
+              <Component Id="cmp0F6EADB772B844B48C250D8F0469A19B">
+                <File Id="fil3555F9DC200B4AA5BC55BB5B411833DC" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PSReadLine\_manifest\spdx_2.2\manifest.spdx.json.sha256" />
+              </Component>
+            </Directory>
+          </Directory>
         </Directory>
         <Directory Name="PowerShellGet" Id="dir49159A33EB06456C9C2C971815311A6A">
           <Directory Name="en-US" Id="dirF5EBE6CBD04149359D3582351CB4438D">
@@ -3748,7 +3768,11 @@
       <ComponentRef Id="cmp6DDBFA3A9FED42B3AFDCDD4BE0416533" />
       <ComponentRef Id="cmp84599819161549BC82898469571ADE7B" />
       <ComponentRef Id="cmpC0582B8F392548248FA3DE3080069F68" />
-      <ComponentRef Id="cmp6EEA835AD77246C8A01C0F3B8BB0568E" />
+      <ComponentRef Id="cmp9207ABECCDB7479392AFC35A6133994E" />
+      <ComponentRef Id="cmp6BFA61E2CB7C40E2A92575EBFC772B96" />
+      <ComponentRef Id="cmp0F6EADB772B844B48C250D8F0469A19B" />
+      <ComponentRef Id="cmpFDAD012AF60E4E3A9281239CB2D1814A" />
+      <ComponentRef Id="cmp3F48AB8F48674965B721E9D5DE5AC19F" />
       <ComponentRef Id="cmpB9EF9DAB25064D92A757E7D390CC8922" />
       <ComponentRef Id="cmp092D1859608844F78D3211718ED31171" />
       <ComponentRef Id="cmpDCFC0B0822274CA2A1C954DF2E407911" />
diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj
index f41e3740bc0..1bbb056765f 100644
--- a/src/Modules/PSGalleryModules.csproj
+++ b/src/Modules/PSGalleryModules.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="PowerShellGet" Version="2.2.5" />
     <PackageReference Include="PackageManagement" Version="1.4.7" />
     <PackageReference Include="Microsoft.PowerShell.Archive" Version="1.2.5" />
-    <PackageReference Include="PSReadLine" Version="2.1.0" />
+    <PackageReference Include="PSReadLine" Version="2.2.2" />
     <PackageReference Include="ThreadJob" Version="2.0.3" />
   </ItemGroup>
 
diff --git a/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1 b/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1
index 62c27c87a12..6e5924d9c55 100644
--- a/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1
+++ b/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1
@@ -12,13 +12,13 @@ Describe "PSReadLine" -tags "CI" {
         Import-Module PSReadLine
         $module = Get-Module PSReadLine
         $module.Name | Should -BeExactly 'PSReadLine'
-        $module.Version | Should -Match '^2.1.\d$'
+        $module.Version | Should -Match '^2.2.\d$'
     }
 
     It "Should be installed to `$PSHOME" {
         $module = Get-Module (Join-Path -Path $PSHOME -ChildPath "Modules" -AdditionalChildPath "PSReadLine") -ListAvailable
         $module.Name | Should -BeExactly 'PSReadLine'
-        $module.Version | Should -Match '^2.1.\d$'
+        $module.Version | Should -Match '^2.2.\d$'
         $module.Path | Should -Be (Join-Path -Path $PSHOME -ChildPath "Modules/PSReadLine/PSReadLine.psd1")
     }
 

From 369fb73de6b665b0162c1d8ebabd898f0e476b42 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 23 Feb 2022 00:47:01 +0000
Subject: [PATCH 250/645] Merged PR 19248: Remove
 SkipExperimentalFeatureGeneration when building alpine

Remove SkipExperimentalFeatureGeneration when building alpine
---
 tools/packaging/packaging.psm1 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 1437c5383ec..ff19e06f3cb 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -4483,8 +4483,6 @@ function Invoke-AzDevOpsLinuxPackageBuild {
             }
             'alpine' {
                 $buildParams.Add("Runtime", 'alpine-x64')
-                # We are cross compiling, so we can't generate experimental features
-                $buildParams.Add("SkipExperimentalFeatureGeneration", $true)
             }
         }
 

From e1f52dda7777db246903cdf6ba5025355e4be92e Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 23 Feb 2022 15:01:12 -0800
Subject: [PATCH 251/645] Refactor module assembly loading logic to allow the
 whole module to be loaded in a custom ALC (#16889)

---
 build.psm1                                    |  20 +-
 .../engine/ExecutionContext.cs                | 149 +++++--
 .../engine/InitialSessionState.cs             | 140 +------
 .../engine/Modules/ImportModuleCommand.cs     |  79 ++--
 .../engine/Modules/ModuleCmdletBase.cs        | 382 +++++++++---------
 .../engine/Modules/ModuleIntrinsics.cs        |  46 ++-
 .../engine/Module/IsolatedModule.Tests.ps1    |  74 ++++
 .../Module/TestModuleManifest.Tests.ps1       |  11 +-
 .../IsolatedModule/IsolatedModule.psd1        |  16 +
 test/tools/TestAlc/TestAlc.sln                |  34 ++
 test/tools/TestAlc/init/Init.cs               |  83 ++++
 .../TestAlc/init/Test.Isolated.Init.csproj    |  21 +
 test/tools/TestAlc/nested/NestedCommand.cs    |  43 ++
 .../nested/Test.Isolated.Nested.csproj        |  22 +
 test/tools/TestAlc/root/RootCommand.cs        |  39 ++
 .../TestAlc/root/Test.Isolated.Root.csproj    |  21 +
 16 files changed, 772 insertions(+), 408 deletions(-)
 create mode 100644 test/powershell/engine/Module/IsolatedModule.Tests.ps1
 create mode 100644 test/tools/Modules/IsolatedModule/IsolatedModule.psd1
 create mode 100644 test/tools/TestAlc/TestAlc.sln
 create mode 100644 test/tools/TestAlc/init/Init.cs
 create mode 100644 test/tools/TestAlc/init/Test.Isolated.Init.csproj
 create mode 100644 test/tools/TestAlc/nested/NestedCommand.cs
 create mode 100644 test/tools/TestAlc/nested/Test.Isolated.Nested.csproj
 create mode 100644 test/tools/TestAlc/root/RootCommand.cs
 create mode 100644 test/tools/TestAlc/root/Test.Isolated.Root.csproj

diff --git a/build.psm1 b/build.psm1
index 3e33ed87de9..2dacee97445 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1046,9 +1046,10 @@ function Publish-PSTestTools {
     Find-Dotnet
 
     $tools = @(
-        @{Path="${PSScriptRoot}/test/tools/TestExe";Output="testexe"}
-        @{Path="${PSScriptRoot}/test/tools/WebListener";Output="WebListener"}
-        @{Path="${PSScriptRoot}/test/tools/TestService";Output="TestService"}
+        @{ Path="${PSScriptRoot}/test/tools/TestAlc";     Output="library" }
+        @{ Path="${PSScriptRoot}/test/tools/TestExe";     Output="exe" }
+        @{ Path="${PSScriptRoot}/test/tools/WebListener"; Output="exe" }
+        @{ Path="${PSScriptRoot}/test/tools/TestService"; Output="exe" }
     )
 
     $Options = Get-PSOptions -DefaultToNew
@@ -1069,12 +1070,19 @@ function Publish-PSTestTools {
                 Remove-Item -Path $objPath -Recurse -Force
             }
 
+            if ($tool.Output -eq 'library') {
+                ## Handle building and publishing assemblies.
+                dotnet publish --configuration $Options.Configuration --framework $Options.Framework
+                continue
+            }
+
+            ## Handle building and publishing executables.
             if (-not $runtime) {
-                dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $Options.Runtime
-            } else {
-                dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $runtime
+                $runtime = $Options.Runtime
             }
 
+            dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $runtime --self-contained
+
             if ( -not $env:PATH.Contains($toolPath) ) {
                 $env:PATH = $toolPath+$TestModulePathSeparator+$($env:PATH)
             }
diff --git a/src/System.Management.Automation/engine/ExecutionContext.cs b/src/System.Management.Automation/engine/ExecutionContext.cs
index 18ba461a68e..d73a1e97eb8 100644
--- a/src/System.Management.Automation/engine/ExecutionContext.cs
+++ b/src/System.Management.Automation/engine/ExecutionContext.cs
@@ -1269,55 +1269,150 @@ internal PSTransactionManager TransactionManager
 
         internal PSTransactionManager transactionManager;
 
-        internal Assembly AddAssembly(string name, string filename, out Exception error)
-        {
-            Assembly loadedAssembly = LoadAssembly(name, filename, out error);
-
-            if (loadedAssembly == null)
-                return null;
-
-            if (AssemblyCache.ContainsKey(loadedAssembly.FullName))
+        /// <summary>
+        /// This method is used for assembly loading requests stemmed from 'InitialSessionState' binding and module loading.
+        /// </summary>
+        /// <param name="source">Source of the assembly loading request, should be a module name when specified.</param>
+        /// <param name="assemblyName">Name of the assembly to be loaded.</param>
+        /// <param name="filePath">Path of the assembly to be loaded.</param>
+        /// <param name="error">Exception that is caught when the loading fails.</param>
+        internal Assembly AddAssembly(string source, string assemblyName, string filePath, out Exception error)
+        {
+            // Search the cache by the path, and return the assembly if we find it.
+            // It's common to have two loading requests for the same assembly when loading a module -- the first time for
+            // resolving a binary module path, and the second time for actually processing that module.
+            //
+            // That's not a problem when all the module assemblies are loaded into the default ALC. But in a scenario where
+            // a module tries to hide its nested/root binary modules in a custom ALC, that will become a problem. This is
+            // because:
+            // in that scenario, the module will usually setup a handler to load the specific assemblies to the custom ALC,
+            // and that will be how the first loading request gets served. However, after the module path is resolved with
+            // the first loading, the path will be used for the second loading upon real module processing. Since we prefer
+            // loading-by-path over loading-by-name in the 'LoadAssembly' call, we will end up loading the same assembly in
+            // the default ALC (because we use 'Assembly.LoadFrom' which always loads an assembly to the default ALC) if we
+            // do not search in the cache first. That will break the scenario, because the module means to isolate all its
+            // dependencies from the default ALC, and it failed to do so.
+            //
+            // Therefore, we need to search the cache first. The reason we use path as the key is to make sure the request
+            // is for exactly the same assembly. The same assembly file should not be loaded into different ALC's by module
+            // loading within the same PowerShell session (Runspace).
+            //
+            // An example module targeting the abovementioned scenario will likely have the following file structure:
+            // IsolatedModule
+            //  │   IsolatedModule.psd1 (has 'NestedModules = @('Test.Isolated.Init.dll', 'Test.Isolated.Nested.dll')')
+            //  │   Test.Isolated.Init.dll (contains the custom ALC and code to setup 'Resolving' handler)
+            //  └───Dependencies (folder under module base)
+            //         Newtonsoft.Json.dll (version 10.0.0.0 dependency)
+            //         Test.Isolated.Nested.dll (nested binary module referencing the particular dependency)
+            //
+            // In this example, the following events will happen in sequence:
+            //  1. PowerShell is able to find 'Test.Isolated.Init.dll' under module base folder, so it will be loaded into
+            //     the default ALC as expected and setup the 'Resolving' handler via the 'OnImport' call.
+            //  2. PowerShell cannot find 'Test.Isolated.Nested.dll' under the module base folder, so it will call the method
+            //     'FixFileName(.., bool canLoadAssembly)' to resolve the path of this binary module.
+            //     This particular overload will attempt to load the assembly by name, which will be served by the 'Resolving'
+            //     handler that was setup in the step 1. So, the assembly will be loaded into the custom ALC and insert to the
+            //     assembly cache.
+            //  3. Path of the nested module 'Test.Isolated.Init.dll' now has been resolved by the step 2 (assembly.Location).
+            //     Now it's time to actually load this binary module for processing in the method 'LoadBinaryModule', which
+            //     will make a call to this method with the resolved assembly file path.
+            // At this poin, we will have to query the cache first, instead of calling 'LoadAssembly' directly, to make sure
+            // that the assembly instance loaded in the custom ALC in step 2 gets returned back. Otherwise, the same assembly
+            // file will be loaded in the default ALC because 'Assembly.LoadFrom' is used in 'LoadAssembly' and that API will
+            // always load an assembly file to the default ALC, and that will break this scenario.
+            if (TryGetFromAssemblyCache(source, filePath, out Assembly loadedAssembly))
             {
-                // we should ignore this assembly.
+                error = null;
                 return loadedAssembly;
             }
-            // We will cache the assembly by both full name and
-            // file name
-            AssemblyCache.Add(loadedAssembly.FullName, loadedAssembly);
 
-            if (AssemblyCache.ContainsKey(loadedAssembly.GetName().Name))
+            // Attempt to load the requested assembly, first by path then by name.
+            loadedAssembly = LoadAssembly(assemblyName, filePath, out error);
+            if (loadedAssembly is not null)
             {
-                // we should ignore this assembly.
-                return loadedAssembly;
+                AddToAssemblyCache(source, loadedAssembly);
             }
 
-            AssemblyCache.Add(loadedAssembly.GetName().Name, loadedAssembly);
             return loadedAssembly;
         }
 
-        internal void RemoveAssembly(string name)
+        /// <summary>
+        /// Add a loaded assembly to the 'AssemblyCache'.
+        /// The <paramref name="source"/> is used as a prefix for the key to make it easy to remove all associated
+        /// assemblies from the cache when a module gets unloaded.
+        /// </summary>
+        /// <param name="source">The source where the assembly comes from, should be a module name when specified.</param>
+        /// <param name="assembly">The assembly we try to cache.</param>
+        internal void AddToAssemblyCache(string source, Assembly assembly)
+        {
+            // Try caching the assembly by its location if possible.
+            // When it's a dynamic assembly, we use it's full name. This could happen with 'Import-Module -Assembly'.
+            string key = string.IsNullOrEmpty(assembly.Location) ? assembly.FullName : assembly.Location;
+
+            // When the assembly is from a module loading, we prefix the key with the source,
+            // so we can remove it from the cache when the module gets unloaded.
+            if (!string.IsNullOrEmpty(source))
+            {
+                // Both 'source' and 'key' are of the string type, so no need to specify 'InvariantCulture'.
+                key = $"{source}@{key}";
+            }
+
+            AssemblyCache.TryAdd(key, assembly);
+        }
+
+        /// <summary>
+        /// Remove all cache entries that are associated with the specified source.
+        /// </summary>
+        internal void RemoveFromAssemblyCache(string source)
         {
-            Assembly loadedAssembly;
-            if (AssemblyCache.TryGetValue(name, out loadedAssembly) && loadedAssembly != null)
+            if (string.IsNullOrEmpty(source))
             {
-                AssemblyCache.Remove(name);
+                return;
+            }
+
+            var keysToRemove = new List<string>();
+            string prefix = $"{source}@";
 
-                AssemblyCache.Remove(loadedAssembly.GetName().Name);
+            foreach (string key in AssemblyCache.Keys)
+            {
+                if (key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+                {
+                    keysToRemove.Add(key);
+                }
+            }
+
+            foreach (string key in keysToRemove)
+            {
+                AssemblyCache.Remove(key);
             }
         }
 
-        [SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadWithPartialName")]
-        [SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFrom")]
-        internal static Assembly LoadAssembly(string name, string filename, out Exception error)
+        /// <summary>
+        /// Try to get an assembly from the cache.
+        /// </summary>
+        private bool TryGetFromAssemblyCache(string source, string filePath, out Assembly assembly)
+        {
+            if (string.IsNullOrEmpty(filePath))
+            {
+                assembly = null;
+                return false;
+            }
+
+            // Both 'source' and 'filePath' are of the string type, so no need to specify 'InvariantCulture'.
+            string key = string.IsNullOrEmpty(source) ? filePath : $"{source}@{filePath}";
+            return AssemblyCache.TryGetValue(key, out assembly);
+        }
+
+        private static Assembly LoadAssembly(string name, string filePath, out Exception error)
         {
             // First we try to load the assembly based on the filename
             Assembly loadedAssembly = null;
             error = null;
-            if (!string.IsNullOrEmpty(filename))
+            if (!string.IsNullOrEmpty(filePath))
             {
                 try
                 {
-                    loadedAssembly = Assembly.LoadFrom(filename);
+                    loadedAssembly = Assembly.LoadFrom(filePath);
                     return loadedAssembly;
                 }
                 catch (FileNotFoundException fileNotFound)
@@ -1562,7 +1657,7 @@ private void InitializeCommon(AutomationEngine engine, PSHost hostInterface)
             EngineHostInterface = hostInterface as InternalHost ?? new InternalHost(hostInterface, this);
 
             // Hook up the assembly cache
-            AssemblyCache = new Dictionary<string, Assembly>();
+            AssemblyCache = new Dictionary<string, Assembly>(StringComparer.OrdinalIgnoreCase);
 
             // Initialize the fixed toplevel session state and the current session state
             TopLevelSessionState = EngineSessionState = new SessionStateInternal(this);
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index bc40e903fa4..c0d4c2cb7cf 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -410,7 +410,7 @@ public SessionStateAssemblyEntry(string name)
         /// <returns>The cloned object.</returns>
         public override InitialSessionStateEntry Clone()
         {
-            SessionStateAssemblyEntry entry = new SessionStateAssemblyEntry(Name, FileName);
+            var entry = new SessionStateAssemblyEntry(Name, FileName);
             entry.SetPSSnapIn(this.PSSnapIn);
             entry.SetModule(this.Module);
             return entry;
@@ -2405,9 +2405,14 @@ private void Bind_LoadAssemblies(ExecutionContext context)
             // Load the assemblies and initialize the assembly cache...
             foreach (SessionStateAssemblyEntry ssae in Assemblies)
             {
-                if (etwEnabled) RunspaceEventSource.Log.LoadAssemblyStart(ssae.Name, ssae.FileName);
-                Exception error = null;
-                Assembly asm = context.AddAssembly(ssae.Name, ssae.FileName, out error);
+                if (etwEnabled)
+                {
+                    RunspaceEventSource.Log.LoadAssemblyStart(ssae.Name, ssae.FileName);
+                }
+
+                // Specify the source only if this is for module loading.
+                // The source is used for porper cleaning of the assembly cache when a module is unloaded.
+                Assembly asm = context.AddAssembly(ssae.Module?.Name, ssae.Name, ssae.FileName, out Exception error);
 
                 if (asm == null || error != null)
                 {
@@ -3374,105 +3379,6 @@ internal static void CreateQuestionVariable(ExecutionContext context)
             context.EngineSessionState.SetVariableAtScope(qv, "global", true, CommandOrigin.Internal);
         }
 
-        /// <summary>
-        /// Remove anything that would have been bound by this ISS instance.
-        /// At this point, it removes assemblies and cmdlet entries at the top level.
-        /// It also removes types and formats.
-        /// The other entry types - functions, variables, aliases
-        /// are not removed by this function.
-        /// </summary>
-        /// <param name="context"></param>
-        internal void Unbind(ExecutionContext context)
-        {
-            lock (_syncObject)
-            {
-                SessionStateInternal ss = context.EngineSessionState;
-
-                // Remove the assemblies from the assembly cache...
-                foreach (SessionStateAssemblyEntry ssae in Assemblies)
-                {
-                    context.RemoveAssembly(ssae.Name);
-                }
-
-                // Remove all of the commands from the top-level session state.
-                foreach (SessionStateCommandEntry cmd in Commands)
-                {
-                    SessionStateCmdletEntry ssce = cmd as SessionStateCmdletEntry;
-                    if (ssce != null)
-                    {
-                        List<CmdletInfo> matches;
-                        if (context.TopLevelSessionState.GetCmdletTable().TryGetValue(ssce.Name, out matches))
-                        {
-                            // Remove the name from the list...
-                            for (int i = matches.Count - 1; i >= 0; i--)
-                            {
-                                if (matches[i].ModuleName.Equals(cmd.PSSnapIn.Name))
-                                {
-                                    string name = matches[i].Name;
-                                    matches.RemoveAt(i);
-                                    context.TopLevelSessionState.RemoveCmdlet(name, i,  /*force*/ true);
-                                }
-                            }
-                            // And remove the entry if the list is now empty...
-                            if (matches.Count == 0)
-                            {
-                                context.TopLevelSessionState.RemoveCmdletEntry(ssce.Name, true);
-                            }
-                        }
-
-                        continue;
-                    }
-                }
-
-                // Remove all of the providers from the top-level provider table.
-                if (_providers != null && _providers.Count > 0)
-                {
-                    Dictionary<string, List<ProviderInfo>> providerTable = context.TopLevelSessionState.Providers;
-
-                    foreach (SessionStateProviderEntry sspe in _providers)
-                    {
-                        List<ProviderInfo> pl;
-                        if (providerTable.TryGetValue(sspe.Name, out pl))
-                        {
-                            Diagnostics.Assert(pl != null, "There should never be a null list of entries in the provider table");
-                            // For each provider with the same name...
-                            for (int i = pl.Count - 1; i >= 0; i--)
-                            {
-                                ProviderInfo pi = pl[i];
-
-                                // If it was implemented by this entry, remove it
-                                if (pi.ImplementingType == sspe.ImplementingType)
-                                {
-                                    RemoveAllDrivesForProvider(pi, context.TopLevelSessionState);
-                                    pl.RemoveAt(i);
-                                }
-                            }
-
-                            // If there are no providers left with this name, remove the key.
-                            if (pl.Count == 0)
-                            {
-                                providerTable.Remove(sspe.Name);
-                            }
-                        }
-                    }
-                }
-
-                List<string> formatFilesToRemove = new List<string>();
-                if (this.Formats != null)
-                {
-                    formatFilesToRemove.AddRange(this.Formats.Select(static f => f.FileName));
-                }
-
-                List<string> typeFilesToRemove = new List<string>();
-                if (this.Types != null)
-                {
-                    typeFilesToRemove.AddRange(this.Types.Select(static t => t.FileName));
-                }
-
-                RemoveTypesAndFormats(context, formatFilesToRemove, typeFilesToRemove);
-            }
-        }
-
         internal static void RemoveTypesAndFormats(ExecutionContext context, IList<string> formatFilesToRemove, IList<string> typeFilesToRemove)
         {
             // The formats and types tables are implemented in such a way that
@@ -3904,11 +3810,9 @@ internal PSSnapInInfo ImportPSSnapIn(PSSnapInInfo psSnapInInfo, out PSSnapInExce
                 this.Formats.Add(formatEntry);
             }
 
-            SessionStateAssemblyEntry assemblyEntry = new SessionStateAssemblyEntry(psSnapInInfo.AssemblyName, psSnapInInfo.AbsoluteModulePath);
-
+            var assemblyEntry = new SessionStateAssemblyEntry(psSnapInInfo.AssemblyName, psSnapInInfo.AbsoluteModulePath);
             assemblyEntry.SetPSSnapIn(psSnapInInfo);
-
-            this.Assemblies.Add(assemblyEntry);
+            Assemblies.Add(assemblyEntry);
 
             // entry from types.ps1xml references a type (Microsoft.PowerShell.Commands.SecurityDescriptorCommandsBase) in this assembly
             if (psSnapInInfo.Name.Equals(CoreSnapin, StringComparison.OrdinalIgnoreCase))
@@ -4005,20 +3909,16 @@ internal void ImportCmdletsFromAssembly(Assembly assembly, PSModuleInfo module)
                 throw e;
             }
 
-            Dictionary<string, SessionStateCmdletEntry> cmdlets = null;
-            Dictionary<string, List<SessionStateAliasEntry>> aliases = null;
-            Dictionary<string, SessionStateProviderEntry> providers = null;
-
             string assemblyPath = assembly.Location;
-            PSSnapInHelpers.AnalyzePSSnapInAssembly(assembly, assemblyPath, psSnapInInfo: null, module, out cmdlets, out aliases, out providers, helpFile: out _);
-
-            // If this is an in-memory assembly, don't added it to the list of AssemblyEntries
-            // since it can't be loaded by path or name
-            if (!string.IsNullOrEmpty(assembly.Location))
-            {
-                SessionStateAssemblyEntry assemblyEntry = new SessionStateAssemblyEntry(assembly.FullName, assemblyPath);
-                this.Assemblies.Add(assemblyEntry);
-            }
+            PSSnapInHelpers.AnalyzePSSnapInAssembly(
+                assembly,
+                assemblyPath,
+                psSnapInInfo: null,
+                module,
+                out Dictionary<string, SessionStateCmdletEntry> cmdlets,
+                out Dictionary<string, List<SessionStateAliasEntry>> aliases,
+                out Dictionary<string, SessionStateProviderEntry> providers,
+                helpFile: out _);
 
             if (cmdlets != null)
             {
diff --git a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
index 45011edb908..8f503cbe464 100644
--- a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
@@ -548,32 +548,15 @@ private void ImportModule_ViaLocalModuleInfo(ImportModuleOptions importModuleOpt
         private void ImportModule_ViaAssembly(ImportModuleOptions importModuleOptions, Assembly suppliedAssembly)
         {
             bool moduleLoaded = false;
+            string moduleName = "dynamic_code_module_" + suppliedAssembly.FullName;
+
             // Loop through Module Cache to ensure that the module is not already imported.
-            if (suppliedAssembly != null && Context.Modules.ModuleTable != null)
+            foreach (KeyValuePair<string, PSModuleInfo> pair in Context.Modules.ModuleTable)
             {
-                foreach (KeyValuePair<string, PSModuleInfo> pair in Context.Modules.ModuleTable)
+                if (pair.Value.Path == string.Empty)
                 {
-                    // if the module in the moduleTable is an assembly module without path, the moduleName is the key.
-                    string moduleName = "dynamic_code_module_" + suppliedAssembly;
-                    if (pair.Value.Path == string.Empty)
-                    {
-                        if (pair.Key.Equals(moduleName, StringComparison.OrdinalIgnoreCase))
-                        {
-                            moduleLoaded = true;
-                            if (BasePassThru)
-                            {
-                                WriteObject(pair.Value);
-                            }
-
-                            break;
-                        }
-                        else
-                        {
-                            continue;
-                        }
-                    }
-
-                    if (pair.Value.Path.Equals(suppliedAssembly.Location, StringComparison.OrdinalIgnoreCase))
+                    // If the module in the moduleTable is an assembly module without path, the moduleName is the key.
+                    if (pair.Key.Equals(moduleName, StringComparison.OrdinalIgnoreCase))
                     {
                         moduleLoaded = true;
                         if (BasePassThru)
@@ -583,12 +566,26 @@ private void ImportModule_ViaAssembly(ImportModuleOptions importModuleOptions, A
 
                         break;
                     }
+
+                    continue;
+                }
+
+                if (pair.Value.Path.Equals(suppliedAssembly.Location, StringComparison.OrdinalIgnoreCase))
+                {
+                    moduleLoaded = true;
+                    if (BasePassThru)
+                    {
+                        WriteObject(pair.Value);
+                    }
+
+                    break;
                 }
             }
 
             if (!moduleLoaded)
             {
                 PSModuleInfo module = LoadBinaryModule(
+                    parentModule: null,
                     moduleName: null,
                     fileName: null,
                     suppliedAssembly,
@@ -596,15 +593,13 @@ private void ImportModule_ViaAssembly(ImportModuleOptions importModuleOptions, A
                     ss: null,
                     importModuleOptions,
                     ManifestProcessingFlags.LoadElements | ManifestProcessingFlags.WriteErrors | ManifestProcessingFlags.NullOnFirstError,
-                    this.BasePrefix,
-                    loadTypes: false,
-                    loadFormats: false,
+                    BasePrefix,
                     out bool found);
 
-                if (found && module != null)
+                if (found && module is not null)
                 {
                     // Add it to all module tables ...
-                    AddModuleToModuleTables(this.Context, this.TargetSessionState.Internal, module);
+                    AddModuleToModuleTables(Context, TargetSessionState.Internal, module);
                     if (BasePassThru)
                     {
                         WriteObject(module);
@@ -1380,14 +1375,25 @@ private void ImportModule_RemotelyViaCimSession(
 
         private bool IsPs1xmlFileHelper_IsPresentInEntries(RemoteDiscoveryHelper.CimModuleFile cimModuleFile, IEnumerable<string> manifestEntries)
         {
-            if (manifestEntries.Any(s => s.EndsWith(cimModuleFile.FileName, StringComparison.OrdinalIgnoreCase)))
+            const string ps1xmlExt = ".ps1xml";
+            string fileName = cimModuleFile.FileName;
+
+            foreach (string entry in manifestEntries)
             {
-                return true;
+                if (entry.EndsWith(fileName, StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
             }
 
-            if (manifestEntries.Any(s => FixupFileName(string.Empty, s, ".ps1xml", isImportingModule: true).EndsWith(cimModuleFile.FileName, StringComparison.OrdinalIgnoreCase)))
+            foreach (string entry in manifestEntries)
             {
-                return true;
+                string tempName = entry.EndsWith(ps1xmlExt, StringComparison.OrdinalIgnoreCase) ? entry : entry + ps1xmlExt;
+                string resolvedPath = ResolveRootedFilePath(tempName, Context);
+                if (resolvedPath is not null && resolvedPath.EndsWith(fileName, StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
             }
 
             return false;
@@ -1894,13 +1900,10 @@ protected override void ProcessRecord()
             else if (this.ParameterSetName.Equals(ParameterSet_Assembly, StringComparison.OrdinalIgnoreCase))
             {
                 // Now load all of the supplied assemblies...
-                if (Assembly != null)
+                foreach (Assembly suppliedAssembly in Assembly)
                 {
-                    foreach (Assembly suppliedAssembly in Assembly)
-                    {
-                        ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.ModuleLoad, suppliedAssembly.GetName().Name);
-                        ImportModule_ViaAssembly(importModuleOptions, suppliedAssembly);
-                    }
+                    ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.ModuleLoad, suppliedAssembly.GetName().Name);
+                    ImportModule_ViaAssembly(importModuleOptions, suppliedAssembly);
                 }
             }
             else if (this.ParameterSetName.Equals(ParameterSet_Name, StringComparison.OrdinalIgnoreCase))
diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index 53dc8d058c0..1c94d557a83 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -682,9 +682,19 @@ private bool ValidateManifestHash(
             return result;
         }
 
-        private PSModuleInfo LoadModuleNamedInManifest(PSModuleInfo parentModule, ModuleSpecification moduleSpecification, string moduleBase, bool searchModulePath,
-            string prefix, SessionState ss, ImportModuleOptions options, ManifestProcessingFlags manifestProcessingFlags, bool loadTypes,
-            bool loadFormats, object privateData, out bool found, string shortModuleName, PSLanguageMode? manifestLanguageMode)
+        private PSModuleInfo LoadModuleNamedInManifest(
+            PSModuleInfo parentModule,
+            ModuleSpecification moduleSpecification,
+            string moduleBase,
+            bool searchModulePath,
+            string prefix,
+            SessionState ss,
+            ImportModuleOptions options,
+            ManifestProcessingFlags manifestProcessingFlags,
+            object privateData,
+            out bool found,
+            string shortModuleName,
+            PSLanguageMode? manifestLanguageMode)
         {
             PSModuleInfo module = null;
             PSModuleInfo tempModuleInfoFromVerification = null;
@@ -698,11 +708,16 @@ private PSModuleInfo LoadModuleNamedInManifest(PSModuleInfo parentModule, Module
 
             var importingModule = manifestProcessingFlags.HasFlag(ManifestProcessingFlags.LoadElements);
             string extension = Path.GetExtension(moduleSpecification.Name);
+
             // First check for fully-qualified paths - either absolute or relative
             string rootedPath = ResolveRootedFilePath(moduleSpecification.Name, this.Context);
             if (string.IsNullOrEmpty(rootedPath))
             {
-                rootedPath = FixupFileName(moduleBase, moduleSpecification.Name, extension, importingModule);
+                // Use the name of the parent module if it's specified, otherwise, use the current module name.
+                //  - If the current module is a nested module, then the parent module will be specifeid.
+                //  - If the current module is a root module, then the parent module will not be specified.
+                string moduleName = parentModule?.Name ?? ModuleIntrinsics.GetModuleName(moduleSpecification.Name);
+                rootedPath = FixFileName(moduleName, moduleBase, moduleSpecification.Name, extension: null, canLoadAssembly: importingModule);
             }
             else
             {
@@ -925,8 +940,6 @@ private PSModuleInfo LoadModuleNamedInManifest(PSModuleInfo parentModule, Module
                                 options,
                                 manifestProcessingFlags,
                                 prefix,
-                                loadTypes,
-                                loadFormats,
                                 out found,
                                 shortModuleName,
                                 disableFormatUpdates: false);
@@ -1524,6 +1537,7 @@ internal PSModuleInfo LoadModuleManifest(
 
             Dbg.Assert(moduleManifestPath != null, "moduleManifestPath for module (.psd1) can't be null");
             string moduleBase = Path.GetDirectoryName(moduleManifestPath);
+            string moduleName = ModuleIntrinsics.GetModuleName(moduleManifestPath);
 
             if ((manifestProcessingFlags &
                  (ManifestProcessingFlags.LoadElements | ManifestProcessingFlags.WriteErrors |
@@ -1624,24 +1638,32 @@ internal PSModuleInfo LoadModuleManifest(
                     invalidOperation.SetErrorId("Modules_WildCardNotAllowedInModuleToProcessAndInNestedModules");
                     throw invalidOperation;
                 }
+
                 // See if this module is already loaded. Since the manifest entry may not
                 // have an extension and the module table is indexed by full names, we
                 // may have search through all the extensions.
                 PSModuleInfo loadedModule = null;
-                string rootedPath = this.FixupFileName(moduleBase, actualRootModule, extension: null, importingModule);
-                string mtpExtension = Path.GetExtension(rootedPath);
-                if (!string.IsNullOrEmpty(mtpExtension) && ModuleIntrinsics.IsPowerShellModuleExtension(mtpExtension))
+                string rootedPath = null;
+
+                // For a root module, we use its own module name instead of the manifest module name when calling 'FixFileName'.
+                // This is because when actually loading the root module later, it won't have access to the parent manifest module,
+                // and we will use its own name to query for already loaded assemblies from 'Context.AssemblyCache'.
+                string rootModuleName = ModuleIntrinsics.GetModuleName(actualRootModule);
+                string extension = Path.GetExtension(actualRootModule);
+                if (!string.IsNullOrEmpty(extension) && ModuleIntrinsics.IsPowerShellModuleExtension(extension))
                 {
+                    rootedPath = FixFileName(rootModuleName, moduleBase, actualRootModule, extension: null, canLoadAssembly: importingModule);
                     TryGetFromModuleTable(rootedPath, out loadedModule);
                 }
                 else
                 {
                     foreach (string extensionToTry in ModuleIntrinsics.PSModuleExtensions)
                     {
-                        rootedPath = this.FixupFileName(moduleBase, actualRootModule, extensionToTry, importingModule);
-                        TryGetFromModuleTable(rootedPath, out loadedModule);
-                        if (loadedModule != null)
+                        rootedPath = FixFileName(rootModuleName, moduleBase, actualRootModule, extensionToTry, canLoadAssembly: importingModule);
+                        if (TryGetFromModuleTable(rootedPath, out loadedModule))
+                        {
                             break;
+                        }
                     }
                 }
 
@@ -2049,7 +2071,6 @@ internal PSModuleInfo LoadModuleManifest(
                 {
                     bool nameMissingOrEmpty = false;
                     var invalidNames = new List<string>();
-                    string moduleName = ModuleIntrinsics.GetModuleName(moduleManifestPath);
                     expFeatureList = new List<ExperimentalFeature>(features.Length);
 
                     foreach (Hashtable feature in features)
@@ -2162,61 +2183,72 @@ internal PSModuleInfo LoadModuleManifest(
             // Indicates the ISS.Bind() should be called...
             bool doBind = false;
 
-            // Set up to load any required assemblies that have been specified...
-            List<string> tmpAssemblyList;
-            List<string> assemblyList = new List<string>();
-            List<string> fixedUpAssemblyPathList = new List<string>();
-
-            if (
-                !GetListOfStringsFromData(data, moduleManifestPath, "RequiredAssemblies", manifestProcessingFlags,
-                    out tmpAssemblyList))
+            if (!GetListOfStringsFromData(
+                    data,
+                    moduleManifestPath,
+                    "RequiredAssemblies",
+                    manifestProcessingFlags,
+                    out List<string> assemblyList))
             {
                 containedErrors = true;
-                if (bailOnFirstError) return null;
+                if (bailOnFirstError)
+                {
+                    return null;
+                }
             }
-            else
+            else if (assemblyList != null && importingModule)
             {
-                if (tmpAssemblyList != null && tmpAssemblyList.Count > 0)
+                foreach (string assembly in assemblyList)
                 {
-                    foreach (string assembly in tmpAssemblyList)
+                    if (WildcardPattern.ContainsWildcardCharacters(assembly))
                     {
-                        assemblyList.Add(assembly);
+                        PSInvalidOperationException invalidOperation = PSTraceSource.NewInvalidOperationException(
+                            Modules.WildCardNotAllowedInRequiredAssemblies,
+                            moduleManifestPath);
+                        invalidOperation.SetErrorId("Modules_WildCardNotAllowedInRequiredAssemblies");
+                        throw invalidOperation;
                     }
-                }
-
-                if ((assemblyList != null) && importingModule)
-                {
-                    foreach (string assembly in assemblyList)
+                    else
                     {
-                        if (WildcardPattern.ContainsWildcardCharacters(assembly))
+                        string fileName = null;
+                        string ext = Path.GetExtension(assembly);
+
+                        // Note that we don't need to load the required assemblies eagerly because they will be loaded before
+                        // processing type and format data. So, when calling 'FixupFileName', we only attempt to resolve the
+                        // path, and avoid triggering the loading of the assembly.
+                        if (ModuleIntrinsics.ProcessableAssemblyExtensions.Contains(ext, StringComparer.OrdinalIgnoreCase))
                         {
-                            PSInvalidOperationException invalidOperation = PSTraceSource.NewInvalidOperationException(
-                                Modules.WildCardNotAllowedInRequiredAssemblies,
-                                moduleManifestPath);
-                            invalidOperation.SetErrorId("Modules_WildCardNotAllowedInRequiredAssemblies");
-                            throw invalidOperation;
+                            fileName = FixFileNameWithoutLoadingAssembly(moduleBase, assembly, extension: null);
                         }
                         else
                         {
-                            string fileName = FixupFileName(moduleBase, assembly, StringLiterals.PowerShellNgenAssemblyExtension, importingModule, out bool pathIsResolved);
-                            if (!pathIsResolved)
+                            bool isPathResolved = false;
+                            foreach (string extToTry in ModuleIntrinsics.ProcessableAssemblyExtensions)
                             {
-                                fileName = FixupFileName(moduleBase, assembly, StringLiterals.PowerShellILAssemblyExtension, importingModule);
+                                fileName = FixFileNameWithoutLoadingAssembly(moduleBase, assembly, extToTry, out isPathResolved);
+                                if (isPathResolved)
+                                {
+                                    break;
+                                }
                             }
 
-                            string loadMessage = StringUtil.Format(Modules.LoadingFile, "Assembly", fileName);
-                            WriteVerbose(loadMessage);
-                            iss.Assemblies.Add(new SessionStateAssemblyEntry(assembly, fileName));
-                            fixedUpAssemblyPathList.Add(fileName);
+                            if (!isPathResolved)
+                            {
+                                // We didn't resolve the assembly path, so remove the '.exe' extension that was added in the
+                                // last iteration of the above loop.
+                                int index = fileName.LastIndexOf('.');
+                                fileName = fileName.Substring(0, index);
+                            }
+                        }
 
-                            fileName = FixupFileName(moduleBase, assembly, StringLiterals.PowerShellILExecutableExtension, importingModule);
-                            loadMessage = StringUtil.Format(Modules.LoadingFile, "Executable", fileName);
-                            WriteVerbose(loadMessage);
-                            iss.Assemblies.Add(new SessionStateAssemblyEntry(assembly, fileName));
-                            fixedUpAssemblyPathList.Add(fileName);
+                        WriteVerbose(StringUtil.Format(Modules.LoadingFile, "Assembly", fileName));
 
-                            doBind = true;
-                        }
+                        // Set a fake PSModuleInfo object to indicate the module it comes from.
+                        var assemblyEntry = new SessionStateAssemblyEntry(assembly, fileName);
+                        assemblyEntry.SetModule(new PSModuleInfo(moduleName, path: null, context: null, sessionState: null));
+
+                        iss.Assemblies.Add(assemblyEntry);
+                        doBind = true;
                     }
                 }
             }
@@ -2253,8 +2285,7 @@ internal PSModuleInfo LoadModuleManifest(
                                 continue;
                             }
 
-                            string resolvedEntryFileName = ResolveRootedFilePath(entry.FileName, Context) ??
-                                                            entry.FileName;
+                            string resolvedEntryFileName = ResolveRootedFilePath(entry.FileName, Context) ?? entry.FileName;
                             if (resolvedEntryFileName.Equals(resolvedFileName, StringComparison.OrdinalIgnoreCase))
                             {
                                 isAlreadyLoaded = true;
@@ -2377,7 +2408,7 @@ internal PSModuleInfo LoadModuleManifest(
                 key: "FileList",
                 manifestProcessingFlags,
                 moduleBase,
-                extension: string.Empty,
+                extension: null,
                 // Don't check file existence - don't want to change current behavior without feature team discussion.
                 verifyFilesExist: false,
                 out List<string> fileList))
@@ -2517,10 +2548,18 @@ internal PSModuleInfo LoadModuleManifest(
             // If there is a session state, set up to import/export commands and variables
             if (ss != null)
             {
-                ss.Internal.SetVariable(SpecialVariables.PSScriptRootVarPath, Path.GetDirectoryName(moduleManifestPath),
-                    true, CommandOrigin.Internal);
-                ss.Internal.SetVariable(SpecialVariables.PSCommandPathVarPath, moduleManifestPath, true,
+                ss.Internal.SetVariable(
+                    SpecialVariables.PSScriptRootVarPath,
+                    moduleBase,
+                    asValue: true,
+                    CommandOrigin.Internal);
+
+                ss.Internal.SetVariable(
+                    SpecialVariables.PSCommandPathVarPath,
+                    moduleManifestPath,
+                    asValue: true,
                     CommandOrigin.Internal);
+
                 ss.Internal.Module = manifestInfo;
 
                 // without ModuleToProcess a manifest will export everything by default
@@ -2974,8 +3013,6 @@ internal PSModuleInfo LoadModuleManifest(
                             ss: null,
                             options: nestedModuleOptions,
                             manifestProcessingFlags: manifestProcessingFlags,
-                            loadTypes: true,
-                            loadFormats: true,
                             privateData: privateData,
                             found: out found,
                             shortModuleName: null,
@@ -3077,8 +3114,6 @@ internal PSModuleInfo LoadModuleManifest(
                         ss: ss,
                         options: options,
                         manifestProcessingFlags: manifestProcessingFlags,
-                        loadTypes: (exportedTypeFiles == null || exportedTypeFiles.Count == 0),        // If types files already loaded, don't load snapin files
-                        loadFormats: (exportedFormatFiles == null || exportedFormatFiles.Count == 0),   // if format files already loaded, don't load snapin files
                         privateData: privateData,
                         found: out found,
                         shortModuleName: null,
@@ -4403,8 +4438,6 @@ private bool GetListOfFilesFromData(
             out List<string> list)
         {
             list = null;
-
-            bool importingModule = manifestProcessingFlags.HasFlag(ManifestProcessingFlags.LoadElements);
             if (!GetListOfStringsFromData(data, moduleManifestPath, key, manifestProcessingFlags, out List<string> listOfStrings))
             {
                 return false;
@@ -4426,7 +4459,7 @@ private bool GetListOfFilesFromData(
                 {
                     try
                     {
-                        string fixedFileName = FixupFileName(moduleBase, s, extension, importingModule, skipLoading: true);
+                        string fixedFileName = FixFileNameWithoutLoadingAssembly(moduleBase, s, extension);
                         var dir = Path.GetDirectoryName(fixedFileName);
 
                         if (string.Equals(psHome, dir, StringComparison.OrdinalIgnoreCase) ||
@@ -4581,12 +4614,22 @@ internal bool GetScalarFromData<T>(
             }
         }
 
+        private string FixFileNameWithoutLoadingAssembly(string moduleBase, string fileName, string extension)
+        {
+            return FixFileName(moduleName: null, moduleBase, fileName, extension, canLoadAssembly: false, pathIsResolved: out _);
+        }
+
+        private string FixFileNameWithoutLoadingAssembly(string moduleBase, string fileName, string extension, out bool pathIsResolved)
+        {
+            return FixFileName(moduleName: null, moduleBase, fileName, extension, canLoadAssembly: false, out pathIsResolved);
+        }
+
         /// <summary>
         /// A utility routine to fix up a file name so it's rooted and has an extension.
         /// </summary>
-        internal string FixupFileName(string moduleBase, string name, string extension, bool isImportingModule, bool skipLoading = false)
+        private string FixFileName(string moduleName, string moduleBase, string fileName, string extension, bool canLoadAssembly)
         {
-            return FixupFileName(moduleBase, name, extension, isImportingModule, pathIsResolved: out _, skipLoading);
+            return FixFileName(moduleName, moduleBase, fileName, extension, canLoadAssembly, pathIsResolved: out _);
         }
 
         /// <summary>
@@ -4596,24 +4639,33 @@ internal string FixupFileName(string moduleBase, string name, string extension,
         /// When fixing up an assembly file, this method loads the resovled assembly if it's in the process of actually loading a module.
         /// Read the comments in the method for the detailed information.
         /// </remarks>
+        /// <param name="moduleName">Name of the module that we are processing, used for caching purpose when we need to load an assembly.</param>
         /// <param name="moduleBase">The base path to use if the file is not rooted.</param>
-        /// <param name="name">The file name to resolve.</param>
-        /// <param name="extension">The extension to use in case the given name has no extension.</param>
-        /// <param name="isImportingModule">Indicate if we are loading a module.</param>
+        /// <param name="fileName">The file name to resolve.</param>
+        /// <param name="extension">The extension to use for the look up.</param>
+        /// <param name="canLoadAssembly">Indicate if we can load assembly for the resolution.</param>
         /// <param name="pathIsResolved">Indicate if the returned path is fully resolved.</param>
-        /// <param name="skipLoading">Indicate if the resolved module should be loaded.</param>
         /// <returns>
-        /// The resolved file path. Or, the combined path of <paramref name="moduleBase"/> and <paramref name="name"/> when the file path cannot be resolved.
+        /// The resolved file path. Or, the combined path of <paramref name="moduleBase"/> and <paramref name="fileName"/> when the file path cannot be resolved.
         /// </returns>
-        internal string FixupFileName(string moduleBase, string name, string extension, bool isImportingModule, out bool pathIsResolved, bool skipLoading = false)
+        private string FixFileName(string moduleName, string moduleBase, string fileName, string extension, bool canLoadAssembly, out bool pathIsResolved)
         {
             pathIsResolved = false;
-            string originalName = name;
-            string originalExt = Path.GetExtension(name);
 
-            if (string.IsNullOrEmpty(originalExt))
+            string originalName = fileName;
+            string originalExt = Path.GetExtension(fileName);
+
+            if (string.IsNullOrEmpty(extension))
             {
-                name += extension;
+                // When 'extension' is not explicitly specified, we honor the original extension.
+                extension = originalExt;
+            }
+            else if (!extension.Equals(originalExt, StringComparison.OrdinalIgnoreCase))
+            {
+                // When 'extension' is explicitly specified, append it if the original extension is different.
+                // Note: the original extension could actually be part of the file name. For example, the name
+                // is `Microsoft.PowerShell.Command.Utility`, in which case the extension is `.Utility`.
+                fileName += extension;
             }
 
             // Try to get the resolved fully qualified path to the file.
@@ -4625,24 +4677,24 @@ internal string FixupFileName(string moduleBase, string name, string extension,
             //    Check for combinedPath in this case will get us the normalized rooted path 'C:\Windows\System32\WindowsPowerShell\v1.0\WSMan.format.ps1xml'.
             // The 'Microsoft.WSMan.Management' module in PowerShell was updated to not use the relative path for 'FormatsToProcess' entry,
             // but it's safer to keep the original behavior to avoid unexpected breaking changes.
-            string combinedPath = Path.Combine(moduleBase, name);
-            string resolvedPath = IsRooted(name)
-                ? ResolveRootedFilePath(name, Context) ?? ResolveRootedFilePath(combinedPath, Context)
+            string combinedPath = Path.Combine(moduleBase, fileName);
+            string resolvedPath = IsRooted(fileName)
+                ? ResolveRootedFilePath(fileName, Context) ?? ResolveRootedFilePath(combinedPath, Context)
                 : ResolveRootedFilePath(combinedPath, Context);
 
             // Return the path if successfully resolved.
-            if (resolvedPath != null)
+            if (resolvedPath is not null)
             {
-                if (isImportingModule && resolvedPath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) && !skipLoading)
+                if (canLoadAssembly && resolvedPath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))
                 {
                     // If we are fixing up an assembly file path and we are actually loading the module, then we load the resolved assembly file here.
-                    // This is because we process type/format ps1xml files before 'RootModule' and 'NestedModules' entries during the module loading.
-                    // A types.ps1xml file could refer to a type defined in the assembly that is specified in the 'RootModule' or 'NestedModule', and
-                    // in that case, processing the types.ps1xml file would fail because it happens before processing the 'RootModule', which loads
-                    // the assembly. We cannot move the processing of types.ps1xml file after processing 'RootModule' either, because the 'RootModule'
-                    // might refer to members defined in the types.ps1xml file. In order to make it work for this paradox, we have to load the resolved
-                    // assembly when we are actually loading the module. However, when it's module analysis, there is no need to load the assembly.
-                    ExecutionContext.LoadAssembly(name: null, filename: resolvedPath, error: out _);
+                    // This is because we process type/format ps1xml files before 'RootModule' during the module loading. A types.ps1xml file could
+                    // refer to a type defined in the assembly that is specified in the 'RootModule', and in that case, processing the types.ps1xml file
+                    // would fail because it happens before processing the 'RootModule', which loads the assembly.
+                    // We cannot move the processing of types.ps1xml file after processing 'RootModule' either, because the 'RootModule' might refer to
+                    // members defined in the types.ps1xml file. In order to make it work for this paradox, we have to load the resolved assembly when
+                    // we are actually loading the module. However, when it's module analysis, there is no need to load the assembly.
+                    Context.AddAssembly(source: moduleName, assemblyName: null, filePath: resolvedPath, error: out _);
                 }
 
                 pathIsResolved = true;
@@ -4655,12 +4707,12 @@ internal string FixupFileName(string moduleBase, string name, string extension,
             // For dlls, we cannot get the path from the provider.
             // We need to load the assembly and then get the path.
             // If the module is already loaded, this is not expensive since the assembly is already loaded in the AppDomain
-            if (!string.IsNullOrEmpty(extension) &&
+            if (canLoadAssembly && !string.IsNullOrEmpty(extension) &&
                 (extension.Equals(StringLiterals.PowerShellILAssemblyExtension, StringComparison.OrdinalIgnoreCase) ||
-                extension.Equals(StringLiterals.PowerShellILExecutableExtension, StringComparison.OrdinalIgnoreCase)))
+                 extension.Equals(StringLiterals.PowerShellILExecutableExtension, StringComparison.OrdinalIgnoreCase)))
             {
-                Assembly assembly = ExecutionContext.LoadAssembly(name: originalName, filename: null, error: out _);
-                if (assembly != null)
+                Assembly assembly = Context.AddAssembly(source: moduleName, assemblyName: originalName, filePath: null, error: out _);
+                if (assembly is not null)
                 {
                     pathIsResolved = true;
                     result = assembly.Location;
@@ -4974,8 +5026,6 @@ internal void RemoveModule(PSModuleInfo module)
         /// <param name="moduleNameInRemoveModuleCmdlet">Module name specified in the cmdlet.</param>
         internal void RemoveModule(PSModuleInfo module, string moduleNameInRemoveModuleCmdlet)
         {
-            bool isTopLevelModule = false;
-
             // if the module path is empty string, means it is a dynamically generated assembly.
             // We have set the module path to be module name as key to make it unique, we need update here as well in case the module can be removed.
             if (module.Path == string.Empty)
@@ -4983,7 +5033,7 @@ internal void RemoveModule(PSModuleInfo module, string moduleNameInRemoveModuleC
                 module.Path = module.Name;
             }
 
-            bool shouldModuleBeRemoved = ShouldModuleBeRemoved(module, moduleNameInRemoveModuleCmdlet, out isTopLevelModule);
+            bool shouldModuleBeRemoved = ShouldModuleBeRemoved(module, moduleNameInRemoveModuleCmdlet, out bool isTopLevelModule);
 
             if (shouldModuleBeRemoved)
             {
@@ -5214,6 +5264,15 @@ internal void RemoveModule(PSModuleInfo module, string moduleNameInRemoveModuleC
 
                     // And the appdomain level module path cache.
                     PSModuleInfo.RemoveFromAppDomainLevelCache(module.Name);
+
+                    // And remove the module assembly entries that may have been added from the assembly cache.
+                    Context.RemoveFromAssemblyCache(source: module.Name);
+                    if (module.ModuleType == ModuleType.Binary && !string.IsNullOrEmpty(module.RootModule))
+                    {
+                        // We also need to clean up the cache entries that are possibly referenced by the root module in this case.
+                        string rootModuleName = ModuleIntrinsics.GetModuleName(module.RootModule);
+                        Context.RemoveFromAssemblyCache(source: rootModuleName);
+                    }
                 }
             }
         }
@@ -5903,6 +5962,7 @@ internal PSModuleInfo LoadModule(PSModuleInfo parentModule, string fileName, str
                          ext.Equals(StringLiterals.PowerShellILExecutableExtension, StringComparison.OrdinalIgnoreCase))
                 {
                     module = LoadBinaryModule(
+                        parentModule,
                         ModuleIntrinsics.GetModuleName(fileName),
                         fileName,
                         assemblyToLoad: null,
@@ -5911,8 +5971,6 @@ internal PSModuleInfo LoadModule(PSModuleInfo parentModule, string fileName, str
                         options,
                         manifestProcessingFlags,
                         prefix,
-                        loadTypes: true,
-                        loadFormats: true,
                         out found);
 
                     if (found && module != null)
@@ -6384,6 +6442,7 @@ private PSModuleInfo AnalyzeScriptFile(string filename, bool force, ExecutionCon
         /// <summary>
         /// Load a binary module. A binary module is an assembly that should contain cmdlets.
         /// </summary>
+        /// <param name="parentModule">The parent module for which this module is a nested module.</param>
         /// <param name="moduleName">The name of the snapin or assembly to load.</param>
         /// <param name="fileName">The path to the assembly to load.</param>
         /// <param name="assemblyToLoad">The assembly to load so no lookup need be done.</param>
@@ -6395,12 +6454,11 @@ private PSModuleInfo AnalyzeScriptFile(string filename, bool force, ExecutionCon
         /// </param>
         /// <param name="options">The set of options that are used while importing a module.</param>
         /// <param name="manifestProcessingFlags">The manifest processing flags to use when processing the module.</param>
-        /// <param name="loadTypes">Load the types files mentioned in the snapin registration.</param>
-        /// <param name="loadFormats">Load the formst files mentioned in the snapin registration.</param>
         /// <param name="prefix">Command name prefix.</param>
         /// <param name="found">Sets this to true if an assembly was found.</param>
         /// <returns>THe module info object that was created...</returns>
         internal PSModuleInfo LoadBinaryModule(
+            PSModuleInfo parentModule,
             string moduleName,
             string fileName,
             Assembly assemblyToLoad,
@@ -6409,12 +6467,10 @@ internal PSModuleInfo LoadBinaryModule(
             ImportModuleOptions options,
             ManifestProcessingFlags manifestProcessingFlags,
             string prefix,
-            bool loadTypes,
-            bool loadFormats,
             out bool found)
         {
             return LoadBinaryModule(
-                parentModule: null,
+                parentModule,
                 moduleName,
                 fileName,
                 assemblyToLoad,
@@ -6423,8 +6479,6 @@ internal PSModuleInfo LoadBinaryModule(
                 options,
                 manifestProcessingFlags,
                 prefix,
-                loadTypes,
-                loadFormats,
                 out found,
                 shortModuleName: null,
                 disableFormatUpdates: false);
@@ -6446,8 +6500,6 @@ internal PSModuleInfo LoadBinaryModule(
         /// <param name="options">The set of options that are used while importing a module.</param>
         /// <param name="manifestProcessingFlags">The manifest processing flags to use when processing the module.</param>
         /// <param name="prefix">Command name prefix.</param>
-        /// <param name="loadTypes">Load the types files mentioned in the snapin registration.</param>
-        /// <param name="loadFormats">Load the formst files mentioned in the snapin registration.</param>
         /// <param name="found">Sets this to true if an assembly was found.</param>
         /// <param name="shortModuleName">Short name for module.</param>
         /// <param name="disableFormatUpdates"></param>
@@ -6462,44 +6514,36 @@ internal PSModuleInfo LoadBinaryModule(
             ImportModuleOptions options,
             ManifestProcessingFlags manifestProcessingFlags,
             string prefix,
-            bool loadTypes,
-            bool loadFormats,
             out bool found,
             string shortModuleName,
             bool disableFormatUpdates)
         {
-            PSModuleInfo module = null;
-
             if (string.IsNullOrEmpty(moduleName) && string.IsNullOrEmpty(fileName) && assemblyToLoad == null)
+            {
                 throw PSTraceSource.NewArgumentNullException("moduleName,fileName,assemblyToLoad");
+            }
+
+            bool isParentEngineModule = parentModule != null && InitialSessionState.IsEngineModule(parentModule.Name);
 
             // Load the dll and process any cmdlets it might contain...
             InitialSessionState iss = InitialSessionState.Create();
             List<string> detectedCmdlets = null;
             List<Tuple<string, string>> detectedAliases = null;
             Assembly assembly = null;
-            Exception error = null;
             string modulePath = string.Empty;
             Version assemblyVersion = new Version(0, 0, 0, 0);
-            var importingModule = (manifestProcessingFlags & ManifestProcessingFlags.LoadElements) != 0;
+            bool importingModule = (manifestProcessingFlags & ManifestProcessingFlags.LoadElements) != 0;
 
             // See if we're loading a straight assembly...
             if (assemblyToLoad != null)
             {
                 // Figure out what to use for a module path...
-                if (!string.IsNullOrEmpty(fileName))
-                {
-                    modulePath = fileName;
-                }
-                else
-                {
-                    modulePath = assemblyToLoad.Location;
-                }
+                modulePath = string.IsNullOrEmpty(fileName) ? assemblyToLoad.Location : fileName;
 
                 // And what to use for a module name...
                 if (string.IsNullOrEmpty(moduleName))
                 {
-                    moduleName = "dynamic_code_module_" + assemblyToLoad.GetName();
+                    moduleName = "dynamic_code_module_" + assemblyToLoad.FullName;
                 }
 
                 if (importingModule)
@@ -6507,59 +6551,41 @@ internal PSModuleInfo LoadBinaryModule(
                     // Passing module as a parameter here so that the providers can have the module property populated.
                     // For engine providers, the module should point to top-level module name
                     // For FileSystem, the module is Microsoft.PowerShell.Core and not System.Management.Automation
-                    if (parentModule != null && InitialSessionState.IsEngineModule(parentModule.Name))
-                    {
-                        iss.ImportCmdletsFromAssembly(assemblyToLoad, parentModule);
-                    }
-                    else
-                    {
-                        iss.ImportCmdletsFromAssembly(assemblyToLoad, null);
-                    }
+                    iss.ImportCmdletsFromAssembly(assemblyToLoad, isParentEngineModule ? parentModule : null);
                 }
 
                 assemblyVersion = GetAssemblyVersionNumber(assemblyToLoad);
                 assembly = assemblyToLoad;
-                // If this is an in-memory only assembly, add it directly to the assembly cache if
-                // it isn't already there.
-                if (string.IsNullOrEmpty(assembly.Location))
-                {
-                    if (!Context.AssemblyCache.ContainsKey(assembly.FullName))
-                    {
-                        Context.AssemblyCache.Add(assembly.FullName, assembly);
-                    }
-                }
+
+                // Use the parent module name for caching if there is one.
+                string source = parentModule?.Name ?? moduleName;
+                // Add it to the assembly cache if it isn't already there.
+                Context.AddToAssemblyCache(source, assembly);
             }
             else if (importingModule)
             {
-                assembly = Context.AddAssembly(moduleName, fileName, out error);
+                // Use the parent module name for caching if there is one.
+                string source = parentModule?.Name ?? moduleName;
+                assembly = Context.AddAssembly(source, moduleName, fileName, out Exception error);
 
                 if (assembly == null)
                 {
                     if (error != null)
+                    {
                         throw error;
+                    }
 
                     found = false;
                     return null;
                 }
 
                 assemblyVersion = GetAssemblyVersionNumber(assembly);
-
-                if (string.IsNullOrEmpty(fileName))
-                    modulePath = assembly.Location;
-                else
-                    modulePath = fileName;
+                modulePath = string.IsNullOrEmpty(fileName) ? assembly.Location : fileName;
 
                 // Passing module as a parameter here so that the providers can have the module property populated.
                 // For engine providers, the module should point to top-level module name
                 // For FileSystem, the module is Microsoft.PowerShell.Core and not System.Management.Automation
-                if (parentModule != null && InitialSessionState.IsEngineModule(parentModule.Name))
-                {
-                    iss.ImportCmdletsFromAssembly(assembly, parentModule);
-                }
-                else
-                {
-                    iss.ImportCmdletsFromAssembly(assembly, null);
-                }
+                iss.ImportCmdletsFromAssembly(assembly, isParentEngineModule ? parentModule : null);
             }
             else
             {
@@ -6576,58 +6602,25 @@ internal PSModuleInfo LoadBinaryModule(
             }
 
             found = true;
-            if (string.IsNullOrEmpty(shortModuleName))
-                module = new PSModuleInfo(moduleName, modulePath, Context, ss);
-            else
-                module = new PSModuleInfo(shortModuleName, modulePath, Context, ss);
+            string nameToUse = string.IsNullOrEmpty(shortModuleName) ? moduleName : shortModuleName;
+            PSModuleInfo module = new PSModuleInfo(nameToUse, modulePath, Context, ss);
 
             module.SetModuleType(ModuleType.Binary);
             module.SetModuleBase(moduleBase);
             module.SetVersion(assemblyVersion);
-            module.ImplementingAssembly = assemblyToLoad ?? assembly;
+            module.ImplementingAssembly = assembly;
 
             if (importingModule)
             {
                 SetModuleLoggingInformation(module);
             }
 
-            // Add the types table entries
-            List<string> typesFileNames = new List<string>();
-            foreach (SessionStateTypeEntry sste in iss.Types)
-            {
-                typesFileNames.Add(sste.FileName);
-            }
-
-            if (typesFileNames.Count > 0)
-            {
-                module.SetExportedTypeFiles(new ReadOnlyCollection<string>(typesFileNames));
-            }
-
-            // Add the format file entries
-            List<string> formatsFileNames = new List<string>();
-            foreach (SessionStateFormatEntry ssfe in iss.Formats)
-            {
-                formatsFileNames.Add(ssfe.FileName);
-            }
-
-            if (formatsFileNames.Count > 0)
-            {
-                module.SetExportedFormatFiles(new ReadOnlyCollection<string>(formatsFileNames));
-            }
-
             // Add the module info the providers...
             foreach (SessionStateProviderEntry sspe in iss.Providers)
             {
                 // For engine providers, the module should point to top-level module name
                 // For FileSystem, the module is Microsoft.PowerShell.Core and not System.Management.Automation
-                if (parentModule != null && InitialSessionState.IsEngineModule(parentModule.Name))
-                {
-                    sspe.SetModule(parentModule);
-                }
-                else
-                {
-                    sspe.SetModule(module);
-                }
+                sspe.SetModule(isParentEngineModule ? parentModule : module);
             }
 
             // Add all of the exported cmdlets to the module object...
@@ -6741,16 +6734,7 @@ internal PSModuleInfo LoadBinaryModule(
                     iss.Bind(Context, updateOnly: true, module, options.NoClobber, options.Local, setLocation: false);
 
                     // Scan all of the types in the assembly to register JobSourceAdapters.
-                    IEnumerable<Type> allTypes = Array.Empty<Type>();
-                    if (assembly != null)
-                    {
-                        allTypes = assembly.ExportedTypes;
-                    }
-                    else if (assemblyToLoad != null)
-                    {
-                        allTypes = assemblyToLoad.ExportedTypes;
-                    }
-
+                    IEnumerable<Type> allTypes = assembly?.ExportedTypes ?? Array.Empty<Type>();
                     foreach (Type type in allTypes)
                     {
                         // If it derives from JobSourceAdapter and it's not already registered, register it...
diff --git a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
index ada03fb4914..d845a1d2fb0 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
@@ -885,25 +885,35 @@ internal static ExperimentalFeature[] GetExperimentalFeature(string manifestPath
         }
 
         // The extensions of all of the files that can be processed with Import-Module, put the ni.dll in front of .dll to have higher priority to be loaded.
-        internal static readonly string[] PSModuleProcessableExtensions = new string[] {
-                            StringLiterals.PowerShellDataFileExtension,
-                            StringLiterals.PowerShellScriptFileExtension,
-                            StringLiterals.PowerShellModuleFileExtension,
-                            StringLiterals.PowerShellCmdletizationFileExtension,
-                            StringLiterals.PowerShellNgenAssemblyExtension,
-                            StringLiterals.PowerShellILAssemblyExtension,
-                            StringLiterals.PowerShellILExecutableExtension,
-                        };
+        internal static readonly string[] PSModuleProcessableExtensions = new string[]
+        {
+            StringLiterals.PowerShellDataFileExtension,
+            StringLiterals.PowerShellScriptFileExtension,
+            StringLiterals.PowerShellModuleFileExtension,
+            StringLiterals.PowerShellCmdletizationFileExtension,
+            StringLiterals.PowerShellNgenAssemblyExtension,
+            StringLiterals.PowerShellILAssemblyExtension,
+            StringLiterals.PowerShellILExecutableExtension,
+        };
 
         // A list of the extensions to check for implicit module loading and discovery, put the ni.dll in front of .dll to have higher priority to be loaded.
-        internal static readonly string[] PSModuleExtensions = new string[] {
-                            StringLiterals.PowerShellDataFileExtension,
-                            StringLiterals.PowerShellModuleFileExtension,
-                            StringLiterals.PowerShellCmdletizationFileExtension,
-                            StringLiterals.PowerShellNgenAssemblyExtension,
-                            StringLiterals.PowerShellILAssemblyExtension,
-                            StringLiterals.PowerShellILExecutableExtension,
-                        };
+        internal static readonly string[] PSModuleExtensions = new string[]
+        {
+            StringLiterals.PowerShellDataFileExtension,
+            StringLiterals.PowerShellModuleFileExtension,
+            StringLiterals.PowerShellCmdletizationFileExtension,
+            StringLiterals.PowerShellNgenAssemblyExtension,
+            StringLiterals.PowerShellILAssemblyExtension,
+            StringLiterals.PowerShellILExecutableExtension,
+        };
+
+        // A list of the extensions to check for required assemblies.
+        internal static readonly string[] ProcessableAssemblyExtensions = new string[]
+        {
+            StringLiterals.PowerShellNgenAssemblyExtension,
+            StringLiterals.PowerShellILAssemblyExtension,
+            StringLiterals.PowerShellILExecutableExtension
+        };
 
         /// <summary>
         /// Returns true if the extension is one of the module extensions...
@@ -915,7 +925,9 @@ internal static bool IsPowerShellModuleExtension(string extension)
             foreach (string ext in PSModuleProcessableExtensions)
             {
                 if (extension.Equals(ext, StringComparison.OrdinalIgnoreCase))
+                {
                     return true;
+                }
             }
 
             return false;
diff --git a/test/powershell/engine/Module/IsolatedModule.Tests.ps1 b/test/powershell/engine/Module/IsolatedModule.Tests.ps1
new file mode 100644
index 00000000000..114b1d1610a
--- /dev/null
+++ b/test/powershell/engine/Module/IsolatedModule.Tests.ps1
@@ -0,0 +1,74 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe "Isolated module scenario - load the whole module in custom ALC" {
+    It "Loading 'IsolatedModule' should work as expected" {
+        ## The 'IsolatedModule' module can be found at '<repo-root>\test\tools\Modules'.
+        ## The module assemblies are created and deployed by '<repo-root>\test\tools\TestAlc'.
+        ## The module defines its own custom ALC and has its module structure organized in a special way that allows the module to be loaded in that custom ALC.
+        ## The file structure of this module is as follows:
+        ## │   IsolatedModule.psd1
+        ## │   Test.Isolated.Init.dll (contains the custom ALC and code to setup 'Resolving' handler)
+        ## │
+        ## └───Dependencies
+        ##        Newtonsoft.Json.dll (version 10.0.0.0 dependency)
+        ##        Test.Isolated.Nested.dll (nested binary module)
+        ##        Test.Isolated.Root.dll (root binary module)
+        $module = Import-Module IsolatedModule -PassThru
+        $nestedCmd = Get-Command Test-NestedCommand
+        $rootCmd = Get-Command Test-RootCommand
+
+        $module.ModuleType | Should -Be "Binary"
+        $module.RootModule | Should -Not -BeNullOrEmpty
+
+        ## The type 'Test.Isolated.Nested.Foo' from the nested module can be resolved and should be from the same load context.
+        $context1 = [System.Runtime.Loader.AssemblyLoadContext]::GetLoadContext($nestedCmd.ImplementingType.Assembly)
+        $context2 = [System.Runtime.Loader.AssemblyLoadContext]::GetLoadContext([Test.Isolated.Nested.Foo].Assembly)
+        $context1.Name | Should -BeExactly "MyCustomALC"
+        $context1 | Should -Be $context2
+
+        ## Test-NestedCommand depends on NewtonSoft.Json 10.0.0.0 while PowerShell depends on 13.0.0.0 or higher.
+        ## The exact version of NewtonSoft.Json should be loaded to the custom ALC.
+        $foo = [Test.Isolated.Nested.Foo]::new("Hello", "World")
+        Test-NestedCommand -Param $foo | Should -BeExactly "Hello-World-Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
+
+        ## The type 'Test.Isolated.Root.Red' from the root module can be resolved and should be from the same load context.
+        $context3 = [System.Runtime.Loader.AssemblyLoadContext]::GetLoadContext($rootCmd.ImplementingType.Assembly)
+        $context4 = [System.Runtime.Loader.AssemblyLoadContext]::GetLoadContext([Test.Isolated.Root.Red].Assembly)
+        $context3.Name | Should -BeExactly "MyCustomALC"
+        $context3 | Should -Be $context4
+        $context3 | Should -Be $context1
+
+        ## No type identity issue in parameter binding because they are from the same assembly instance.
+        $red = [Test.Isolated.Root.Red]::new("RED!")
+        Test-RootCommand -Param $red | Should -BeExactly "RED!"
+
+        ## Removing the module should have its assemblies removed from 'Context.AssemblyCache' and results in the 'TypeNotFound'
+        ## error when trying to resolve the following 2 types:
+        ##  - 'Test.Isolated.Nested.Bar', from 'Test.Isolated.Nested.dll'
+        ##  - 'Test.Isolated.Root.Yellow', from 'Test.Isolated.Root.dll'
+        ## The types cannot be found because:
+        ##  1. they are from a load context that is not visible to PowerShell,
+        ##  2. those two assemblies have been removed from the cache when unloading the module.
+        ## [Test.Isolated.Nested.Foo] and [Test.Isolated.Root.Red] can still be found because they were added to type cache when
+        ## successfully resolved above.
+        Remove-Module IsolatedModule
+        { [Test.Isolated.Nested.Bar] } | Should -Throw -ErrorId "TypeNotFound"
+        { [Test.Isolated.Root.Yellow] } | Should -Throw -ErrorId "TypeNotFound"
+    }
+
+    It "WSMan and Certificate providers should reference the manifest module instead of the nested module" -Skip:(!$IsWindows) {
+        $wsManModule = Import-Module Microsoft.WSMan.Management -PassThru
+        $securityModule = Import-Module Microsoft.PowerShell.Security -PassThru
+
+        $wsManModule.ModuleType | Should -Be "Manifest"
+        $securityModule.ModuleType | Should -Be "Manifest"
+
+        ## For engine providers, the 'Module' property should point to top-level module, instead of the nested module.
+        $wsManProvider = Get-PSProvider WSMan
+        $certificateProvider = Get-PSProvider Certificate
+
+        $wsManProvider.Module | Should -Be $wsManModule
+        $certificateProvider.Module | Should -Be $securityModule
+    }
+}
diff --git a/test/powershell/engine/Module/TestModuleManifest.Tests.ps1 b/test/powershell/engine/Module/TestModuleManifest.Tests.ps1
index 2b84e75f902..091b968c276 100644
--- a/test/powershell/engine/Module/TestModuleManifest.Tests.ps1
+++ b/test/powershell/engine/Module/TestModuleManifest.Tests.ps1
@@ -18,12 +18,21 @@ Describe "Test-ModuleManifest tests" -tags "CI" {
 
         New-Item -ItemType Directory -Path testdrive:/module/foo > $null
         New-Item -ItemType Directory -Path testdrive:/module/bar > $null
+
         New-Item -ItemType File -Path testdrive:/module/foo/bar.psm1 > $null
+        New-Item -ItemType File -Path testdrive:/module/foo/bar.ps1 > $null
+        New-Item -ItemType File -Path testdrive:/module/foo/bar.ps1xml > $null
+
         New-Item -ItemType File -Path testdrive:/module/bar/foo.psm1 > $null
+        New-Item -ItemType File -Path testdrive:/module/bar/foo.ps1 > $null
+        New-Item -ItemType File -Path testdrive:/module/bar/foo.ps1xml > $null
+
         $testModulePath = "testdrive:/module/test.psd1"
         $fileList = "foo\bar.psm1","bar/foo.psm1"
+        $scripts = "foo\/bar.ps1","bar/\foo.ps1"
+        $ps1xml = "foo//bar.ps1xml","bar\\foo.ps1xml"
 
-        New-ModuleManifest -NestedModules $fileList -RootModule foo\bar.psm1 -RequiredAssemblies $fileList -Path $testModulePath -TypesToProcess $fileList -FormatsToProcess $fileList -ScriptsToProcess $fileList -FileList $fileList -ModuleList $fileList
+        New-ModuleManifest -NestedModules $fileList -RootModule foo\bar.psm1 -RequiredAssemblies $fileList -Path $testModulePath -TypesToProcess $ps1xml -FormatsToProcess $ps1xml -ScriptsToProcess $scripts -FileList $fileList -ModuleList $fileList
 
         Test-Path $testModulePath | Should -BeTrue
 
diff --git a/test/tools/Modules/IsolatedModule/IsolatedModule.psd1 b/test/tools/Modules/IsolatedModule/IsolatedModule.psd1
new file mode 100644
index 00000000000..2bbe183c243
--- /dev/null
+++ b/test/tools/Modules/IsolatedModule/IsolatedModule.psd1
@@ -0,0 +1,16 @@
+#
+# Module manifest for module 'IsolatedModule'
+#
+
+@{
+    ModuleVersion = '0.0.1'
+    GUID = '20d4742b-b17d-4ce8-b8da-29b25433cd18'
+    Author = 'Microsoft Corporation'
+
+    RootModule = 'Test.Isolated.Root.dll'
+    NestedModules = @('Test.Isolated.Init.dll', 'Test.Isolated.Nested.dll')
+    FunctionsToExport = @()
+    CmdletsToExport = @('Test-NestedCommand', 'Test-RootCommand')
+    VariablesToExport = '*'
+    AliasesToExport = @()
+}
diff --git a/test/tools/TestAlc/TestAlc.sln b/test/tools/TestAlc/TestAlc.sln
new file mode 100644
index 00000000000..c97dde9eb93
--- /dev/null
+++ b/test/tools/TestAlc/TestAlc.sln
@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30114.105
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Isolated.Init", "init\Test.Isolated.Init.csproj", "{87AFE044-D21A-4ECE-A8F7-9A31678811D9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Isolated.Nested", "nested\Test.Isolated.Nested.csproj", "{702DAF12-2A79-4756-8E2A-E18B46639AD3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Isolated.Root", "root\Test.Isolated.Root.csproj", "{9D0B1FAD-52F7-436A-AB9D-5A53E370C72B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{87AFE044-D21A-4ECE-A8F7-9A31678811D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87AFE044-D21A-4ECE-A8F7-9A31678811D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87AFE044-D21A-4ECE-A8F7-9A31678811D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87AFE044-D21A-4ECE-A8F7-9A31678811D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{702DAF12-2A79-4756-8E2A-E18B46639AD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{702DAF12-2A79-4756-8E2A-E18B46639AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{702DAF12-2A79-4756-8E2A-E18B46639AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{702DAF12-2A79-4756-8E2A-E18B46639AD3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D0B1FAD-52F7-436A-AB9D-5A53E370C72B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D0B1FAD-52F7-436A-AB9D-5A53E370C72B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D0B1FAD-52F7-436A-AB9D-5A53E370C72B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D0B1FAD-52F7-436A-AB9D-5A53E370C72B}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/test/tools/TestAlc/init/Init.cs b/test/tools/TestAlc/init/Init.cs
new file mode 100644
index 00000000000..4241e56fa4e
--- /dev/null
+++ b/test/tools/TestAlc/init/Init.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Management.Automation;
+using System.Reflection;
+using System.Runtime.Loader;
+
+namespace Test.Isolated.Init
+{
+    internal class CustomLoadContext : AssemblyLoadContext
+    {
+        private readonly string _dependencyDirPath;
+
+        public CustomLoadContext(string dependencyDirPath)
+            : base("MyCustomALC", isCollectible: false)
+        {
+            _dependencyDirPath = dependencyDirPath;
+        }
+
+        protected override Assembly Load(AssemblyName assemblyName)
+        {
+            // We do the simple logic here of looking for an assembly of the given name
+            // in the configured dependency directory.
+            string assemblyPath = Path.Combine(_dependencyDirPath, $"{assemblyName.Name}.dll");
+
+            if (File.Exists(assemblyPath))
+            {
+                // The ALC must use inherited methods to load assemblies.
+                // Assembly.Load*() won't work here.
+                return LoadFromAssemblyPath(assemblyPath);
+            }
+
+            // For other assemblies, return null to allow other resolutions to continue.
+            return null;
+        }
+    }
+
+    public class Init : IModuleAssemblyInitializer, IModuleAssemblyCleanup
+    {
+        private static readonly CustomLoadContext s_context;
+        private static readonly HashSet<string> s_moduleAssemblies;
+
+        static Init()
+        {
+            string dependencyDirPath = Path.Combine(Path.GetDirectoryName(typeof(Init).Assembly.Location), "Dependencies");
+            s_context = new CustomLoadContext(dependencyDirPath);
+            s_moduleAssemblies = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+            {
+                "Test.Isolated.Nested",
+                "Test.Isolated.Root"
+            };
+        }
+
+        public void OnImport()
+        {
+            // Add the Resolving event handler here.
+            AssemblyLoadContext.Default.Resolving += ResolveAlcEngine;
+        }
+
+        public void OnRemove(PSModuleInfo psModuleInfo)
+        {
+            // Remove the Resolving event handler here.
+            AssemblyLoadContext.Default.Resolving -= ResolveAlcEngine;
+        }
+
+        private static Assembly ResolveAlcEngine(AssemblyLoadContext defaultAlc, AssemblyName assemblyToResolve)
+        {
+            // We only want to resolve our module assemblies here.
+            if (s_moduleAssemblies.Contains(assemblyToResolve.Name))
+            {
+                // This is where the nested module 'Test.Isolated.Nested.dll' and the root module 'Test.Isolated.Root.dll'
+                // gets loaded into our custom ALC and then passed through into PowerShell's ALC.
+                return s_context.LoadFromAssemblyName(assemblyToResolve);
+            }
+
+            // Let the resolution chain continue for other assemblies.
+            return null;
+        }
+    }
+}
diff --git a/test/tools/TestAlc/init/Test.Isolated.Init.csproj b/test/tools/TestAlc/init/Test.Isolated.Init.csproj
new file mode 100644
index 00000000000..c1a291fa550
--- /dev/null
+++ b/test/tools/TestAlc/init/Test.Isolated.Init.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\Test.Common.props"/>
+
+  <PropertyGroup>
+    <!-- Disable PDB generation -->
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>None</DebugType>
+
+    <!-- Disable deps.json generation -->
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- Deploy the produced assembly -->
+    <PublishDir>..\..\Modules\IsolatedModule</PublishDir>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/tools/TestAlc/nested/NestedCommand.cs b/test/tools/TestAlc/nested/NestedCommand.cs
new file mode 100644
index 00000000000..88822920138
--- /dev/null
+++ b/test/tools/TestAlc/nested/NestedCommand.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.Management.Automation;
+using Newtonsoft.Json;
+
+namespace Test.Isolated.Nested
+{
+    [Cmdlet("Test", "NestedCommand")]
+    public class TestNestedCommand : PSCmdlet
+    {
+        [Parameter(Mandatory = true)]
+        public Foo Param { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            WriteObject($"{Param.Name}-{Param.Path}-{typeof(StringEscapeHandling).Assembly.FullName}");
+        }
+    }
+
+    public class Foo
+    {
+        public string Name { get; }
+
+        public string Path { get; }
+
+        public Foo(string name, string path)
+        {
+            Name = name;
+            Path = path;
+        }
+    }
+
+    public class Bar
+    {
+        public string Id { get; }
+
+        public Bar(string id)
+        {
+            Id = id;
+        }
+    }
+}
diff --git a/test/tools/TestAlc/nested/Test.Isolated.Nested.csproj b/test/tools/TestAlc/nested/Test.Isolated.Nested.csproj
new file mode 100644
index 00000000000..2f4a64332b9
--- /dev/null
+++ b/test/tools/TestAlc/nested/Test.Isolated.Nested.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\Test.Common.props"/>
+
+  <PropertyGroup>
+    <!-- Disable PDB generation -->
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>None</DebugType>
+
+    <!-- Disable deps.json generation -->
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- Deploy the produced assembly -->
+    <PublishDir>..\..\Modules\IsolatedModule\Dependencies</PublishDir>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/tools/TestAlc/root/RootCommand.cs b/test/tools/TestAlc/root/RootCommand.cs
new file mode 100644
index 00000000000..74aa40006f2
--- /dev/null
+++ b/test/tools/TestAlc/root/RootCommand.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.Management.Automation;
+
+namespace Test.Isolated.Root
+{
+    [Cmdlet("Test", "RootCommand")]
+    public class TestRootCommand : PSCmdlet
+    {
+        [Parameter(Mandatory = true)]
+        public Red Param { get; set; }
+
+        protected override void ProcessRecord()
+        {
+            WriteObject(Param.Name);
+        }
+    }
+
+    public class Red
+    {
+        public string Name { get; }
+
+        public Red(string name)
+        {
+            Name = name;
+        }
+    }
+
+    public class Yellow
+    {
+        public string Id { get; }
+
+        public Yellow(string id)
+        {
+            Id = id;
+        }
+    }
+}
diff --git a/test/tools/TestAlc/root/Test.Isolated.Root.csproj b/test/tools/TestAlc/root/Test.Isolated.Root.csproj
new file mode 100644
index 00000000000..ab333e0668a
--- /dev/null
+++ b/test/tools/TestAlc/root/Test.Isolated.Root.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\Test.Common.props"/>
+
+  <PropertyGroup>
+    <!-- Disable PDB generation -->
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>None</DebugType>
+
+    <!-- Disable deps.json generation -->
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+
+    <!-- Deploy the produced assembly -->
+    <PublishDir>..\..\Modules\IsolatedModule\Dependencies</PublishDir>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>

From 8a004b3f982a65d46979c3342a8b6b0c23367908 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 23 Feb 2022 15:03:28 -0800
Subject: [PATCH 252/645] opt-in to   - name: BUILDSECMON_OPT_IN (#16911)

value: true
Opt in to security monitoring
---
 tools/releaseBuild/azureDevOps/releaseBuild.yml    | 2 ++
 tools/releaseBuild/azureDevOps/releasePipeline.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index 97cb0d02eac..59fb0498a57 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -44,6 +44,8 @@ variables:
     value: https://github.com/powershell/powershell
   - name: SBOMGenerator_Formats
     value: spdx:2.2
+  - name: BUILDSECMON_OPT_IN
+    value: true
 
 stages:
   - stage: prep
diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index c1e3315082d..88d37303888 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -19,6 +19,8 @@ variables:
     value: none
   - name: skipComponentGovernanceDetection
     value: true
+  - name: BUILDSECMON_OPT_IN
+    value: true
 
 stages:
 - stage: MSIXBundle

From e486f2038039918aa173e95e93c029b2c4b4cfe5 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 24 Feb 2022 00:19:47 +0000
Subject: [PATCH 253/645] Merged PR 19268: Remove -Force from Start-PSBootstrap
 for SDK and global tool tests

Remove -Force from Start-PSBootstrap for SDK and global tool tests
---
 .../azureDevOps/templates/release-GlobalToolTest.yml          | 4 ++--
 tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
index 726c7788997..60a76f90bf6 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
@@ -69,7 +69,7 @@ jobs:
     - pwsh: |
         $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
         Import-Module "$(Build.SourcesDirectory)/build.psm1" -Force
-        Start-PSBootstrap -Force
+        Start-PSBootstrap
 
         $toolPath = New-Item -ItemType Directory "$(System.DefaultWorkingDirectory)/toolPath" | Select-Object -ExpandProperty FullName
 
@@ -94,7 +94,7 @@ jobs:
 
     - pwsh: |
         Import-Module "$(Build.SourcesDirectory)/build.psm1" -Force
-        Start-PSBootstrap -Force
+        Start-PSBootstrap
 
         $exeName = if ($IsWindows) { "pwsh.exe" } else { "pwsh" }
 
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
index 572f909583d..bbbcc4f12cd 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@@ -99,7 +99,7 @@ jobs:
     - pwsh: |
         $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
         Import-Module "$(Build.SourcesDirectory)/build.psm1" -Force
-        Start-PSBootstrap -Force
+        Start-PSBootstrap
 
         $localLocation = "$(Pipeline.Workspace)/releasePipeline/finalResults"
         $xmlElement = @"

From be8866bccb1c2915bc698e9068b5b3cf9c8c6d4c Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 24 Feb 2022 00:29:50 +0000
Subject: [PATCH 254/645] Merged PR 19269: Update the way we set DOTNET_ROOT
 for global tool tests

Update the way we set DOTNET_ROOT for global tool tests
---
 .../azureDevOps/templates/release-GlobalToolTest.yml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
index 60a76f90bf6..e0b17bb30f2 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
@@ -100,7 +100,7 @@ jobs:
 
         $toolPath = "$(System.DefaultWorkingDirectory)/toolPath/${{ parameters.globalToolExeName }}"
 
-        $env:DOTNET_ROOT = if ($IsWindows) { "$env:LOCALAPPDATA\Microsoft\dotnet" } else { "$env:HOME/.dotnet" }
+        $env:DOTNET_ROOT = Split-Path (Get-Command -Type Application -Name dotnet | Select-Object -First 1).Source
 
         Write-Verbose -Verbose "DOTNET_ROOT: $env:DOTNET_ROOT"
         Get-ChildItem $env:DOTNET_ROOT

From 21b8c9ebf87a61953cb64aa6310d2178a77f7f61 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 24 Feb 2022 01:10:30 +0000
Subject: [PATCH 255/645] Merged PR 19272: Fix DOTNET_ROOT if it is a link

Fix DOTNET_ROOT if it is a link
---
 .../azureDevOps/templates/release-GlobalToolTest.yml         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
index e0b17bb30f2..3f685b3a3d8 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
@@ -100,7 +100,10 @@ jobs:
 
         $toolPath = "$(System.DefaultWorkingDirectory)/toolPath/${{ parameters.globalToolExeName }}"
 
-        $env:DOTNET_ROOT = Split-Path (Get-Command -Type Application -Name dotnet | Select-Object -First 1).Source
+        $source = (get-command -Type Application -Name dotnet | Select-Object -First 1 -ExpandProperty source)
+        $target = (Get-ChildItem $source).target
+
+        $env:DOTNET_ROOT = (resolve-path -Path (Join-Path (split-path $source) $target)).ProviderPath
 
         Write-Verbose -Verbose "DOTNET_ROOT: $env:DOTNET_ROOT"
         Get-ChildItem $env:DOTNET_ROOT

From c3a9bb80f1e1021f776b83713d6f4d2c6bd184bf Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 24 Feb 2022 01:18:47 +0000
Subject: [PATCH 256/645] Merged PR 19273: Add split-path so we point to the
 folder where dotnet

Add split-path so we point to the folder where dotnet
---
 .../azureDevOps/templates/release-GlobalToolTest.yml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
index 3f685b3a3d8..b6974e32a1f 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
@@ -103,7 +103,7 @@ jobs:
         $source = (get-command -Type Application -Name dotnet | Select-Object -First 1 -ExpandProperty source)
         $target = (Get-ChildItem $source).target
 
-        $env:DOTNET_ROOT = (resolve-path -Path (Join-Path (split-path $source) $target)).ProviderPath
+        $env:DOTNET_ROOT = split-path (resolve-path -Path (Join-Path (split-path $source) $target)).ProviderPath
 
         Write-Verbose -Verbose "DOTNET_ROOT: $env:DOTNET_ROOT"
         Get-ChildItem $env:DOTNET_ROOT

From 6c9f9b26ce9edc3050e7090a8e269ef6d9e22812 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 24 Feb 2022 01:32:41 +0000
Subject: [PATCH 257/645] Merged PR 19274: Split target dynamically

Split target dynamically
---
 .../azureDevOps/templates/release-GlobalToolTest.yml   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
index b6974e32a1f..8ac318db921 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
@@ -103,7 +103,15 @@ jobs:
         $source = (get-command -Type Application -Name dotnet | Select-Object -First 1 -ExpandProperty source)
         $target = (Get-ChildItem $source).target
 
-        $env:DOTNET_ROOT = split-path (resolve-path -Path (Join-Path (split-path $source) $target)).ProviderPath
+        # If we find a symbolic link for dotnet, then we need to split the filename off the target.
+        if ($target) {
+          Write-Verbose -Verbose "Splitting target: $target"
+          $target = Split-Path $target
+        }
+
+        Write-Verbose -Verbose "target is set as $target"
+
+        $env:DOTNET_ROOT = (resolve-path -Path (Join-Path (split-path $source) $target)).ProviderPath
 
         Write-Verbose -Verbose "DOTNET_ROOT: $env:DOTNET_ROOT"
         Get-ChildItem $env:DOTNET_ROOT

From 47657f6956c50066240cf83ff4ff39ec4aa8a29c Mon Sep 17 00:00:00 2001
From: Travis Plunk <tplunk@microsoft.com>
Date: Thu, 24 Feb 2022 20:06:24 +0000
Subject: [PATCH 258/645] Merged PR 19284: Add change log for 7.3.0.preview.2

Add change log for 7.3.0.preview.2
---
 .spelling            |  38 +++++++++++++
 CHANGELOG/preview.md | 123 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 161 insertions(+)

diff --git a/.spelling b/.spelling
index 7c136a35594..965635c3559 100644
--- a/.spelling
+++ b/.spelling
@@ -1146,6 +1146,12 @@ Microsoft.Management.UI.Internal
 StringComparison
 osx-arm64
 crossgen2
+MartinGC94
+BrannenGH
+SergeyZalyadeev
+KiwiThePoodle
+Thomas-Yu
+cgmanifest.json
  - CHANGELOG.md
 aavdberg
 asrosent
@@ -1440,3 +1446,35 @@ kilasuit
 michaeltlombardi
 SeeminglyScience
 TobiasPSP
+ - CHANGELOG/preview.md
+ayousuf23
+hammy3502
+PowerShellExecutionHelper.cs
+ClientRemotePowerShell
+DOTNET_ROOT
+SkipExperimentalFeatureGeneration
+AzCopy
+Start-PSBootStrap
+precheck
+SKUs
+powershell.config.json
+Microsoft.PowerShell.GlobalTool.Shim.csproj
+InvokeCommand
+UseDotNet
+vmImage
+NoLanguage
+GetValueOrDefault
+kondratyev-nv
+PkgES
+v7.2.0
+preview.9
+pwsh.exe
+XunitXml.TestLogger
+rtm.21527.11
+ThirdPartyNotices.txt
+buildinfo
+tar.gz
+rc.2.21505.57
+psoptions.json
+manifest.spdx.json
+vPack
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index 799630aa599..fab3c51cd7b 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,5 +1,128 @@
 # Current preview release
 
+## [7.3.0-preview.2] - 2022-02-24
+
+### Engine Updates and Fixes
+
+- Fix the `clean` block for generated proxy function (#16827)
+- Add support to allow invoking method with generic type arguments (#12412 and #16822) (Thanks @vexx32!)
+- Report error when PowerShell built-in modules are missing (#16628)
+
+### General Cmdlet Updates and Fixes
+
+- Prevent command completion if the word to complete is a single dash (#16781) (Thanks @ayousuf23!)
+- Use `FindFirstFileW` instead of `FindFirstFileExW` to correctly handle Unicode file names on FAT32 (#16840) (Thanks @iSazonov!)
+- Add completion for loop labels after Break/Continue (#16438) (Thanks @MartinGC94!)
+- Support OpenSSH options for `PSRP` over SSH commands (#12802) (Thanks @BrannenGH!)
+- Adds a `.ResolvedTarget` Property to `File-System` Items to Reflect a Symlink's Target as `FileSystemInfo` (#16490) (Thanks @hammy3502!)
+- Use `NotifyEndApplication` to re-enable VT mode (#16612)
+- Add new parameter to `Start-Sleep`: `[-Duration] <timespan>` (#16185) (Thanks @IISResetMe!)
+- Add lock and null check to remoting internals (#16542) (#16683) (Thanks @SergeyZalyadeev!)
+- Make `Measure-Object` ignore missing properties unless running in strict mode (#16589) (Thanks @KiwiThePoodle!)
+- Add `-StrictMode` to `Invoke-Command` to allow specifying strict mode when invoking command locally (#16545) (Thanks @Thomas-Yu!)
+- Fix `$PSNativeCommandArgPassing` = `Windows` to handle empty args correctly (#16639)
+- Reduce the amount of startup banner text (#16516) (Thanks @rkeithhill!)
+- Add `exec` cmdlet for bash compatibility (#16462)
+- Add AMSI method invocation logging as experimental feature (#16496)
+- Fix web cmdlets so that an empty `Get` does not include a `content-length` header (#16587)
+- Update `HelpInfoUri` for 7.3 release (#16646)
+- Fix parsing `SemanticVersion` build label from version string (#16608)
+- Fix `ForEach-Object -Parallel` when passing in script block variable (#16564)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@eltociear, @iSazonov, @xtqqczze</p>
+
+</summary>
+
+<ul>
+<li>Fix typo in PowerShellExecutionHelper.cs (#16776) (Thanks @eltociear!)</li>
+<li>Use more efficient platform detection API (#16760) (Thanks @iSazonov!)</li>
+<li>Seal <code>ClientRemotePowerShell</code> (#15802) (Thanks @xtqqczze!)</li>
+<li>Fix the DSC overview URL in a markdown file and some small cleanup changes (#16629)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Fix automation to update experimental JSON files in GitHub action (#16837)
+
+### Tests
+
+- Update `markdownlint` to the latest version (#16825)
+- Bump the package `path-parse` from `1.0.6` to `1.0.7` (#16820)
+- Remove assert that is incorrect and affecting our tests (#16588)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@dahlia</p>
+
+</summary>
+
+<ul>
+<li>Update NuGet Testing to not re-install dotnet,
+when not needed and dynamically determine the DOTNET_ROOT (Internal 19268, 19269, 19272, 19273, and 19274)</li>
+<li>Remove SkipExperimentalFeatureGeneration when building alpine (Internal 19248)</li>
+<li>Revert .NET 7 changes, Update to the latest .NET 6 and Update WXS file due to blocking issue in .NET 7 Preview 1 </li>
+<li>Install and Find AzCopy</li>
+<li>Use Start-PSBootStrap for installing .NET during nuget packaging</li>
+<li>Fix pool syntax for deployments (Internal 19189)</li>
+<li>Bump NJsonSchema from 10.5.2 to 10.6.9 (#16888)</li>
+<li>Update projects and scripts to use .NET 7 preview 1 pre-release builds (#16856)</li>
+<li>Add warning messages when package precheck fails (#16867)</li>
+<li>Refactor Global Tool packaging to include SBOM generation (#16860)</li>
+<li>Update to use <code>windows-latest</code> as the build agent image (#16831)</li>
+<li>Ensure alpine and arm SKUs have <code>powershell.config.json</code> file with experimental features enabled (#16823)</li>
+<li>Update experimental feature json files (#16838) (Thanks @github-actions[bot]!)</li>
+<li>Remove WiX install (#16834)</li>
+<li>Add experimental json update automation (#16833)</li>
+<li>Update .NET SDK to 6.0.101 and fix <code>Microsoft.PowerShell.GlobalTool.Shim.csproj</code> (#16821)</li>
+<li>Add SBOM manifest to nuget packages (#16711)</li>
+<li>Improve logic for updating .NET in CI (#16808)</li>
+<li>Add Linux package dependencies for packaging (#16807)</li>
+<li>Switch to our custom images for build and release (#16801)</li>
+<li>Remove all references to <code>cmake</code> for the builds in this repo (#16578)</li>
+<li>Fix build for new <code>InvokeCommand</code> attributes (#16800)</li>
+<li>Let macOS installer run without Rosetta on Apple Silicon (#16742) (Thanks @dahlia!)</li>
+<li>Update the expect .NET SDK quality to GA for installing dotnet (#16784)</li>
+<li>Change nuget release yaml to use <code>UseDotNet</code> task (#16701)</li>
+<li>Bump Microsoft.ApplicationInsights from 2.19.0 to 2.20.0 (#16642)</li>
+<li>Register NuGet source when generating <code>CGManifest</code> (#16570)</li>
+<li>Update Images used for release (#16580)</li>
+<li>Update SBOM generation (#16641)</li>
+<li>Bring changes from 7.3.0-preview.1 (#16640)</li>
+<li>Update the <code>vmImage</code> and PowerShell root directory for macOS builds (#16611)</li>
+<li>Update macOS build image and root folder for build (#16609)</li>
+<li>Disabled Yarn cache in markdown.yml (#16599)</li>
+<li>Update cgmanifest (#16600)</li>
+<li>Fix broken links in markdown (#16598)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Add newly joined members to their respective Working Groups (#16849)
+- Update Engine Working Group members (#16780)
+- Replace the broken link about pull request (#16771)
+- Update change log to remove a broken URL (#16735)
+- Updated `README.md` and `metadata.json` for `v7.3.0-preview.1` release (#16627)
+- Updating changelog for `7.2.1` (#16616)
+- Updated `README.md` and `metadata.json` for `7.2.1` release (#16586)
+
+[7.3.0-preview.2]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.1...v7.3.0-preview.2
+
 ## [7.3.0-preview.1] - 2021-12-16
 
 ### Breaking Changes

From 8335f76600c52cda44b213b415b551fcec5a289b Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Thu, 24 Feb 2022 15:47:26 -0800
Subject: [PATCH 259/645] Revert "update wxs file"

This reverts commit 10bbd74d8c6d579a2efee1f453e11d5330498d95.

Revert "Update to the latest .NET 6"

This reverts commit 3a49e1f6fef45c1c2f75c05ba0e720b21200785a.

Revert "Revert .NET 7 changes"

This reverts commit abf3a89ce28f0fbfa22f572f9c516619c818c0f0.
---
 Analyzers.props                               |  2 +-
 DotnetRuntimeMetadata.json                    | 12 ++---
 PowerShell.Common.props                       |  5 +-
 assets/wix/files.wxs                          | 14 ++++--
 build.psm1                                    | 21 +++-----
 global.json                                   |  2 +-
 nuget.config                                  |  3 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  6 +--
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           |  8 +--
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 src/Modules/PSGalleryModules.csproj           |  2 +-
 src/ResGen/ResGen.csproj                      |  2 +-
 .../System.Management.Automation.csproj       | 20 ++++----
 .../engine/Modules/ModuleCmdletBase.cs        |  2 +
 src/TypeCatalogGen/TypeCatalogGen.csproj      |  2 +-
 test/Test.Common.props                        |  2 +-
 .../ResultsComparer/ResultsComparer.csproj    |  2 +-
 test/powershell/Host/Startup.Tests.ps1        |  5 +-
 .../PackageManagement.Tests.ps1               | 15 +++++-
 .../PowerShellGet/PowerShellGet.Tests.ps1     | 28 +++++++++++
 .../Get-ExperimentalFeature.Tests.ps1         |  4 +-
 test/tools/OpenCover/OpenCover.psm1           |  4 +-
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/WebListener.csproj     |  4 +-
 tools/UpdateDotnetRuntime.ps1                 |  2 +-
 tools/cgmanifest.json                         | 50 +++++++++----------
 tools/findMissingNotices.ps1                  |  4 +-
 tools/packaging/packaging.psm1                |  8 +--
 tools/packaging/packaging.strings.psd1        |  2 +-
 tools/packaging/projects/nuget/package.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  4 +-
 .../Microsoft.PowerShell.ConsoleHost.csproj   |  2 +-
 .../System.Management.Automation.csproj       |  4 +-
 .../templates/release-SDKTests.yml            |  2 +-
 36 files changed, 148 insertions(+), 105 deletions(-)

diff --git a/Analyzers.props b/Analyzers.props
index d2527a40b7a..8c69e56237e 100644
--- a/Analyzers.props
+++ b/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="7.0.0-preview1.22068.2" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 0917e8476c6..92f5825c978 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,13 +1,13 @@
 {
   "sdk": {
-    "channel": "6.0.1xx",
-    "quality": "ga",
+    "channel": "7.0.1xx-preview1",
+    "quality": "signed",
     "qualityFallback": "daily",
-    "packageVersionPattern": "6.0.0",
-    "sdkImageVersion": "6.0.100",
-    "nextChannel": "6.0.1xx",
+    "packageVersionPattern": "7.0.0-preview.1",
+    "sdkImageVersion": "7.0.100",
+    "nextChannel": "7.0.1xx-preview1",
     "azureFeed": "",
-    "sdkImageOverride": ""
+    "sdkImageOverride": "7.0.100-preview.1.22110.4"
   },
   "internalfeed" : {
     "url": ""
diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 4054cd5b19a..39e799d5a34 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -135,10 +135,11 @@
     <Company>Microsoft Corporation</Company>
     <Copyright>(c) Microsoft Corporation.</Copyright>
 
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <LangVersion>10.0</LangVersion>
+    <!-- disable ReadyToRun due to issue: https://github.com/dotnet/runtime/issues/65412
     <PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
-    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
+    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols-->
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index fa44cc0e8b3..9bbc1715145 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1638,6 +1638,9 @@
         <Component Id="cmpA75DEF5617C54DA1937CB37D5824BF79">
           <File Id="fil3EE6096BD3C8407685E881F3CE6BF5C1" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Security.Cryptography.OpenSsl.dll" />
         </Component>
+        <Component Id="cmpE5993DB9118640FD8C180A2D61C89C01">
+          <File Id="fil7381E5F4FBC64B60A8B7D7841B89F4C6" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Security.Cryptography.dll" />
+        </Component>
       </Directory>
       <Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
         <Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
@@ -3154,8 +3157,11 @@
       <Component Id="cmp22840874A8C84AA796496634FBEBF09C">
         <File Id="fil2067B616D1FA4B30932A0240ABE06089" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
       </Component>
-      <Component Id="cmp037C557288DD4F6CBA05E6D562F34759">
-        <File Id="fil17EAEAF558ED429CB9297130A55C96D0" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.222.6406.dll" />
+      <Component Id="cmpAC388473B5C048E3AB478DCC0B3C61FE">
+        <File Id="fil2D3CF7A46E0842BABB83B0A8787FED26" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.7608.dll" />
+      </Component>
+      <Component Id="cmpE0DEAA289B2D4594A0C4791B2808C97C">
+        <File Id="fil530EAD567BDB402FA6F02AFAA696D721" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4173,7 +4179,9 @@
       <ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
       <ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
       <ComponentRef Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9" />
-      <ComponentRef Id="cmp037C557288DD4F6CBA05E6D562F34759" />
+      <ComponentRef Id="cmpAC388473B5C048E3AB478DCC0B3C61FE" />
+      <ComponentRef Id="cmpE5993DB9118640FD8C180A2D61C89C01" />
+      <ComponentRef Id="cmpE0DEAA289B2D4594A0C4791B2808C97C" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/build.psm1 b/build.psm1
index 1cc49b68ef0..0e5b11ad2eb 100644
--- a/build.psm1
+++ b/build.psm1
@@ -541,7 +541,9 @@ Fix steps:
 
             try {
                 Push-Location $globalToolSrcFolder
-                $Arguments += "--output", $publishPath
+                if ($Arguments -notcontains '--output') {
+                    $Arguments += "--output", $publishPath
+                }
                 Write-Log -message "Run dotnet $Arguments from $PWD to build global tool entry point"
                 Start-NativeExecution { dotnet $Arguments }
             }
@@ -801,8 +803,8 @@ function New-PSOptions {
         [ValidateSet("Debug", "Release", "CodeCoverage", '')]
         [string]$Configuration,
 
-        [ValidateSet("net6.0")]
-        [string]$Framework = "net6.0",
+        [ValidateSet("net7.0")]
+        [string]$Framework = "net7.0",
 
         # These are duplicated from Start-PSBuild
         # We do not use ValidateScript since we want tab completion
@@ -1745,11 +1747,6 @@ function Install-Dotnet {
 
     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" }
@@ -1818,13 +1815,11 @@ function Install-Dotnet {
         $installScript = "dotnet-install.ps1"
         Invoke-WebRequest -Uri $installObtainUrl/$installScript -OutFile $installScript
         if (-not $environment.IsCoreCLR) {
-            $installArgs = @{
-                Quality = $Quality
-            }
-
+            $installArgs = @{}
             if ($Version) {
                 $installArgs += @{ Version = $Version }
             } elseif ($Channel) {
+                $installArgs += @{ Quality = $Quality }
                 $installArgs += @{ Channel = $Channel }
             }
 
@@ -1850,7 +1845,7 @@ function Install-Dotnet {
             $fullDotnetInstallPath = Join-Path -Path (Convert-Path -Path $PWD.Path) -ChildPath $installScript
 
             if ($Version) {
-                $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version, '-Quality', $Quality)
+                $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version)
             }
             elseif ($Channel) {
                 $psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Channel', $Channel, '-Quality', $Quality)
diff --git a/global.json b/global.json
index 572a2a6fa06..9b02b7b47f7 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.200"
+    "version": "7.0.100-preview.1"
   }
 }
diff --git a/nuget.config b/nuget.config
index 5a541e6ff31..aca42b62494 100644
--- a/nuget.config
+++ b/nuget.config
@@ -2,11 +2,10 @@
 <configuration>
   <packageSources>
     <clear />
+    <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/7.0.100-preview.1.22110.4-shipping/nuget/v2" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
   </disabledPackageSources>
 </configuration>
-
-
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 7ab8ecf2825..2d5c09d969a 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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="7.0.0-preview.1.22076.8" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index f11e1edc63b..c91fa2e60fe 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
-    <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.1.0-3.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.1.22076.8" />
     <PackageReference Include="NJsonSchema" Version="10.6.9" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index c2dba27c14f..5b615fd1ae8 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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="7.0.0-preview.1.22076.8" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index b79ab533b88..3a36a1b19d5 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- 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="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.1.22076.8" />
     <!-- 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" />
@@ -30,7 +30,7 @@
     <PackageReference Include="System.Private.ServiceModel" Version="4.9.0" />
     <!-- 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="7.0.0-preview.1.22076.8" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index d6b7c281f9e..a18bc1305fd 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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="7.0.0-preview.1.22076.8" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj
index ca1c34df8b5..f41e3740bc0 100644
--- a/src/Modules/PSGalleryModules.csproj
+++ b/src/Modules/PSGalleryModules.csproj
@@ -5,7 +5,7 @@
     <Company>Microsoft Corporation</Company>
     <Copyright>(c) Microsoft Corporation.</Copyright>
 
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
diff --git a/src/ResGen/ResGen.csproj b/src/ResGen/ResGen.csproj
index 5c736ad9ed9..f86d5328ba8 100644
--- a/src/ResGen/ResGen.csproj
+++ b/src/ResGen/ResGen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Generates C# typed bindings for .resx files</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>resgen</AssemblyName>
     <OutputType>Exe</OutputType>
     <TieredCompilation>true</TieredCompilation>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 1f298d296ab..f6f6ab1adb0 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,19 +16,19 @@
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.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="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.1.22076.8" />
     <!--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="System.Management" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.1.22076.8" />
     <!-- 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.3.0-preview.1" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index a4d1a7057f1..53dc8d058c0 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -1890,7 +1890,9 @@ internal PSModuleInfo LoadModuleManifest(
             else if ((requiredProcessorArchitecture != ProcessorArchitecture.None) &&
                      (requiredProcessorArchitecture != ProcessorArchitecture.MSIL))
             {
+                #pragma warning disable SYSLIB0037
                 ProcessorArchitecture currentArchitecture = typeof(object).Assembly.GetName().ProcessorArchitecture;
+                #pragma warning restore SYSLIB0037
 
                 if (currentArchitecture != requiredProcessorArchitecture)
                 {
diff --git a/src/TypeCatalogGen/TypeCatalogGen.csproj b/src/TypeCatalogGen/TypeCatalogGen.csproj
index e81e027ea75..170819a6bf9 100644
--- a/src/TypeCatalogGen/TypeCatalogGen.csproj
+++ b/src/TypeCatalogGen/TypeCatalogGen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Generates CorePsTypeCatalog.cs given powershell.inc</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyName>TypeCatalogGen</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/test/Test.Common.props b/test/Test.Common.props
index a1b4b8686d6..cdfe931012c 100644
--- a/test/Test.Common.props
+++ b/test/Test.Common.props
@@ -6,7 +6,7 @@
     <Company>Microsoft Corporation</Company>
     <Copyright>(c) Microsoft Corporation.</Copyright>
 
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <LangVersion>9.0</LangVersion>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
index 838d6ccd673..5274b08d613 100644
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@@ -6,7 +6,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
     <PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
diff --git a/test/powershell/Host/Startup.Tests.ps1 b/test/powershell/Host/Startup.Tests.ps1
index bb775d0ca2f..54d8d9a5226 100644
--- a/test/powershell/Host/Startup.Tests.ps1
+++ b/test/powershell/Host/Startup.Tests.ps1
@@ -44,14 +44,12 @@ Describe "Validate start of console host" -Tag CI {
             'System.Reflection.Primitives.dll'
             'System.Runtime.dll'
             'System.Runtime.InteropServices.dll'
-            'System.Runtime.InteropServices.RuntimeInformation.dll'
             'System.Runtime.Loader.dll'
             'System.Runtime.Numerics.dll'
             'System.Runtime.Serialization.Formatters.dll'
             'System.Runtime.Serialization.Primitives.dll'
             'System.Security.AccessControl.dll'
-            'System.Security.Cryptography.Encoding.dll'
-            'System.Security.Cryptography.Primitives.dll'
+            'System.Security.Cryptography.dll'
             'System.Security.Cryptography.X509Certificates.dll'
             'System.Security.Principal.Windows.dll'
             'System.Text.Encoding.Extensions.dll'
@@ -75,6 +73,7 @@ Describe "Validate start of console host" -Tag CI {
         else {
             $allowedAssemblies += @(
                 'System.Net.Sockets.dll'
+                'System.Reflection.Emit.dll'
             )
         }
 
diff --git a/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1 b/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
index ef0a1f17d5f..5070cf9e8b8 100644
--- a/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
+++ b/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
@@ -19,13 +19,24 @@ $InternalSource = 'OneGetTestSource'
 Describe "PackageManagement Acceptance Test" -Tags "Feature" {
 
  BeforeAll{
-    Register-PackageSource -Name Nugettest -provider NuGet -Location https://www.nuget.org/api/v2 -Force
-    Register-PackageSource -Name $InternalSource -Location $InternalGallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue
+
+    # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+    # These should be re-enabled when the issue is fixed
+    $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+    $PSDefaultParameterValues["it:pending"] = $true
+
+    # The cmdlets in the if block fail due the to above issue, hence putting them in a if ($false)
+    if ($false) {
+        Register-PackageSource -Name Nugettest -provider NuGet -Location https://www.nuget.org/api/v2 -Force
+        Register-PackageSource -Name $InternalSource -Location $InternalGallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue
+    }
+
     $SavedProgressPreference = $ProgressPreference
     $ProgressPreference = "SilentlyContinue"
  }
  AfterAll {
      $ProgressPreference = $SavedProgressPreference
+     $global:PSDefaultParameterValues = $originalDefaultParameterValues
  }
     It "get-packageprovider" {
 
diff --git a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1 b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
index e178d0a77e3..dcecd602d47 100644
--- a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
+++ b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
@@ -111,6 +111,12 @@ function Remove-InstalledModules
 Describe "PowerShellGet - Module tests" -tags "Feature" {
 
     BeforeAll {
+        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+        # These should be re-enabled when the issue is fixed
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        $PSDefaultParameterValues["it:pending"] = $true
+        return
+
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -141,6 +147,7 @@ Describe "PowerShellGet - Module tests" -tags "Feature" {
     }
 
     AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledModules
     }
 }
@@ -148,6 +155,12 @@ Describe "PowerShellGet - Module tests" -tags "Feature" {
 Describe "PowerShellGet - Module tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
 
     BeforeAll {
+        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+        # These should be re-enabled when the issue is fixed
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        $PSDefaultParameterValues["it:pending"] = $true
+        return
+
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -172,6 +185,7 @@ Describe "PowerShellGet - Module tests (Admin)" -Tags @('Feature', 'RequireAdmin
     }
 
     AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledModules
     }
 }
@@ -184,6 +198,12 @@ function Remove-InstalledScripts
 Describe "PowerShellGet - Script tests" -tags "Feature" {
 
     BeforeAll {
+        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+        # These should be re-enabled when the issue is fixed
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        $PSDefaultParameterValues["it:pending"] = $true
+        return
+
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -210,6 +230,7 @@ Describe "PowerShellGet - Script tests" -tags "Feature" {
     }
 
     AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledScripts
     }
 }
@@ -217,6 +238,12 @@ Describe "PowerShellGet - Script tests" -tags "Feature" {
 Describe "PowerShellGet - Script tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
 
     BeforeAll {
+        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+        # These should be re-enabled when the issue is fixed
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        $PSDefaultParameterValues["it:pending"] = $true
+        return
+
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -237,6 +264,7 @@ Describe "PowerShellGet - Script tests (Admin)" -Tags @('Feature', 'RequireAdmin
     }
 
     AfterAll {
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledScripts
     }
 }
diff --git a/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1 b/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
index af18672cf27..02c4ad856b7 100644
--- a/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
+++ b/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
@@ -167,7 +167,7 @@ Describe "Default enablement of Experimental Features" -Tags CI {
     It "On stable builds, Experimental Features are not enabled" -Skip:($isPreview) {
         foreach ($expFeature in Get-ExperimentalFeature)
         {
-            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net6.0\win7-x64\publish)
+            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win7-x64\publish)
             # is launched from another pwsh (with $PSHOME like C:\program files\powershell\7)
             # resulting in combined PSModulePath which is used by Get-ExperimentalFeature to enum module-scoped exp.features from both pwsh locations.
             # So we need to exclude parent's modules' exp.features from verification using filtering on $PSHOME.
@@ -184,7 +184,7 @@ Describe "Default enablement of Experimental Features" -Tags CI {
 
         foreach ($expFeature in Get-ExperimentalFeature)
         {
-            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net6.0\win7-x64\publish)
+            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win7-x64\publish)
             # is launched from another pwsh (with $PSHOME like C:\program files\powershell\7)
             # resulting in combined PSModulePath which is used by Get-ExperimentalFeature to enum module-scoped exp.features from both pwsh locations.
             # So we need to exclude parent's modules' exp.features from verification using filtering on $PSHOME.
diff --git a/test/tools/OpenCover/OpenCover.psm1 b/test/tools/OpenCover/OpenCover.psm1
index d0def0abf6c..f9130df5ae9 100644
--- a/test/tools/OpenCover/OpenCover.psm1
+++ b/test/tools/OpenCover/OpenCover.psm1
@@ -615,7 +615,7 @@ function Install-OpenCover
 .Description
    Invoke-OpenCover runs tests under OpenCover by executing tests on PowerShell located at $PowerShellExeDirectory.
 .EXAMPLE
-   Invoke-OpenCover -TestPath $PWD/test/powershell -PowerShellExeDirectory $PWD/src/powershell-win-core/bin/CodeCoverage/net6.0/win7-x64
+   Invoke-OpenCover -TestPath $PWD/test/powershell -PowerShellExeDirectory $PWD/src/powershell-win-core/bin/CodeCoverage/7.0/win7-x64
 #>
 function Invoke-OpenCover
 {
@@ -624,7 +624,7 @@ function Invoke-OpenCover
         [parameter()]$OutputLog = "$HOME/Documents/OpenCover.xml",
         [parameter()]$TestPath = "${script:psRepoPath}/test/powershell",
         [parameter()]$OpenCoverPath = "$HOME/OpenCover",
-        [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net6.0/win7-x64/publish",
+        [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net7.0/win7-x64/publish",
         [parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml",
         [parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml",
         [parameter()]$PesterLogFormat = "NUnitXml",
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 491a77f0c80..c49ec96994b 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.1.22076.8" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index bbc07be5259..c425f0002c3 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.1.22109.13" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.1.22076.8" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index 6747368a4c6..40b83623375 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -342,7 +342,7 @@ if ($dotnetUpdate.ShouldUpdate) {
         Import-Module "$PSScriptRoot/../build.psm1" -Force
         Import-Module "$PSScriptRoot/packaging" -Force
         Start-PSBootstrap -Package
-        Start-PSBuild -Clean -Configuration Release -CrossGen -InteractiveAuth:$InteractiveAuth
+        Start-PSBuild -Clean -Configuration Release -InteractiveAuth:$InteractiveAuth
 
         $publishPath = Split-Path (Get-PSOutput)
         Remove-Item -Path "$publishPath\*.pdb"
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index f83a3199565..6a4ca73ef6d 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -65,7 +65,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Common",
-          "Version": "4.1.0"
+          "Version": "4.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -75,7 +75,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.CSharp",
-          "Version": "4.1.0"
+          "Version": "4.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -504,8 +504,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
-          "Version": "6.0.0"
+          "Name": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -514,7 +514,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
+          "Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
           "Version": "6.0.0"
         }
       },
@@ -524,8 +524,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -604,8 +604,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.win.System.Diagnostics.Debug",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -614,8 +614,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.win.System.Runtime.Extensions",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -624,8 +624,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.win7.System.Private.Uri",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -634,8 +634,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win.System.Diagnostics.Debug",
-          "Version": "4.3.0"
+          "Name": "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets",
+          "Version": "1.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -644,8 +644,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win.System.Runtime.Extensions",
-          "Version": "4.3.0"
+          "Name": "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets",
+          "Version": "1.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -654,8 +654,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets",
-          "Version": "1.0.1"
+          "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -664,8 +664,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets",
-          "Version": "1.0.1"
+          "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -674,8 +674,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win7.System.Private.Uri",
-          "Version": "4.3.0"
+          "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -845,7 +845,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.DirectoryServices.Protocols",
-          "Version": "6.0.0"
+          "Version": "6.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -1405,7 +1405,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Web.Services.Description",
-          "Version": "4.9.0"
+          "Version": "4.9.0-rc2.21473.1"
         }
       },
       "DevelopmentDependency": false
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index 315a83284d7..658e95212db 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -177,8 +177,8 @@ function Get-CGRegistrations {
 
     $registrationChanged = $false
 
-    $dotnetTargetName = 'net6.0'
-    $dotnetTargetNameWin7 = 'net6.0-windows7.0'
+    $dotnetTargetName = 'net7.0'
+    $dotnetTargetNameWin7 = 'net7.0-windows7.0'
     $unixProjectName = 'powershell-unix'
     $windowsProjectName = 'powershell-win-core'
     $actualRuntime = $Runtime
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index ff19e06f3cb..2a765619e10 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -8,7 +8,7 @@ $packagingStrings = Import-PowerShellDataFile "$PSScriptRoot\packaging.strings.p
 Import-Module "$PSScriptRoot\..\Xml" -ErrorAction Stop -Force
 $DebianDistributions = @("deb")
 $RedhatDistributions = @("rh")
-$script:netCoreRuntime = 'net6.0'
+$script:netCoreRuntime = 'net7.0'
 $script:iconFileName = "Powershell_black_64.png"
 $script:iconPath = Join-Path -path $PSScriptRoot -ChildPath "../../assets/$iconFileName" -Resolve
 
@@ -2181,7 +2181,7 @@ function New-ILNugetPackageFromSource
 }
 
 <#
-  Copy the generated reference assemblies to the 'ref/net6.0' folder properly.
+  Copy the generated reference assemblies to the 'ref/net7.0' folder properly.
   This is a helper function used by 'New-ILNugetPackageSource'.
 #>
 function CopyReferenceAssemblies
@@ -3131,7 +3131,7 @@ function New-MSIPatch
         # This example shows how to produce a Debug-x64 installer for development purposes.
         cd $RootPathOfPowerShellRepo
         Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
-        New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net6.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
+        New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
 #>
 function New-MSIPackage
 {
@@ -3522,7 +3522,7 @@ function Start-MsiBuild {
         # This example shows how to produce a Debug-x64 installer for development purposes.
         cd $RootPathOfPowerShellRepo
         Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
-        New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net6.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
+        New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
 #>
 function New-MSIXPackage
 {
diff --git a/tools/packaging/packaging.strings.psd1 b/tools/packaging/packaging.strings.psd1
index b70592c313d..b0753a0a4fd 100644
--- a/tools/packaging/packaging.strings.psd1
+++ b/tools/packaging/packaging.strings.psd1
@@ -166,7 +166,7 @@ open {0}
             <files include="**/*" buildAction="None" copyToOutput="true" flatten="false" />
         </contentFiles>
         <dependencies>
-            <group targetFramework="net6.0"></group>
+            <group targetFramework="net7.0"></group>
         </dependencies>
     </metadata>
 </package>
diff --git a/tools/packaging/projects/nuget/package.csproj b/tools/packaging/projects/nuget/package.csproj
index cee634e2ffa..d82205451ac 100644
--- a/tools/packaging/projects/nuget/package.csproj
+++ b/tools/packaging/projects/nuget/package.csproj
@@ -11,6 +11,6 @@
     <NuspecProperties>runtime=$(RID);version=$(SemVer);PackageName=$(PackageName)</NuspecProperties>
     <NuspecBasePath>$(StagingPath)</NuspecBasePath>
     <IsTool>True</IsTool>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 53eee6e16db..e8efd4c4aee 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Version>$(RefAsmVersion)</Version>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@@ -14,7 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
     <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
   </ItemGroup>
 </Project>
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
index a95a2a47cac..4394e1148d1 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Version>$(RefAsmVersion)</Version>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
index e382b8cbb33..5793e09c887 100644
--- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Version>$(RefAsmVersion)</Version>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@@ -9,6 +9,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
   </ItemGroup>
 </Project>
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
index bbbcc4f12cd..03b54aed9e4 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@@ -104,7 +104,7 @@ jobs:
         $localLocation = "$(Pipeline.Workspace)/releasePipeline/finalResults"
         $xmlElement = @"
           <add key=`"local`" value=`"$localLocation`" />
-          <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v2" />
+          <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/7.0.100-preview.1.22101.1-shipping/nuget/v2" />
         </packageSources>
         "@
 

From ee6bc9527c2596f048088fa7b396d2664a11ad08 Mon Sep 17 00:00:00 2001
From: Steven Bucher <stevenbucher8@gmail.com>
Date: Mon, 28 Feb 2022 17:49:52 -0800
Subject: [PATCH 260/645] Add the module `CompatPowerShellGet` to the
 allow-list of telemetry modules (#16935)

---
 src/System.Management.Automation/utils/Telemetry.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/System.Management.Automation/utils/Telemetry.cs b/src/System.Management.Automation/utils/Telemetry.cs
index 105feef73e1..357eed7c5c2 100644
--- a/src/System.Management.Automation/utils/Telemetry.cs
+++ b/src/System.Management.Automation/utils/Telemetry.cs
@@ -322,6 +322,7 @@ static ApplicationInsightsTelemetry()
                         "branchcache",
                         "CimCmdlets",
                         "clusterawareupdating",
+                        "CompatPowerShellGet",
                         "configci",
                         "ConfigurationManager",
                         "DataProtectionManager",

From df460b7275262732854b1ec461047d8e340c83a8 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Wed, 2 Mar 2022 13:53:35 -0800
Subject: [PATCH 261/645] Add fix of process objects for processes that have
 exited. (#16946)

* Add fix for process objects for processes that have exited.

* Fix code factor

* Fix typo

* Add try/catch for possible race condition on exiting process.
---
 .../commands/EnterPSHostProcessCommand.cs     | 91 ++++++++++++++-----
 .../resources/RemotingErrorIdStrings.resx     |  2 +-
 2 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/src/System.Management.Automation/engine/remoting/commands/EnterPSHostProcessCommand.cs b/src/System.Management.Automation/engine/remoting/commands/EnterPSHostProcessCommand.cs
index 756250eb8d7..c3ad65b0506 100644
--- a/src/System.Management.Automation/engine/remoting/commands/EnterPSHostProcessCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/EnterPSHostProcessCommand.cs
@@ -318,22 +318,19 @@ private static void PrepareRunspace(Runspace runspace)
 
         private Process GetProcessById(int procId)
         {
-            try
-            {
-                return Process.GetProcessById(procId);
-            }
-            catch (System.ArgumentException)
+            var process = PSHostProcessUtils.GetProcessById(procId);
+            if (process is null)
             {
                 ThrowTerminatingError(
-                        new ErrorRecord(
-                            new PSArgumentException(StringUtil.Format(RemotingErrorIdStrings.EnterPSHostProcessNoProcessFoundWithId, procId)),
-                            "EnterPSHostProcessNoProcessFoundWithId",
-                            ErrorCategory.InvalidArgument,
-                            this)
-                        );
-
-                return null;
+                    new ErrorRecord(
+                        new PSArgumentException(StringUtil.Format(RemotingErrorIdStrings.EnterPSHostProcessNoProcessFoundWithId, procId)),
+                        "EnterPSHostProcessNoProcessFoundWithId",
+                        ErrorCategory.InvalidArgument,
+                        this)
+                    );
             }
+
+            return process;
         }
 
         private Process GetProcessByHostProcessInfo(PSHostProcessInfo hostProcessInfo)
@@ -403,7 +400,7 @@ private void VerifyProcess(Process process)
             {
                 ThrowTerminatingError(
                         new ErrorRecord(
-                            new PSInvalidOperationException(StringUtil.Format(RemotingErrorIdStrings.EnterPSHostProcessNoPowerShell, Process.ProcessName)),
+                            new PSInvalidOperationException(StringUtil.Format(RemotingErrorIdStrings.EnterPSHostProcessNoPowerShell, Process.Id)),
                             "EnterPSHostProcessNoPowerShell",
                             ErrorCategory.InvalidOperation,
                             this)
@@ -599,9 +596,22 @@ private static int[] GetProcIdsFromNames(string[] names)
                 WildcardPattern namePattern = WildcardPattern.Get(name, WildcardOptions.IgnoreCase);
                 foreach (var proc in processes)
                 {
-                    if (namePattern.IsMatch(proc.ProcessName))
+                    // Skip processes that have already terminated.
+                    if (proc.HasExited)
+                    {
+                        continue;
+                    }
+
+                    try
                     {
-                        returnIds.Add(proc.Id);
+                        if (namePattern.IsMatch(proc.ProcessName))
+                        {
+                            returnIds.Add(proc.Id);
+                        }
+                    }
+                    catch (InvalidOperationException)
+                    {
+                        // Ignore if process has exited in the mean time.
                     }
                 }
             }
@@ -681,10 +691,9 @@ internal static IReadOnlyCollection<PSHostProcessInfo> GetAppDomainNamesFromProc
                                     string pName = namedPipe.Substring(pNameIndex + 1);
 
                                     Process process = null;
-
                                     try
                                     {
-                                        process = System.Diagnostics.Process.GetProcessById(id);
+                                        process = PSHostProcessUtils.GetProcessById(id);
                                     }
                                     catch (Exception)
                                     {
@@ -704,10 +713,20 @@ internal static IReadOnlyCollection<PSHostProcessInfo> GetAppDomainNamesFromProc
                                             // best effort to cleanup
                                         }
                                     }
-                                    else if (process.ProcessName.Equals(pName, StringComparison.Ordinal))
+                                    else
                                     {
-                                        // only add if the process name matches
-                                        procAppDomainInfo.Add(new PSHostProcessInfo(pName, id, appDomainName, namedPipe));
+                                        try
+                                        {
+                                            if (process.ProcessName.Equals(pName, StringComparison.Ordinal))
+                                            {
+                                                // only add if the process name matches
+                                                procAppDomainInfo.Add(new PSHostProcessInfo(pName, id, appDomainName, namedPipe));
+                                            }
+                                        }
+                                        catch (InvalidOperationException)
+                                        {
+                                            // Ignore if process has exited in the mean time.
+                                        }
                                     }
                                 }
                             }
@@ -796,8 +815,8 @@ internal PSHostProcessInfo(
             MainWindowTitle = string.Empty;
             try
             {
-                var proc = Process.GetProcessById(processId);
-                MainWindowTitle = proc.MainWindowTitle ?? string.Empty;
+                var process = PSHostProcessUtils.GetProcessById(processId);
+                MainWindowTitle = process?.MainWindowTitle ?? string.Empty;
             }
             catch (ArgumentException)
             {
@@ -831,4 +850,30 @@ public string GetPipeNameFilePath()
     }
 
     #endregion
+
+    #region PSHostProcessUtils
+
+    internal static class PSHostProcessUtils
+    {
+        /// <summary>
+        /// Return a System.Diagnostics.Process object by process Id,
+        /// or null if not found or process has exited.
+        /// </summary>
+        /// <param name="procId">Process of Id to find.</param>
+        /// <returns>Process object or null.</returns>
+        public static Process GetProcessById(int procId)
+        {
+            try
+            {
+                var process = Process.GetProcessById(procId);
+                return process.HasExited ? null : process;
+            }
+            catch (System.ArgumentException)
+            {
+                return null;
+            }
+        }
+    }
+
+    #endregion
 }
diff --git a/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx b/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
index 680e6d1a6b5..6cbcdc72ddb 100644
--- a/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
+++ b/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
@@ -1408,7 +1408,7 @@ All WinRM sessions connected to PowerShell session configurations, such as Micro
     <value>Multiple processes were found with this name {0}. Use the process Id to specify a single process to enter.</value>
   </data>
   <data name="EnterPSHostProcessNoPowerShell" xml:space="preserve">
-    <value>Cannot enter process {0} because it has not loaded the PowerShell engine.</value>
+    <value>Cannot enter process with Id '{0}' because it has not loaded the PowerShell engine.</value>
   </data>
   <data name="EnterPSHostProcessNoProcessFoundWithId" xml:space="preserve">
     <value>No process was found with Id: {0}.</value>

From 9b2d97e3e2b300520662ca2677c039c0348e56ef Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 2 Mar 2022 17:39:30 -0800
Subject: [PATCH 262/645] Update a few tests to make them more stable in CI
 (#16944)

---
 .../Enter-PSHostProcess.Tests.ps1             | 32 ++++++++-----------
 .../Get-WinEvent.Tests.ps1                    |  2 +-
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Enter-PSHostProcess.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Enter-PSHostProcess.Tests.ps1
index a4898b1e1ad..7e9469613bb 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Enter-PSHostProcess.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Enter-PSHostProcess.Tests.ps1
@@ -34,32 +34,26 @@ function Invoke-PSHostProcessScript {
         [int] $Retry = 5 # Default retry of 5 times
     )
 
-    $sb = {
-        # use $i as an incrementally growing pause based on the attempt number
-        # so that it's more likely to succeed.
-        $commandStr = @'
-Start-Sleep -Seconds {0}
-Enter-PSHostProcess {1} -ErrorAction Stop
+    $commandStr = @'
+Enter-PSHostProcess {0} -ErrorAction Stop
 $PID
 Exit-PSHostProcess
-'@ -f $i, $ArgumentString
-
-        ($commandStr | & $powershell -c -) -eq $Id
-    }
+'@ -f $ArgumentString
 
     $result = $false
-    $failures = 0
     foreach ($i in 1..$Retry) {
-        if ($sb.Invoke()) {
-            $result = $true
+        # use $i as an incrementally growing pause based on the attempt number
+        # so that it's more likely to succeed.
+        Start-Sleep -Seconds $i
+
+        $result = ($commandStr | & $powershell -noprofile -c -) -eq $Id
+        if ($result) {
             break
         }
-
-        $failures++
     }
 
-    if($failures) {
-        Write-Warning "Enter-PSHostProcess script failed $i out of $Retry times."
+    if ($i -gt 1) {
+        Write-Verbose -Verbose "Enter-PSHostProcess script failed $i out of $Retry times."
     }
 
     $result
@@ -99,7 +93,7 @@ Describe "Enter-PSHostProcess tests" -Tag Feature {
 
             # This will enter and exit another process
             Invoke-PSHostProcessScript -ArgumentString "-Id $pwshId" -Id $pwshId |
-                Should -BeTrue -Because "The script was able to enter another process and grab the pid of '$pwshId'."
+                Should -BeTrue -Because "The script was able to enter another process and grab the pid of '$pwshId'"
 
             # Re-enter and exit the other process
             Invoke-PSHostProcessScript -ArgumentString "-Id $pwshId" -Id $pwshId |
@@ -109,7 +103,7 @@ Describe "Enter-PSHostProcess tests" -Tag Feature {
         It "Can enter, exit, and re-enter another Windows PowerShell PSHost" -Skip:(!$IsWindows) {
             # Start a PowerShell job where the first thing it does is return $PID. After that, spin forever.
             # We will use this job as the target process for Enter-PSHostProcess
-            $powershellJob = Start-Job {
+            $powershellJob = Start-Job -PSVersion 5.1 {
                 $PID
                 while ($true) {
                     Start-Sleep -Seconds 30 | Out-Null
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Get-WinEvent.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Get-WinEvent.Tests.ps1
index 3d881d3b2da..5a321539f14 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Get-WinEvent.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Get-WinEvent.Tests.ps1
@@ -44,7 +44,7 @@ Describe 'Get-WinEvent' -Tags "CI" {
             # we sample the first 20 results, as this could be very large
             $results = Get-WinEvent -provider $providerForTests.Name -max 20
             foreach($event in $results ) {
-                $event.providername | Should -BeExactly $providerForTests.name
+                $event.providername | Should -Be $providerForTests.name
             }
         }
         It 'Get-WinEvent can get events via logname' {

From 102782fbb0bc82310ca8eaba5574fc54e9ca9e6d Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 3 Mar 2022 09:21:21 -0800
Subject: [PATCH 263/645] Fix the parsing code for method generic arguments
 (#16937)

---
 .../engine/parser/Parser.cs                   | 47 +++++++---
 .../engine/parser/ast.cs                      | 92 +++----------------
 .../Parser/MethodInvocation.Tests.ps1         | 82 ++++++++++++++---
 3 files changed, 117 insertions(+), 104 deletions(-)

diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
index a855be0b0a7..1d3f299f304 100644
--- a/src/System.Management.Automation/engine/parser/Parser.cs
+++ b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -7745,7 +7745,6 @@ private ExpressionAst MemberAccessRule(ExpressionAst targetExpr, Token operatorT
             // On entry, we've verified that operatorToken is not preceded by whitespace.
 
             CommandElementAst member = MemberNameRule();
-            List<ITypeName> genericTypeArguments = null;
 
             if (member == null)
             {
@@ -7760,9 +7759,10 @@ private ExpressionAst MemberAccessRule(ExpressionAst targetExpr, Token operatorT
             }
             else if (_ungotToken == null)
             {
-                // Member name may be an incomplete token like `$a.$(Command-Name`; we do not look for generic args or
-                // invocation token(s) if the member name token is recognisably incomplete.
-                genericTypeArguments = GenericMethodArgumentsRule(out Token rBracket);
+                // Member name may be an incomplete token like `$a.$(Command-Name`, in which case, '_ungotToken != null'.
+                // We do not look for generic args or invocation token if the member name token is recognisably incomplete.
+                int resyncIndex = _tokenizer.GetRestorePoint();
+                List<ITypeName> genericTypeArguments = GenericMethodArgumentsRule(resyncIndex, out Token rBracket);
                 Token lParen = NextInvokeMemberToken();
 
                 if (lParen != null)
@@ -7778,6 +7778,13 @@ private ExpressionAst MemberAccessRule(ExpressionAst targetExpr, Token operatorT
                         "member and paren must be adjacent when the method is not generic");
                     return MemberInvokeRule(targetExpr, lParen, operatorToken, member, genericTypeArguments);
                 }
+                else if (rBracket != null)
+                {
+                    // We had a legit section of generic arguments but no 'lParen' following that, so this is not a method
+                    // invocation, but an invalid indexing operation. Resync the tokenizer back to before the generic arg
+                    // parsing and then continue.
+                    Resync(resyncIndex);
+                }
             }
 
             return new MemberExpressionAst(
@@ -7785,15 +7792,13 @@ private ExpressionAst MemberAccessRule(ExpressionAst targetExpr, Token operatorT
                 targetExpr,
                 member,
                 @static: operatorToken.Kind == TokenKind.ColonColon,
-                nullConditional: operatorToken.Kind == TokenKind.QuestionDot,
-                genericTypeArguments);
+                nullConditional: operatorToken.Kind == TokenKind.QuestionDot);
         }
 
-        private List<ITypeName> GenericMethodArgumentsRule(out Token rBracketToken)
+        private List<ITypeName> GenericMethodArgumentsRule(int resyncIndex, out Token rBracketToken)
         {
             List<ITypeName> genericTypes = null;
 
-            int resyncIndex = _tokenizer.GetRestorePoint();
             Token lBracket = NextToken();
             rBracketToken = null;
 
@@ -7817,7 +7822,23 @@ private List<ITypeName> GenericMethodArgumentsRule(out Token rBracketToken)
 
                 SkipNewlines();
                 Token firstToken = NextToken();
-                if (firstToken.Kind == TokenKind.Identifier || firstToken.Kind == TokenKind.LBracket)
+
+                // For method generic arguments, we only support the syntax `$var.Method[TypeName1 <, TypeName2 ...>]`,
+                // not the syntax `$var.Method[[TypeName1] <, [TypeName2] ...>]`.
+                // The latter syntax has been supported for type expression since the beginning, but it's ambiguous in
+                // this scenario because we could be looking at an indexing operation on a property like:
+                //    `$var.Property[<expression>]`
+                // and the `<expression>` could start with a type expression like `[TypeName]::Method()`, or even just
+                // a single type expression acting as a key to a hashtable property. Such cases will cause ambiguities.
+                //
+                // It could be possible to write code that sorts out the ambiguity and continue to support the latter
+                // syntax for method generic arguments, and thus to allow assembly-qualified type names. But we choose
+                // not to do so because:
+                //   1. that will definitely increase the complexity of the parsing code and also make it fragile;
+                //   2. the latter syntax hurts readability a lot due to the number of opening/closing brackets.
+                // The downside is that the assembly-qualified type names won't be supported for method generic args,
+                // but that's likely not a problem in practice, and we can revisit if it turns out otherwise.
+                if (firstToken.Kind == TokenKind.Identifier)
                 {
                     resyncIndex = -1;
                     genericTypes = GenericTypeArgumentsRule(firstToken, out rBracketToken);
@@ -7836,11 +7857,11 @@ private List<ITypeName> GenericMethodArgumentsRule(out Token rBracketToken)
             finally
             {
                 SetTokenizerMode(oldTokenizerMode);
-            }
 
-            if (resyncIndex > 0)
-            {
-                Resync(resyncIndex);
+                if (resyncIndex > 0)
+                {
+                    Resync(resyncIndex);
+                }
             }
 
             return genericTypes;
diff --git a/src/System.Management.Automation/engine/parser/ast.cs b/src/System.Management.Automation/engine/parser/ast.cs
index 8671f3c58f2..bb817ec3d78 100644
--- a/src/System.Management.Automation/engine/parser/ast.cs
+++ b/src/System.Management.Automation/engine/parser/ast.cs
@@ -8012,16 +8012,10 @@ public class MemberExpressionAst : ExpressionAst, ISupportsAssignment
         /// <param name="static">True if the '::' operator was used, false if '.' is used.
         /// True if the member access is for a static member, using '::', false if accessing a member on an instance using '.'.
         /// </param>
-        /// <param name="genericTypes">The generic type arguments passed to the member.</param>
         /// <exception cref="PSArgumentNullException">
         /// If <paramref name="extent"/>, <paramref name="expression"/>, or <paramref name="member"/> is null.
         /// </exception>
-        public MemberExpressionAst(
-            IScriptExtent extent,
-            ExpressionAst expression,
-            CommandElementAst member,
-            bool @static,
-            IList<ITypeName> genericTypes)
+        public MemberExpressionAst(IScriptExtent extent, ExpressionAst expression, CommandElementAst member, bool @static)
             : base(extent)
         {
             if (expression == null || member == null)
@@ -8034,35 +8028,6 @@ public MemberExpressionAst(
             this.Member = member;
             SetParent(member);
             this.Static = @static;
-
-            if (genericTypes is not null && genericTypes.Count > 0)
-            {
-                this.GenericTypeArguments = new ReadOnlyCollection<ITypeName>(genericTypes);
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemberExpressionAst"/> class.
-        /// </summary>
-        /// <param name="extent">
-        /// The extent of the expression, starting with the expression before the operator '.' or '::' and ending after
-        /// membername or expression naming the member.
-        /// </param>
-        /// <param name="expression">The expression before the member access operator '.' or '::'.</param>
-        /// <param name="member">The name or expression naming the member to access.</param>
-        /// <param name="static">True if the '::' operator was used, false if '.' is used.
-        /// True if the member access is for a static member, using '::', false if accessing a member on an instance using '.'.
-        /// </param>
-        /// <exception cref="PSArgumentNullException">
-        /// If <paramref name="extent"/>, <paramref name="expression"/>, or <paramref name="member"/> is null.
-        /// </exception>
-        public MemberExpressionAst(
-            IScriptExtent extent,
-            ExpressionAst expression,
-            CommandElementAst member,
-            bool @static)
-            : this(extent, expression, member, @static, genericTypes: null)
-        {
         }
 
         /// <summary>
@@ -8076,46 +8041,15 @@ public MemberExpressionAst(
         /// <param name="member">The name or expression naming the member to access.</param>
         /// <param name="static">True if the '::' operator was used, false if '.' or '?.' is used.</param>
         /// <param name="nullConditional">True if '?.' used.</param>
-        /// <param name="genericTypes">The generic type arguments passed to the member.</param>
         /// <exception cref="PSArgumentNullException">
         /// If <paramref name="extent"/>, <paramref name="expression"/>, or <paramref name="member"/> is null.
         /// </exception>
-        public MemberExpressionAst(
-            IScriptExtent extent,
-            ExpressionAst expression,
-            CommandElementAst member,
-            bool @static,
-            bool nullConditional,
-            IList<ITypeName> genericTypes)
-            : this(extent, expression, member, @static, genericTypes)
+        public MemberExpressionAst(IScriptExtent extent, ExpressionAst expression, CommandElementAst member, bool @static, bool nullConditional)
+            : this(extent, expression, member, @static)
         {
             this.NullConditional = nullConditional;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemberExpressionAst"/> class.
-        /// </summary>
-        /// <param name="extent">
-        /// The extent of the expression, starting with the expression before the operator '.', '::' or '?.' and ending after
-        /// membername or expression naming the member.
-        /// </param>
-        /// <param name="expression">The expression before the member access operator '.', '::' or '?.'.</param>
-        /// <param name="member">The name or expression naming the member to access.</param>
-        /// <param name="static">True if the '::' operator was used, false if '.' or '?.' is used.</param>
-        /// <param name="nullConditional">True if '?.' used.</param>
-        /// <exception cref="PSArgumentNullException">
-        /// If <paramref name="extent"/>, <paramref name="expression"/>, or <paramref name="member"/> is null.
-        /// </exception>
-        public MemberExpressionAst(
-            IScriptExtent extent,
-            ExpressionAst expression,
-            CommandElementAst member,
-            bool @static,
-            bool nullConditional)
-            : this(extent, expression, member, @static, nullConditional, genericTypes: null)
-        {
-        }
-
         /// <summary>
         /// The expression that produces the value to retrieve the member from.  This property is never null.
         /// </summary>
@@ -8136,11 +8070,6 @@ public MemberExpressionAst(
         /// </summary>
         public bool NullConditional { get; protected set; }
 
-        /// <summary>
-        /// Gets a list of generic type arguments passed to this member.
-        /// </summary>
-        public ReadOnlyCollection<ITypeName> GenericTypeArguments { get; }
-
         /// <summary>
         /// Copy the MemberExpressionAst instance.
         /// </summary>
@@ -8154,8 +8083,7 @@ public override Ast Copy()
                 newExpression,
                 newMember,
                 this.Static,
-                this.NullConditional,
-                this.GenericTypeArguments);
+                this.NullConditional);
         }
 
         #region Visitors
@@ -8214,13 +8142,18 @@ public InvokeMemberExpressionAst(
             IEnumerable<ExpressionAst> arguments,
             bool @static,
             IList<ITypeName> genericTypes)
-            : base(extent, expression, method, @static, genericTypes)
+            : base(extent, expression, method, @static)
         {
             if (arguments != null && arguments.Any())
             {
                 this.Arguments = new ReadOnlyCollection<ExpressionAst>(arguments.ToArray());
                 SetParents(Arguments);
             }
+
+            if (genericTypes != null && genericTypes.Count > 0)
+            {
+                this.GenericTypeArguments = new ReadOnlyCollection<ITypeName>(genericTypes);
+            }
         }
 
         /// <summary>
@@ -8308,6 +8241,11 @@ public InvokeMemberExpressionAst(
         {
         }
 
+        /// <summary>
+        /// Gets a list of generic type arguments passed to this method invocation.
+        /// </summary>
+        public ReadOnlyCollection<ITypeName> GenericTypeArguments { get; }
+
         /// <summary>
         /// The non-empty collection of arguments to pass when invoking the method, or null if no arguments were specified.
         /// </summary>
diff --git a/test/powershell/Language/Parser/MethodInvocation.Tests.ps1 b/test/powershell/Language/Parser/MethodInvocation.Tests.ps1
index e60f8a2b148..ca4db39bd66 100644
--- a/test/powershell/Language/Parser/MethodInvocation.Tests.ps1
+++ b/test/powershell/Language/Parser/MethodInvocation.Tests.ps1
@@ -13,9 +13,40 @@ Describe 'Generic Method invocation' -Tags 'CI' {
                 Script       = '[Array]::Empty[System.Collections.Generic.Dictionary[System.Numerics.BigInteger, System.Collections.Generic.List[string[,]]]]()'
                 ExpectedType = [System.Collections.Generic.Dictionary[System.Numerics.BigInteger, System.Collections.Generic.List[string[, ]]][]]
             }
+        )
+
+        $IndexingAProperty = @(
             @{
-                Script       = '[Array]::$("Empty")[[System.Collections.Generic.Dictionary`2[[System.String, System.Private.CoreLib],[System.Numerics.BigInteger, System.Runtime.Numerics]], System.Private.CoreLib]]()'
-                ExpectedType = [System.Collections.Generic.Dictionary`2[[System.String, System.Private.CoreLib], [System.Numerics.BigInteger, System.Runtime.Numerics]][], System.Private.CoreLib]
+                Script       = '[object]::Property[[type]]'
+                IndexType    = 'System.Management.Automation.Language.TypeExpressionAst'
+                IndexString  = '[type]'
+            }
+            @{
+                Script       = '$object.IPSubnet[[Array]::IndexOf($_.IPAddress, $_.IPAddress[0])]'
+                IndexType    = 'System.Management.Automation.Language.InvokeMemberExpressionAst'
+                IndexString  = '[Array]::IndexOf($_.IPAddress, $_.IPAddress[0])'
+            }
+            @{
+                Script       = @'
+                    [IPAddress]::Parse(
+                        $_.IPSubnet[
+                            [Array]::IndexOf($_.IPAddress, $_.IPAddress[0])
+                        ]
+                    )
+'@
+                IndexType    = 'System.Management.Automation.Language.InvokeMemberExpressionAst'
+                IndexString  = '[Array]::IndexOf($_.IPAddress, $_.IPAddress[0])'
+            }
+            @{
+                Script       = @'
+                    [IPAddress]::Parse(
+                        $_.IPSubnet[
+                            ([Array]::IndexOf($_.IPAddress, $_.IPAddress[0]))
+                        ]
+                    )
+'@
+                IndexType    = 'System.Management.Automation.Language.ParenExpressionAst'
+                IndexString  = '([Array]::IndexOf($_.IPAddress, $_.IPAddress[0]))'
             }
         )
 
@@ -37,8 +68,8 @@ Describe 'Generic Method invocation' -Tags 'CI' {
             }
             @{
                 Script         = '[array]::empty[type]]()'
-                ExpectedErrors = @('UnexpectedToken', 'ExpectedExpression')
-                ErrorCount     = 2
+                ExpectedErrors = @('MissingArrayIndexExpression', 'UnexpectedToken', 'ExpectedExpression')
+                ErrorCount     = 3
             }
             @{
                 Script         = '$object.Method[type,]()'
@@ -70,6 +101,21 @@ Describe 'Generic Method invocation' -Tags 'CI' {
                 ExpectedErrors = @('EndSquareBracketExpectedAtEndOfType', 'UnexpectedToken')
                 ErrorCount     = 2
             }
+            @{
+                Script         = '$object.Method[[type]]()'
+                ExpectedErrors = @('UnexpectedToken', 'ExpectedExpression')
+                ErrorCount     = 2
+            }
+            @{
+                Script         = '[Array]::Empty[[type]]()'
+                ExpectedErrors = @('UnexpectedToken', 'ExpectedExpression')
+                ErrorCount     = 2
+            }
+            @{
+                Script         = '$object.Property[type]'
+                ExpectedErrors = @('MissingArrayIndexExpression', 'UnexpectedToken')
+                ErrorCount     = 2
+            }
         )
     }
 
@@ -79,6 +125,24 @@ Describe 'Generic Method invocation' -Tags 'CI' {
         { [scriptblock]::Create($script) } | Should -Not -Throw
     }
 
+    It "parses fine for indexing a property: <Script>" -TestCases $IndexingAProperty {
+        param($Script, $IndexType, $IndexString)
+
+        $parseErrors = $null
+
+        $ast = [System.Management.Automation.Language.Parser]::ParseInput($Script, [ref]$null, [ref]$parseErrors)
+        $parseErrors | Should -BeNullOrEmpty
+
+        $cmdExpr = $ast.EndBlock.Statements[0].PipelineElements[0]
+        $cmdExpr | Should -BeOfType 'System.Management.Automation.Language.CommandExpressionAst'
+
+        $indexExpr = $cmdExpr.Expression -is [System.Management.Automation.Language.InvokeMemberExpressionAst] ? $cmdExpr.Expression.Arguments[0] : $cmdExpr.Expression
+
+        $indexExpr | Should -BeOfType 'System.Management.Automation.Language.IndexExpressionAst'
+        $indexExpr.Index | Should -BeOfType $IndexType
+        $indexExpr.Index.ToString() | Should -BeExactly $IndexString
+    }
+
     It 'reports a parse error for "<Script>"' -TestCases $ExpectedParseErrors {
         param($Script, $ExpectedErrors, $ErrorCount)
 
@@ -164,16 +228,6 @@ Describe 'Generic Method invocation' -Tags 'CI' {
         }
     }
 
-    It 'lists the same method group information with and without type parameters' {
-        $dict = [System.Collections.Concurrent.ConcurrentDictionary[string, int]]::new()
-        $noTypeParams = $dict.AddOrUpdate
-        $typeParams = $dict.AddOrUpdate[string]
-        $extraTypeParams = $dict.AddOrUpdate[string, int]
-
-        $typeParams.OverloadDefinitions | Should -BeExactly $noTypeParams.OverloadDefinitions
-        $extraTypeParams.OverloadDefinitions | Should -BeExactly $typeParams.OverloadDefinitions
-    }
-
     It 'successfully invokes common Linq generic methods' {
         [System.Collections.Generic.List[int]]$list = @( 1, 2, 3, 4, 5 )
         $result = [System.Linq.Enumerable]::Select[int, float](

From c196e2f793a6af6666edf69d3627b356cf589646 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Fri, 4 Mar 2022 03:09:12 +0100
Subject: [PATCH 264/645] Improve Hashtable completion in multiple scenarios
 (#16498)

---
 .../CommandCompletion/CompletionAnalysis.cs   |  81 ++---
 .../CommandCompletion/CompletionCompleters.cs | 283 ++++++++++++++++--
 .../Host/TabCompletion/BugFix.Tests.ps1       |   5 +-
 .../TabCompletion/TabCompletion.Tests.ps1     |  69 +++++
 4 files changed, 368 insertions(+), 70 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index 7e3e52472c5..eaac62ba33f 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -928,6 +928,12 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
             if (result == null || result.Count == 0)
             {
                 result = GetResultForHashtable(completionContext);
+                // Handles the following scenario: [ipaddress]@{Address=""; <Tab> }
+                if (result?.Count > 0)
+                {
+                    replacementIndex = completionContext.CursorPosition.Offset;
+                    replacementLength = 0;
+                }
             }
 
             if (result == null || result.Count == 0)
@@ -950,59 +956,56 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
         // Helper method to auto complete hashtable key
         private static List<CompletionResult> GetResultForHashtable(CompletionContext completionContext)
         {
-            var lastAst = completionContext.RelatedAsts.Last();
-            HashtableAst tempHashtableAst = null;
-            IScriptPosition cursor = completionContext.CursorPosition;
-            var hashTableAst = lastAst as HashtableAst;
-            if (hashTableAst != null)
+            Ast lastRelatedAst = null;
+            var cursorPosition = completionContext.CursorPosition;
+
+            // Enumeration is used over the LastAst pattern because empty lines following a key-value pair will set LastAst to the value.
+            // Example:
+            // @{
+            //     Key1="Value1"
+            //     <Tab>
+            // }
+            // In this case the last 3 Asts will be StringConstantExpression, CommandExpression, and Pipeline instead of the expected Hashtable
+            for (int i = completionContext.RelatedAsts.Count - 1; i >= 0; i--)
+            {
+                Ast ast = completionContext.RelatedAsts[i];
+                if (cursorPosition.Offset >= ast.Extent.StartOffset && cursorPosition.Offset <= ast.Extent.EndOffset)
+                {
+                    lastRelatedAst = ast;
+                    break;
+                }
+            }
+
+            if (lastRelatedAst is HashtableAst hashtableAst)
             {
-                // Check if the cursor within the hashtable
-                if (cursor.Offset < hashTableAst.Extent.EndOffset)
+                // Cursor is just after the hashtable: @{}<Tab>
+                if (completionContext.TokenAtCursor is not null && completionContext.TokenAtCursor.Kind == TokenKind.RCurly)
                 {
-                    tempHashtableAst = hashTableAst;
+                    return null;
                 }
-                else if (cursor.Offset == hashTableAst.Extent.EndOffset)
+
+                bool cursorIsWithinOrOnSameLineAsKeypair = false;
+                foreach (var pair in hashtableAst.KeyValuePairs)
                 {
-                    // Exclude the scenario that cursor at the end of hashtable, i.e. after '}'
-                    if (completionContext.TokenAtCursor == null ||
-                        completionContext.TokenAtCursor.Kind != TokenKind.RCurly)
+                    if (cursorPosition.Offset >= pair.Item1.Extent.StartOffset
+                        && (cursorPosition.Offset <= pair.Item2.Extent.EndOffset || cursorPosition.LineNumber == pair.Item2.Extent.EndLineNumber))
                     {
-                        tempHashtableAst = hashTableAst;
+                        cursorIsWithinOrOnSameLineAsKeypair = true;
+                        break;
                     }
                 }
-            }
-            else
-            {
-                // Handle property completion on a blank line for DynamicKeyword statement
-                Ast lastChildofHashtableAst;
-                hashTableAst = Ast.GetAncestorHashtableAst(lastAst, out lastChildofHashtableAst);
 
-                // Check if the hashtable within a DynamicKeyword statement
-                if (hashTableAst != null)
+                if (cursorIsWithinOrOnSameLineAsKeypair)
                 {
-                    var keywordAst = Ast.GetAncestorAst<DynamicKeywordStatementAst>(hashTableAst);
-                    if (keywordAst != null)
+                    var tokenBeforeOrAtCursor = completionContext.TokenBeforeCursor ?? completionContext.TokenAtCursor;
+                    if (tokenBeforeOrAtCursor.Kind != TokenKind.Semi)
                     {
-                        // Handle only empty line
-                        if (string.IsNullOrWhiteSpace(cursor.Line))
-                        {
-                            // Check if the cursor outside of last child of hashtable and within the hashtable
-                            if (cursor.Offset > lastChildofHashtableAst.Extent.EndOffset &&
-                                cursor.Offset <= hashTableAst.Extent.EndOffset)
-                            {
-                                tempHashtableAst = hashTableAst;
-                            }
-                        }
+                        return null;
                     }
                 }
-            }
-
-            hashTableAst = tempHashtableAst;
-            if (hashTableAst != null)
-            {
                 completionContext.ReplacementIndex = completionContext.CursorPosition.Offset;
                 completionContext.ReplacementLength = 0;
-                return CompletionCompleters.CompleteHashtableKey(completionContext, hashTableAst);
+                return CompletionCompleters.CompleteHashtableKey(completionContext, hashtableAst);
             }
 
             return null;
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index f0157ae8b1b..b9f2ef70dba 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -2275,7 +2275,7 @@ private static void NativeCommandArgumentCompletion(
                     {
                         if (parameterName.Equals("MemberName", StringComparison.OrdinalIgnoreCase))
                         {
-                            NativeCompletionMemberName(context, result, commandAst);
+                            NativeCompletionMemberName(context, result, commandAst, boundArguments?[parameterName]);
                         }
 
                         break;
@@ -2287,7 +2287,7 @@ private static void NativeCommandArgumentCompletion(
                     {
                         if (parameterName.Equals("Property", StringComparison.OrdinalIgnoreCase))
                         {
-                            NativeCompletionMemberName(context, result, commandAst);
+                            NativeCompletionMemberName(context, result, commandAst, boundArguments?[parameterName]);
                         }
 
                         break;
@@ -2299,7 +2299,7 @@ private static void NativeCommandArgumentCompletion(
                     {
                         if (parameterName.Equals("Property", StringComparison.OrdinalIgnoreCase))
                         {
-                            NativeCompletionMemberName(context, result, commandAst);
+                            NativeCompletionMemberName(context, result, commandAst, boundArguments?[parameterName]);
                         }
                         else if (parameterName.Equals("View", StringComparison.OrdinalIgnoreCase))
                         {
@@ -2314,7 +2314,7 @@ private static void NativeCommandArgumentCompletion(
                          || parameterName.Equals("ExcludeProperty", StringComparison.OrdinalIgnoreCase)
                          || parameterName.Equals("ExpandProperty", StringComparison.OrdinalIgnoreCase))
                         {
-                            NativeCompletionMemberName(context, result, commandAst);
+                            NativeCompletionMemberName(context, result, commandAst, boundArguments?[parameterName]);
                         }
 
                         break;
@@ -2336,8 +2336,22 @@ private static void NativeCommandArgumentCompletion(
                 case "Invoke-CimMethod":
                 case "New-CimInstance":
                 case "Register-CimIndicationEvent":
+                case "Set-CimInstance":
                     {
-                        NativeCompletionCimCommands(parameterName, boundArguments, result, commandAst, context);
+                        // Avoids completion for parameters that expect a hashtable.
+                        if (parameterName.Equals("Arguments", StringComparison.OrdinalIgnoreCase)
+                            || (parameterName.Equals("Property", StringComparison.OrdinalIgnoreCase) && !commandName.Equals("Get-CimInstance")))
+                        {
+                            break;
+                        }
+
+                        HashSet<string> excludedValues = null;
+                        if (parameterName.Equals("Property", StringComparison.OrdinalIgnoreCase) && boundArguments["Property"] is AstPair pair)
+                        {
+                            excludedValues = GetParameterValues(pair, context.CursorPosition.Offset);
+                        }
+
+                        NativeCompletionCimCommands(parameterName, boundArguments, result, commandAst, context, excludedValues, commandName);
                         break;
                     }
 
@@ -2508,7 +2522,9 @@ private static void NativeCompletionCimCommands(
             Dictionary<string, AstParameterArgumentPair> boundArguments,
             List<CompletionResult> result,
             CommandAst commandAst,
-            CompletionContext context)
+            CompletionContext context,
+            HashSet<string> excludedValues,
+            string commandName)
         {
             if (boundArguments != null)
             {
@@ -2529,6 +2545,7 @@ private static void NativeCompletionCimCommands(
                 }
             }
 
+            RemoveLastNullCompletionResult(result);
             if (parameter.Equals("Namespace", StringComparison.OrdinalIgnoreCase))
             {
                 NativeCompletionCimNamespace(result, context);
@@ -2574,6 +2591,16 @@ private static void NativeCompletionCimCommands(
                         {
                             NativeCompletionCimMethodName(pseudoboundCimNamespace, pseudoboundClassName, !gotInstance, result, context);
                         }
+                        else if (parameter.Equals("Arguments", StringComparison.OrdinalIgnoreCase))
+                        {
+                            string pseudoboundMethodName = NativeCommandArgumentCompletion_ExtractSecondaryArgument(boundArguments, "MethodName").FirstOrDefault();
+                            NativeCompletionCimMethodArgumentName(pseudoboundCimNamespace, pseudoboundClassName, pseudoboundMethodName, excludedValues, result, context);
+                        }
+                        else if (parameter.Equals("Property", StringComparison.OrdinalIgnoreCase))
+                        {
+                            bool includeReadOnly = !commandName.Equals("Set-CimInstance", StringComparison.OrdinalIgnoreCase);
+                            NativeCompletionCimPropertyName(pseudoboundCimNamespace, pseudoboundClassName, includeReadOnly, excludedValues, result, context);
+                        }
                     }
                 }
 
@@ -2716,6 +2743,82 @@ private static void NativeCompletionCimMethodName(
             result.AddRange(localResults.OrderBy(static x => x.ListItemText, StringComparer.OrdinalIgnoreCase));
         }
 
+        private static void NativeCompletionCimMethodArgumentName(
+            string pseudoboundNamespace,
+            string pseudoboundClassName,
+            string pseudoboundMethodName,
+            HashSet<string> excludedParameters,
+            List<CompletionResult> result,
+            CompletionContext context)
+        {
+            if (string.IsNullOrWhiteSpace(pseudoboundClassName) || string.IsNullOrWhiteSpace(pseudoboundMethodName))
+            {
+                return;
+            }
+
+            CimClass cimClass;
+            using (var cimSession = CimSession.Create(null))
+            {
+                using var options = new CimOperationOptions();
+                options.Flags |= CimOperationFlags.LocalizedQualifiers;
+                cimClass = cimSession.GetClass(pseudoboundNamespace ?? "root/cimv2", pseudoboundClassName, options);
+            }
+
+            var methodParameters = cimClass.CimClassMethods[pseudoboundMethodName]?.Parameters;
+            if (methodParameters is null)
+            {
+                return;
+            }
+
+            foreach (var parameter in methodParameters)
+            {
+                if ((string.IsNullOrEmpty(context.WordToComplete) || parameter.Name.StartsWith(context.WordToComplete, StringComparison.OrdinalIgnoreCase))
+                        && (excludedParameters is null || !excludedParameters.Contains(parameter.Name))
+                        && parameter.Qualifiers["In"]?.Value is true)
+                {
+                    string parameterDescription = parameter.Qualifiers["Description"]?.Value as string ?? string.Empty;
+                    string toolTip = $"[{CimInstanceAdapter.CimTypeToTypeNameDisplayString(parameter.CimType)}] {parameterDescription}";
+                    result.Add(new CompletionResult(parameter.Name, parameter.Name, CompletionResultType.Property, toolTip));
+                }
+            }
+        }
+
+        private static void NativeCompletionCimPropertyName(
+            string pseudoboundNamespace,
+            string pseudoboundClassName,
+            bool includeReadOnly,
+            HashSet<string> excludedProperties,
+            List<CompletionResult> result,
+            CompletionContext context)
+        {
+            if (string.IsNullOrWhiteSpace(pseudoboundClassName))
+            {
+                return;
+            }
+
+            CimClass cimClass;
+            using (var cimSession = CimSession.Create(null))
+            {
+                using var options = new CimOperationOptions();
+                options.Flags |= CimOperationFlags.LocalizedQualifiers;
+                cimClass = cimSession.GetClass(pseudoboundNamespace ?? "root/cimv2", pseudoboundClassName, options);
+            }
+
+            foreach (var property in cimClass.CimClassProperties)
+            {
+                bool isReadOnly = (property.Flags & CimFlags.ReadOnly) != 0;
+                if ((!isReadOnly || (isReadOnly && includeReadOnly))
+                    && (string.IsNullOrEmpty(context.WordToComplete) || property.Name.StartsWith(context.WordToComplete, StringComparison.OrdinalIgnoreCase))
+                    && (excludedProperties is null || !excludedProperties.Contains(property.Name)))
+                {
+                    string propertyDescription = property.Qualifiers["Description"]?.Value as string ?? string.Empty;
+                    string accessString = isReadOnly ? "{ get; }" : "{ get; set; }";
+                    string toolTip = $"[{CimInstanceAdapter.CimTypeToTypeNameDisplayString(property.CimType)}] {accessString} {propertyDescription}";
+                    result.Add(new CompletionResult(property.Name, property.Name, CompletionResultType.Property, toolTip));
+                }
+            }
+        }
+
         private static readonly ConcurrentDictionary<string, IEnumerable<string>> s_cimNamespaceToClassNames =
             new ConcurrentDictionary<string, IEnumerable<string>>(StringComparer.OrdinalIgnoreCase);
 
@@ -3845,17 +3948,38 @@ private static IEnumerable<PSTypeName> GetInferenceTypes(CompletionContext conte
             return prevType;
         }
 
-        private static void NativeCompletionMemberName(CompletionContext context, List<CompletionResult> result, CommandAst commandAst)
+        private static void NativeCompletionMemberName(CompletionContext context, List<CompletionResult> result, CommandAst commandAst, AstParameterArgumentPair parameterInfo)
         {
             IEnumerable<PSTypeName> prevType = GetInferenceTypes(context, commandAst);
             if (prevType is not null)
             {
-                CompleteMemberByInferredType(context.TypeInferenceContext, prevType, result, context.WordToComplete + "*", filter: IsPropertyMember, isStatic: false);
+                HashSet<string> excludedMembers = null;
+                if (parameterInfo is AstPair pair)
+                {
+                    excludedMembers = GetParameterValues(pair, context.CursorPosition.Offset);
+                }
+
+                CompleteMemberByInferredType(context.TypeInferenceContext, prevType, result, context.WordToComplete + "*", filter: IsPropertyMember, isStatic: false, excludedMembers);
             }
 
             result.Add(CompletionResult.Null);
         }
 
+        /// <summary>
+        /// Returns all string values bound to a parameter except the one the cursor is currently at.
+        /// </summary>
+        private static HashSet<string>GetParameterValues(AstPair parameter, int cursorOffset)
+        {
+            var result = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            var parameterValues = parameter.Argument.FindAll(ast => !(cursorOffset >= ast.Extent.StartOffset && cursorOffset <= ast.Extent.EndOffset) && ast is StringConstantExpressionAst, searchNestedScriptBlocks: false);
+            foreach (Ast ast in parameterValues)
+            {
+                result.Add(ast.Extent.Text);
+            }
+
+            return result;
+        }
+
         private static void NativeCompletionFormatViewName(
             CompletionContext context,
             Dictionary<string, AstParameterArgumentPair> boundArguments,
@@ -5798,7 +5922,7 @@ private static void CompleteFormatViewByInferredType(CompletionContext context,
             }
         }
 
-        internal static void CompleteMemberByInferredType(TypeInferenceContext context, IEnumerable<PSTypeName> inferredTypes, List<CompletionResult> results, string memberName, Func<object, bool> filter, bool isStatic)
+        internal static void CompleteMemberByInferredType(TypeInferenceContext context, IEnumerable<PSTypeName> inferredTypes, List<CompletionResult> results, string memberName, Func<object, bool> filter, bool isStatic, HashSet<string> excludedMembers = null)
         {
             bool extensionMethodsAdded = false;
             HashSet<string> typeNameUsed = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
@@ -5814,7 +5938,7 @@ internal static void CompleteMemberByInferredType(TypeInferenceContext context,
                 var members = context.GetMembersByInferredType(psTypeName, isStatic, filter);
                 foreach (var member in members)
                 {
-                    AddInferredMember(member, memberNamePattern, results);
+                    AddInferredMember(member, memberNamePattern, results, excludedMembers);
                 }
 
                 // Check if we need to complete against the extension methods 'Where' and 'ForEach'
@@ -5841,7 +5965,7 @@ internal static void CompleteMemberByInferredType(TypeInferenceContext context,
             }
         }
 
-        private static void AddInferredMember(object member, WildcardPattern memberNamePattern, List<CompletionResult> results)
+        private static void AddInferredMember(object member, WildcardPattern memberNamePattern, List<CompletionResult> results, HashSet<string> excludedMembers)
         {
             string memberName = null;
             bool isMethod = false;
@@ -5894,7 +6018,7 @@ private static void AddInferredMember(object member, WildcardPattern memberNameP
                 getToolTip = memberAst.GetTooltip;
             }
 
-            if (memberName == null || !memberNamePattern.IsMatch(memberName))
+            if (memberName == null || !memberNamePattern.IsMatch(memberName) || (excludedMembers is not null && excludedMembers.Contains(memberName)))
             {
                 return;
             }
@@ -6815,13 +6939,25 @@ internal static List<CompletionResult> CompleteHashtableKeyForDynamicKeyword(
 
         internal static List<CompletionResult> CompleteHashtableKey(CompletionContext completionContext, HashtableAst hashtableAst)
         {
+            int cursorOffset = completionContext.CursorPosition.Offset;
+            string wordToComplete = completionContext.WordToComplete;
+            var excludedKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            foreach (var keyPair in hashtableAst.KeyValuePairs)
+            {
+                // Exclude all existing keys, except the key the cursor is currently at
+                if (!(cursorOffset >= keyPair.Item1.Extent.StartOffset && cursorOffset <= keyPair.Item1.Extent.EndOffset))
+                {
+                    excludedKeys.Add(keyPair.Item1.Extent.Text);
+                }
+            }
+
             var typeAst = hashtableAst.Parent as ConvertExpressionAst;
             if (typeAst != null)
             {
                 var result = new List<CompletionResult>();
                 CompleteMemberByInferredType(
                     completionContext.TypeInferenceContext, AstTypeInference.InferTypeOf(typeAst, completionContext.TypeInferenceContext, TypeInferenceRuntimePermissions.AllowSafeEval),
-                    result, completionContext.WordToComplete + "*", IsWriteablePropertyMember, isStatic: false);
+                    result, wordToComplete + "*", IsWriteablePropertyMember, isStatic: false, excludedKeys);
                 return result;
             }
 
@@ -6921,7 +7057,7 @@ internal static List<CompletionResult> CompleteHashtableKey(CompletionContext co
                             case "Format-List":
                             case "Format-Wide":
                             case "Format-Custom":
-                                return GetSpecialHashTableKeyMembers("Expression", "FormatString", "Label");
+                                return GetSpecialHashTableKeyMembers(excludedKeys, wordToComplete, "Expression", "FormatString", "Label");
                         }
 
                         return null;
@@ -6936,37 +7072,128 @@ internal static List<CompletionResult> CompleteHashtableKey(CompletionContext co
                                 var result = new List<CompletionResult>();
                                 CompleteMemberByInferredType(
                                     completionContext.TypeInferenceContext, inferredType,
-                                    result, completionContext.WordToComplete + "*", IsWriteablePropertyMember, isStatic: false);
+                                    result, completionContext.WordToComplete + "*", IsWriteablePropertyMember, isStatic: false, excludedKeys);
                                 return result;
                             case "Select-Object":
-                                return GetSpecialHashTableKeyMembers("Name", "Expression");
+                                return GetSpecialHashTableKeyMembers(excludedKeys, wordToComplete, "Name", "Expression");
                             case "Sort-Object":
-                                return GetSpecialHashTableKeyMembers("Expression", "Ascending", "Descending");
+                                return GetSpecialHashTableKeyMembers(excludedKeys, wordToComplete, "Expression", "Ascending", "Descending");
                             case "Group-Object":
-                                return GetSpecialHashTableKeyMembers("Expression");
+                                return GetSpecialHashTableKeyMembers(excludedKeys, wordToComplete, "Expression");
                             case "Format-Table":
-                                return GetSpecialHashTableKeyMembers("Expression", "FormatString", "Label", "Width", "Alignment");
+                                return GetSpecialHashTableKeyMembers(excludedKeys, wordToComplete, "Expression", "FormatString", "Label", "Width", "Alignment");
                             case "Format-List":
-                                return GetSpecialHashTableKeyMembers("Expression", "FormatString", "Label");
+                                return GetSpecialHashTableKeyMembers(excludedKeys, wordToComplete, "Expression", "FormatString", "Label");
                             case "Format-Wide":
-                                return GetSpecialHashTableKeyMembers("Expression", "FormatString");
+                                return GetSpecialHashTableKeyMembers(excludedKeys, wordToComplete, "Expression", "FormatString");
                             case "Format-Custom":
-                                return GetSpecialHashTableKeyMembers("Expression", "Depth");
+                                return GetSpecialHashTableKeyMembers(excludedKeys, wordToComplete, "Expression", "Depth");
+                            case "Set-CimInstance":
+                            case "New-CimInstance":
+                                var results = new List<CompletionResult>();
+                                NativeCompletionCimCommands(parameterName, binding.BoundArguments, results, commandAst, completionContext, excludedKeys, binding.CommandName);
+                                // this method adds a null CompletionResult to the list but we don't want that here.
+                                if (results.Count > 1)
+                                {
+                                    results.RemoveAt(results.Count - 1);
+                                    return results;
+                                }
+
+                                return null;
+                        }
+                    }
+
+                    if (parameterName.Equals("FilterHashtable", StringComparison.OrdinalIgnoreCase))
+                    {
+                        switch (binding.CommandName)
+                        {
+                            case "Get-WinEvent":
+                                return GetSpecialHashTableKeyMembers(excludedKeys, wordToComplete, "LogName", "ProviderName", "Path", "Keywords", "ID", "Level", 
+                                    "StartTime", "EndTime", "UserID", "Data", "SuppressHashFilter");
+                        }
+                    }
+
+                    if (parameterName.Equals("Arguments", StringComparison.OrdinalIgnoreCase))
+                    {
+                        switch (binding.CommandName)
+                        {
+                            case "Invoke-CimMethod":
+                                var result = new List<CompletionResult>();
+                                NativeCompletionCimCommands(parameterName, binding.BoundArguments, result, commandAst, completionContext, excludedKeys, binding.CommandName);
+                                // this method adds a null CompletionResult to the list but we don't want that here.
+                                if (result.Count > 1)
+                                {
+                                    result.RemoveAt(result.Count - 1);
+                                    return result;
+                                }
+
+                                return null;
                         }
                     }
                 }
             }
 
+            if (ast.Parent is AssignmentStatementAst assignment && assignment.Left is VariableExpressionAst assignmentVar)
+            {
+                var firstSplatUse = completionContext.RelatedAsts[0].Find(
+                    currentAst =>
+                        currentAst.Extent.StartOffset > hashtableAst.Extent.EndOffset
+                        && currentAst is VariableExpressionAst splatVar
+                        && splatVar.Splatted
+                        && splatVar.VariablePath.UserPath.Equals(assignmentVar.VariablePath.UserPath, StringComparison.OrdinalIgnoreCase),
+                    searchNestedScriptBlocks: true) as VariableExpressionAst;
+
+                if (firstSplatUse is not null && firstSplatUse.Parent is CommandAst command)
+                {
+                    var binding = new PseudoParameterBinder()
+                        .DoPseudoParameterBinding(
+                            command,
+                            pipeArgumentType: null,
+                            paramAstAtCursor: null,
+                            PseudoParameterBinder.BindingType.ParameterCompletion);
+
+                    if (binding is null)
+                    {
+                        return null;
+                    }
+
+                    var results = new List<CompletionResult>();
+                    foreach (var parameter in binding.UnboundParameters)
+                    {
+                        if (!excludedKeys.Contains(parameter.Parameter.Name)
+                            && (wordToComplete is null || parameter.Parameter.Name.StartsWith(wordToComplete, StringComparison.OrdinalIgnoreCase)))
+                        {
+                            results.Add(new CompletionResult(parameter.Parameter.Name, parameter.Parameter.Name, CompletionResultType.ParameterName, $"[{parameter.Parameter.Type.Name}]"));
+                        }
+                    }
+
+                    if (results.Count > 0)
+                    {
+                        return results;
+                    }
+                }
+            }
+
             return null;
         }
 
-        private static List<CompletionResult> GetSpecialHashTableKeyMembers(params string[] keys)
+        private static List<CompletionResult> GetSpecialHashTableKeyMembers(HashSet<string> excludedKeys, string wordToComplete, params string[] keys)
         {
-            // Resources were removed because they missed the deadline for loc.
-            // return keys.Select(key => new CompletionResult(key, key, CompletionResultType.Property,
-            //    ResourceManagerCache.GetResourceString(typeof(CompletionCompleters).Assembly,
-            //                                           "TabCompletionStrings", key + "HashKeyDescription"))).ToList();
-            return keys.Select(static key => new CompletionResult(key, key, CompletionResultType.Property, key)).ToList();
+            var result = new List<CompletionResult>();
+            foreach (string key in keys)
+            {
+                if ((string.IsNullOrEmpty(wordToComplete) || key.StartsWith(wordToComplete, StringComparison.OrdinalIgnoreCase)) && !excludedKeys.Contains(key))
+                {
+                    result.Add(new CompletionResult(key, key, CompletionResultType.Property, key));
+                }
+            }
+
+            if (result.Count == 0)
+            {
+                return null;
+            }
+
+            return result;
         }
 
         #endregion Hashtable Keys
diff --git a/test/powershell/Host/TabCompletion/BugFix.Tests.ps1 b/test/powershell/Host/TabCompletion/BugFix.Tests.ps1
index 78be093a5bb..3cc44f3c0e1 100644
--- a/test/powershell/Host/TabCompletion/BugFix.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/BugFix.Tests.ps1
@@ -85,8 +85,7 @@ Describe "Tab completion bug fix" -Tags "CI" {
         $result.CurrentMatchIndex | Should -Be -1
         $result.ReplacementIndex | Should -Be 40
         $result.ReplacementLength | Should -Be 0
-        $result.CompletionMatches[0].CompletionText | Should -BeExactly 'Expression'
-        $result.CompletionMatches[1].CompletionText | Should -BeExactly 'Ascending'
-        $result.CompletionMatches[2].CompletionText | Should -BeExactly 'Descending'
+        $result.CompletionMatches[0].CompletionText | Should -BeExactly 'Ascending'
+        $result.CompletionMatches[1].CompletionText | Should -BeExactly 'Descending'
     }
 }
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index e05ba3352bf..31d1aa5d10e 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -144,6 +144,50 @@ Describe "TabCompletion" -Tags CI {
         $res.CompletionMatches | Should -HaveCount 3
         $res.CompletionMatches.CompletionText -join ' ' | Should -BeExactly 'A B C'
     }
+    It 'Complete hashtable key without duplicate keys' {
+        class X {
+            $A
+            $B
+            $C
+        }
+        $TestString = '[x]@{A="";^}'
+        $CursorIndex = $TestString.IndexOf('^')
+        $res = TabExpansion2 -inputScript $TestString.Remove($CursorIndex, 1) -cursorColumn $CursorIndex
+        $res.CompletionMatches | Should -HaveCount 2
+        $res.CompletionMatches.CompletionText -join ' ' | Should -BeExactly 'B C'
+    }
+    It 'Complete hashtable key on empty line after key/value pair' {
+        class X {
+            $A
+            $B
+            $C
+        }
+        $TestString = @'
+[x]@{
+    B=""
+    ^
+}
+'@
+        $CursorIndex = $TestString.IndexOf('^')
+        $res = TabExpansion2 -inputScript $TestString.Remove($CursorIndex, 1) -cursorColumn $CursorIndex
+        $res.CompletionMatches | Should -HaveCount 2
+        $res.CompletionMatches.CompletionText -join ' ' | Should -BeExactly 'A C'
+    }
+
+    It 'Complete hashtable keys for Get-WinEvent FilterHashtable' -Skip:(!$IsWindows) {
+        $TestString = 'Get-WinEvent -FilterHashtable @{^'
+        $CursorIndex = $TestString.IndexOf('^')
+        $res = TabExpansion2 -inputScript $TestString.Remove($CursorIndex, 1) -cursorColumn $CursorIndex
+        $res.CompletionMatches | Should -HaveCount 11
+        $res.CompletionMatches.CompletionText -join ' ' | Should -BeExactly 'LogName ProviderName Path Keywords ID Level StartTime EndTime UserID Data SuppressHashFilter'
+    }
+
+    It 'Complete hashtable keys for a hashtable used for splatting' {
+        $TestString = '$GetChildItemParams=@{^};Get-ChildItem @GetChildItemParams -Force -Recurse'
+        $CursorIndex = $TestString.IndexOf('^')
+        $res = TabExpansion2 -inputScript $TestString.Remove($CursorIndex, 1) -cursorColumn $CursorIndex
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Path'
+    }
 
     It 'Should complete "Get-Process -Id " with Id and name in tooltip' {
         Set-StrictMode -Version 3.0
@@ -1179,6 +1223,12 @@ dir -Recurse `
             $res.CompletionMatches | Should -HaveCount 2
             [string]::Join(',', ($res.CompletionMatches.completiontext | Sort-Object)) | Should -BeExactly "1.0,1.1"
         }
+        
+        It 'Should complete Select-Object properties without duplicates' {
+            $res = TabExpansion2 -inputScript '$PSVersionTable | Select-Object -Property Count,'
+            $res.CompletionMatches.CompletionText | Should -Not -Contain "Count"
+        }
+        
         It '<Intent>' -TestCases @(
             @{
                 Intent = 'Complete loop labels with no input'
@@ -1537,6 +1587,18 @@ dir -Recurse `
                 @{ inputStr = '[Microsoft.Management.Infrastructure.CimClass]$c = $null; $c.CimClassNam'; expected = 'CimClassName' }
                 @{ inputStr = '[Microsoft.Management.Infrastructure.CimClass]$c = $null; $c.CimClassName.Substrin'; expected = 'Substring(' }
                 @{ inputStr = 'Get-CimInstance -ClassName Win32_Process | %{ $_.ExecutableP'; expected = 'ExecutablePath' }
+                @{ inputStr = 'Get-CimInstance -ClassName Win32_Process | Invoke-CimMethod -MethodName SetPriority -Arguments @{'; expected = 'Priority' }
+                @{ inputStr = 'Get-CimInstance -ClassName Win32_Service | Invoke-CimMethod -MethodName Change -Arguments @{d'; expected = 'DesktopInteract' }
+                @{ inputStr = 'Invoke-CimMethod -ClassName Win32_Process -MethodName Create -Arguments @{'; expected = 'CommandLine' }
+                @{ inputStr = 'New-CimInstance Win32_Environment -Property @{'; expected = 'Caption' }
+                @{ inputStr = 'Get-CimInstance Win32_Environment | Set-CimInstance -Property @{'; expected = 'Name' }
+                @{ inputStr = 'Set-CimInstance -Namespace root/CIMV'; expected = 'root/CIMV2' }
+                @{ inputStr = 'Get-CimInstance Win32_Process -Property '; expected = 'Caption' }
+                @{ inputStr = 'Get-CimInstance Win32_Process -Property Caption,'; expected = 'Description' }
+            )
+            $FailCases = @(
+                @{ inputStr = "Invoke-CimMethod -ClassName Win32_Process -MethodName Create -Arguments " }
+                @{ inputStr = "New-CimInstance Win32_Process -Property " }
             )
         }
 
@@ -1547,6 +1609,13 @@ dir -Recurse `
             $res.CompletionMatches.Count | Should -BeGreaterThan 0
             $res.CompletionMatches[0].CompletionText | Should -Be $expected
         }
+
+        It "CIM cmdlet input '<inputStr>' should not successfully complete" -TestCases $FailCases -Skip:(!$IsWindows) {
+            param($inputStr)
+
+            $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length
+            $res.CompletionMatches[0].ResultType | should -Not -Be 'Property'
+        }
     }
 
     Context "Module cmdlet completion tests" {

From 4711eb570e45ffd161ff50fc7d474816875abc99 Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Fri, 4 Mar 2022 13:48:42 -0800
Subject: [PATCH 265/645] Roll back windows images used in testing to Windows
 Server 2019 (#16958)

---
 .vsts-ci/templates/windows-test.yml | 2 +-
 .vsts-ci/windows-daily.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/templates/windows-test.yml b/.vsts-ci/templates/windows-test.yml
index 475c40c665c..2e5d5b67e24 100644
--- a/.vsts-ci/templates/windows-test.yml
+++ b/.vsts-ci/templates/windows-test.yml
@@ -1,5 +1,5 @@
 parameters:
-  pool: 'windows-latest'
+  pool: 'windows-2019'
   parentJobs: []
   purpose: ''
   tagSet: 'CI'
diff --git a/.vsts-ci/windows-daily.yml b/.vsts-ci/windows-daily.yml
index 55470e6dd53..15d1a82fc3f 100644
--- a/.vsts-ci/windows-daily.yml
+++ b/.vsts-ci/windows-daily.yml
@@ -53,7 +53,7 @@ stages:
   jobs:
   - job: win_test
     pool:
-      vmImage: windows-latest
+      vmImage: windows-2019
     displayName: Windows Test
     timeoutInMinutes: 90
 

From a3c4a163ffa34645c39031963c78ddfd00a373eb Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 4 Mar 2022 15:01:18 -0800
Subject: [PATCH 266/645] Allow the `PSGetMemberBinder` to get value of `ByRef`
 property (#16956)

---
 .../engine/parser/Compiler.cs                  |  3 +++
 .../engine/runtime/Binding/Binders.cs          | 12 +++++++++++-
 .../engine/runtime/Operations/MiscOps.cs       | 11 +++++++++++
 .../Language/Scripting/Adapter.Tests.ps1       | 18 ++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index 0a68cb7951f..7550a81d459 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -252,6 +252,9 @@ internal static class CachedReflectionInfo
                 new Type[] { typeof(int), typeof(IEqualityComparer) },
                 null);
 
+        internal static readonly MethodInfo ByRefOps_GetByRefPropertyValue =
+            typeof(ByRefOps).GetMethod(nameof(ByRefOps.GetByRefPropertyValue), StaticFlags);
+
         internal static readonly MethodInfo HashtableOps_Add =
             typeof(HashtableOps).GetMethod(nameof(HashtableOps.Add), StaticFlags);
 
diff --git a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
index 52f85e372b2..8025b116f19 100644
--- a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
+++ b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
@@ -5277,7 +5277,17 @@ public override DynamicMetaObject FallbackGetMember(DynamicMetaObject target, Dy
                                     return GenerateGetPropertyException(restrictions).WriteToDebugLog(this);
                                 }
 
-                                expr = Expression.Property(targetExpr, propertyAccessor);
+                                if (propertyAccessor.PropertyType.IsByRef)
+                                {
+                                    expr = Expression.Call(
+                                        CachedReflectionInfo.ByRefOps_GetByRefPropertyValue,
+                                        targetExpr,
+                                        Expression.Constant(propertyAccessor));
+                                }
+                                else
+                                {
+                                    expr = Expression.Property(targetExpr, propertyAccessor);
+                                }
                             }
                             else
                             {
diff --git a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
index 72a676dad1c..fdcbaf98f56 100644
--- a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
+++ b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
@@ -1321,6 +1321,17 @@ internal ScriptBlock GetScriptBlock(ExecutionContext context, bool isFilter)
         }
     }
 
+    internal static class ByRefOps
+    {
+        /// <summary>
+        /// There is no way to directly work with ByRef type in the expression tree, so we turn to reflection in this case.
+        /// </summary>
+        internal static object GetByRefPropertyValue(object target, PropertyInfo property)
+        {
+            return property.GetValue(target);
+        }
+    }
+
     internal static class HashtableOps
     {
         internal static void AddKeyValuePair(IDictionary hashtable, object key, object value, IScriptExtent errorExtent)
diff --git a/test/powershell/Language/Scripting/Adapter.Tests.ps1 b/test/powershell/Language/Scripting/Adapter.Tests.ps1
index db681192c4e..2d7a13891e5 100644
--- a/test/powershell/Language/Scripting/Adapter.Tests.ps1
+++ b/test/powershell/Language/Scripting/Adapter.Tests.ps1
@@ -108,3 +108,21 @@ Describe "Interface static members" -Tags "CI" {
         $obj.GetId() | Should -Be 100
     }
 }
+
+Describe "ByRef property" -Tags "CI" {
+
+    It "Get value from ByRef property" {
+        $list = [System.Collections.Generic.LinkedList[int]]::new()
+        $node = $list.AddLast(1)
+
+        ## Get value through language binder.
+        $node.ValueRef | Should -Be 1
+
+        ## Get value through .NET adapter.
+        $property = $node.PSObject.Properties["ValueRef"]
+        $property.IsSettable | Should -BeFalse
+        $property.IsGettable | Should -BeTrue
+        $property.TypeNameOfValue | Should -BeExactly 'System.Int32&'
+        $property.Value | Should -Be 1
+    }
+}

From 25bc64f4b05b4a38858c300864c8f902d6977cc3 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 4 Mar 2022 16:16:28 -0800
Subject: [PATCH 267/645] Allow a collection that contains `Automation.Null`
 elements to be piped to pipeline (#16957)

---
 .../engine/Pipe.cs                            | 23 +++++++++++++++----
 .../Scripting/PipelineBehaviour.Tests.ps1     | 21 +++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/System.Management.Automation/engine/Pipe.cs b/src/System.Management.Automation/engine/Pipe.cs
index 9e24c6471db..2669e41ce31 100644
--- a/src/System.Management.Automation/engine/Pipe.cs
+++ b/src/System.Management.Automation/engine/Pipe.cs
@@ -559,15 +559,28 @@ internal object Retrieve()
             else if (_enumeratorToProcess != null)
             {
                 if (_enumeratorToProcessIsEmpty)
-                    return AutomationNull.Value;
-
-                if (!ParserOps.MoveNext(_context, null, _enumeratorToProcess))
                 {
-                    _enumeratorToProcessIsEmpty = true;
                     return AutomationNull.Value;
                 }
 
-                return ParserOps.Current(null, _enumeratorToProcess);
+                while (true)
+                {
+                    if (!ParserOps.MoveNext(_context, errorPosition: null, _enumeratorToProcess))
+                    {
+                        _enumeratorToProcessIsEmpty = true;
+                        return AutomationNull.Value;
+                    }
+
+                    object retValue = ParserOps.Current(errorPosition: null, _enumeratorToProcess);
+                    if (retValue == AutomationNull.Value)
+                    {
+                        // 'AutomationNull.Value' from the enumerator won't be sent to the pipeline.
+                        // We try to get the next value in this case.
+                        continue;
+                    }
+
+                    return retValue;
+                }
             }
             else if (ExternalReader != null)
             {
diff --git a/test/powershell/Language/Scripting/PipelineBehaviour.Tests.ps1 b/test/powershell/Language/Scripting/PipelineBehaviour.Tests.ps1
index 0478492c910..04993c80a9f 100644
--- a/test/powershell/Language/Scripting/PipelineBehaviour.Tests.ps1
+++ b/test/powershell/Language/Scripting/PipelineBehaviour.Tests.ps1
@@ -602,3 +602,24 @@ Describe 'Function Pipeline Behaviour' -Tag 'CI' {
         #>
     }
 }
+
+Describe 'Other Pipeline Behaviour' -Tag 'CI' {
+    It "Array with 'Automation.Null' elements can be piped to pipeline" {
+        $automationNull = & {}
+
+        ## 'Automation.Null' elements will not be sent to the pipeline (skipped).
+        1, $automationNull, 2, $automationNull, 3, 4, 5 | ForEach-Object { $_ } | Should -Be (1..5)
+        $array = 1, $automationNull, 2, $automationNull, 3, 4, 5
+        $array.Count | Should -Be 7
+        $array | ForEach-Object { $_ } | Should -Be (1..5)
+    }
+
+    It "Automation.Null is not written to pipeline in a function" {
+        $automationNull = & {}
+
+        function MyTest { 1, $automationNull, 2, $automationNull, 3, 4, 5 }
+        $result = MyTest
+        $result.Count | Should -Be 5
+        MyTest | Should -Be (1..5)
+    }
+}

From fa03f180e753b3f0051e9f3072b3c6926b22a13e Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Sat, 12 Mar 2022 09:12:21 +0900
Subject: [PATCH 268/645] Fix a typo in `CommandHelpProvider.cs` (#16949)

non-existant -> non-existent
---
 src/System.Management.Automation/help/CommandHelpProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/help/CommandHelpProvider.cs b/src/System.Management.Automation/help/CommandHelpProvider.cs
index 2abfbeaee22..e32d1c86354 100644
--- a/src/System.Management.Automation/help/CommandHelpProvider.cs
+++ b/src/System.Management.Automation/help/CommandHelpProvider.cs
@@ -1275,7 +1275,7 @@ internal override IEnumerable<HelpInfo> ProcessForwardedHelp(HelpInfo helpInfo,
                     }
                     catch (CommandNotFoundException)
                     {
-                        // ignore errors for aliases pointing to non-existant commands
+                        // ignore errors for aliases pointing to non-existent commands
                     }
                 }
 

From 8d0830133a41db4a291aee610eb8f35b4cda7200 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 16 Mar 2022 15:55:27 -0700
Subject: [PATCH 269/645] Update `AzureFileCopy` task and fix the syntax for
 specifying `pool` (#17013)

---
 .../azureDevOps/templates/release-BuildJson.yml             | 6 +++---
 .../azureDevOps/templates/release-UpdateDepsJson.yml        | 2 +-
 tools/releaseBuild/azureDevOps/vpackRelease.yml             | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml b/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
index 05c9298d837..e5e5572eb84 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-BuildJson.yml
@@ -68,7 +68,7 @@ steps:
     }
   displayName: Download and Capture NuPkgs
 
-- task: AzureFileCopy@2
+- task: AzureFileCopy@4
   displayName: 'AzureBlob build info JSON file Copy'
   inputs:
     SourcePath: '$(BuildInfoJsonFile)'
@@ -78,7 +78,7 @@ steps:
     ContainerName: BuildInfo
   condition: and(succeeded(), eq(variables['CopyMainBuildInfo'], 'YES'))
 
-- task: AzureFileCopy@2
+- task: AzureFileCopy@4
   displayName: 'AzureBlob build info ''lts.json'' Copy when needed'
   inputs:
     SourcePath: '$(LtsBuildInfoJsonFile)'
@@ -88,7 +88,7 @@ steps:
     ContainerName: BuildInfo
   condition: and(succeeded(), eq(variables['CopyLTSBuildInfo'], 'YES'))
 
-- task: AzureFileCopy@2
+- task: AzureFileCopy@4
   displayName: 'AzureBlob build info ''Major-Minor.json'' Copy when needed'
   inputs:
     SourcePath: '$(VersionBuildInfoJsonFile)'
diff --git a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
index 799e220626d..31a9715299e 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-UpdateDepsJson.yml
@@ -59,7 +59,7 @@ jobs:
       Write-Host "##$vstsCommand"
     displayName: Determine file to upload
 
-  - task: AzureFileCopy@2
+  - task: AzureFileCopy@4
     displayName: 'AzureBlob pwsh.deps.json file Copy'
     inputs:
       SourcePath: '$(FileToUpload)'
diff --git a/tools/releaseBuild/azureDevOps/vpackRelease.yml b/tools/releaseBuild/azureDevOps/vpackRelease.yml
index 875e2d25c3c..11b93b25899 100644
--- a/tools/releaseBuild/azureDevOps/vpackRelease.yml
+++ b/tools/releaseBuild/azureDevOps/vpackRelease.yml
@@ -25,7 +25,8 @@ stages:
     displayName: Name the build
     condition: succeeded()
 
-    pool: PowerShell1ES
+    pool:
+      name: PowerShell1ES
       demands:
       - ImageOverride -equals PSMMS2019-Secure
 

From b46ac16e09dce433dbc1ecb19ab949754eef4978 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 16 Mar 2022 15:57:31 -0700
Subject: [PATCH 270/645] Update docs for the v7.2.2 release (#16979)

---
 README.md           | 54 ++++++++++++++++++++++-----------------------
 tools/metadata.json |  8 +++----
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 4fd7459ebfd..9d223f84881 100644
--- a/README.md
+++ b/README.md
@@ -64,33 +64,33 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 | 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.1/PowerShell-7.2.1-win-x86.msi
-[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x64.msi
-[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-lts_7.2.1-1.deb_amd64.deb
-[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-lts-7.2.1-1.rh.x86_64.rpm
-[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-lts-7.2.1-osx-x64.pkg
-[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-lts-7.2.1-osx-arm64.pkg
-
-[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x64.msi
-[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x86.msi
-[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell_7.2.1-1.deb_amd64.deb
-[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell_7.2.1-1.deb_amd64.deb
-[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell_7.2.1-1.deb_amd64.deb
-[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell_7.2.1-1.deb_amd64.deb
-[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell_7.2.1-1.deb_amd64.deb
-[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell_7.2.1-1.deb_amd64.deb
-[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-1.rh.x86_64.rpm
-[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-1.rh.x86_64.rpm
-[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-osx-x64.pkg
-[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-osx-arm64.pkg
-[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-arm64.zip
-[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x86.zip
-[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x64.zip
-[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-osx-x64.tar.gz
-[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-osx-arm64.tar.gz
-[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-linux-x64.tar.gz
-[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-linux-arm32.tar.gz
-[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/powershell-7.2.1-linux-arm64.tar.gz
+[lts-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x86.msi
+[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x64.msi
+[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-lts_7.2.2-1.deb_amd64.deb
+[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-lts-7.2.2-1.rh.x86_64.rpm
+[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-lts-7.2.2-osx-x64.pkg
+[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-lts-7.2.2-osx-arm64.pkg
+
+[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x64.msi
+[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x86.msi
+[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell_7.2.2-1.deb_amd64.deb
+[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell_7.2.2-1.deb_amd64.deb
+[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell_7.2.2-1.deb_amd64.deb
+[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell_7.2.2-1.deb_amd64.deb
+[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell_7.2.2-1.deb_amd64.deb
+[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell_7.2.2-1.deb_amd64.deb
+[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-1.rh.x86_64.rpm
+[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-1.rh.x86_64.rpm
+[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-osx-x64.pkg
+[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-osx-arm64.pkg
+[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-arm64.zip
+[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x86.zip
+[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x64.zip
+[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-osx-x64.tar.gz
+[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-osx-arm64.tar.gz
+[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-linux-x64.tar.gz
+[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-linux-arm32.tar.gz
+[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-linux-arm64.tar.gz
 [rl-snap]: https://snapcraft.io/powershell
 
 [pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/PowerShell-7.3.0-preview.2-win-x64.msi
diff --git a/tools/metadata.json b/tools/metadata.json
index c1ab6c3eeb7..df77af4d4e3 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,9 +1,9 @@
 {
-  "StableReleaseTag": "v7.2.1",
+  "StableReleaseTag": "v7.2.2",
   "PreviewReleaseTag": "v7.3.0-preview.2",
-  "ServicingReleaseTag": "v7.0.8",
-  "ReleaseTag": "v7.2.1",
-  "LTSReleaseTag" : ["v7.2.1", "v7.0.8"],
+  "ServicingReleaseTag": "v7.0.9",
+  "ReleaseTag": "v7.2.2",
+  "LTSReleaseTag" : ["v7.2.2", "v7.0.9"],
   "NextReleaseTag": "v7.3.0-preview.2",
   "LTSRelease": { "Latest": false, "Package": false },
   "StableRelease":  { "Latest": false, "Package": false }

From 1268a0a04f797aa631f92ada5271f594379155af Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 18 Mar 2022 09:10:53 -0700
Subject: [PATCH 271/645] Update .NET to 7.0.0-preview.2 build (#16930)

---
 DotnetRuntimeMetadata.json                    | 10 ++--
 assets/wix/files.wxs                          |  8 ++--
 build.psm1                                    |  2 +-
 global.json                                   |  2 +-
 nuget.config                                  |  2 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  6 +--
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           |  8 ++--
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 .../System.Management.Automation.csproj       | 18 ++++----
 test/powershell/Host/Startup.Tests.ps1        |  1 -
 .../Test-Connection.Tests.ps1                 |  3 +-
 .../PackageManagement.Tests.ps1               | 18 ++------
 .../PowerShellGet/PowerShellGet.Tests.ps1     |  8 ++--
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/WebListener.csproj     |  4 +-
 test/xUnit/csharp/test_NativeInterop.cs       |  2 +-
 tools/cgmanifest.json                         | 46 +++++++++----------
 ...crosoft.PowerShell.Commands.Utility.csproj |  2 +-
 .../System.Management.Automation.csproj       |  2 +-
 21 files changed, 71 insertions(+), 79 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 92f5825c978..fcb9f330e2a 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,15 +1,15 @@
 {
   "sdk": {
-    "channel": "7.0.1xx-preview1",
+    "channel": "7.0.1xx-preview2",
     "quality": "signed",
     "qualityFallback": "daily",
-    "packageVersionPattern": "7.0.0-preview.1",
+    "packageVersionPattern": "7.0.0-preview.2",
     "sdkImageVersion": "7.0.100",
-    "nextChannel": "7.0.1xx-preview1",
+    "nextChannel": "7.0.1xx-preview2",
     "azureFeed": "",
-    "sdkImageOverride": "7.0.100-preview.1.22110.4"
+    "sdkImageOverride": "7.0.100-preview.2.22153.17"
   },
-  "internalfeed" : {
+  "internalfeed": {
     "url": ""
   }
 }
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index a9f2465288c..65fe6f17e61 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3177,12 +3177,12 @@
       <Component Id="cmp22840874A8C84AA796496634FBEBF09C">
         <File Id="fil2067B616D1FA4B30932A0240ABE06089" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
       </Component>
-      <Component Id="cmpAC388473B5C048E3AB478DCC0B3C61FE">
-        <File Id="fil2D3CF7A46E0842BABB83B0A8787FED26" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.7608.dll" />
-      </Component>
       <Component Id="cmpE0DEAA289B2D4594A0C4791B2808C97C">
         <File Id="fil530EAD567BDB402FA6F02AFAA696D721" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.dll" />
       </Component>
+      <Component Id="cmp05AA3332D604464298B922F34672061F">
+        <File Id="fil45EB1A6088AA4475B1B9B0413BC0FE02" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.15202.dll" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -4203,9 +4203,9 @@
       <ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
       <ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
       <ComponentRef Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9" />
-      <ComponentRef Id="cmpAC388473B5C048E3AB478DCC0B3C61FE" />
       <ComponentRef Id="cmpE5993DB9118640FD8C180A2D61C89C01" />
       <ComponentRef Id="cmpE0DEAA289B2D4594A0C4791B2808C97C" />
+      <ComponentRef Id="cmp05AA3332D604464298B922F34672061F" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/build.psm1 b/build.psm1
index 24c5500eb95..5d56fe5c924 100644
--- a/build.psm1
+++ b/build.psm1
@@ -2118,7 +2118,7 @@ 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
+        dotnet --list-sdks | Select-String -Pattern '\d*.\d*.\d*(-\w*\.\d*.\d*.\d*)?' | ForEach-Object { [System.Management.Automation.SemanticVersion]::new($_.matches.value) } | Sort-Object -Descending | Select-Object -First 1
     } -IgnoreExitcode 2> $null
 }
 
diff --git a/global.json b/global.json
index 9b02b7b47f7..463c146c54b 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100-preview.1"
+    "version": "7.0.100-preview.2.22153.17"
   }
 }
diff --git a/nuget.config b/nuget.config
index aca42b62494..314766a64f0 100644
--- a/nuget.config
+++ b/nuget.config
@@ -2,7 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/7.0.100-preview.1.22110.4-shipping/nuget/v2" />
+    <add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v2" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 2d5c09d969a..50cb39f3206 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.2.22152.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index c91fa2e60fe..f6059f756e9 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0-3.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0-1.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.2.22152.2" />
     <PackageReference Include="NJsonSchema" Version="10.6.9" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 5b615fd1ae8..3afc5691568 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.2.22152.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 3a36a1b19d5..a7f86581f9a 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.2.22152.2" />
     <!-- 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" />
@@ -30,7 +30,7 @@
     <PackageReference Include="System.Private.ServiceModel" Version="4.9.0" />
     <!-- 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="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.2.22152.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index a18bc1305fd..a0d5f1f3c34 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.2.22152.2" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index f6f6ab1adb0..b53b6c3eee7 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.2.22152.2" />
     <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
-    <PackageReference Include="System.Management" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.1.22076.8" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="System.Management" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.2.22152.2" />
     <!-- 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.3.0-preview.1" />
diff --git a/test/powershell/Host/Startup.Tests.ps1 b/test/powershell/Host/Startup.Tests.ps1
index 54d8d9a5226..d0d8662cc93 100644
--- a/test/powershell/Host/Startup.Tests.ps1
+++ b/test/powershell/Host/Startup.Tests.ps1
@@ -50,7 +50,6 @@ Describe "Validate start of console host" -Tag CI {
             'System.Runtime.Serialization.Primitives.dll'
             'System.Security.AccessControl.dll'
             'System.Security.Cryptography.dll'
-            'System.Security.Cryptography.X509Certificates.dll'
             'System.Security.Principal.Windows.dll'
             'System.Text.Encoding.Extensions.dll'
             'System.Text.RegularExpressions.dll'
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
index c41b60c3ecb..dbe91e86574 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
@@ -32,7 +32,8 @@ function GetExternalHostAddress([string]$HostName)
     }
 }
 
-Describe "Test-Connection" -tags "CI" {
+# Adding RequireSudoOnUnix due to issue: https://github.com/dotnet/runtime/issues/66746
+Describe "Test-Connection" -tags "CI", "RequireSudoOnUnix" {
     BeforeAll {
         $hostName = [System.Net.Dns]::GetHostName()
         $gatewayAddress = GetGatewayAddress
diff --git a/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1 b/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
index 5070cf9e8b8..0520860c8d1 100644
--- a/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
+++ b/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
@@ -19,24 +19,15 @@ $InternalSource = 'OneGetTestSource'
 Describe "PackageManagement Acceptance Test" -Tags "Feature" {
 
  BeforeAll{
+    Register-PackageSource -Name Nugettest -provider NuGet -Location https://www.nuget.org/api/v2 -Force
 
-    # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
-    # These should be re-enabled when the issue is fixed
-    $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-    $PSDefaultParameterValues["it:pending"] = $true
-
-    # The cmdlets in the if block fail due the to above issue, hence putting them in a if ($false)
-    if ($false) {
-        Register-PackageSource -Name Nugettest -provider NuGet -Location https://www.nuget.org/api/v2 -Force
-        Register-PackageSource -Name $InternalSource -Location $InternalGallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue
-    }
-
+    ## Comment out this line because 'poshtestgallery.com' is down, tracked by https://github.com/PowerShell/PowerShell/issues/17019
+    ## Register-PackageSource -Name $InternalSource -Location $InternalGallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue
     $SavedProgressPreference = $ProgressPreference
     $ProgressPreference = "SilentlyContinue"
  }
  AfterAll {
      $ProgressPreference = $SavedProgressPreference
-     $global:PSDefaultParameterValues = $originalDefaultParameterValues
  }
     It "get-packageprovider" {
 
@@ -52,7 +43,8 @@ Describe "PackageManagement Acceptance Test" -Tags "Feature" {
         $fpp | Should -Contain "PowerShellGet"
     }
 
-     It "install-packageprovider, Expect succeed" {
+    ## Make this test pending because 'poshtestgallery.com' is down, tracked by https://github.com/PowerShell/PowerShell/issues/17019
+    It "install-packageprovider, Expect succeed" -Pending {
         $ipp = (Install-PackageProvider -Name gistprovider -Force -Source $InternalSource -Scope CurrentUser).name
         $ipp | Should -Contain "gistprovider"
     }
diff --git a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1 b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
index dcecd602d47..d3cc46f2e91 100644
--- a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
+++ b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
@@ -111,7 +111,7 @@ function Remove-InstalledModules
 Describe "PowerShellGet - Module tests" -tags "Feature" {
 
     BeforeAll {
-        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+        # Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019
         # These should be re-enabled when the issue is fixed
         $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
         $PSDefaultParameterValues["it:pending"] = $true
@@ -155,7 +155,7 @@ Describe "PowerShellGet - Module tests" -tags "Feature" {
 Describe "PowerShellGet - Module tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
 
     BeforeAll {
-        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+        # Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019
         # These should be re-enabled when the issue is fixed
         $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
         $PSDefaultParameterValues["it:pending"] = $true
@@ -198,7 +198,7 @@ function Remove-InstalledScripts
 Describe "PowerShellGet - Script tests" -tags "Feature" {
 
     BeforeAll {
-        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+        # Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019
         # These should be re-enabled when the issue is fixed
         $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
         $PSDefaultParameterValues["it:pending"] = $true
@@ -238,7 +238,7 @@ Describe "PowerShellGet - Script tests" -tags "Feature" {
 Describe "PowerShellGet - Script tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
 
     BeforeAll {
-        # Setting all It block to pending as the test fail due to https://github.com/dotnet/runtime/issues/65013
+        # Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019
         # These should be re-enabled when the issue is fixed
         $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
         $PSDefaultParameterValues["it:pending"] = $true
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index c49ec96994b..50338b19df3 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.2.22152.2" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index c425f0002c3..878d2547786 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.1.22109.13" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.1.22076.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.2.22153.2" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.2.22152.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/xUnit/csharp/test_NativeInterop.cs b/test/xUnit/csharp/test_NativeInterop.cs
index 685e8a23ce4..b0c1c531e7f 100644
--- a/test/xUnit/csharp/test_NativeInterop.cs
+++ b/test/xUnit/csharp/test_NativeInterop.cs
@@ -17,7 +17,7 @@ namespace PSTests.Sequential
 {
     public static class NativeInterop
     {
-        [Fact]
+        [Fact(Skip = "Have to skip this test due to https://github.com/dotnet/runtime/issues/66785")]
         public static void TestLoadNativeInMemoryAssembly()
         {
             string tempDir = Path.Combine(Path.GetTempPath(), "TestLoadNativeInMemoryAssembly");
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 6a4ca73ef6d..11b27afff68 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -65,7 +65,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Common",
-          "Version": "4.0.1"
+          "Version": "4.1.0"
         }
       },
       "DevelopmentDependency": false
@@ -75,7 +75,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.CSharp",
-          "Version": "4.0.1"
+          "Version": "4.1.0"
         }
       },
       "DevelopmentDependency": false
@@ -504,8 +504,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
+          "Version": "6.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -514,7 +514,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
+          "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
           "Version": "6.0.0"
         }
       },
@@ -524,8 +524,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
-          "Version": "6.0.0"
+          "Name": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -604,8 +604,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win.System.Diagnostics.Debug",
-          "Version": "4.3.0"
+          "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -614,8 +614,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win.System.Runtime.Extensions",
-          "Version": "4.3.0"
+          "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -624,8 +624,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win7.System.Private.Uri",
-          "Version": "4.3.0"
+          "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -634,8 +634,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets",
-          "Version": "1.0.1"
+          "Name": "runtime.win.System.Diagnostics.Debug",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -644,8 +644,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets",
-          "Version": "1.0.1"
+          "Name": "runtime.win.System.Runtime.Extensions",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -654,8 +654,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets",
+          "Version": "1.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -664,8 +664,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets",
+          "Version": "1.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -674,8 +674,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "runtime.win7.System.Private.Uri",
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index e8efd4c4aee..4dfc566682c 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
     <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
   </ItemGroup>
 </Project>
diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
index 5793e09c887..862cf1ddff8 100644
--- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@@ -9,6 +9,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
-    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22054.8" />
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
   </ItemGroup>
 </Project>

From e22a427345544e233879f72c7611a206a9a186e6 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Fri, 18 Mar 2022 11:18:47 -0700
Subject: [PATCH 272/645] Simplify Enum generator for the `-bnot` operator test
 (#17014)

---
 test/powershell/Language/Parser/BNotOperator.Tests.ps1 | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/powershell/Language/Parser/BNotOperator.Tests.ps1 b/test/powershell/Language/Parser/BNotOperator.Tests.ps1
index eb6dd934e30..41930766dc6 100644
--- a/test/powershell/Language/Parser/BNotOperator.Tests.ps1
+++ b/test/powershell/Language/Parser/BNotOperator.Tests.ps1
@@ -12,7 +12,7 @@ $ns = [Guid]::NewGuid() -replace '-',''
 
 $typeDefinition = "namespace ns_$ns`n{"
 
-$enumTypeNames = foreach ($baseType in $baseTypes.Keys)
+foreach ($baseType in $baseTypes.Keys)
 {
     $baseTypeName = $baseTypes[$baseType]
     $typeDefinition += @"
@@ -24,14 +24,12 @@ $enumTypeNames = foreach ($baseType in $baseTypes.Keys)
         Max = $($baseType::MaxValue)
     }
 "@
-
-    "ns_$ns.E_$baseTypeName"
 }
 
 $typeDefinition += "`n}"
 
-Write-Verbose $typeDefinition
-Add-Type $typeDefinition
+Write-Verbose $typeDefinition -verbose
+$enumTypeNames = Add-Type $typeDefinition -Pass
 
 Describe "bnot on enums" -Tags "CI" {
     foreach ($enumType in [type[]]$enumTypeNames)

From 965095e4ba65303ed46c1725a652e682f3bdb6ae Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Fri, 18 Mar 2022 13:45:24 -0700
Subject: [PATCH 273/645] Do not pull dotnet updates from internal feed
 (#17007)

---
 .github/workflows/daily.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index ee430ac6c7a..a324f52be59 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -34,7 +34,7 @@ jobs:
           $currentVersion = (Get-Content .\global.json | ConvertFrom-Json).sdk.version
           Set-GWVariable -Name OLD_VERSION -Value $currentVersion
 
-          ./tools/UpdateDotnetRuntime.ps1 -UpdateMSIPackaging -UseInternalFeed
+          ./tools/UpdateDotnetRuntime.ps1 -UpdateMSIPackaging
           $newVersion = (Get-Content .\global.json | ConvertFrom-Json).sdk.version
           Set-GWVariable -Name NEW_VERSION -Value $newVersion
 

From 9c44c1c8c5eb1076f0082fe9e5eb8c65f6e3f6ec Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
Date: Sat, 19 Mar 2022 00:01:16 +0300
Subject: [PATCH 274/645] Fix typos in names of method (#17003)

---
 .../FormatAndOutput/OutGridView/OutGridViewCommand.cs       | 2 +-
 .../utility/FormatAndOutput/OutGridView/OutWindowProxy.cs   | 2 +-
 src/System.Management.Automation/engine/TypeTable.cs        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutGridViewCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutGridViewCommand.cs
index e606e58e9e4..5f231780055 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutGridViewCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutGridViewCommand.cs
@@ -145,7 +145,7 @@ protected override void EndProcessing()
             // The pipeline will be blocked while we don't return
             if (this.Wait || this.OutputMode != OutputModeOption.None)
             {
-                _windowProxy.BlockUntillClosed();
+                _windowProxy.BlockUntilClosed();
             }
 
             // Output selected items to pipeline.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs
index 3f22caf1e7b..5ca41608a70 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs
@@ -230,7 +230,7 @@ internal void ShowWindow()
             }
         }
 
-        internal void BlockUntillClosed()
+        internal void BlockUntilClosed()
         {
             if (_closedEvent != null)
             {
diff --git a/src/System.Management.Automation/engine/TypeTable.cs b/src/System.Management.Automation/engine/TypeTable.cs
index edc870f8933..2242f86aff5 100644
--- a/src/System.Management.Automation/engine/TypeTable.cs
+++ b/src/System.Management.Automation/engine/TypeTable.cs
@@ -139,17 +139,17 @@ private void UnknownNode(string node, string expectedNodes)
             else
             {
                 _context.AddError(_readerLineInfo.LineNumber, TypesXmlStrings.UnknownNode, _reader.LocalName, expectedNodes);
-                SkipUntillNodeEnd(_reader.LocalName);
+                SkipUntilNodeEnd(_reader.LocalName);
             }
         }
 
-        private void SkipUntillNodeEnd(string nodeName)
+        private void SkipUntilNodeEnd(string nodeName)
         {
             while (_reader.Read())
             {
                 if (_reader.IsStartElement() && _reader.LocalName.Equals(nodeName))
                 {
-                    SkipUntillNodeEnd(nodeName);
+                    SkipUntilNodeEnd(nodeName);
                 }
                 else if ((_reader.NodeType == XmlNodeType.EndElement) && _reader.LocalName.Equals(nodeName))
                 {

From 10027be363cf37c5888befb7126b6f4a5380e314 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Fri, 18 Mar 2022 16:15:59 -0700
Subject: [PATCH 275/645] Add `-because` to the failing test to aid in
 debugging (#17030)

---
 test/powershell/engine/Help/HelpSystem.Tests.ps1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/powershell/engine/Help/HelpSystem.Tests.ps1 b/test/powershell/engine/Help/HelpSystem.Tests.ps1
index 0590c7877ff..2712d761b20 100644
--- a/test/powershell/engine/Help/HelpSystem.Tests.ps1
+++ b/test/powershell/engine/Help/HelpSystem.Tests.ps1
@@ -576,7 +576,8 @@ Describe "Help failure cases" -Tags Feature {
     ) {
         param($command)
 
-        { & $command DoesNotExist -ErrorAction Stop } | Should -Throw -ErrorId "HelpNotFound,Microsoft.PowerShell.Commands.GetHelpCommand"
+        # under some conditions this does not throw, so include what we actually got
+        { & $command DoesNotExist -ErrorAction Stop } | Should -Throw -ErrorId "HelpNotFound,Microsoft.PowerShell.Commands.GetHelpCommand" -Because "$(& $command DoesNotExist -ea Ignore)"
     }
 }
 

From 8ad642013a5495ce102d9857afb4dcb9a44dc00f Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Sat, 19 Mar 2022 00:04:15 -0700
Subject: [PATCH 276/645] Remove `EventLogLogProvider` and its related legacy
 code (#17027)

---
 .../System.Management.Automation.csproj       |   1 -
 .../logging/MshLog.cs                         |   5 -
 .../logging/eventlog/EventLogLogProvider.cs   | 684 ------------------
 .../utils/PowerShellExecutionHelper.cs        |  71 --
 4 files changed, 761 deletions(-)
 delete mode 100644 src/System.Management.Automation/logging/eventlog/EventLogLogProvider.cs

diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index b53b6c3eee7..e798d80ef70 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -44,7 +44,6 @@
     <Compile Remove="engine\hostifaces\RunspaceInvoke.cs" />
     <Compile Remove="engine\remoting\commands\ResumeJob.cs" />
     <Compile Remove="engine\remoting\commands\SuspendJob.cs" />
-    <Compile Remove="logging\eventlog\EventLogLogProvider.cs" />
     <Compile Remove="namespaces\SafeTransactionHandle.cs" />
     <Compile Remove="namespaces\SafeRegistryHandle.cs" />
     <Compile Remove="namespaces\TransactedRegistry.cs" />
diff --git a/src/System.Management.Automation/logging/MshLog.cs b/src/System.Management.Automation/logging/MshLog.cs
index 89c8231311e..9d98ea8d0ab 100644
--- a/src/System.Management.Automation/logging/MshLog.cs
+++ b/src/System.Management.Automation/logging/MshLog.cs
@@ -134,11 +134,6 @@ private static Collection<LogProvider> CreateLogProvider(string shellId)
 
             try
             {
-#if !CORECLR    // TODO:CORECLR EventLogLogProvider not handled yet
-                LogProvider eventLogLogProvider = new EventLogLogProvider(shellId);
-                providers.Add(eventLogLogProvider);
-#endif
-
 #if UNIX
                 LogProvider sysLogProvider = new PSSysLogProvider();
                 providers.Add(sysLogProvider);
diff --git a/src/System.Management.Automation/logging/eventlog/EventLogLogProvider.cs b/src/System.Management.Automation/logging/eventlog/EventLogLogProvider.cs
deleted file mode 100644
index e6f301a04ac..00000000000
--- a/src/System.Management.Automation/logging/eventlog/EventLogLogProvider.cs
+++ /dev/null
@@ -1,684 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Resources;
-using System.Text;
-using System.Threading;
-
-namespace System.Management.Automation
-{
-    /// <summary>
-    /// EventLogLogProvider is a class to implement Msh Provider interface using EventLog technology.
-    ///
-    /// EventLogLogProvider will be the provider to use if Monad is running in early windows releases
-    /// from 2000 to 2003.
-    ///
-    /// EventLogLogProvider will be packaged in the same dll as Msh Log Engine since EventLog should
-    /// always be available.
-    /// </summary>
-    internal class EventLogLogProvider : LogProvider
-    {
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <returns></returns>
-        internal EventLogLogProvider(string shellId)
-        {
-            string source = SetupEventSource(shellId);
-
-            _eventLog = new EventLog();
-            _eventLog.Source = source;
-
-            _resourceManager = new ResourceManager("System.Management.Automation.resources.Logging", System.Reflection.Assembly.GetExecutingAssembly());
-        }
-
-        internal string SetupEventSource(string shellId)
-        {
-            string source;
-
-            // In case shellId == null, use the "Default" source.
-            if (string.IsNullOrEmpty(shellId))
-            {
-                source = "Default";
-            }
-            else
-            {
-                int index = shellId.LastIndexOf('.');
-
-                if (index < 0)
-                    source = shellId;
-                else
-                    source = shellId.Substring(index + 1);
-
-                // There may be a situation where ShellId ends with a '.'.
-                // In that case, use the default source.
-                if (string.IsNullOrEmpty(source))
-                    source = "Default";
-            }
-
-            if (EventLog.SourceExists(source))
-            {
-                return source;
-            }
-
-            string message = string.Format(Thread.CurrentThread.CurrentCulture, "Event source '{0}' is not registered", source);
-            throw new InvalidOperationException(message);
-        }
-
-        /// <summary>
-        /// This represent a handle to EventLog.
-        /// </summary>
-        private EventLog _eventLog;
-        private ResourceManager _resourceManager;
-
-        #region Log Provider Api
-
-        private const int EngineHealthCategoryId = 1;
-        private const int CommandHealthCategoryId = 2;
-        private const int ProviderHealthCategoryId = 3;
-        private const int EngineLifecycleCategoryId = 4;
-        private const int CommandLifecycleCategoryId = 5;
-        private const int ProviderLifecycleCategoryId = 6;
-        private const int SettingsCategoryId = 7;
-        private const int PipelineExecutionDetailCategoryId = 8;
-
-        /// <summary>
-        /// Log engine health event.
-        /// </summary>
-        /// <param name="logContext"></param>
-        /// <param name="eventId"></param>
-        /// <param name="exception"></param>
-        /// <param name="additionalInfo"></param>
-        internal override void LogEngineHealthEvent(LogContext logContext, int eventId, Exception exception, Dictionary<string, string> additionalInfo)
-        {
-            Hashtable mapArgs = new Hashtable();
-
-            IContainsErrorRecord icer = exception as IContainsErrorRecord;
-            if (icer != null && icer.ErrorRecord != null)
-            {
-                mapArgs["ExceptionClass"] = exception.GetType().Name;
-                mapArgs["ErrorCategory"] = icer.ErrorRecord.CategoryInfo.Category;
-                mapArgs["ErrorId"] = icer.ErrorRecord.FullyQualifiedErrorId;
-
-                if (icer.ErrorRecord.ErrorDetails != null)
-                {
-                    mapArgs["ErrorMessage"] = icer.ErrorRecord.ErrorDetails.Message;
-                }
-                else
-                {
-                    mapArgs["ErrorMessage"] = exception.Message;
-                }
-            }
-            else
-            {
-                mapArgs["ExceptionClass"] = exception.GetType().Name;
-                mapArgs["ErrorCategory"] = string.Empty;
-                mapArgs["ErrorId"] = string.Empty;
-                mapArgs["ErrorMessage"] = exception.Message;
-            }
-
-            FillEventArgs(mapArgs, logContext);
-
-            FillEventArgs(mapArgs, additionalInfo);
-
-            EventInstance entry = new EventInstance(eventId, EngineHealthCategoryId);
-
-            entry.EntryType = GetEventLogEntryType(logContext);
-
-            string detail = GetEventDetail("EngineHealthContext", mapArgs);
-
-            LogEvent(entry, mapArgs["ErrorMessage"], detail);
-        }
-
-        private static EventLogEntryType GetEventLogEntryType(LogContext logContext)
-        {
-            switch (logContext.Severity)
-            {
-                case "Critical":
-                case "Error":
-                    return EventLogEntryType.Error;
-                case "Warning":
-                    return EventLogEntryType.Warning;
-                default:
-                    return EventLogEntryType.Information;
-            }
-        }
-
-        /// <summary>
-        /// Log engine lifecycle event.
-        /// </summary>
-        /// <param name="logContext"></param>
-        /// <param name="newState"></param>
-        /// <param name="previousState"></param>
-        internal override void LogEngineLifecycleEvent(LogContext logContext, EngineState newState, EngineState previousState)
-        {
-            int eventId = GetEngineLifecycleEventId(newState);
-
-            if (eventId == _invalidEventId)
-                return;
-
-            Hashtable mapArgs = new Hashtable();
-
-            mapArgs["NewEngineState"] = newState.ToString();
-            mapArgs["PreviousEngineState"] = previousState.ToString();
-
-            FillEventArgs(mapArgs, logContext);
-
-            EventInstance entry = new EventInstance(eventId, EngineLifecycleCategoryId);
-
-            entry.EntryType = EventLogEntryType.Information;
-
-            string detail = GetEventDetail("EngineLifecycleContext", mapArgs);
-
-            LogEvent(entry, newState, previousState, detail);
-        }
-
-        private const int _baseEngineLifecycleEventId = 400;
-        private const int _invalidEventId = -1;
-
-        /// <summary>
-        /// Get engine lifecycle event id based on engine state.
-        /// </summary>
-        /// <param name="engineState"></param>
-        /// <returns></returns>
-        private static int GetEngineLifecycleEventId(EngineState engineState)
-        {
-            switch (engineState)
-            {
-                case EngineState.None:
-                    return _invalidEventId;
-                case EngineState.Available:
-                    return _baseEngineLifecycleEventId;
-                case EngineState.Degraded:
-                    return _baseEngineLifecycleEventId + 1;
-                case EngineState.OutOfService:
-                    return _baseEngineLifecycleEventId + 2;
-                case EngineState.Stopped:
-                    return _baseEngineLifecycleEventId + 3;
-            }
-
-            return _invalidEventId;
-        }
-
-        private const int _commandHealthEventId = 200;
-
-        /// <summary>
-        /// Provider interface function for logging command health event.
-        /// </summary>
-        /// <param name="logContext"></param>
-        /// <param name="exception"></param>
-        internal override void LogCommandHealthEvent(LogContext logContext, Exception exception)
-        {
-            int eventId = _commandHealthEventId;
-
-            Hashtable mapArgs = new Hashtable();
-
-            IContainsErrorRecord icer = exception as IContainsErrorRecord;
-            if (icer != null && icer.ErrorRecord != null)
-            {
-                mapArgs["ExceptionClass"] = exception.GetType().Name;
-                mapArgs["ErrorCategory"] = icer.ErrorRecord.CategoryInfo.Category;
-                mapArgs["ErrorId"] = icer.ErrorRecord.FullyQualifiedErrorId;
-
-                if (icer.ErrorRecord.ErrorDetails != null)
-                {
-                    mapArgs["ErrorMessage"] = icer.ErrorRecord.ErrorDetails.Message;
-                }
-                else
-                {
-                    mapArgs["ErrorMessage"] = exception.Message;
-                }
-            }
-            else
-            {
-                mapArgs["ExceptionClass"] = exception.GetType().Name;
-                mapArgs["ErrorCategory"] = string.Empty;
-                mapArgs["ErrorId"] = string.Empty;
-                mapArgs["ErrorMessage"] = exception.Message;
-            }
-
-            FillEventArgs(mapArgs, logContext);
-
-            EventInstance entry = new EventInstance(eventId, CommandHealthCategoryId);
-
-            entry.EntryType = GetEventLogEntryType(logContext);
-
-            string detail = GetEventDetail("CommandHealthContext", mapArgs);
-
-            LogEvent(entry, mapArgs["ErrorMessage"], detail);
-        }
-
-        /// <summary>
-        /// Log command life cycle event.
-        /// </summary>
-        /// <param name="getLogContext"></param>
-        /// <param name="newState"></param>
-        internal override void LogCommandLifecycleEvent(Func<LogContext> getLogContext, CommandState newState)
-        {
-            LogContext logContext = getLogContext();
-
-            int eventId = GetCommandLifecycleEventId(newState);
-
-            if (eventId == _invalidEventId)
-                return;
-
-            Hashtable mapArgs = new Hashtable();
-
-            mapArgs["NewCommandState"] = newState.ToString();
-
-            FillEventArgs(mapArgs, logContext);
-
-            EventInstance entry = new EventInstance(eventId, CommandLifecycleCategoryId);
-
-            entry.EntryType = EventLogEntryType.Information;
-
-            string detail = GetEventDetail("CommandLifecycleContext", mapArgs);
-
-            LogEvent(entry, logContext.CommandName, newState, detail);
-        }
-
-        private const int _baseCommandLifecycleEventId = 500;
-
-        /// <summary>
-        /// Get command lifecycle event id based on command state.
-        /// </summary>
-        /// <param name="commandState"></param>
-        /// <returns></returns>
-        private static int GetCommandLifecycleEventId(CommandState commandState)
-        {
-            switch (commandState)
-            {
-                case CommandState.Started:
-                    return _baseCommandLifecycleEventId;
-                case CommandState.Stopped:
-                    return _baseCommandLifecycleEventId + 1;
-                case CommandState.Terminated:
-                    return _baseCommandLifecycleEventId + 2;
-            }
-
-            return _invalidEventId;
-        }
-
-        private const int _pipelineExecutionDetailEventId = 800;
-
-        /// <summary>
-        /// Log pipeline execution detail event.
-        ///
-        /// This may end of logging more than one event if the detail string is too long to be fit in 64K.
-        /// </summary>
-        /// <param name="logContext"></param>
-        /// <param name="pipelineExecutionDetail"></param>
-        internal override void LogPipelineExecutionDetailEvent(LogContext logContext, List<string> pipelineExecutionDetail)
-        {
-            List<string> details = GroupMessages(pipelineExecutionDetail);
-
-            for (int i = 0; i < details.Count; i++)
-            {
-                LogPipelineExecutionDetailEvent(logContext, details[i], i + 1, details.Count);
-            }
-        }
-
-        private const int MaxLength = 16000;
-
-        private List<string> GroupMessages(List<string> messages)
-        {
-            List<string> result = new List<string>();
-
-            if (messages == null || messages.Count == 0)
-                return result;
-
-            StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < messages.Count; i++)
-            {
-                if (sb.Length + messages[i].Length < MaxLength)
-                {
-                    sb.AppendLine(messages[i]);
-                    continue;
-                }
-
-                result.Add(sb.ToString());
-                sb = new StringBuilder();
-                sb.AppendLine(messages[i]);
-            }
-
-            result.Add(sb.ToString());
-
-            return result;
-        }
-
-        /// <summary>
-        /// Log one pipeline execution detail event. Detail message is already chopped up so that it will
-        /// fit in 64K.
-        /// </summary>
-        /// <param name="logContext"></param>
-        /// <param name="pipelineExecutionDetail"></param>
-        /// <param name="detailSequence"></param>
-        /// <param name="detailTotal"></param>
-        private void LogPipelineExecutionDetailEvent(LogContext logContext, string pipelineExecutionDetail, int detailSequence, int detailTotal)
-        {
-            int eventId = _pipelineExecutionDetailEventId;
-
-            Hashtable mapArgs = new Hashtable();
-
-            mapArgs["PipelineExecutionDetail"] = pipelineExecutionDetail;
-            mapArgs["DetailSequence"] = detailSequence;
-            mapArgs["DetailTotal"] = detailTotal;
-
-            FillEventArgs(mapArgs, logContext);
-
-            EventInstance entry = new EventInstance(eventId, PipelineExecutionDetailCategoryId);
-
-            entry.EntryType = EventLogEntryType.Information;
-
-            string pipelineInfo = GetEventDetail("PipelineExecutionDetailContext", mapArgs);
-
-            LogEvent(entry, logContext.CommandLine, pipelineInfo, pipelineExecutionDetail);
-        }
-
-        private const int _providerHealthEventId = 300;
-        /// <summary>
-        /// Provider interface function for logging provider health event.
-        /// </summary>
-        /// <param name="logContext"></param>
-        /// <param name="providerName"></param>
-        /// <param name="exception"></param>
-        internal override void LogProviderHealthEvent(LogContext logContext, string providerName, Exception exception)
-        {
-            int eventId = _providerHealthEventId;
-
-            Hashtable mapArgs = new Hashtable();
-
-            mapArgs["ProviderName"] = providerName;
-
-            IContainsErrorRecord icer = exception as IContainsErrorRecord;
-            if (icer != null && icer.ErrorRecord != null)
-            {
-                mapArgs["ExceptionClass"] = exception.GetType().Name;
-                mapArgs["ErrorCategory"] = icer.ErrorRecord.CategoryInfo.Category;
-                mapArgs["ErrorId"] = icer.ErrorRecord.FullyQualifiedErrorId;
-
-                if (icer.ErrorRecord.ErrorDetails != null
-                    && !string.IsNullOrEmpty(icer.ErrorRecord.ErrorDetails.Message))
-                {
-                    mapArgs["ErrorMessage"] = icer.ErrorRecord.ErrorDetails.Message;
-                }
-                else
-                {
-                    mapArgs["ErrorMessage"] = exception.Message;
-                }
-            }
-            else
-            {
-                mapArgs["ExceptionClass"] = exception.GetType().Name;
-                mapArgs["ErrorCategory"] = string.Empty;
-                mapArgs["ErrorId"] = string.Empty;
-                mapArgs["ErrorMessage"] = exception.Message;
-            }
-
-            FillEventArgs(mapArgs, logContext);
-
-            EventInstance entry = new EventInstance(eventId, ProviderHealthCategoryId);
-
-            entry.EntryType = GetEventLogEntryType(logContext);
-
-            string detail = GetEventDetail("ProviderHealthContext", mapArgs);
-
-            LogEvent(entry, mapArgs["ErrorMessage"], detail);
-        }
-
-        /// <summary>
-        /// Log provider lifecycle event.
-        /// </summary>
-        /// <param name="logContext"></param>
-        /// <param name="providerName"></param>
-        /// <param name="newState"></param>
-        internal override void LogProviderLifecycleEvent(LogContext logContext, string providerName, ProviderState newState)
-        {
-            int eventId = GetProviderLifecycleEventId(newState);
-
-            if (eventId == _invalidEventId)
-                return;
-
-            Hashtable mapArgs = new Hashtable();
-
-            mapArgs["ProviderName"] = providerName;
-            mapArgs["NewProviderState"] = newState.ToString();
-
-            FillEventArgs(mapArgs, logContext);
-
-            EventInstance entry = new EventInstance(eventId, ProviderLifecycleCategoryId);
-
-            entry.EntryType = EventLogEntryType.Information;
-
-            string detail = GetEventDetail("ProviderLifecycleContext", mapArgs);
-
-            LogEvent(entry, providerName, newState, detail);
-        }
-
-        private const int _baseProviderLifecycleEventId = 600;
-
-        /// <summary>
-        /// Get provider lifecycle event id based on provider state.
-        /// </summary>
-        /// <param name="providerState"></param>
-        /// <returns></returns>
-        private static int GetProviderLifecycleEventId(ProviderState providerState)
-        {
-            switch (providerState)
-            {
-                case ProviderState.Started:
-                    return _baseProviderLifecycleEventId;
-                case ProviderState.Stopped:
-                    return _baseProviderLifecycleEventId + 1;
-            }
-
-            return _invalidEventId;
-        }
-
-        private const int _settingsEventId = 700;
-
-        /// <summary>
-        /// Log settings event.
-        /// </summary>
-        /// <param name="logContext"></param>
-        /// <param name="variableName"></param>
-        /// <param name="value"></param>
-        /// <param name="previousValue"></param>
-        internal override void LogSettingsEvent(LogContext logContext, string variableName, string value, string previousValue)
-        {
-            int eventId = _settingsEventId;
-
-            Hashtable mapArgs = new Hashtable();
-
-            mapArgs["VariableName"] = variableName;
-            mapArgs["NewValue"] = value;
-            mapArgs["PreviousValue"] = previousValue;
-
-            FillEventArgs(mapArgs, logContext);
-
-            EventInstance entry = new EventInstance(eventId, SettingsCategoryId);
-
-            entry.EntryType = EventLogEntryType.Information;
-
-            string detail = GetEventDetail("SettingsContext", mapArgs);
-
-            LogEvent(entry, variableName, value, previousValue, detail);
-        }
-
-        #endregion Log Provider Api
-
-        #region EventLog helper functions
-
-        /// <summary>
-        /// This is the helper function for logging an event with localizable message
-        /// to event log. It will trace all exception thrown by eventlog.
-        /// </summary>
-        /// <param name="entry"></param>
-        /// <param name="args"></param>
-        private void LogEvent(EventInstance entry, params object[] args)
-        {
-            try
-            {
-                _eventLog.WriteEvent(entry, args);
-            }
-            catch (ArgumentException)
-            {
-                return;
-            }
-            catch (InvalidOperationException)
-            {
-                return;
-            }
-            catch (Win32Exception)
-            {
-                return;
-            }
-        }
-
-        #endregion
-
-        #region Event Arguments
-
-        /// <summary>
-        /// Fill event arguments with logContext info.
-        ///
-        /// In EventLog Api, arguments are passed in as an array of objects.
-        /// </summary>
-        /// <param name="mapArgs">An ArrayList to contain the event arguments.</param>
-        /// <param name="logContext">The log context containing the info to fill in.</param>
-        private static void FillEventArgs(Hashtable mapArgs, LogContext logContext)
-        {
-            mapArgs["Severity"] = logContext.Severity;
-            mapArgs["SequenceNumber"] = logContext.SequenceNumber;
-            mapArgs["HostName"] = logContext.HostName;
-            mapArgs["HostVersion"] = logContext.HostVersion;
-            mapArgs["HostId"] = logContext.HostId;
-            mapArgs["HostApplication"] = logContext.HostApplication;
-            mapArgs["EngineVersion"] = logContext.EngineVersion;
-            mapArgs["RunspaceId"] = logContext.RunspaceId;
-            mapArgs["PipelineId"] = logContext.PipelineId;
-            mapArgs["CommandName"] = logContext.CommandName;
-            mapArgs["CommandType"] = logContext.CommandType;
-            mapArgs["ScriptName"] = logContext.ScriptName;
-            mapArgs["CommandPath"] = logContext.CommandPath;
-            mapArgs["CommandLine"] = logContext.CommandLine;
-            mapArgs["User"] = logContext.User;
-            mapArgs["Time"] = logContext.Time;
-        }
-
-        /// <summary>
-        /// Fill event arguments with additionalInfo stored in a string dictionary.
-        /// </summary>
-        /// <param name="mapArgs">An arraylist to contain the event arguments.</param>
-        /// <param name="additionalInfo">A string dictionary to fill in.</param>
-        private static void FillEventArgs(Hashtable mapArgs, Dictionary<string, string> additionalInfo)
-        {
-            if (additionalInfo == null)
-            {
-                for (int i = 0; i < 3; i++)
-                {
-                    string id = ((int)(i + 1)).ToString("d1", CultureInfo.CurrentCulture);
-
-                    mapArgs["AdditionalInfo_Name" + id] = string.Empty;
-                    mapArgs["AdditionalInfo_Value" + id] = string.Empty;
-                }
-
-                return;
-            }
-
-            string[] keys = new string[additionalInfo.Count];
-            string[] values = new string[additionalInfo.Count];
-
-            additionalInfo.Keys.CopyTo(keys, 0);
-            additionalInfo.Values.CopyTo(values, 0);
-            for (int i = 0; i < 3; i++)
-            {
-                string id = ((int)(i + 1)).ToString("d1", CultureInfo.CurrentCulture);
-
-                if (i < keys.Length)
-                {
-                    mapArgs["AdditionalInfo_Name" + id] = keys[i];
-                    mapArgs["AdditionalInfo_Value" + id] = values[i];
-                }
-                else
-                {
-                    mapArgs["AdditionalInfo_Name" + id] = string.Empty;
-                    mapArgs["AdditionalInfo_Value" + id] = string.Empty;
-                }
-            }
-
-            return;
-        }
-
-        #endregion Event Arguments
-
-        #region Event Message
-
-        private string GetEventDetail(string contextId, Hashtable mapArgs)
-        {
-            return GetMessage(contextId, mapArgs);
-        }
-
-        private string GetMessage(string messageId, Hashtable mapArgs)
-        {
-            if (_resourceManager == null)
-                return string.Empty;
-
-            string messageTemplate = _resourceManager.GetString(messageId);
-
-            if (string.IsNullOrEmpty(messageTemplate))
-                return string.Empty;
-
-            return FillMessageTemplate(messageTemplate, mapArgs);
-        }
-
-        private static string FillMessageTemplate(string messageTemplate, Hashtable mapArgs)
-        {
-            StringBuilder message = new StringBuilder();
-
-            int cursor = 0;
-
-            while (true)
-            {
-                int startIndex = messageTemplate.IndexOf('[', cursor);
-
-                if (startIndex < 0)
-                {
-                    message.Append(messageTemplate.Substring(cursor));
-                    return message.ToString();
-                }
-
-                int endIndex = messageTemplate.IndexOf(']', startIndex + 1);
-
-                if (endIndex < 0)
-                {
-                    message.Append(messageTemplate.Substring(cursor));
-                    return message.ToString();
-                }
-
-                message.Append(messageTemplate.Substring(cursor, startIndex - cursor));
-                cursor = startIndex;
-
-                string placeHolder = messageTemplate.Substring(startIndex + 1, endIndex - startIndex - 1);
-
-                if (mapArgs.Contains(placeHolder))
-                {
-                    message.Append(mapArgs[placeHolder]);
-                    cursor = endIndex + 1;
-                }
-                else
-                {
-                    message.Append("[");
-                    cursor++;
-                }
-            }
-        }
-
-        #endregion Event Message
-    }
-}
diff --git a/src/System.Management.Automation/utils/PowerShellExecutionHelper.cs b/src/System.Management.Automation/utils/PowerShellExecutionHelper.cs
index 87e5c6b8742..d30d759647a 100644
--- a/src/System.Management.Automation/utils/PowerShellExecutionHelper.cs
+++ b/src/System.Management.Automation/utils/PowerShellExecutionHelper.cs
@@ -46,12 +46,6 @@ internal PowerShellExecutionHelper(PowerShell powershell)
 
         #region Command Execution
 
-        internal Collection<PSObject> ExecuteCommand(string command)
-        {
-            Exception unused;
-            return ExecuteCommand(command, true, out unused, null);
-        }
-
         internal bool ExecuteCommandAndGetResultAsBool()
         {
             Exception exceptionThrown;
@@ -66,71 +60,6 @@ internal bool ExecuteCommandAndGetResultAsBool()
             return (streamResults.Count > 1) || (LanguagePrimitives.IsTrue(streamResults[0]));
         }
 
-        internal string ExecuteCommandAndGetResultAsString()
-        {
-            Exception exceptionThrown;
-            Collection<PSObject> streamResults = ExecuteCurrentPowerShell(out exceptionThrown);
-
-            if (exceptionThrown != null || streamResults == null || streamResults.Count == 0)
-            {
-                return null;
-            }
-
-            // we got back one or more objects. Pick off the first result.
-            if (streamResults[0] == null)
-                return string.Empty;
-
-            // And convert the base object into a string. We can't use the proxied
-            // ToString() on the PSObject because there is no default runspace
-            // available.
-            return SafeToString(streamResults[0]);
-        }
-
-        internal Collection<PSObject> ExecuteCommand(string command, bool isScript, out Exception exceptionThrown, Hashtable args)
-        {
-            Diagnostics.Assert(command != null, "caller to verify command is not null");
-
-            exceptionThrown = null;
-
-            // This flag indicates a previous call to this method had its pipeline cancelled
-            if (CancelTabCompletion)
-            {
-                return new Collection<PSObject>();
-            }
-
-            CurrentPowerShell.AddCommand(command);
-
-            Command cmd = new Command(command, isScript);
-            if (args != null)
-            {
-                foreach (DictionaryEntry arg in args)
-                {
-                    cmd.Parameters.Add((string)(arg.Key), arg.Value);
-                }
-            }
-
-            Collection<PSObject> results = null;
-            try
-            {
-                // blocks until all results are retrieved.
-                // results = this.ExecuteCommand(cmd);
-
-                // If this pipeline has been stopped lets set a flag to cancel all future tab completion calls
-                // until the next completion
-                if (IsStopped)
-                {
-                    results = new Collection<PSObject>();
-                    CancelTabCompletion = true;
-                }
-            }
-            catch (Exception e)
-            {
-                exceptionThrown = e;
-            }
-
-            return results;
-        }
-
         internal Collection<PSObject> ExecuteCurrentPowerShell(out Exception exceptionThrown, IEnumerable input = null)
         {
             exceptionThrown = null;

From 79559df0da7b0721d5b80bb775f806342a73afa1 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 21 Mar 2022 21:07:57 +0000
Subject: [PATCH 277/645] Merged PR 19678: Update change log for
 v7.3.0-preview.3 release

Update change log for v7.3.0-preview.3 release
---
 .spelling            |  1 +
 CHANGELOG/preview.md | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/.spelling b/.spelling
index 965635c3559..85ca1f2bb21 100644
--- a/.spelling
+++ b/.spelling
@@ -1477,4 +1477,5 @@ tar.gz
 rc.2.21505.57
 psoptions.json
 manifest.spdx.json
+AzureFileCopy
 vPack
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index fab3c51cd7b..0d11d0af62c 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,5 +1,45 @@
 # Current preview release
 
+## [7.3.0-preview.3] - 2022-03-21
+
+### Engine Updates and Fixes
+
+- Fix the parsing code for .NET method generic arguments (#16937)
+- Allow the `PSGetMemberBinder` to get value of `ByRef` property (#16956)
+- Allow a collection that contains `Automation.Null` elements to be piped to pipeline (#16957)
+
+### General Cmdlet Updates and Fixes
+
+- Add the module `CompatPowerShellGet` to the allow-list of telemetry modules (#16935)
+- Fix `Enter-PSHostProcess` and `Get-PSHostProcessInfo` cmdlets by handling processes that have exited (#16946)
+- Improve Hashtable completion in multiple scenarios (#16498) (Thanks @MartinGC94!)
+
+### Code Cleanup
+
+- Fix a typo in `CommandHelpProvider.cs` (#16949) (Thanks @eltociear!)
+
+### Tests
+
+- Update a few tests to make them more stable in CI (#16944)
+- Roll back Windows images used in testing to Windows Server 2019 (#16958)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+<p>Update .NET SDK to 7.0.0-preview.2</p>
+</summary>
+
+<ul>
+<li>Update .NET to 7.0.0-preview.2 build (#16930)</li>
+<li>Update <code>AzureFileCopy</code> task and fix the syntax for specifying <code>pool</code> (#17013)</li>
+</ul>
+
+</details>
+
+[7.3.0-preview.3]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.2...v7.3.0-preview.3
+
 ## [7.3.0-preview.2] - 2022-02-24
 
 ### Engine Updates and Fixes

From 63e8d57a679e2531df53aad2c72575c1824636b2 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 21 Mar 2022 15:57:29 -0700
Subject: [PATCH 278/645] Update `README.md` and `metadata.json` for
 v7.3.0-preview.3 release (#17029)

---
 README.md           | 28 ++++++++++++++--------------
 tools/metadata.json |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 9d223f84881..52f1376c6ce 100644
--- a/README.md
+++ b/README.md
@@ -93,20 +93,20 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 [rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-linux-arm64.tar.gz
 [rl-snap]: https://snapcraft.io/powershell
 
-[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/PowerShell-7.3.0-preview.2-win-x64.msi
-[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/PowerShell-7.3.0-preview.2-win-x86.msi
-[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-preview_7.3.0-preview.2-1.deb_amd64.deb
-[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-preview-7.3.0_preview.1-1.rh.x86_64.rpm
-[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-osx-x64.pkg
-[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-osx-arm64.pkg
-[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/PowerShell-7.3.0-preview.2-win-arm64.zip
-[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/PowerShell-7.3.0-preview.2-win-x86.zip
-[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/PowerShell-7.3.0-preview.2-win-x64.zip
-[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-osx-x64.tar.gz
-[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-osx-arm64.tar.gz
-[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-linux-x64.tar.gz
-[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-linux-arm32.tar.gz
-[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.2/powershell-7.3.0-preview.2-linux-arm64.tar.gz
+[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/PowerShell-7.3.0-preview.3-win-x64.msi
+[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/PowerShell-7.3.0-preview.3-win-x86.msi
+[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-preview_7.3.0-preview.3-1.deb_amd64.deb
+[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-preview-7.3.0_preview.3-1.rh.x86_64.rpm
+[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-osx-x64.pkg
+[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-osx-arm64.pkg
+[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/PowerShell-7.3.0-preview.3-win-arm64.zip
+[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/PowerShell-7.3.0-preview.3-win-x86.zip
+[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/PowerShell-7.3.0-preview.3-win-x64.zip
+[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-osx-x64.tar.gz
+[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-osx-arm64.tar.gz
+[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-linux-x64.tar.gz
+[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-linux-arm32.tar.gz
+[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-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
diff --git a/tools/metadata.json b/tools/metadata.json
index df77af4d4e3..3a10dcebd56 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,10 +1,10 @@
 {
   "StableReleaseTag": "v7.2.2",
-  "PreviewReleaseTag": "v7.3.0-preview.2",
+  "PreviewReleaseTag": "v7.3.0-preview.3",
   "ServicingReleaseTag": "v7.0.9",
   "ReleaseTag": "v7.2.2",
   "LTSReleaseTag" : ["v7.2.2", "v7.0.9"],
-  "NextReleaseTag": "v7.3.0-preview.2",
+  "NextReleaseTag": "v7.3.0-preview.4",
   "LTSRelease": { "Latest": false, "Package": false },
   "StableRelease":  { "Latest": false, "Package": false }
 }

From a6d04226c365d811d271340174e8453cbb53b26c Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Wed, 23 Mar 2022 08:04:07 -0700
Subject: [PATCH 279/645] Add Custom Remote Connections Feature (#17011)

* Changes for custom remote connections

* Remove NamedPipeConnection dependency on RemoteSessionNamedPipe.

* Enable custom connection tests and tool build for all platforms

* Fix CustomConnection.Tests.ps1

* Fix tests attempt 1

* Fix tool build

* Move test to elevated

* Fix non-Windows pipe name

* Update test for non-Windows

* Skip broken non-Windows timer

* Add comment for skipped test
---
 build.psm1                                    |  58 +-
 .../CommandCompletion/CommandCompletion.cs    |   4 -
 .../engine/hostifaces/Connection.cs           |   9 +-
 .../engine/hostifaces/ConnectionFactory.cs    |  10 -
 .../client/RemoteRunspacePoolInternal.cs      |   4 +-
 .../engine/remoting/client/remoterunspace.cs  |  21 +-
 .../remoting/client/remoterunspaceinfo.cs     |  37 +-
 .../remoting/commands/newrunspacecommand.cs   |   4 +-
 .../remoting/common/RemoteSessionNamedPipe.cs |  48 +-
 .../remoting/common/RunspaceConnectionInfo.cs | 142 ++--
 .../remoting/fanin/BaseTransportManager.cs    | 114 +++-
 .../fanin/OutOfProcTransportManager.cs        | 267 +++++---
 .../remoting/fanin/WSManTransportManager.cs   |  17 +-
 .../server/OutOfProcServerMediator.cs         |  21 +-
 .../resources/RemotingErrorIdStrings.resx     |   3 +
 .../utils/CryptoUtils.cs                      |   4 +-
 .../engine/Api/BasicEngine.Tests.ps1          |  15 +-
 .../Remoting/CustomConnection.Tests.ps1       |  69 ++
 test/tools/NamedPipeConnection/build.ps1      |  84 +++
 test/tools/NamedPipeConnection/doBuild.ps1    |  81 +++
 test/tools/NamedPipeConnection/nuget.config   |  10 +
 ...rosoft.PowerShell.NamedPipeConnection.psd1 |  80 +++
 ...soft.PowerShell.NamedPipeConnection.csproj |  22 +
 .../src/code/NamedPipeConnection.cs           | 638 ++++++++++++++++++
 .../test/CustomConnection.Tests.ps1           |  67 ++
 25 files changed, 1576 insertions(+), 253 deletions(-)
 create mode 100644 test/powershell/engine/Remoting/CustomConnection.Tests.ps1
 create mode 100644 test/tools/NamedPipeConnection/build.ps1
 create mode 100644 test/tools/NamedPipeConnection/doBuild.ps1
 create mode 100644 test/tools/NamedPipeConnection/nuget.config
 create mode 100644 test/tools/NamedPipeConnection/src/Microsoft.PowerShell.NamedPipeConnection.psd1
 create mode 100644 test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
 create mode 100644 test/tools/NamedPipeConnection/src/code/NamedPipeConnection.cs
 create mode 100644 test/tools/NamedPipeConnection/test/CustomConnection.Tests.ps1

diff --git a/build.psm1 b/build.psm1
index 5d56fe5c924..aabc3b380b5 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1036,6 +1036,48 @@ function Get-PesterTag {
     $o
 }
 
+# Function to build and publish the Microsoft.PowerShell.NamedPipeConnection module for
+# testing PowerShell remote custom connections.
+function Publish-CustomConnectionTestModule
+{
+    $sourcePath = "${PSScriptRoot}/test/tools/NamedPipeConnection"
+    $outPath = "${PSScriptRoot}/test/tools/NamedPipeConnection/out/Microsoft.PowerShell.NamedPipeConnection"
+    $publishPath = "${PSScriptRoot}/test/tools/Modules"
+    $refPath = "${sourcePath}/src/code/Ref"
+
+    # Copy the current SMA build to the refPath.
+    $smaPath = Join-Path -Path (Split-Path -Path (Get-PSOutput)) -ChildPath 'System.Management.Automation.dll'
+    if (! (Test-Path -Path $smaPath)) {
+        throw "Publish-CustomConnectionTestModule: Cannot find reference SMA at: ${smaPath}"
+    }
+    if (! (Test-Path -Path $refPath)) {
+        $null = New-Item -Path $refPath -ItemType Directory -Force
+    }
+    Copy-Item -Path $smapath -Destination $refPath -Force
+
+    Find-DotNet
+
+    Push-Location -Path $sourcePath
+    try {
+        # Build the Microsoft.PowerShell.NamedPipeConnect module
+        ./build.ps1 -Clean -Build
+
+        if (! (Test-Path -Path $outPath)) {
+            throw "Publish-CustomConnectionTestModule: Build failed. Output path does not exist: $outPath"
+        }
+
+        # Publish the Microsoft.PowerShell.NamedPipeConnection module
+        Copy-Item -Path $outPath -Destination $publishPath -Recurse -Force
+
+        # Clean up build artifacts
+        ./build.ps1 -Clean
+        Remove-Item -Path $refPath -Recurse -Force -ErrorAction SilentlyContinue
+    }
+    finally {
+        Pop-Location
+    }
+}
+
 function Publish-PSTestTools {
     [CmdletBinding()]
     param(
@@ -1204,6 +1246,9 @@ function Start-PSPester {
             $publishArgs['runtime'] = 'alpine-x64'
         }
         Publish-PSTestTools @publishArgs | ForEach-Object {Write-Host $_}
+
+        # Publish the Microsoft.PowerShell.NamedPipeConnection module for testing custom remote connections.
+        Publish-CustomConnectionTestModule | ForEach-Object { Write-Host $_ }
     }
 
     # All concatenated commands/arguments are suffixed with the delimiter (space)
@@ -1661,9 +1706,18 @@ function Test-PSPesterResults
     }
     elseif ($PSCmdlet.ParameterSetName -eq 'PesterPassThruObject')
     {
-        if ($ResultObject.TotalCount -le 0 -and -not $CanHaveNoResult)
+        if (-not $CanHaveNoResult)
         {
-            throw 'NO TESTS RUN'
+            $noTotalCountMember = if ($null -eq (Get-Member -InputObject $ResultObject -Name 'TotalCount')) { $true } else { $false }
+            if ($noTotalCountMember)
+            {
+                Write-Verbose -Verbose -Message "`$ResultObject has no 'TotalCount' property"
+                Write-Verbose -Verbose "$($ResultObject | Out-String)"
+            }
+            if ($noTotalCountMember -or $ResultObject.TotalCount -le 0)
+            {
+                throw 'NO TESTS RUN'
+            }
         }
         elseif ($ResultObject.FailedCount -gt 0)
         {
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs b/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs
index 0549f93e266..409cb902f77 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs
@@ -182,10 +182,6 @@ public static CommandCompletion CompleteInput(string input, int cursorIndex, Has
                     CheckScriptCallOnRemoteRunspace(remoteRunspace);
                     if (remoteRunspace.GetCapabilities().Equals(Runspaces.RunspaceCapability.Default))
                     {
-                        // Capability:
-                        //      NamedPipeTransport (0x2)            -> If remoteMachine is Threshold or later
-                        //      SupportsDisconnect (0x1)            -> If remoteMachine is Win8 or later
-                        //      Default (0x0)                       -> If remoteMachine is Win7
                         // Remoting to a Win7 machine. Use the legacy tab completion function from V1/V2
                         int replacementIndex;
                         int replacementLength;
diff --git a/src/System.Management.Automation/engine/hostifaces/Connection.cs b/src/System.Management.Automation/engine/hostifaces/Connection.cs
index 5af011adb82..e892631d0d1 100644
--- a/src/System.Management.Automation/engine/hostifaces/Connection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/Connection.cs
@@ -414,7 +414,7 @@ internal RunspaceAvailabilityEventArgs(RunspaceAvailability runspaceAvailability
     public enum RunspaceCapability
     {
         /// <summary>
-        /// No additional capabilities beyond a default runspace.
+        /// Legacy capabilities for WinRM only, from Win7 timeframe.
         /// </summary>
         Default = 0x0,
 
@@ -436,7 +436,12 @@ public enum RunspaceCapability
         /// <summary>
         /// Runspace is based on SSH transport.
         /// </summary>
-        SSHTransport = 0x8
+        SSHTransport = 0x8,
+
+        /// <summary>
+        /// Runspace is based on open custom connection/transport support.
+        /// </summary>
+        CustomTransport = 0x100
     }
 
     #endregion
diff --git a/src/System.Management.Automation/engine/hostifaces/ConnectionFactory.cs b/src/System.Management.Automation/engine/hostifaces/ConnectionFactory.cs
index b812e8fe82b..014eed0f548 100644
--- a/src/System.Management.Automation/engine/hostifaces/ConnectionFactory.cs
+++ b/src/System.Management.Automation/engine/hostifaces/ConnectionFactory.cs
@@ -539,16 +539,6 @@ public static Runspace CreateRunspace(RunspaceConnectionInfo connectionInfo, PSH
         /// <returns></returns>
         public static Runspace CreateRunspace(RunspaceConnectionInfo connectionInfo, PSHost host, TypeTable typeTable, PSPrimitiveDictionary applicationArguments, string name)
         {
-            if (connectionInfo is not WSManConnectionInfo &&
-                connectionInfo is not NewProcessConnectionInfo &&
-                connectionInfo is not NamedPipeConnectionInfo &&
-                connectionInfo is not SSHConnectionInfo &&
-                connectionInfo is not VMConnectionInfo &&
-                connectionInfo is not ContainerConnectionInfo)
-            {
-                throw new NotSupportedException();
-            }
-
             if (connectionInfo is WSManConnectionInfo)
             {
                 RemotingCommandUtil.CheckHostRemotingPrerequisites();
diff --git a/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs b/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs
index 94584c613f5..8a572529971 100644
--- a/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs
@@ -81,7 +81,7 @@ internal RemoteRunspacePoolInternal(int minRunspaces,
                     minPoolSz.ToString(CultureInfo.InvariantCulture),
                     maxPoolSz.ToString(CultureInfo.InvariantCulture));
 
-            _connectionInfo = connectionInfo.InternalCopy();
+            _connectionInfo = connectionInfo.Clone();
 
             this.host = host;
             ApplicationArguments = applicationArguments;
@@ -128,7 +128,7 @@ internal RemoteRunspacePoolInternal(Guid instanceId, string name, bool isDisconn
 
             if (connectionInfo is WSManConnectionInfo)
             {
-                _connectionInfo = connectionInfo.InternalCopy();
+                _connectionInfo = connectionInfo.Clone();
             }
             else
             {
diff --git a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
index f2e9bd9093e..c8e61148746 100644
--- a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
+++ b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
@@ -137,8 +137,8 @@ internal RemoteRunspace(TypeTable typeTable, RunspaceConnectionInfo connectionIn
                         PSTask.CreateRunspace, PSKeyword.UseAlwaysOperational,
                         InstanceId.ToString());
 
-            _connectionInfo = connectionInfo.InternalCopy();
-            OriginalConnectionInfo = connectionInfo.InternalCopy();
+            _connectionInfo = connectionInfo.Clone();
+            OriginalConnectionInfo = connectionInfo.Clone();
 
             RunspacePool = new RunspacePool(1, 1, typeTable, host, applicationArguments, connectionInfo, name);
 
@@ -170,7 +170,7 @@ internal RemoteRunspace(RunspacePool runspacePool)
             RunspacePool.RemoteRunspacePoolInternal.SetMinRunspaces(1);
             RunspacePool.RemoteRunspacePoolInternal.SetMaxRunspaces(1);
 
-            _connectionInfo = runspacePool.ConnectionInfo.InternalCopy();
+            _connectionInfo = runspacePool.ConnectionInfo.Clone();
 
             // Update runspace DisconnectedOn and ExpiresOn property from WSManConnectionInfo
             UpdateDisconnectExpiresOn();
@@ -938,6 +938,11 @@ public override RunspaceCapability GetCapabilities()
                 returnCaps |= RunspaceCapability.SupportsDisconnect;
             }
 
+            if (_connectionInfo is WSManConnectionInfo)
+            {
+                return returnCaps;
+            }
+
             if (_connectionInfo is NamedPipeConnectionInfo)
             {
                 returnCaps |= RunspaceCapability.NamedPipeTransport;
@@ -950,16 +955,20 @@ public override RunspaceCapability GetCapabilities()
             {
                 returnCaps |= RunspaceCapability.SSHTransport;
             }
-            else
+            else if (_connectionInfo is ContainerConnectionInfo containerConnectionInfo)
             {
-                ContainerConnectionInfo containerConnectionInfo = _connectionInfo as ContainerConnectionInfo;
-
                 if ((containerConnectionInfo != null) &&
                     (containerConnectionInfo.ContainerProc.RuntimeId == Guid.Empty))
                 {
                     returnCaps |= RunspaceCapability.NamedPipeTransport;
                 }
             }
+            else
+            {
+                // Unknown connection info type means a custom connection/transport, which at
+                // minimum supports remote runspace capability starting from PowerShell v7.x.
+                returnCaps |= RunspaceCapability.CustomTransport;
+            }
 
             return returnCaps;
         }
diff --git a/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs b/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs
index 1fa03edf25b..8bfc34d48e0 100644
--- a/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs
+++ b/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs
@@ -44,6 +44,7 @@ public sealed class PSSession
         #region Private Members
 
         private RemoteRunspace _remoteRunspace;
+        private string _transportName;
 
         /// <summary>
         /// Static variable which is incremented to generate id.
@@ -302,7 +303,8 @@ internal PSSession(RemoteRunspace remoteRunspace)
                     break;
 
                 default:
-                    Dbg.Assert(false, "Invalid Runspace");
+                    // Default for custom connection and transports.
+                    ComputerType = TargetMachineType.RemoteMachine;
                     break;
             }
         }
@@ -338,7 +340,7 @@ private string GetTransportName()
                     return "VMBus";
 
                 default:
-                    return "Unknown";
+                    return string.IsNullOrEmpty(_transportName) ? "Custom" : _transportName;
             }
         }
 
@@ -359,6 +361,37 @@ private static string GetDisplayShellName(string shell)
 
         #region Static Methods
 
+        /// <summary>
+        /// Creates a PSSession object from the provided remote runspace object.
+        /// If psCmdlet argument is non-null, then the new PSSession object is added to the
+        /// session runspace repository (Get-PSSession).
+        /// </summary>
+        /// <param name="runspace">Runspace for the new PSSession.</param>
+        /// <param name="transportName">Optional transport name.</param>
+        /// <param name="psCmdlet">Optional cmdlet associated with the PSSession creation.</param>
+        public static PSSession Create(
+            Runspace runspace,
+            string transportName,
+            PSCmdlet psCmdlet)
+        {
+            if (!(runspace is RemoteRunspace remoteRunspace))
+            {
+                throw new PSArgumentException(RemotingErrorIdStrings.InvalidPSSessionArgument);
+            }
+
+            var psSession = new PSSession(remoteRunspace)
+            {
+                _transportName = transportName
+            };
+
+            if (psCmdlet != null)
+            {
+                psCmdlet.RunspaceRepository.Add(psSession);
+            }
+
+            return psSession;
+        }
+
         /// <summary>
         /// Generates a unique runspace id.
         /// </summary>
diff --git a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
index a9ba8007a2b..2df942f9e01 100644
--- a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
@@ -647,11 +647,11 @@ private List<RemoteRunspace> CreateRunspacesWhenRunspaceParameterSpecified()
 
                         if (remoteRunspace.ConnectionInfo is VMConnectionInfo)
                         {
-                            newConnectionInfo = remoteRunspace.ConnectionInfo.InternalCopy();
+                            newConnectionInfo = remoteRunspace.ConnectionInfo.Clone();
                         }
                         else if (remoteRunspace.ConnectionInfo is ContainerConnectionInfo)
                         {
-                            ContainerConnectionInfo newContainerConnectionInfo = remoteRunspace.ConnectionInfo.InternalCopy() as ContainerConnectionInfo;
+                            ContainerConnectionInfo newContainerConnectionInfo = remoteRunspace.ConnectionInfo.Clone() as ContainerConnectionInfo;
                             newContainerConnectionInfo.CreateContainerProcess();
                             newConnectionInfo = newContainerConnectionInfo;
                         }
diff --git a/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs b/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
index 2c154f79990..7d53cbfc4b2 100644
--- a/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
@@ -1009,8 +1009,6 @@ internal class NamedPipeClientBase : IDisposable
         private NamedPipeClientStream _clientPipeStream;
         private readonly PowerShellTraceSource _tracer = PowerShellTraceSourceFactory.GetTraceSource();
 
-        protected string _pipeName;
-
         #endregion
 
         #region Properties
@@ -1030,25 +1028,30 @@ internal class NamedPipeClientBase : IDisposable
         /// </summary>
         public string PipeName
         {
-            get { return _pipeName; }
+            get;
+            internal set;
         }
 
         #endregion
 
-        #region Constructor
-
-        public NamedPipeClientBase()
-        { }
-
-        #endregion
-
         #region IDisposable
 
         /// <summary>
-        /// Dispose.
+        /// Dispose object.
         /// </summary>
         public void Dispose()
         {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (!disposing)
+            {
+                return;
+            }
+
             if (TextReader != null)
             {
                 try { TextReader.Dispose(); }
@@ -1093,7 +1096,7 @@ public void Connect(
             TextWriter.AutoFlush = true;
 
             _tracer.WriteMessage("NamedPipeClientBase", "Connect", Guid.Empty,
-                "Connection started on pipe: {0}", _pipeName);
+                "Connection started on pipe: {0}", PipeName);
         }
 
         /// <summary>
@@ -1107,9 +1110,15 @@ public void Close()
             }
         }
 
+        /// <summary>
+        /// Abort connection attempt.
+        /// </summary>
         public virtual void AbortConnect()
         { }
 
+        /// <summary>
+        /// Begin connection attempt.
+        /// </summary>
         protected virtual NamedPipeClientStream DoConnect(int timeout)
         {
             return null;
@@ -1166,7 +1175,7 @@ internal RemoteSessionNamedPipeClient(
                 throw new PSArgumentNullException(nameof(pipeName));
             }
 
-            _pipeName = pipeName;
+            PipeName = pipeName;
 
             // Defer creating the .Net NamedPipeClientStream object until we connect.
             // _clientPipeStream == null.
@@ -1189,7 +1198,7 @@ internal RemoteSessionNamedPipeClient(
 
             if (coreName == null) { throw new PSArgumentNullException(nameof(coreName)); }
 
-            _pipeName = @"\\" + serverName + @"\" + namespaceName + @"\" + coreName;
+            PipeName = @"\\" + serverName + @"\" + namespaceName + @"\" + coreName;
 
             // Defer creating the .Net NamedPipeClientStream object until we connect.
             // _clientPipeStream == null.
@@ -1211,6 +1220,9 @@ public override void AbortConnect()
 
         #region Protected Methods
 
+        /// <summary>
+        /// Begin connection attempt.
+        /// </summary>
         protected override NamedPipeClientStream DoConnect(int timeout)
         {
             // Repeatedly attempt connection to pipe until timeout expires.
@@ -1220,11 +1232,11 @@ protected override NamedPipeClientStream DoConnect(int timeout)
 
             NamedPipeClientStream namedPipeClientStream = new NamedPipeClientStream(
                 serverName: ".",
-                pipeName: _pipeName,
+                pipeName: PipeName,
                 direction: PipeDirection.InOut,
                 options: PipeOptions.Asynchronous);
 
-            namedPipeClientStream.Connect();
+            namedPipeClientStream.ConnectAsync(timeout);
 
             do
             {
@@ -1275,7 +1287,7 @@ public ContainerSessionNamedPipeClient(
             //
             // Named pipe inside Windows Server container is under different name space.
             //
-            _pipeName = containerObRoot + @"\Device\NamedPipe\" +
+            PipeName = containerObRoot + @"\Device\NamedPipe\" +
                 NamedPipeUtils.CreateProcessPipeName(procId, appDomainName);
         }
 
@@ -1301,7 +1313,7 @@ protected override NamedPipeClientStream DoConnect(int timeout)
             {
                 // Get handle to pipe.
                 pipeHandle = NamedPipeNative.CreateFile(
-                    lpFileName: _pipeName,
+                    lpFileName: PipeName,
                     dwDesiredAccess: NamedPipeNative.GENERIC_READ | NamedPipeNative.GENERIC_WRITE,
                     dwShareMode: 0,
                     SecurityAttributes: IntPtr.Zero,
diff --git a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
index 1a28cc75980..ad4625c3762 100644
--- a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
@@ -326,13 +326,33 @@ internal int TimeSpanToTimeOutMs(TimeSpan t)
             }
         }
 
+        /// <summary>
+        /// Validates port number is in range.
+        /// </summary>
+        /// <param name="port">Port number to validate.</param>
+        internal virtual void ValidatePortInRange(int port)
+        {
+            if ((port < MinPort || port > MaxPort))
+            {
+                string message =
+                    PSRemotingErrorInvariants.FormatResourceString(
+                        RemotingErrorIdStrings.PortIsOutOfRange, port);
+                ArgumentException e = new ArgumentException(message);
+                throw e;
+            }
+        }
+
+        #endregion
+
+        #region Public methods
+
         /// <summary>
         /// Creates the appropriate client session transportmanager.
         /// </summary>
         /// <param name="instanceId">Runspace/Pool instance Id.</param>
         /// <param name="sessionName">Session name.</param>
         /// <param name="cryptoHelper">PSRemotingCryptoHelper.</param>
-        internal virtual BaseClientSessionTransportManager CreateClientSessionTransportManager(
+        public virtual BaseClientSessionTransportManager CreateClientSessionTransportManager(
             Guid instanceId,
             string sessionName,
             PSRemotingCryptoHelper cryptoHelper)
@@ -344,27 +364,11 @@ internal virtual BaseClientSessionTransportManager CreateClientSessionTransportM
         /// Create a copy of the connection info object.
         /// </summary>
         /// <returns>Copy of the connection info object.</returns>
-        internal virtual RunspaceConnectionInfo InternalCopy()
+        public virtual RunspaceConnectionInfo Clone()
         {
             throw new PSNotImplementedException();
         }
 
-        /// <summary>
-        /// Validates port number is in range.
-        /// </summary>
-        /// <param name="port">Port number to validate.</param>
-        internal virtual void ValidatePortInRange(int port)
-        {
-            if ((port < MinPort || port > MaxPort))
-            {
-                string message =
-                    PSRemotingErrorInvariants.FormatResourceString(
-                        RemotingErrorIdStrings.PortIsOutOfRange, port);
-                ArgumentException e = new ArgumentException(message);
-                throw e;
-            }
-        }
-
         #endregion
 
         #region Constants
@@ -1063,10 +1067,10 @@ public override void SetSessionOptions(PSSessionOption options)
         }
 
         /// <summary>
-        /// Shallow copy of the current instance.
+        /// Create a copy of the connection info object.
         /// </summary>
-        /// <returns>RunspaceConnectionInfo.</returns>
-        internal override RunspaceConnectionInfo InternalCopy()
+        /// <returns>Copy of the connection info object.</returns>
+        public override RunspaceConnectionInfo Clone()
         {
             return Copy();
         }
@@ -1134,7 +1138,14 @@ public WSManConnectionInfo Copy()
 
         #region Internal Methods
 
-        internal override BaseClientSessionTransportManager CreateClientSessionTransportManager(Guid instanceId, string sessionName, PSRemotingCryptoHelper cryptoHelper)
+        /// <summary>
+        /// Creates the appropriate client session transportmanager.
+        /// </summary>
+        /// <param name="instanceId">Runspace/Pool instance Id.</param>
+        /// <param name="sessionName">Session name.</param>
+        /// <param name="cryptoHelper">PSRemotingCryptoHelper instance.</param>
+        /// <returns>Instance of WSManClientSessionTransportManager</returns>
+        public override BaseClientSessionTransportManager CreateClientSessionTransportManager(Guid instanceId, string sessionName, PSRemotingCryptoHelper cryptoHelper)
         {
             return new WSManClientSessionTransportManager(
                 instanceId,
@@ -1654,12 +1665,23 @@ public NewProcessConnectionInfo Copy()
             return result;
         }
 
-        internal override RunspaceConnectionInfo InternalCopy()
+        /// <summary>
+        /// Create a copy of the connection info object.
+        /// </summary>
+        /// <returns>Copy of the connection info object.</returns>
+        public override RunspaceConnectionInfo Clone()
         {
             return Copy();
         }
 
-        internal override BaseClientSessionTransportManager CreateClientSessionTransportManager(Guid instanceId, string sessionName, PSRemotingCryptoHelper cryptoHelper)
+        /// <summary>
+        /// Creates the appropriate client session transportmanager.
+        /// </summary>
+        /// <param name="instanceId">Runspace/Pool instance Id.</param>
+        /// <param name="sessionName">Session name.</param>
+        /// <param name="cryptoHelper">PSRemotingCryptoHelper object.</param>
+        /// <returns>Instance of OutOfProcessClientSessionTransportManager</returns>
+        public override BaseClientSessionTransportManager CreateClientSessionTransportManager(Guid instanceId, string sessionName, PSRemotingCryptoHelper cryptoHelper)
         {
             return new OutOfProcessClientSessionTransportManager(
                 instanceId,
@@ -1874,10 +1896,10 @@ public override string CertificateThumbprint
         }
 
         /// <summary>
-        /// Shallow copy of current instance.
+        /// Create a copy of the connection info object.
         /// </summary>
-        /// <returns>NamedPipeConnectionInfo.</returns>
-        internal override RunspaceConnectionInfo InternalCopy()
+        /// <returns>Copy of the connection info object.</returns>
+        public override RunspaceConnectionInfo Clone()
         {
             NamedPipeConnectionInfo newCopy = new NamedPipeConnectionInfo();
             newCopy._authMechanism = this.AuthenticationMechanism;
@@ -1890,7 +1912,14 @@ internal override RunspaceConnectionInfo InternalCopy()
             return newCopy;
         }
 
-        internal override BaseClientSessionTransportManager CreateClientSessionTransportManager(Guid instanceId, string sessionName, PSRemotingCryptoHelper cryptoHelper)
+        /// <summary>
+        /// Creates the appropriate client session transportmanager.
+        /// </summary>
+        /// <param name="instanceId">Runspace/Pool instance Id.</param>
+        /// <param name="sessionName">Session name.</param>
+        /// <param name="cryptoHelper">PSRemotingCryptoHelper object.</param>
+        /// <returns>Instance of NamedPipeClientSessionTransportManager</returns>
+        public override BaseClientSessionTransportManager CreateClientSessionTransportManager(Guid instanceId, string sessionName, PSRemotingCryptoHelper cryptoHelper)
         {
             return new NamedPipeClientSessionTransportManager(
                 this,
@@ -1936,7 +1965,7 @@ public string UserName
         /// <summary>
         /// Key File Path.
         /// </summary>
-        private string KeyFilePath
+        public string KeyFilePath
         {
             get;
             set;
@@ -1945,7 +1974,7 @@ private string KeyFilePath
         /// <summary>
         /// Port for connection.
         /// </summary>
-        private int Port
+        public int Port
         {
             get;
             set;
@@ -1954,7 +1983,7 @@ private int Port
         /// <summary>
         /// Subsystem to use.
         /// </summary>
-        private string Subsystem
+        public string Subsystem
         {
             get;
             set;
@@ -2131,10 +2160,10 @@ public override string CertificateThumbprint
         }
 
         /// <summary>
-        /// Shallow copy of current instance.
+        /// Create a copy of the connection info object.
         /// </summary>
-        /// <returns>NamedPipeConnectionInfo.</returns>
-        internal override RunspaceConnectionInfo InternalCopy()
+        /// <returns>Copy of the connection info object.</returns>
+        public override RunspaceConnectionInfo Clone()
         {
             SSHConnectionInfo newCopy = new SSHConnectionInfo();
             newCopy.ComputerName = ComputerName;
@@ -2149,13 +2178,12 @@ internal override RunspaceConnectionInfo InternalCopy()
         }
 
         /// <summary>
-        /// CreateClientSessionTransportManager.
+        /// Creates the appropriate client session transportmanager.
         /// </summary>
-        /// <param name="instanceId"></param>
-        /// <param name="sessionName"></param>
-        /// <param name="cryptoHelper"></param>
-        /// <returns></returns>
-        internal override BaseClientSessionTransportManager CreateClientSessionTransportManager(Guid instanceId, string sessionName, PSRemotingCryptoHelper cryptoHelper)
+        /// <param name="instanceId">Runspace/Pool instance Id.</param>
+        /// <param name="sessionName">Session name.</param>
+        /// <param name="cryptoHelper">PSRemotingCryptoHelper.</param>
+        public override BaseClientSessionTransportManager CreateClientSessionTransportManager(Guid instanceId, string sessionName, PSRemotingCryptoHelper cryptoHelper)
         {
             return new SSHClientSessionTransportManager(
                 this,
@@ -2269,6 +2297,10 @@ internal int StartSSHProcess(
             return StartSSHProcessImpl(startInfo, out stdInWriterVar, out stdOutReaderVar, out stdErrReaderVar);
         }
 
+        /// <summary>
+        /// Terminates the SSH process by process Id.
+        /// </summary>
+        /// <param name="pid">Process id.</param>
         internal void KillSSHProcess(int pid)
         {
             KillSSHProcessImpl(pid);
@@ -2932,13 +2964,24 @@ public override PSCredential Credential
         /// </summary>
         public override string ComputerName { get; set; }
 
-        internal override RunspaceConnectionInfo InternalCopy()
+        /// <summary>
+        /// Create a copy of the connection info object.
+        /// </summary>
+        /// <returns>Copy of the connection info object.</returns>
+        public override RunspaceConnectionInfo Clone()
         {
             VMConnectionInfo result = new VMConnectionInfo(Credential, VMGuid, ComputerName, ConfigurationName);
             return result;
         }
 
-        internal override BaseClientSessionTransportManager CreateClientSessionTransportManager(Guid instanceId, string sessionName, PSRemotingCryptoHelper cryptoHelper)
+        /// <summary>
+        /// Creates the appropriate client session transportmanager.
+        /// </summary>
+        /// <param name="instanceId">Runspace/Pool instance Id.</param>
+        /// <param name="sessionName">Session name.</param>
+        /// <param name="cryptoHelper">PSRemotingCryptoHelper instance.</param>
+        /// <returns>Instance of VMHyperVSocketClientSessionTransportManager.</returns>
+        public override BaseClientSessionTransportManager CreateClientSessionTransportManager(Guid instanceId, string sessionName, PSRemotingCryptoHelper cryptoHelper)
         {
             return new VMHyperVSocketClientSessionTransportManager(
                 this,
@@ -3065,13 +3108,24 @@ public override string ComputerName
             set { throw new PSNotSupportedException(); }
         }
 
-        internal override RunspaceConnectionInfo InternalCopy()
+        /// <summary>
+        /// Create a copy of the connection info object.
+        /// </summary>
+        /// <returns>Copy of the connection info object.</returns>
+        public override RunspaceConnectionInfo Clone()
         {
             ContainerConnectionInfo newCopy = new ContainerConnectionInfo(ContainerProc);
             return newCopy;
         }
 
-        internal override BaseClientSessionTransportManager CreateClientSessionTransportManager(Guid instanceId, string sessionName, PSRemotingCryptoHelper cryptoHelper)
+        /// <summary>
+        /// Creates the appropriate client session transportmanager.
+        /// </summary>
+        /// <param name="instanceId">Runspace/Pool instance Id.</param>
+        /// <param name="sessionName">Session name.</param>
+        /// <param name="cryptoHelper">PSRemotingCryptoHelper object.</param>
+        /// <returns>Instance of ContainerHyperVSocketClientSessionTransportManager</returns>
+        public override BaseClientSessionTransportManager CreateClientSessionTransportManager(Guid instanceId, string sessionName, PSRemotingCryptoHelper cryptoHelper)
         {
             if (ContainerProc.RuntimeId != Guid.Empty)
             {
diff --git a/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
index 5d12914074c..780c71f2ee7 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
@@ -33,27 +33,81 @@ namespace System.Management.Automation.Remoting
 {
     #region TransportErrorOccuredEventArgs
 
-    internal enum TransportMethodEnum
+    /// <summary>
+    /// Transport method for error reporting.
+    /// </summary>
+    public enum TransportMethodEnum
     {
+        /// <summary>
+        /// CreateShellEx
+        /// </summary>
         CreateShellEx = 0,
+
+        /// <summary>
+        /// RunShellCommandEx
+        /// </summary>
         RunShellCommandEx = 1,
+
+        /// <summary>
+        /// SendShellInputEx
+        /// </summary>
         SendShellInputEx = 2,
+
+        /// <summary>
+        /// ReceiveShellOutputEx
+        /// </summary>
         ReceiveShellOutputEx = 3,
+
+        /// <summary>
+        /// CloseShellOperationEx
+        /// </summary>
         CloseShellOperationEx = 4,
+
+        /// <summary>
+        /// CommandInputEx
+        /// </summary>
         CommandInputEx = 5,
+
+        /// <summary>
+        /// ReceiveCommandOutputEx
+        /// </summary>
         ReceiveCommandOutputEx = 6,
+
+        /// <summary>
+        /// DisconnectShellEx
+        /// </summary>
         DisconnectShellEx = 7,
+
+        /// <summary>
+        /// ReconnectShellEx
+        /// </summary>
         ReconnectShellEx = 8,
+        
+        /// <summary>
+        /// ConnectShellEx
+        /// </summary>
         ConnectShellEx = 9,
+
+        /// <summary>
+        /// ReconnectShellCommandEx
+        /// </summary>
         ReconnectShellCommandEx = 10,
+
+        /// <summary>
+        /// ConnectShellCommandEx
+        /// </summary>
         ConnectShellCommandEx = 11,
+
+        /// <summary>
+        /// Unknown
+        /// </summary>
         Unknown = 12,
     }
 
     /// <summary>
-    /// Event arguments passed to TransportErrorOccured handlers.
+    /// Event arguments passed to TransportErrorOccurred handlers.
     /// </summary>
-    internal class TransportErrorOccuredEventArgs : EventArgs
+    public sealed class TransportErrorOccuredEventArgs : EventArgs
     {
         /// <summary>
         /// Constructor.
@@ -62,9 +116,10 @@ internal class TransportErrorOccuredEventArgs : EventArgs
         /// Error occurred.
         /// </param>
         /// <param name="m">
-        /// The transport method that raised the error
+        /// The transport method that raised the error.
         /// </param>
-        internal TransportErrorOccuredEventArgs(PSRemotingTransportException e,
+        public TransportErrorOccuredEventArgs(
+            PSRemotingTransportException e,
             TransportMethodEnum m)
         {
             Exception = e;
@@ -136,7 +191,7 @@ internal CreateCompleteEventArgs(
     /// Contains implementation that is common to both client and server
     /// transport managers.
     /// </summary>
-    internal abstract class BaseTransportManager : IDisposable
+    public abstract class BaseTransportManager : IDisposable
     {
         #region tracer
 
@@ -206,7 +261,7 @@ internal abstract class BaseTransportManager : IDisposable
 
         #region Constructor
 
-        protected BaseTransportManager(PSRemotingCryptoHelper cryptoHelper)
+        internal BaseTransportManager(PSRemotingCryptoHelper cryptoHelper)
         {
             CryptoHelper = cryptoHelper;
             // create a common fragmentor used by this transport manager to send and receive data.
@@ -361,7 +416,7 @@ public void MigrateDataReadyEventHandlers(BaseTransportManager transportManager)
         /// Raise the error handlers.
         /// </summary>
         /// <param name="eventArgs"></param>
-        internal virtual void RaiseErrorHandler(TransportErrorOccuredEventArgs eventArgs)
+        public virtual void RaiseErrorHandler(TransportErrorOccuredEventArgs eventArgs)
         {
             WSManTransportErrorOccured.SafeInvoke(this, eventArgs);
         }
@@ -393,7 +448,10 @@ public void Dispose()
             System.GC.SuppressFinalize(this);
         }
 
-        internal virtual void Dispose(bool isDisposing)
+        /// <summary>
+        /// Dispose resources.
+        /// </summary>
+        protected virtual void Dispose(bool isDisposing)
         {
             if (isDisposing)
             {
@@ -407,18 +465,21 @@ internal virtual void Dispose(bool isDisposing)
 
 namespace System.Management.Automation.Remoting.Client
 {
-    internal abstract class BaseClientTransportManager : BaseTransportManager, IDisposable
+    /// <summary>
+    /// Remoting base client transport manager.
+    /// </summary>
+    public abstract class BaseClientTransportManager : BaseTransportManager, IDisposable
     {
         #region Tracer
         [TraceSourceAttribute("ClientTransport", "Traces ClientTransportManager")]
-        protected static PSTraceSource tracer = PSTraceSource.GetTracer("ClientTransport", "Traces ClientTransportManager");
+        internal static PSTraceSource tracer = PSTraceSource.GetTracer("ClientTransport", "Traces ClientTransportManager");
         #endregion
 
         #region Data
 
-        protected bool isClosed;
-        protected object syncObject = new object();
-        protected PrioritySendDataCollection dataToBeSent;
+        internal bool isClosed;
+        internal object syncObject = new object();
+        internal PrioritySendDataCollection dataToBeSent;
         // used to handle callbacks from the server..these are used to synchronize received callbacks
         private readonly Queue<CallbackNotificationInformation> _callbackNotificationQueue;
         private readonly ReceiveDataCollection.OnDataAvailableCallback _onDataAvailableCallback;
@@ -429,13 +490,13 @@ internal abstract class BaseClientTransportManager : BaseTransportManager, IDisp
         // this is used log crimson messages.
 
         // keeps track of whether a receive request has been placed on transport
-        protected bool receiveDataInitiated;
+        internal bool receiveDataInitiated;
 
         #endregion
 
         #region Constructors
 
-        protected BaseClientTransportManager(Guid runspaceId, PSRemotingCryptoHelper cryptoHelper)
+        internal BaseClientTransportManager(Guid runspaceId, PSRemotingCryptoHelper cryptoHelper)
             : base(cryptoHelper)
         {
             RunspacePoolInstanceId = runspaceId;
@@ -933,14 +994,17 @@ internal class CallbackNotificationInformation
 
         #region Abstract / Virtual methods
 
-        internal abstract void CreateAsync();
+        /// <summary>
+        /// Create the transport manager and initiate connection.
+        /// </summary>
+        public abstract void CreateAsync();
 
         internal abstract void ConnectAsync();
 
         /// <summary>
         /// The caller should make sure the call is synchronized.
         /// </summary>
-        internal virtual void CloseAsync()
+        public virtual void CloseAsync()
         {
             // Clear the send collection
             dataToBeSent.Clear();
@@ -998,7 +1062,10 @@ internal virtual void PrepareForConnect()
             }
         }
 
-        internal override void Dispose(bool isDisposing)
+        /// <summary>
+        /// Dispose resources.
+        /// </summary>
+        protected override void Dispose(bool isDisposing)
         {
             // clear event handlers
             this.CreateCompleted = null;
@@ -1014,11 +1081,14 @@ internal override void Dispose(bool isDisposing)
         #endregion
     }
 
-    internal abstract class BaseClientSessionTransportManager : BaseClientTransportManager, IDisposable
+    /// <summary>
+    /// Remoting base client session transport manager.
+    /// </summary>
+    public abstract class BaseClientSessionTransportManager : BaseClientTransportManager, IDisposable
     {
         #region Constructors
 
-        protected BaseClientSessionTransportManager(Guid runspaceId, PSRemotingCryptoHelper cryptoHelper)
+        internal BaseClientSessionTransportManager(Guid runspaceId, PSRemotingCryptoHelper cryptoHelper)
             : base(runspaceId, cryptoHelper)
         {
         }
@@ -1167,7 +1237,7 @@ internal void RaiseSignalCompleted()
 
         #region Overrides
 
-        internal override void Dispose(bool isDisposing)
+        protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
 
diff --git a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
index 038ea9620e5..2883bfd68fe 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
@@ -412,6 +412,19 @@ internal class OutOfProcessTextWriter
         private readonly TextWriter _writer;
         private bool _isStopped;
         private readonly object _syncObject = new object();
+        private const string _errorPrepend = "__NamedPipeError__:";
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Prefix for transport error message.
+        /// </summary>
+        public static string ErrorPrefix
+        {
+            get => _errorPrepend;
+        }
 
         #endregion
 
@@ -421,9 +434,13 @@ internal class OutOfProcessTextWriter
         /// Constructs the wrapper.
         /// </summary>
         /// <param name="writerToWrap"></param>
-        internal OutOfProcessTextWriter(TextWriter writerToWrap)
+        public OutOfProcessTextWriter(TextWriter writerToWrap)
         {
-            Dbg.Assert(writerToWrap != null, "Cannot wrap a null writer.");
+            if (writerToWrap is null)
+            {
+                throw new PSArgumentNullException(nameof(writerToWrap));
+            }
+
             _writer = writerToWrap;
         }
 
@@ -435,7 +452,7 @@ internal OutOfProcessTextWriter(TextWriter writerToWrap)
         /// Calls writer.WriteLine() with data.
         /// </summary>
         /// <param name="data"></param>
-        internal virtual void WriteLine(string data)
+        public virtual void WriteLine(string data)
         {
             if (_isStopped)
             {
@@ -467,7 +484,10 @@ internal void StopWriting()
 
 namespace System.Management.Automation.Remoting.Client
 {
-    internal abstract class OutOfProcessClientSessionTransportManagerBase : BaseClientSessionTransportManager
+    /// <summary>
+    /// Client session transport manager abstract base class.
+    /// </summary>
+    public abstract class ClientSessionTransportManagerBase : BaseClientSessionTransportManager
     {
         #region Data
 
@@ -477,15 +497,17 @@ internal abstract class OutOfProcessClientSessionTransportManagerBase : BaseClie
         private OutOfProcessUtils.DataProcessingDelegates _dataProcessingCallbacks;
         private readonly Dictionary<Guid, OutOfProcessClientCommandTransportManager> _cmdTransportManagers;
         private readonly Timer _closeTimeOutTimer;
-
-        protected OutOfProcessTextWriter stdInWriter;
-        protected PowerShellTraceSource _tracer;
+        internal PowerShellTraceSource _tracer;
+        internal OutOfProcessTextWriter _messageWriter;
 
         #endregion
 
         #region Constructor
 
-        internal OutOfProcessClientSessionTransportManagerBase(
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        protected ClientSessionTransportManagerBase(
             Guid runspaceId,
             PSRemotingCryptoHelper cryptoHelper)
             : base(runspaceId, cryptoHelper)
@@ -505,7 +527,7 @@ internal OutOfProcessClientSessionTransportManagerBase(
             _dataProcessingCallbacks.ClosePacketReceived += new OutOfProcessUtils.ClosePacketReceived(OnClosePacketReceived);
             _dataProcessingCallbacks.CloseAckPacketReceived += new OutOfProcessUtils.CloseAckPacketReceived(OnCloseAckReceived);
 
-            dataToBeSent.Fragmentor = base.Fragmentor;
+            dataToBeSent.Fragmentor = Fragmentor;
             // session transport manager can receive unlimited data..however each object is limited
             // by maxRecvdObjectSize. this is to allow clients to use a session for an unlimited time..
             // also the messages that can be sent to a session are limited and very controlled.
@@ -546,7 +568,7 @@ internal override void ConnectAsync()
         /// <summary>
         /// Closes the server process.
         /// </summary>
-        internal override void CloseAsync()
+        public override void CloseAsync()
         {
             bool shouldRaiseCloseCompleted = false;
             lock (syncObject)
@@ -560,7 +582,7 @@ internal override void CloseAsync()
                 // will know that we are closing.
                 isClosed = true;
 
-                if (stdInWriter == null)
+                if (_messageWriter == null)
                 {
                     // this will happen if CloseAsync() is called
                     // before ConnectAsync()..in which case we
@@ -586,7 +608,7 @@ internal override void CloseAsync()
             try
             {
                 // send Close signal to the server and let it die gracefully.
-                stdInWriter.WriteLine(OutOfProcessUtils.CreateClosePacket(Guid.Empty));
+                _messageWriter.WriteLine(OutOfProcessUtils.CreateClosePacket(Guid.Empty));
 
                 // start the timer..so client can fail deterministically
                 _closeTimeOutTimer.Change(60 * 1000, Timeout.Infinite);
@@ -618,7 +640,7 @@ internal override BaseClientCommandTransportManager CreateClientCommandTransport
             Dbg.Assert(cmd != null, "Cmd cannot be null");
 
             OutOfProcessClientCommandTransportManager result = new
-                OutOfProcessClientCommandTransportManager(cmd, noInput, this, stdInWriter);
+                OutOfProcessClientCommandTransportManager(cmd, noInput, this, _messageWriter);
             AddCommandTransportManager(cmd.InstanceId, result);
 
             return result;
@@ -628,7 +650,7 @@ internal override BaseClientCommandTransportManager CreateClientCommandTransport
         /// Terminates the server process and disposes other resources.
         /// </summary>
         /// <param name="isDisposing"></param>
-        internal override void Dispose(bool isDisposing)
+        protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
             if (isDisposing)
@@ -693,6 +715,9 @@ private void OnCloseSessionCompleted()
             CleanupConnection();
         }
 
+        /// <summary>
+        /// Optional additional connection clean up after a connection is closed.
+        /// </summary>
         protected abstract void CleanupConnection();
 
         private void ProcessMessageProc(object state)
@@ -731,6 +756,9 @@ private void ProcessMessageProc(object state)
 
         private const string SESSIONDMESSAGETAG = "PSGuid='00000000-0000-0000-0000-000000000000'";
 
+        /// <summary>
+        /// Handles protocol output data from a transport.
+        /// </summary>
         protected void HandleOutputDataReceived(string data)
         {
             if (string.IsNullOrEmpty(data))
@@ -762,6 +790,9 @@ protected void HandleOutputDataReceived(string data)
             }
         }
 
+        /// <summary>
+        /// Handles protocol error data.
+        /// </summary>
         protected void HandleErrorDataReceived(string data)
         {
             lock (syncObject)
@@ -778,57 +809,13 @@ protected void HandleErrorDataReceived(string data)
             RaiseErrorHandler(new TransportErrorOccuredEventArgs(psrte, TransportMethodEnum.Unknown));
         }
 
-        protected void OnExited(object sender, EventArgs e)
-        {
-            TransportMethodEnum transportMethod = TransportMethodEnum.Unknown;
-            lock (syncObject)
-            {
-                // There is no need to return when IsClosed==true here as in a legitimate case process exits
-                // after Close is called..In that legitimate case, Exit handler is removed before
-                // calling Exit..So, this Exit must have been called abnormally.
-                if (isClosed)
-                {
-                    transportMethod = TransportMethodEnum.CloseShellOperationEx;
-                }
-
-                // dont let the writer write new data as the process is exited.
-                // Not assigning null to stdInWriter to fix the race condition between OnExited() and CloseAsync() methods.
-                //
-                stdInWriter.StopWriting();
-            }
-
-            // Try to get details about why the process exited
-            // and if they're not available, give information as to why
-            string processDiagnosticMessage;
-            try
-            {
-                var jobProcess = (Process)sender;
-                processDiagnosticMessage = StringUtil.Format(
-                    RemotingErrorIdStrings.ProcessExitInfo,
-                    jobProcess.ExitCode,
-                    jobProcess.StandardOutput.ReadToEnd(),
-                    jobProcess.StandardError.ReadToEnd());
-            }
-            catch (Exception exception)
-            {
-                processDiagnosticMessage = StringUtil.Format(
-                    RemotingErrorIdStrings.ProcessInfoNotRecoverable,
-                    exception.Message);
-            }
-
-            string exitErrorMsg = StringUtil.Format(
-                RemotingErrorIdStrings.IPCServerProcessExited,
-                processDiagnosticMessage);
-            var psrte = new PSRemotingTransportException(
-                PSRemotingErrorId.IPCServerProcessExited,
-                exitErrorMsg);
-            RaiseErrorHandler(new TransportErrorOccuredEventArgs(psrte, transportMethod));
-        }
-
         #endregion
 
         #region Sending Data related Methods
 
+        /// <summary>
+        /// Send any data packet in the queue.
+        /// </summary>
         protected void SendOneItem()
         {
             DataPriorityType priorityType;
@@ -865,7 +852,7 @@ private void SendData(byte[] data, DataPriorityType priorityType)
                     return;
                 }
 
-                stdInWriter.WriteLine(OutOfProcessUtils.CreateDataPacket(data,
+                _messageWriter.WriteLine(OutOfProcessUtils.CreateDataPacket(data,
                     priorityType,
                     Guid.Empty));
             }
@@ -963,7 +950,8 @@ private void OnCommandCreationAckReceived(Guid psGuid)
 
         private void OnSignalPacketReceived(Guid psGuid)
         {
-            throw new PSRemotingTransportException(PSRemotingErrorId.IPCUnknownElementReceived,
+            throw new PSRemotingTransportException(
+                PSRemotingErrorId.IPCUnknownElementReceived,
                 RemotingErrorIdStrings.IPCUnknownElementReceived,
                    OutOfProcessUtils.PS_OUT_OF_PROC_SIGNAL_TAG);
         }
@@ -972,7 +960,8 @@ private void OnSignalAckPacketReceived(Guid psGuid)
         {
             if (psGuid == Guid.Empty)
             {
-                throw new PSRemotingTransportException(PSRemotingErrorId.IPCNoSignalForSession,
+                throw new PSRemotingTransportException(
+                    PSRemotingErrorId.IPCNoSignalForSession,
                     RemotingErrorIdStrings.IPCNoSignalForSession,
                     OutOfProcessUtils.PS_OUT_OF_PROC_SIGNAL_ACK_TAG);
             }
@@ -1035,6 +1024,37 @@ internal void OnCloseTimeOutTimerElapsed(object source)
     
         #region Protected Methods
 
+        /// <summary>
+        /// Standard handler for data received, to be used by custom transport implementations.
+        /// </summary>
+        /// <param name="data">Protocol text data received by custom transport.</param>
+        protected void HandleDataReceived(string data)
+        {
+            if (data.StartsWith(OutOfProcessTextWriter.ErrorPrefix, StringComparison.OrdinalIgnoreCase))
+            {
+                // Error message from the server.
+                string errorData = data.Substring(OutOfProcessTextWriter.ErrorPrefix.Length);
+                HandleErrorDataReceived(errorData);
+            }
+            else
+            {
+                // Normal output data.
+                HandleOutputDataReceived(data);
+            }
+        }
+
+        /// <summary>
+        /// Creates the transport message writer from the provided TexWriter object.
+        /// </summary>
+        /// <param name"textWriter">TextWriter object to be used in the message writer.</param>
+        protected void SetMessageWriter(TextWriter textWriter)
+        {
+            _messageWriter = new OutOfProcessTextWriter(textWriter);
+        }
+
+        /// <summary>
+        /// Disposes message queue components.
+        /// </summary>
         protected void DisposeMessageQueue()
         {
             // Stop session processing thread.
@@ -1065,7 +1085,7 @@ protected void DisposeMessageQueue()
         #endregion
     }
 
-    internal class OutOfProcessClientSessionTransportManager : OutOfProcessClientSessionTransportManagerBase
+    internal class OutOfProcessClientSessionTransportManager : ClientSessionTransportManagerBase
     {
         #region Private Data
 
@@ -1093,14 +1113,14 @@ internal OutOfProcessClientSessionTransportManager(Guid runspaceId,
         /// <summary>
         /// Launch a new Process (pwsh -s) to perform remoting. This is used by *-Job cmdlets
         /// to support background jobs without depending on WinRM (WinRM has complex requirements like
-        /// elevation to support local machine remoting)
+        /// elevation to support local machine remoting).
         /// </summary>
         /// <exception cref="System.InvalidOperationException">
         /// </exception>
         /// <exception cref="System.ComponentModel.Win32Exception">
         /// 1. There was an error in opening the associated file.
         /// </exception>
-        internal override void CreateAsync()
+        public override void CreateAsync()
         {
             if (_connectionInfo != null)
             {
@@ -1141,8 +1161,8 @@ internal override void CreateAsync()
                     _processInstance.Start();
 
                     StartRedirectionReaderThreads(_serverProcess);
-                    stdInWriter = new OutOfProcessTextWriter(_serverProcess.StandardInput);
-                    _processInstance.StdInWriter = stdInWriter;
+                    SetMessageWriter(_serverProcess.StandardInput);
+                    _processInstance.StdInWriter = _messageWriter;
                 }
             }
             catch (System.ComponentModel.Win32Exception w32e)
@@ -1252,7 +1272,7 @@ private void ProcessErrorData(object arg)
         /// Kills the server process and disposes other resources.
         /// </summary>
         /// <param name="isDisposing"></param>
-        internal override void Dispose(bool isDisposing)
+        protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
             if (isDisposing)
@@ -1316,10 +1336,57 @@ private void KillServerProcess()
             }
         }
 
+        private void OnExited(object sender, EventArgs e)
+        {
+            TransportMethodEnum transportMethod = TransportMethodEnum.Unknown;
+            lock (syncObject)
+            {
+                // There is no need to return when IsClosed==true here as in a legitimate case process exits
+                // after Close is called..In that legitimate case, Exit handler is removed before
+                // calling Exit..So, this Exit must have been called abnormally.
+                if (isClosed)
+                {
+                    transportMethod = TransportMethodEnum.CloseShellOperationEx;
+                }
+
+                // dont let the writer write new data as the process is exited.
+                // Not assigning null to stdInWriter to fix the race condition between OnExited() and CloseAsync() methods.
+                //
+                _messageWriter.StopWriting();
+            }
+
+            // Try to get details about why the process exited
+            // and if they're not available, give information as to why
+            string processDiagnosticMessage;
+            try
+            {
+                var jobProcess = (Process)sender;
+                processDiagnosticMessage = StringUtil.Format(
+                    RemotingErrorIdStrings.ProcessExitInfo,
+                    jobProcess.ExitCode,
+                    jobProcess.StandardOutput.ReadToEnd(),
+                    jobProcess.StandardError.ReadToEnd());
+            }
+            catch (Exception exception)
+            {
+                processDiagnosticMessage = StringUtil.Format(
+                    RemotingErrorIdStrings.ProcessInfoNotRecoverable,
+                    exception.Message);
+            }
+
+            string exitErrorMsg = StringUtil.Format(
+                RemotingErrorIdStrings.IPCServerProcessExited,
+                processDiagnosticMessage);
+            var psrte = new PSRemotingTransportException(
+                PSRemotingErrorId.IPCServerProcessExited,
+                exitErrorMsg);
+            RaiseErrorHandler(new TransportErrorOccuredEventArgs(psrte, transportMethod));
+        }
+
         #endregion
     }
 
-    internal abstract class HyperVSocketClientSessionTransportManagerBase : OutOfProcessClientSessionTransportManagerBase
+    internal abstract class HyperVSocketClientSessionTransportManagerBase : ClientSessionTransportManagerBase
     {
         #region Data
 
@@ -1341,7 +1408,7 @@ internal HyperVSocketClientSessionTransportManagerBase(
 
         #region Overrides
 
-        internal override void Dispose(bool isDisposing)
+        protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
 
@@ -1485,7 +1552,7 @@ internal VMHyperVSocketClientSessionTransportManager(
         /// Create a Hyper-V socket connection to the target process and set up
         /// transport reader/writer.
         /// </summary>
-        internal override void CreateAsync()
+        public override void CreateAsync()
         {
             _client = new RemoteSessionHyperVSocketClient(_vmGuid, true);
             if (!_client.Connect(_networkCredential, _configurationName, true))
@@ -1514,7 +1581,7 @@ internal override void CreateAsync()
             }
 
             // Create writer for Hyper-V socket.
-            stdInWriter = new OutOfProcessTextWriter(_client.TextWriter);
+            SetMessageWriter(_client.TextWriter);
 
             // Create reader thread for Hyper-V socket.
             StartReaderThread(_client.TextReader);
@@ -1558,7 +1625,7 @@ internal ContainerHyperVSocketClientSessionTransportManager(
         /// Create a Hyper-V socket connection to the target process and set up
         /// transport reader/writer.
         /// </summary>
-        internal override void CreateAsync()
+        public override void CreateAsync()
         {
             _client = new RemoteSessionHyperVSocketClient(_targetGuid, false, true);
             if (!_client.Connect(null, string.Empty, false))
@@ -1573,7 +1640,7 @@ internal override void CreateAsync()
             }
 
             // Create writer for Hyper-V socket.
-            stdInWriter = new OutOfProcessTextWriter(_client.TextWriter);
+            SetMessageWriter(_client.TextWriter);
 
             // Create reader thread for Hyper-V socket.
             StartReaderThread(_client.TextReader);
@@ -1582,7 +1649,7 @@ internal override void CreateAsync()
         #endregion
     }
 
-    internal sealed class SSHClientSessionTransportManager : OutOfProcessClientSessionTransportManagerBase
+    internal sealed class SSHClientSessionTransportManager : ClientSessionTransportManagerBase
     {
         #region Data
 
@@ -1615,7 +1682,7 @@ internal SSHClientSessionTransportManager(
 
         #region Overrides
 
-        internal override void Dispose(bool isDisposing)
+        protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
 
@@ -1634,7 +1701,7 @@ protected override void CleanupConnection()
         /// Create an SSH connection to the target host and set up
         /// transport reader/writer.
         /// </summary>
-        internal override void CreateAsync()
+        public override void CreateAsync()
         {
             // Create the ssh client process with connection to host target.
             _sshProcessId = _connectionInfo.StartSSHProcess(
@@ -1646,7 +1713,7 @@ internal override void CreateAsync()
             StartErrorThread(_stdErrReader);
 
             // Create writer for named pipe.
-            stdInWriter = new OutOfProcessTextWriter(_stdInWriter);
+            SetMessageWriter(_stdInWriter);
 
             // Create reader thread and send first PSRP message.
             StartReaderThread(_stdOutReader);
@@ -1695,7 +1762,7 @@ internal override void CreateAsync()
                 period: Timeout.Infinite);
         }
 
-        internal override void CloseAsync()
+        public override void CloseAsync()
         {
             base.CloseAsync();
 
@@ -1913,10 +1980,10 @@ private void ProcessReaderThread(object state)
                         break;
                     }
 
-                    if (data.StartsWith(System.Management.Automation.Remoting.Server.NamedPipeErrorTextWriter.ErrorPrepend, StringComparison.OrdinalIgnoreCase))
+                    if (data.StartsWith(System.Management.Automation.Remoting.Server.NamedPipeErrorTextWriter.ErrorPrefix, StringComparison.OrdinalIgnoreCase))
                     {
                         // Error message from the server.
-                        string errorData = data.Substring(System.Management.Automation.Remoting.Server.NamedPipeErrorTextWriter.ErrorPrepend.Length);
+                        string errorData = data.Substring(System.Management.Automation.Remoting.Server.NamedPipeErrorTextWriter.ErrorPrefix.Length);
                         HandleErrorDataReceived(errorData);
                     }
                     else
@@ -1937,7 +2004,7 @@ private void ProcessReaderThread(object state)
             {
                 if (e is ArgumentOutOfRangeException)
                 {
-                    Dbg.Assert(false, "Need to adjust transport fragmentor to accomodate read buffer size.");
+                    Dbg.Assert(false, "Need to adjust transport fragmentor to accommodate read buffer size.");
                 }
 
                 string errorMsg = e.Message ?? string.Empty;
@@ -1949,7 +2016,7 @@ private void ProcessReaderThread(object state)
         #endregion
     }
 
-    internal abstract class NamedPipeClientSessionTransportManagerBase : OutOfProcessClientSessionTransportManagerBase
+    internal abstract class NamedPipeClientSessionTransportManagerBase : ClientSessionTransportManagerBase
     {
         #region Data
 
@@ -1982,7 +2049,7 @@ internal NamedPipeClientSessionTransportManagerBase(
 
         #region Overrides
 
-        internal override void Dispose(bool isDisposing)
+        protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
 
@@ -2043,17 +2110,7 @@ private void ProcessReaderThread(object state)
                         break;
                     }
 
-                    if (data.StartsWith(System.Management.Automation.Remoting.Server.NamedPipeErrorTextWriter.ErrorPrepend, StringComparison.OrdinalIgnoreCase))
-                    {
-                        // Error message from the server.
-                        string errorData = data.Substring(System.Management.Automation.Remoting.Server.NamedPipeErrorTextWriter.ErrorPrepend.Length);
-                        HandleErrorDataReceived(errorData);
-                    }
-                    else
-                    {
-                        // Normal output data.
-                        HandleOutputDataReceived(data);
-                    }
+                    HandleDataReceived(data);
                 }
             }
             catch (ObjectDisposedException)
@@ -2110,7 +2167,7 @@ internal NamedPipeClientSessionTransportManager(
         /// Create a named pipe connection to the target process and set up
         /// transport reader/writer.
         /// </summary>
-        internal override void CreateAsync()
+        public override void CreateAsync()
         {
             _clientPipe = string.IsNullOrEmpty(_connectionInfo.CustomPipeName) ?
                 new RemoteSessionNamedPipeClient(_connectionInfo.ProcessId, _connectionInfo.AppDomainName) :
@@ -2120,7 +2177,7 @@ internal override void CreateAsync()
             _clientPipe.Connect(_connectionInfo.OpenTimeout);
 
             // Create writer for named pipe.
-            stdInWriter = new OutOfProcessTextWriter(_clientPipe.TextWriter);
+            SetMessageWriter(_clientPipe.TextWriter);
 
             // Create reader thread for named pipe.
             StartReaderThread(_clientPipe.TextReader);
@@ -2178,7 +2235,7 @@ internal ContainerNamedPipeClientSessionTransportManager(
         /// Create a named pipe connection to the target process in target container and set up
         /// transport reader/writer.
         /// </summary>
-        internal override void CreateAsync()
+        public override void CreateAsync()
         {
             _clientPipe = new ContainerSessionNamedPipeClient(
                 _connectionInfo.ContainerProc.ProcessId,
@@ -2189,7 +2246,7 @@ internal override void CreateAsync()
             _clientPipe.Connect(_connectionInfo.OpenTimeout);
 
             // Create writer for named pipe.
-            stdInWriter = new OutOfProcessTextWriter(_clientPipe.TextWriter);
+            SetMessageWriter(_clientPipe.TextWriter);
 
             // Create reader thread for named pipe.
             StartReaderThread(_clientPipe.TextReader);
@@ -2228,7 +2285,7 @@ internal class OutOfProcessClientCommandTransportManager : BaseClientCommandTran
         internal OutOfProcessClientCommandTransportManager(
             ClientRemotePowerShell cmd,
             bool noInput,
-            OutOfProcessClientSessionTransportManagerBase sessnTM,
+            ClientSessionTransportManagerBase sessnTM,
             OutOfProcessTextWriter stdInWriter) : base(cmd, sessnTM.CryptoHelper, sessnTM)
         {
             _stdInWriter = stdInWriter;
@@ -2246,7 +2303,7 @@ internal override void ConnectAsync()
             throw new NotImplementedException(RemotingErrorIdStrings.IPCTransportConnectError);
         }
 
-        internal override void CreateAsync()
+        public override void CreateAsync()
         {
             PSEtwLog.LogAnalyticInformational(PSEventId.WSManCreateCommand, PSOpcode.Connect,
                                 PSTask.CreateRunspace,
@@ -2256,7 +2313,7 @@ internal override void CreateAsync()
             _stdInWriter.WriteLine(OutOfProcessUtils.CreateCommandPacket(powershellInstanceId));
         }
 
-        internal override void CloseAsync()
+        public override void CloseAsync()
         {
             lock (syncObject)
             {
@@ -2310,7 +2367,7 @@ internal override void SendStopSignal()
             _signalTimeOutTimer.Change(60 * 1000, Timeout.Infinite);
         }
 
-        internal override void Dispose(bool isDisposing)
+        protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
             if (isDisposing)
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
index 60e4228c9a3..2c447b8787b 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
@@ -1034,7 +1034,7 @@ internal override void StartReceivingData()
         /// <exception cref="PSRemotingTransportException">
         /// WSManCreateShellEx failed.
         /// </exception>
-        internal override void CreateAsync()
+        public override void CreateAsync()
         {
             Dbg.Assert(!isClosed, "object already disposed");
             Dbg.Assert(!string.IsNullOrEmpty(ConnectionInfo.ShellUri), "shell uri cannot be null or empty.");
@@ -1189,7 +1189,7 @@ internal override void CreateAsync()
         /// Closes the pending Create,Send,Receive operations and then closes the shell and release all the resources.
         /// The caller should make sure this method is called only after calling ConnectAsync.
         /// </summary>
-        internal override void CloseAsync()
+        public override void CloseAsync()
         {
             bool shouldRaiseCloseCompleted = false;
             // let other threads release the lock before we clean up the resources.
@@ -1640,7 +1640,7 @@ internal void ProcessWSManTransportError(TransportErrorOccuredEventArgs eventArg
         /// Log the error message in the Crimson logger and raise error handler.
         /// </summary>
         /// <param name="eventArgs"></param>
-        internal override void RaiseErrorHandler(TransportErrorOccuredEventArgs eventArgs)
+        public override void RaiseErrorHandler(TransportErrorOccuredEventArgs eventArgs)
         {
             // Look for a valid stack trace.
             string stackTrace;
@@ -2543,7 +2543,7 @@ private void SendData(byte[] data, DataPriorityType priorityType)
         #region Dispose / Destructor pattern
 
         [SuppressMessage("Microsoft.Usage", "CA2213:DisposableFieldsShouldBeDisposed")]
-        internal override void Dispose(bool isDisposing)
+        protected override void Dispose(bool isDisposing)
         {
             tracer.WriteLine("Disposing session with session context: {0} Operation Context: {1}", _sessionContextID, _wsManShellOperationHandle);
 
@@ -3013,11 +3013,12 @@ internal override void ConnectAsync()
         }
 
         /// <summary>
+        /// Begin connection creation.
         /// </summary>
         /// <exception cref="PSRemotingTransportException">
         /// WSManRunShellCommandEx failed.
         /// </exception>
-        internal override void CreateAsync()
+        public override void CreateAsync()
         {
             byte[] cmdPart1 = serializedPipeline.ReadOrRegisterCallback(null);
             if (cmdPart1 != null)
@@ -3146,7 +3147,7 @@ internal override void SendStopSignal()
         /// <summary>
         /// Closes the pending Create,Send,Receive operations and then closes the shell and release all the resources.
         /// </summary>
-        internal override void CloseAsync()
+        public override void CloseAsync()
         {
             tracer.WriteLine("Closing command with command context: {0} Operation Context {1}", _cmdContextId, _wsManCmdOperationHandle);
 
@@ -3213,7 +3214,7 @@ internal void ProcessWSManTransportError(TransportErrorOccuredEventArgs eventArg
         /// Log the error message in the Crimson logger and raise error handler.
         /// </summary>
         /// <param name="eventArgs"></param>
-        internal override void RaiseErrorHandler(TransportErrorOccuredEventArgs eventArgs)
+        public override void RaiseErrorHandler(TransportErrorOccuredEventArgs eventArgs)
         {
             // Look for a valid stack trace.
             string stackTrace;
@@ -4086,7 +4087,7 @@ internal override void StartReceivingData()
 
         #region Dispose / Destructor pattern
 
-        internal override void Dispose(bool isDisposing)
+        protected override void Dispose(bool isDisposing)
         {
             tracer.WriteLine("Disposing command with command context: {0} Operation Context: {1}", _cmdContextId, _wsManCmdOperationHandle);
             base.Dispose(isDisposing);
diff --git a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
index fe17a31f0cb..510dbeea197 100644
--- a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
+++ b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
@@ -565,21 +565,6 @@ internal static void Run(
 
     internal sealed class NamedPipeErrorTextWriter : OutOfProcessTextWriter
     {
-        #region Private Members
-
-        private const string _errorPrepend = "__NamedPipeError__:";
-
-        #endregion
-
-        #region Properties
-
-        internal static string ErrorPrepend
-        {
-            get { return _errorPrepend; }
-        }
-
-        #endregion
-
         #region Constructors
 
         internal NamedPipeErrorTextWriter(
@@ -590,9 +575,9 @@ internal NamedPipeErrorTextWriter(
 
         #region Base class overrides
 
-        internal override void WriteLine(string data)
+        public override void WriteLine(string data)
         {
-            string dataToWrite = (data != null) ? _errorPrepend + data : null;
+            string dataToWrite = (data != null) ? ErrorPrefix + data : null;
             base.WriteLine(dataToWrite);
         }
 
@@ -681,7 +666,7 @@ internal HyperVSocketErrorTextWriter(
 
         #region Base class overrides
 
-        internal override void WriteLine(string data)
+        public override void WriteLine(string data)
         {
             string dataToWrite = (data != null) ? _errorPrepend + data : null;
             base.WriteLine(dataToWrite);
diff --git a/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx b/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
index 6cbcdc72ddb..429557a7951 100644
--- a/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
+++ b/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
@@ -1702,4 +1702,7 @@ SSH client process terminated before connection could be established.</value>
   <data name="WindowsPowerShellNotPresent" xml:space="preserve">
     <value>Unable to create Windows PowerShell process because Windows PowerShell could not be found on this machine.</value>
   </data>
+  <data name="InvalidPSSessionArgument" xml:space="preserve">
+    <value>The Runspace argument to Create must be a non-null RemoteRunspace object.</value>
+  </data>
 </root>
diff --git a/src/System.Management.Automation/utils/CryptoUtils.cs b/src/System.Management.Automation/utils/CryptoUtils.cs
index a8f27732a7b..5aa321fcb72 100644
--- a/src/System.Management.Automation/utils/CryptoUtils.cs
+++ b/src/System.Management.Automation/utils/CryptoUtils.cs
@@ -635,7 +635,7 @@ private void Dispose(bool disposing)
     /// Helper for exchanging keys and encrypting/decrypting
     /// secure strings for serialization in remoting.
     /// </summary>
-    internal abstract class PSRemotingCryptoHelper : IDisposable
+    public abstract class PSRemotingCryptoHelper : IDisposable
     {
         #region Protected Members
 
@@ -645,7 +645,7 @@ internal abstract class PSRemotingCryptoHelper : IDisposable
         /// it and performing symmetric key operations using the
         /// session key.
         /// </summary>
-        protected PSRSACryptoServiceProvider _rsaCryptoProvider;
+        internal PSRSACryptoServiceProvider _rsaCryptoProvider;
 
         /// <summary>
         /// Key exchange has been completed and both keys
diff --git a/test/powershell/engine/Api/BasicEngine.Tests.ps1 b/test/powershell/engine/Api/BasicEngine.Tests.ps1
index 2a367987f28..904676d753b 100644
--- a/test/powershell/engine/Api/BasicEngine.Tests.ps1
+++ b/test/powershell/engine/Api/BasicEngine.Tests.ps1
@@ -45,21 +45,24 @@ $rs.Open()
 $ps = [powershell]::Create()
 $ps.RunspacePool = $rs
 $null = $ps.AddScript(1).Invoke()
-"should_not_stop_responding_at_exit"
+Write-Output "should_not_stop_responding_at_exit"
 exit
 '@
         $outputFile = New-Item -Path $TestDrive\output.txt -ItemType File
         $process = Start-Process "$PSHOME/pwsh" -ArgumentList $command -PassThru -RedirectStandardOutput $outputFile
-        Wait-UntilTrue -sb { $process.HasExited } -TimeoutInMilliseconds 5000 -IntervalInMilliseconds 1000 | Should -BeTrue
-        $hasExited = $process.HasExited
+        $hasExited = Wait-UntilTrue -sb { $process.HasExited } -TimeoutInMilliseconds 10000 -IntervalInMilliseconds 100
 
-        $verboseMessage = Get-Content $outputFile
+        $expectedOutput = Get-Content $outputFile
+
+        if (! $hasExited) {
+            Write-Verbose -Verbose -Message "Process has not exited after 10 second wait."
+            Write-Verbose -Verbose -Message "Process object is: $($process | Select-Object 'ProcessName','Id','HasExited' | Out-String)"
 
-        if (-not $hasExited) {
             Stop-Process $process -Force
         }
 
-        $hasExited | Should -BeTrue -Because "Process did not exit in 5 seconds as: $verboseMessage"
+        $hasExited | Should -BeTrue -Because "Process did not exit in 10 seconds as: $expectedOutput"
+        $expectedOutput | Should -BeExactly 'should_not_stop_responding_at_exit'
     }
 }
 
diff --git a/test/powershell/engine/Remoting/CustomConnection.Tests.ps1 b/test/powershell/engine/Remoting/CustomConnection.Tests.ps1
new file mode 100644
index 00000000000..4be4d335a84
--- /dev/null
+++ b/test/powershell/engine/Remoting/CustomConnection.Tests.ps1
@@ -0,0 +1,69 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+$script:JobId = -1
+
+function Start-PwshProcess
+{
+    $job = Start-Job -ScriptBlock { Write-Output $PID; Start-Sleep -Seconds 300 }
+    $script:JobId = $job.Id
+    $procId = -1
+    $count = 0
+    while (($procId -eq -1) -and ($count++ -lt 10))
+    {
+        Start-Sleep -Seconds 1
+        $procId = Receive-Job -Job $job
+        if ($null -eq $procId) {
+            $procId = -1
+        }
+    }
+
+    if ($procId -eq -1) {
+        throw "Start-PwshProcess: Unable to start job process and obtain process Id."
+    }
+
+    return $procId
+}
+
+Describe 'NamedPipe Custom Remote Connection Tests' -Tags 'Feature','RequireAdminOnWindows' {
+
+    BeforeAll {
+        Import-Module -Name Microsoft.PowerShell.NamedPipeConnection -ErrorAction Stop
+
+        $script:PwshProcId = Start-PwshProcess
+        $script:session = $null
+    }
+
+    AfterAll {
+        if ($null -ne $script:session)
+        {
+            Remove-PSSession -Session $script:session
+        }
+
+        Remove-Job -Id $script:JobId -Force -ErrorAction SilentlyContinue
+    }
+
+    It 'Verifies that New-NamedPipeSession succeeds in connectiong to Pwsh process' {
+        $script:session = New-NamedPipeSession -ProcessId $script:PwshProcId -ConnectingTimeout 10 -Name CustomNPConnection -ErrorAction Stop
+
+        # Verify created PSSession
+        $script:session.State | Should -BeExactly 'Opened'
+        $script:session.Availability | Should -BeExactly 'Available'
+        $script:session.Name | Should -BeExactly 'CustomNPConnection'
+        $script:session.Transport | Should -BeExactly 'PSNPTest'
+        $script:session.ComputerName | Should -BeExactly "LocalMachine:$($script:PwshProcId)"
+    }
+
+    # Skip this timeout test for non-Windows platforms, because dotNet named pipes do not honor the 'NumberOfServerInstances'
+    # property and allows connection to a currently connected server.
+    It 'Verifies timeout error when trying to connect to pwsh process with current connection' -Skip:(!$IsWindows) {
+        $brokenSession = New-NamedPipeSession -ProcessId $script:PwshProcId -ConnectingTimeout 2 -Name CustomNPConnection -ErrorAction Stop
+
+        # Verify expected broken session
+        $brokenSession.State | Should -BeExactly 'Broken'
+        $brokenSession.Availability | Should -BeExactly 'None'
+        $brokenSession.Runspace.RunspaceStateInfo.Reason.InnerException.GetType().Name | Should -BeExactly 'TimeoutException'
+
+        $brokenSession | Remove-PSSession
+    }
+}
diff --git a/test/tools/NamedPipeConnection/build.ps1 b/test/tools/NamedPipeConnection/build.ps1
new file mode 100644
index 00000000000..1427971d633
--- /dev/null
+++ b/test/tools/NamedPipeConnection/build.ps1
@@ -0,0 +1,84 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+# Do NOT edit this file.  Edit dobuild.ps1
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost", "")]
+param (
+    [Parameter(ParameterSetName="build")]
+    [switch]
+    $Clean,
+
+    [Parameter(ParameterSetName="build")]
+    [switch]
+    $Build,
+
+    [Parameter(ParameterSetName="publish")]
+    [switch]
+    $Publish,
+
+    [Parameter(ParameterSetName="publish")]
+    [switch]
+    $Signed,
+
+    [Parameter(ParameterSetName="build")]
+    [switch]
+    $Test,
+
+    [Parameter(ParameterSetName="build")]
+    [string[]]
+    [ValidateSet("Functional","StaticAnalysis")]
+    $TestType = @("Functional"),
+
+    [Parameter(ParameterSetName="help")]
+    [switch]
+    $UpdateHelp,
+
+    [ValidateSet("Debug", "Release")]
+    [string] $BuildConfiguration = "Debug",
+
+    [ValidateSet("net7.0")]
+    [string] $BuildFramework = "net7.0"
+)
+
+$script:ModuleName = 'Microsoft.PowerShell.NamedPipeConnection'
+$script:SrcPath = Join-Path -Path $PSScriptRoot -ChildPath 'src'
+$script:OutDirectory = Join-Path -Path $PSScriptRoot -ChildPath 'out'
+
+$script:BuildConfiguration = $BuildConfiguration
+$script:BuildFramework = $BuildFramework
+
+. $PSScriptRoot/doBuild.ps1
+
+if ($Clean.IsPresent)
+{
+    if (Test-Path "${PSScriptRoot}/out")
+    {
+        Remove-Item -Path "${PSScriptRoot}/out" -Force -Recurse -ErrorAction Stop -Verbose
+    }
+
+    if (Test-Path "${SrcPath}/code/bin")
+    {
+        Remove-Item -Path "${SrcPath}/code/bin" -Recurse -Force -ErrorAction Stop -Verbose
+    }
+
+    if (Test-Path "${SrcPath}/code/obj")
+    {
+        Remove-Item -Path "${SrcPath}/code/obj" -Recurse -Force -ErrorAction Stop -Verbose
+    }
+}
+
+if ($Build.IsPresent)
+{
+    if (-not (Test-Path $OutDirectory))
+    {
+        $script:OutModule = New-Item -ItemType Directory -Path (Join-Path $OutDirectory $ModuleName)
+    }
+    else
+    {
+        $script:OutModule = Join-Path $OutDirectory $ModuleName
+    }
+
+    Write-Verbose -Verbose -Message "Invoking DoBuild script"
+    DoBuild
+    Write-Verbose -Verbose -Message "Finished invoking DoBuild script"
+}
diff --git a/test/tools/NamedPipeConnection/doBuild.ps1 b/test/tools/NamedPipeConnection/doBuild.ps1
new file mode 100644
index 00000000000..b00769f1293
--- /dev/null
+++ b/test/tools/NamedPipeConnection/doBuild.ps1
@@ -0,0 +1,81 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+<#
+.DESCRIPTION
+Implement build and packaging of the package and place the output $OutDirectory/$ModuleName
+#>
+function DoBuild
+{
+    Write-Verbose -Verbose -Message "Starting DoBuild with configuration: $BuildConfiguration, framework: $BuildFramework"
+
+    # Module build out path
+    $BuildOutPath = "${OutDirectory}/${ModuleName}"
+    Write-Verbose -Verbose -Message "Module output file path: '$BuildOutPath'"
+
+    # Module build source path
+    $BuildSrcPath = "bin/${BuildConfiguration}/${BuildFramework}/publish"
+    Write-Verbose -Verbose -Message "Module build source path: '$BuildSrcPath'"
+
+    # Copy psd1 file
+    Write-Verbose -Verbose "Copy-Item ${SrcPath}/${ModuleName}.psd1 to ${OutDirectory}/${ModuleName}"
+    Copy-Item "${SrcPath}/${ModuleName}.psd1" "${OutDirectory}/${ModuleName}"
+
+    if ( Test-Path "${SrcPath}/code" ) {
+        Write-Verbose -Verbose -Message "Building assembly and copying to '$BuildOutPath'"
+        # build code and place it in the staging location
+        Push-Location "${SrcPath}/code"
+        try {
+            # Get dotnet.exe command path.
+            $dotnetCommand = Get-Command -Name 'dotnet' -ErrorAction Ignore
+
+            # Check for dotnet for Windows (we only build on Windows platforms).
+            if ($null -eq $dotnetCommand) {
+                Write-Verbose -Verbose -Message "dotnet.exe cannot be found in current path. Looking in ProgramFiles path."
+                $dotnetCommandPath = Join-Path -Path $env:ProgramFiles -ChildPath "dotnet\dotnet.exe"
+                $dotnetCommand = Get-Command -Name $dotnetCommandPath -ErrorAction Ignore
+                if ($null -eq $dotnetCommand) {
+                    throw "Dotnet.exe cannot be found: $dotnetCommandPath is unavailable for build."
+                }
+            }
+
+            Write-Verbose -Verbose -Message "dotnet.exe command found in path: $($dotnetCommand.Path)"
+
+            # Check dotnet version
+            Write-Verbose -Verbose -Message "DotNet version: $(& ($dotnetCommand) --version)"
+
+            # Build source
+            Write-Verbose -Verbose -Message "Building with configuration: $BuildConfiguration, framework: $BuildFramework"
+            Write-Verbose -Verbose -Message "Building location: PSScriptRoot: $PSScriptRoot, PWD: $pwd"
+            & ($dotnetCommand) publish --configuration $BuildConfiguration --framework $BuildFramework --output $BuildSrcPath
+
+            # Place build results
+            if (! (Test-Path -Path "$BuildSrcPath/${ModuleName}.dll"))
+            {
+                throw "Expected binary was not created: $BuildSrcPath/${ModuleName}.dll"
+            }
+
+            Write-Verbose -Verbose -Message "Copying $BuildSrcPath/${ModuleName}.dll to $BuildOutPath"
+            Copy-Item -Path "$BuildSrcPath/${ModuleName}.dll" -Dest "$BuildOutPath"
+            
+            if (Test-Path -Path "$BuildSrcPath/${ModuleName}.pdb")
+            {
+                Write-Verbose -Verbose -Message "Copying $BuildSrcPath/${ModuleName}.pdb to $BuildOutPath"
+                Copy-Item -Path "$BuildSrcPath/${ModuleName}.pdb" -Dest "$BuildOutPath"
+            }
+        }
+        catch {
+            Write-Verbose -Verbose -Message "dotnet build failed with error: $_"
+            Write-Error "dotnet build failed with error: $_"
+        }
+        finally {
+            Pop-Location
+        }
+    }
+    else {
+        Write-Verbose -Verbose -Message "No code to build in '${SrcPath}/code'"
+    }
+
+    ## Add build and packaging here
+    Write-Verbose -Verbose -Message "Ending DoBuild"
+}
diff --git a/test/tools/NamedPipeConnection/nuget.config b/test/tools/NamedPipeConnection/nuget.config
new file mode 100644
index 00000000000..6548586147e
--- /dev/null
+++ b/test/tools/NamedPipeConnection/nuget.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
+</configuration>
diff --git a/test/tools/NamedPipeConnection/src/Microsoft.PowerShell.NamedPipeConnection.psd1 b/test/tools/NamedPipeConnection/src/Microsoft.PowerShell.NamedPipeConnection.psd1
new file mode 100644
index 00000000000..0c5e0e417c4
--- /dev/null
+++ b/test/tools/NamedPipeConnection/src/Microsoft.PowerShell.NamedPipeConnection.psd1
@@ -0,0 +1,80 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+@{
+
+# Script module or binary module file associated with this manifest.
+RootModule = '.\Microsoft.PowerShell.NamedPipeConnection.dll'
+
+# Version number of this module.
+ModuleVersion = '1.0.0'
+
+# Supported PSEditions
+CompatiblePSEditions = @('Core')
+
+# ID used to uniquely identify this module
+GUID = 'd73fd604-f213-47e2-b1cb-092bb73be2dc'
+
+# Author of this module
+Author = 'Microsoft Corporation'
+
+# Company or vendor of this module
+CompanyName = 'Microsoft Corporation'
+
+# Copyright statement for this module
+Copyright = '(c) Microsoft Corporation. All rights reserved.'
+
+# Description of the functionality provided by this module
+Description = "
+
+This PowerShell module implements a custom remoting connection based on named pipes.
+This module is used only for PowerShell custom remoting API testing.
+This module is built as part of the PowerShell CI system.
+"
+
+# Minimum version of the PowerShell engine required by this module
+PowerShellVersion = '7.3.0'
+DotNetFrameworkVersion = '7.0'
+CLRVersion = '4.0.0'
+
+# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
+CmdletsToExport = @('New-NamedPipeSession')
+
+FunctionsToExport = @()
+
+# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
+PrivateData = @{
+
+    PSData = @{
+
+        # Tags applied to this module. These help with module discovery in online galleries.
+        Tags = @('PowerShellCustomRemoteConnection')
+
+        # A URL to the license for this module.
+        LicenseUri = ''
+
+        # A URL to the main website for this project.
+        ProjectUri = ''
+
+        # A URL to an icon representing this module.
+        # IconUri = ''
+
+        # ReleaseNotes of this module
+        # ReleaseNotes = ''
+
+        # Prerelease string of this module
+        # Prerelease = 'beta'
+
+        # Flag to indicate whether the module requires explicit user acceptance for install/update/save
+        # RequireLicenseAcceptance = $false
+
+        # External dependent modules of this module
+        # ExternalModuleDependencies = @()
+    } # End of PSData hashtable
+
+} # End of PrivateData hashtable
+
+# HelpInfo URI of this module
+HelpInfoURI = 'https://aka.ms/ps-modules-help'
+
+}
diff --git a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
new file mode 100644
index 00000000000..fbaf1254a14
--- /dev/null
+++ b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Microsoft.PowerShell.NamedPipeConnection</RootNamespace>
+    <AssemblyName>Microsoft.PowerShell.NamedPipeConnection</AssemblyName>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.0</FileVersion>
+    <InformationalVersion>1.0.0</InformationalVersion>
+    <TargetFrameworks>net7.0</TargetFrameworks>
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+    <LangVersion>9.0</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" version="4.5.0-*" />
+    <Reference Include="System.Management.Automation">
+      <HintPath>.\Ref\System.Management.Automation.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+</Project>
diff --git a/test/tools/NamedPipeConnection/src/code/NamedPipeConnection.cs b/test/tools/NamedPipeConnection/src/code/NamedPipeConnection.cs
new file mode 100644
index 00000000000..02b63999de8
--- /dev/null
+++ b/test/tools/NamedPipeConnection/src/code/NamedPipeConnection.cs
@@ -0,0 +1,638 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.IO;
+using System.IO.Pipes;
+using System.Management.Automation;
+using System.Management.Automation.Internal;
+using System.Management.Automation.Remoting;
+using System.Management.Automation.Remoting.Client;
+using System.Management.Automation.Runspaces;
+using System.Threading;
+
+namespace Microsoft.PowerShell.CustomNamedPipeConnection
+{
+    #region NamedPipeClient
+
+    /// <summary>
+    /// This class is based on PowerShell core source code, and handles creating
+    /// a client side named pipe object that can connect to a running PowerShell 
+    /// process by its process Id.
+    /// </summary>
+    internal sealed class NamedPipeClient
+    {
+        #region Members
+
+        private NamedPipeClientStream _clientPipeStream;
+        private volatile bool _connecting;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Accessor for the named pipe reader.
+        /// </summary>
+        public StreamReader TextReader { get; private set; }
+
+        /// <summary>
+        /// Accessor for the named pipe writer.
+        /// </summary>
+        public StreamWriter TextWriter { get; private set; }
+
+        /// <summary>
+        /// Name of the pipe.
+        /// </summary>
+        public string PipeName { get; private set; }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose object.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (!disposing)
+            {
+                return;
+            }
+
+            if (TextReader != null)
+            {
+                try { TextReader.Dispose(); }
+                catch (ObjectDisposedException) { }
+
+                TextReader = null;
+            }
+
+            if (TextWriter != null)
+            {
+                try { TextWriter.Dispose(); }
+                catch (ObjectDisposedException) { }
+
+                TextWriter = null;
+            }
+
+            if (_clientPipeStream != null)
+            {
+                try { _clientPipeStream.Dispose(); }
+                catch (ObjectDisposedException) { }
+            }
+        }
+
+        #endregion
+
+        #region Constructors
+
+        private NamedPipeClient()
+        { }
+
+        /// <summary>
+        /// Constructor. Creates Named Pipe based on process Id.
+        /// </summary>
+        /// <param name="procId">Target process Id for pipe.</param>
+        public NamedPipeClient(int procId)
+        {
+            PipeName = CreateProcessPipeName(
+                System.Diagnostics.Process.GetProcessById(procId));
+        }
+
+        #endregion
+
+        #region Static methods
+
+        /// <summary>
+        /// Create a pipe name based on process and appdomain name information.
+        /// E.g., "PSHost.ProcessStartTime.ProcessId.DefaultAppDomain.ProcessName"
+        /// </summary>
+        /// <param name="proc">Process object.</param>
+        /// <returns>Pipe name.</returns>
+        private static string CreateProcessPipeName(System.Diagnostics.Process proc)
+        {
+            System.Text.StringBuilder pipeNameBuilder = new System.Text.StringBuilder();
+            pipeNameBuilder.Append(@"PSHost.");
+
+            string DefaultAppDomainName;
+            if (OperatingSystem.IsWindows())
+            {
+                DefaultAppDomainName = "DefaultAppDomain";
+                pipeNameBuilder.Append(proc.StartTime.ToFileTime().ToString(CultureInfo.InvariantCulture));
+            }
+            else
+            {
+                DefaultAppDomainName = "None";
+                pipeNameBuilder.Append(proc.StartTime.ToFileTime().ToString("X8").AsSpan(1, 8));
+            }
+
+            pipeNameBuilder.Append('.')
+                .Append(proc.Id.ToString(CultureInfo.InvariantCulture))
+                .Append('.')
+                .Append(DefaultAppDomainName)
+                .Append('.')
+                .Append(proc.ProcessName);
+
+            return pipeNameBuilder.ToString();
+        }
+
+        #endregion
+
+        #region Public methods
+
+        /// <summary>
+        /// Connect to named pipe server.  This is a blocking call until a
+        /// connection occurs or the timeout time has elapsed.
+        /// </summary>
+        /// <param name="timeout">Connection attempt timeout in milliseconds.</param>
+        public void Connect(
+            int timeout)
+        {
+            // Uses Native API to connect to pipe and return NamedPipeClientStream object.
+            _clientPipeStream = DoConnect(timeout);
+
+            // Create reader/writer streams.
+            TextReader = new StreamReader(_clientPipeStream);
+            TextWriter = new StreamWriter(_clientPipeStream);
+            TextWriter.AutoFlush = true;
+        }
+
+        /// <summary>
+        /// Closes the named pipe.
+        /// </summary>
+        public void Close()
+        {
+            if (_clientPipeStream != null)
+            {
+                _clientPipeStream.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Abort connection attempt.
+        /// </summary>
+        public void AbortConnect()
+        {
+            _connecting = false;
+        }
+
+        #endregion
+
+        #region Private methods
+
+        /// <summary>
+        /// Begin connection attempt.
+        /// </summary>
+        private NamedPipeClientStream DoConnect(int timeout)
+        {
+            // Repeatedly attempt connection to pipe until timeout expires.
+            int startTime = Environment.TickCount;
+            int elapsedTime = 0;
+            _connecting = true;
+
+            NamedPipeClientStream namedPipeClientStream = new NamedPipeClientStream(
+                serverName: ".",
+                pipeName: PipeName,
+                direction: PipeDirection.InOut,
+                options: PipeOptions.Asynchronous);
+
+            namedPipeClientStream.ConnectAsync(timeout);
+
+            do
+            {
+                if (!namedPipeClientStream.IsConnected)
+                {
+                    Thread.Sleep(100);
+                    elapsedTime = unchecked(Environment.TickCount - startTime);
+                    continue;
+                }
+
+                _connecting = false;
+                return namedPipeClientStream;
+            } while (_connecting && (elapsedTime < timeout));
+
+            _connecting = false;
+
+            throw new TimeoutException(@"Timeout expired before connection could be made to named pipe.");
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region NamedPipeInfo
+
+    internal sealed class NamedPipeInfo : RunspaceConnectionInfo
+    {
+        #region Fields
+
+        private NamedPipeClient _clientPipe;
+        private readonly string _computerName;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Process Id to attach to.
+        /// </summary>
+        public int ProcessId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// ConnectingTimeout in Milliseconds
+        /// </summary>
+        public int ConnectingTimeout
+        {
+            get;
+            set;
+        }
+
+        #endregion
+
+        #region Constructors
+
+        private NamedPipeInfo()
+        { }
+
+        /// <summary>
+        /// Construct instance.
+        /// </summary>
+        public NamedPipeInfo(
+            int processId,
+            int connectingTimeout)
+        {
+            ProcessId = processId;
+            ConnectingTimeout = connectingTimeout;
+            _computerName = $"LocalMachine:{ProcessId}";
+            _clientPipe = new NamedPipeClient(ProcessId);
+        }
+
+        #endregion
+
+        #region Overrides
+
+        /// <summary>
+        /// ComputerName
+        /// </summary>
+        public override string ComputerName
+        {
+            get { return _computerName; }
+            set { throw new NotImplementedException(); }
+        }
+
+        /// <summary>
+        /// Credential
+        /// </summary>
+        public override PSCredential Credential
+        {
+            get { return null; }
+            set { throw new NotImplementedException(); }
+        }
+
+        /// <summary>
+        /// AuthenticationMechanism
+        /// </summary>
+        public override AuthenticationMechanism AuthenticationMechanism
+        {
+            get { return AuthenticationMechanism.Default; }
+            set { throw new NotImplementedException(); }
+        }
+
+        /// <summary>
+        /// CertificateThumbprint
+        /// </summary>
+        public override string CertificateThumbprint
+        {
+            get { return string.Empty; }
+            set { throw new NotImplementedException(); }
+        }
+
+        /// <summary>
+        /// Create shallow copy of NamedPipeInfo object.
+        /// </summary>
+        public override RunspaceConnectionInfo Clone()
+        {
+            var connectionInfo = new NamedPipeInfo(ProcessId, ConnectingTimeout);
+            connectionInfo._clientPipe = _clientPipe;
+            return connectionInfo;
+        }
+
+        /// <summary>
+        /// Create an instance of ClientSessionTransportManager.
+        /// </summary>
+        public override BaseClientSessionTransportManager CreateClientSessionTransportManager(
+            Guid instanceId,
+            string sessionName,
+            PSRemotingCryptoHelper cryptoHelper)
+        {
+            return new NamedPipeClientSessionTransportMgr(
+                connectionInfo: this,
+                runspaceId: instanceId,
+                cryptoHelper: cryptoHelper);
+        }
+
+        #endregion
+    
+        #region Public Methods
+
+        /// <summary>
+        /// Attempt to connect to process Id.
+        /// If connection fails, is aborted, or times out, an exception is thrown.
+        /// </summary>
+        /// <param name="textWriter">Named pipe text stream writer.</param>
+        /// <param name="textReader">Named pipe text stream reader.</param>
+        /// <exception cref="TimeoutException">Connect attempt times out or is aborted.</exception>
+        public void Connect(
+            out StreamWriter textWriter,
+            out StreamReader textReader)
+        {
+            // Wait for named pipe to connect.
+            _clientPipe.Connect(
+                timeout: ConnectingTimeout > -1 ? ConnectingTimeout : int.MaxValue);
+
+            textWriter = _clientPipe.TextWriter;
+            textReader = _clientPipe.TextReader;
+        }
+
+        /// <summary>
+        /// Stops a connection attempt, or closes the connection that has been established.
+        /// </summary>
+        public void StopConnect()
+        {
+            _clientPipe?.AbortConnect();
+            _clientPipe?.Close();
+            _clientPipe?.Dispose();
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region NamedPipeClientSessionTransportMgr
+
+    internal sealed class NamedPipeClientSessionTransportMgr : ClientSessionTransportManagerBase
+    {
+        #region Fields
+
+        private readonly NamedPipeInfo _connectionInfo;
+        private const string _threadName = "NamedPipeCustomTransport Reader Thread";
+
+        #endregion
+
+        #region Constructor
+
+        internal NamedPipeClientSessionTransportMgr(
+            NamedPipeInfo connectionInfo,
+            Guid runspaceId,
+            PSRemotingCryptoHelper cryptoHelper)
+            : base(runspaceId, cryptoHelper)
+        {
+            if (connectionInfo == null) { throw new PSArgumentException("connectionInfo"); }
+
+            _connectionInfo = connectionInfo;
+        }
+
+        #endregion
+
+        #region Overrides
+
+        /// <summary>
+        /// Create a named pipe connection to the target process and set up
+        /// transport reader/writer.
+        /// </summary>
+        public override void CreateAsync()
+        {
+            _connectionInfo.Connect(
+                out StreamWriter pipeTextWriter,
+                out StreamReader pipeTextReader);
+
+            // Create writer for named pipe.
+            SetMessageWriter(pipeTextWriter);
+
+            // Create reader thread for named pipe.
+            StartReaderThread(pipeTextReader);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (isDisposing)
+            {
+                CloseConnection();
+            }
+        }
+
+        protected override void CleanupConnection()
+        {
+            CloseConnection();
+        }
+
+        #endregion
+    
+        #region Private Methods
+
+        private void CloseConnection()
+        {
+            _connectionInfo.StopConnect();
+        }
+
+        private void HandleSSHError(PSRemotingTransportException ex)
+        {
+            RaiseErrorHandler(
+                new TransportErrorOccuredEventArgs(
+                    ex,
+                    TransportMethodEnum.CloseShellOperationEx));
+
+            CloseConnection();
+        }
+
+        private void StartReaderThread(
+            StreamReader reader)
+        {
+            Thread readerThread = new Thread(ProcessReaderThread);
+            readerThread.Name = _threadName;
+            readerThread.IsBackground = true;
+            readerThread.Start(reader);
+        }
+
+        private void ProcessReaderThread(object state)
+        {
+            try
+            {
+                StreamReader reader = state as StreamReader;
+
+                // Send one fragment.
+                SendOneItem();
+
+                // Start reader loop.
+                while (true)
+                {
+                    string data = reader.ReadLine();
+                    if (data == null)
+                    {
+                        // End of stream indicates that the SSH transport is broken.
+                        // SSH will return the appropriate error in StdErr stream so
+                        // let the error reader thread report the error.
+                        break;
+                    }
+
+                    HandleDataReceived(data);
+                }
+            }
+            catch (ObjectDisposedException)
+            {
+                // Normal reader thread end.
+            }
+            catch (Exception e)
+            {
+                string errorMsg = e.Message ?? string.Empty;
+                HandleSSHError(new PSRemotingTransportException(
+                    $"The SSH client session has ended reader thread with message: {errorMsg}"));
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region New-NamedPipeSession
+
+    /// <summary>
+    /// Attempts to connect to the specified host computer and returns
+    /// a PSSession object representing the remote session.
+    /// </summary>
+    [Cmdlet(VerbsCommon.New, "NamedPipeSession")]
+    [OutputType(typeof(PSSession))]
+    public sealed class NewNamedPipeSessionCommand : PSCmdlet
+    {
+        #region Fields
+
+        private NamedPipeInfo _connectionInfo;
+        private Runspace _runspace;
+        private ManualResetEvent _openAsync;
+
+        #endregion
+
+        #region Parameters
+
+        /// <summary>
+        /// Name of host computer to connect to.
+        /// </summary>
+        [Parameter(Position=0, Mandatory=true)]
+        [ValidateNotNullOrEmpty]
+        public int ProcessId { get; set; }
+
+        /// <summary>
+        /// Optional value in seconds that limits the time allowed for a connection to be established.
+        /// </summary>
+        [Parameter]
+        [ValidateRange(-1, 86400)]
+        public int ConnectingTimeout { get; set; } = Timeout.Infinite;
+
+        /// <summary>
+        /// Optional name for the new PSSession.
+        /// </summary>
+        [Parameter]
+        [ValidateNotNullOrEmpty]
+        public string Name { get; set; }
+
+        #endregion
+
+        #region Overrides
+
+        /// <summary>
+        /// EndProcessing override.
+        /// </summary>
+        protected override void BeginProcessing()
+        {
+            // Convert ConnectingTimeout value from seconds to milliseconds.
+            _connectionInfo = new NamedPipeInfo(
+                processId: ProcessId,
+                connectingTimeout: (ConnectingTimeout == Timeout.Infinite) ? Timeout.Infinite : ConnectingTimeout * 1000);
+
+            _runspace = RunspaceFactory.CreateRunspace(
+                connectionInfo: _connectionInfo,
+                host: Host,
+                typeTable: TypeTable.LoadDefaultTypeFiles(),
+                applicationArguments: null,
+                name: Name);
+            
+            _openAsync = new ManualResetEvent(false);
+            _runspace.StateChanged += HandleRunspaceStateChanged;
+
+            try
+            {
+                _runspace.OpenAsync();
+                _openAsync.WaitOne();
+
+                WriteObject(
+                    PSSession.Create(
+                        runspace: _runspace,
+                        transportName: "PSNPTest",
+                        psCmdlet: this));
+            }
+            finally
+            {
+                _openAsync.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// StopProcessing override.
+        /// </summary>
+        protected override void StopProcessing()
+        {
+            _connectionInfo?.StopConnect();
+        }
+
+        #endregion
+
+        #region Private methods
+
+        private void HandleRunspaceStateChanged(
+            object source,
+            RunspaceStateEventArgs stateEventArgs)
+        {
+            switch (stateEventArgs.RunspaceStateInfo.State)
+            {
+                case RunspaceState.Opened:
+                case RunspaceState.Closed:
+                case RunspaceState.Broken:
+                    _runspace.StateChanged -= HandleRunspaceStateChanged;
+                    ReleaseWait();
+                    break;
+            }
+        }
+
+        private void ReleaseWait()
+        {
+            try
+            {
+                _openAsync?.Set();
+            }
+            catch (ObjectDisposedException)
+            { }
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/test/tools/NamedPipeConnection/test/CustomConnection.Tests.ps1 b/test/tools/NamedPipeConnection/test/CustomConnection.Tests.ps1
new file mode 100644
index 00000000000..6c2c1337f99
--- /dev/null
+++ b/test/tools/NamedPipeConnection/test/CustomConnection.Tests.ps1
@@ -0,0 +1,67 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+function Start-PwshProcess
+{
+    param (
+        [string] $FilePath = $null
+    )
+
+    if ($FilePath -eq $null -or $FilePath -eq "") {
+        $FilePath = Join-Path -Path $PSHOME -ChildPath 'pwsh'
+    }
+
+    $proc = Start-Process -FilePath $FilePath -WindowStyle Hidden -PassThru -ErrorAction Stop
+
+    return $proc.Id
+}
+
+Describe 'NamedPipe Custom Remote Connection Tests' -Tags 'Feature','RequireAdminOnWindows' {
+
+    BeforeAll {
+        if (!$IsWindows) {
+            return
+        }
+        Import-Module -Name Microsoft.PowerShell.NamedPipeConnection -ErrorAction Stop
+
+        $script:PwshProcId = Start-PwshProcess
+        $script:session = $null
+    }
+
+    AfterAll {
+        if (!$IsWindows) {
+            return
+        }
+        if ($null -ne $script:session)
+        {
+            Remove-PSSession -Session $script:session
+        }
+
+        if ($script:PwshProcId -gt 0)
+        {
+            Stop-Process -Id $script:PwshProcId
+        }
+    }
+
+    It 'Verifies that New-NamedPipeSession succeeds in connectiong to Pwsh process' -Skip:(!$IsWindows) {
+        $script:session = New-NamedPipeSession -ProcessId $script:PwshProcId -ConnectingTimeout 10 -Name CustomNPConnection -ErrorAction Stop
+
+        # Verify created PSSession
+        $script:session.State | Should -BeExactly 'Opened'
+        $script:session.Availability | Should -BeExactly 'Available'
+        $script:session.Name | Should -BeExactly 'CustomNPConnection'
+        $script:session.Transport | Should -BeExactly 'PSNPTest'
+        $script:session.ComputerName | Should -BeExactly "LocalMachine:$($script:PwshProcId)"
+    }
+
+    It 'Verifies timeout error when trying to connect to pwsh process with current connection' -Skip:(!$IsWindows) {
+        $brokenSession = New-NamedPipeSession -ProcessId $script:PwshProcId -ConnectingTimeout 2 -Name CustomNPConnection -ErrorAction Stop
+
+        # Verify expected broken session
+        $brokenSession.State | Should -BeExactly 'Broken'
+        $brokenSession.Availability | Should -BeExactly 'None'
+        $brokenSession.Runspace.RunspaceStateInfo.Reason.InnerException.GetType().Name | Should -BeExactly 'TimeoutException'
+
+        $brokenSession | Remove-PSSession
+    }
+}

From 74a51aa16e93fbb83774bcb283263260c328c267 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Wed, 23 Mar 2022 08:53:12 -0700
Subject: [PATCH 280/645] Use a random string for the missing help topic to
 improve the chances that the help topic really won't be found. (#17042)

---
 test/powershell/engine/Help/HelpSystem.Tests.ps1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/powershell/engine/Help/HelpSystem.Tests.ps1 b/test/powershell/engine/Help/HelpSystem.Tests.ps1
index 2712d761b20..207053b058b 100644
--- a/test/powershell/engine/Help/HelpSystem.Tests.ps1
+++ b/test/powershell/engine/Help/HelpSystem.Tests.ps1
@@ -103,7 +103,7 @@ Describe "Validate that get-help works for CurrentUserScope" -Tags @('CI') {
 Describe "Testing Get-Help Progress" -Tags @('Feature') {
     It "Last ProgressRecord should be Completed" {
         try {
-            $j = Start-Job { Get-Help DoesNotExist }
+            $j = Start-Job { Get-Help ([guid]::NewGuid().ToString("N")) }
             $j | Wait-Job
             $j.ChildJobs[0].Progress[-1].RecordType | Should -Be ([System.Management.Automation.ProgressRecordType]::Completed)
         }
@@ -577,7 +577,8 @@ Describe "Help failure cases" -Tags Feature {
         param($command)
 
         # under some conditions this does not throw, so include what we actually got
-        { & $command DoesNotExist -ErrorAction Stop } | Should -Throw -ErrorId "HelpNotFound,Microsoft.PowerShell.Commands.GetHelpCommand" -Because "$(& $command DoesNotExist -ea Ignore)"
+        $helpTopic = [guid]::NewGuid().ToString("N")
+        { & $command $helpTopic -ErrorAction Stop } | Should -Throw -ErrorId "HelpNotFound,Microsoft.PowerShell.Commands.GetHelpCommand" -Because "$(& $command $helpTopic -ea Ignore)"
     }
 }
 

From b3632eda46e908574ab6373c4b51cccc87dd5212 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Wed, 23 Mar 2022 09:24:10 -0700
Subject: [PATCH 281/645] Improve unique naming for tests (#17043)

---
 .../Language/Parser/Conversions.Tests.ps1      |  2 +-
 .../Language/Scripting/ScriptHelp.Tests.ps1    |  3 ++-
 .../Remove-Module.Tests.ps1                    |  6 +++---
 .../Get-Date.Tests.ps1                         | 18 +++++++++---------
 .../BooleanParameterDCR.Tests.ps1              | 18 +++++++++---------
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/test/powershell/Language/Parser/Conversions.Tests.ps1 b/test/powershell/Language/Parser/Conversions.Tests.ps1
index bfeeddc4f1a..119f74d9a8a 100644
--- a/test/powershell/Language/Parser/Conversions.Tests.ps1
+++ b/test/powershell/Language/Parser/Conversions.Tests.ps1
@@ -526,7 +526,7 @@ Describe 'method conversion' -Tags 'CI' {
 }
 
 Describe 'float/double precision when converting to string' -Tags "CI" {
-    It "<SourceType>-to-[string] conversion in PowerShell should use the precision specifier <Format>" -TestCases @(
+    It "<SourceType>-to-[string] conversion in PowerShell should use the precision specifier <Format> (<ToStringResult>)" -TestCases @(
         @{ SourceType = [double]; Format = "G15"; ValueScript = { 1.1 * 3 }; StringConversionResult = "3.3"; ToStringResult = "3.3000000000000003" }
         @{ SourceType = [double]; Format = "G15"; ValueScript = { 1.1 * 6 }; StringConversionResult = "6.6"; ToStringResult = "6.6000000000000005" }
         @{ SourceType = [double]; Format = "G15"; ValueScript = { [System.Math]::E }; StringConversionResult = [System.Math]::E.ToString("G15"); ToStringResult = [System.Math]::E.ToString() }
diff --git a/test/powershell/Language/Scripting/ScriptHelp.Tests.ps1 b/test/powershell/Language/Scripting/ScriptHelp.Tests.ps1
index 7553fc96207..d78193609b5 100644
--- a/test/powershell/Language/Scripting/ScriptHelp.Tests.ps1
+++ b/test/powershell/Language/Scripting/ScriptHelp.Tests.ps1
@@ -551,7 +551,8 @@ Describe 'get-help other tests' -Tags "CI" {
 
         $x = Get-Help helpFunc11 -det
         $x.Parameters.parameter | ForEach-Object {
-        It '$_.description' { $_.description[0].text | Should -Match "^$($_.Name)\s+help" }
+            $dText = $_.description[0].text
+            It ('$_.description ({0})' -f $title) { $dText | Should -Match "^$($_.Name)\s+help" }
         }
     }
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Remove-Module.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Remove-Module.Tests.ps1
index 665281dd197..9e6c97fae27 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Remove-Module.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Remove-Module.Tests.ps1
@@ -145,7 +145,7 @@ Describe "Remove-Module -Name | -FullyQualifiedName | -ModuleInfo" -Tags "CI" {
         }
     }
 
-    It "Remove-Module -FullyQualifiedName <FullyQualifiedName>" -TestCases $removeModuleByFQNTestCases {
+    It "Remove-Module -FullyQualifiedName <FqnToRemove>" -TestCases $removeModuleByFQNTestCases {
         param([Microsoft.PowerShell.Commands.ModuleSpecification[]]$FqnToRemove, [string[]]$ShouldBeRemoved, [string[]]$ShouldBePresent)
 
         (Get-Module -Name "Bar", "Baz", "Foo").Name | Should -BeExactly "Bar", "Baz", "Foo", "Foo"
@@ -161,7 +161,7 @@ Describe "Remove-Module -Name | -FullyQualifiedName | -ModuleInfo" -Tags "CI" {
         }
     }
 
-    It "Remove-Module -FullyQualifiedName <FullyQualifiedName> (Error cases)" -TestCases $removeModuleByFQNErrorTestCases {
+    It "Remove-Module -FullyQualifiedName <FqnToRemove> (Error cases)" -TestCases $removeModuleByFQNErrorTestCases {
         param([Microsoft.PowerShell.Commands.ModuleSpecification[]]$FqnToRemove, [string[]]$ShouldBeRemoved, [string[]]$ShouldBePresent)
 
         (Get-Module -Name "Bar", "Baz", "Foo").Name | Should -BeExactly "Bar", "Baz", "Foo", "Foo"
@@ -177,7 +177,7 @@ Describe "Remove-Module -Name | -FullyQualifiedName | -ModuleInfo" -Tags "CI" {
         }
     }
 
-    It "Remove-Module -ModuleInfo <ModuleInfo>" -TestCases $removeModuleByFQNTestCases {
+    It "Remove-Module -ModuleInfo <FqnToRemove>" -TestCases $removeModuleByFQNTestCases {
         param([Microsoft.PowerShell.Commands.ModuleSpecification[]]$FqnToRemove, [string[]]$ShouldBeRemoved, [string[]]$ShouldBePresent)
 
         (Get-Module -Name "Bar", "Baz", "Foo").Name | Should -BeExactly "Bar", "Baz", "Foo", "Foo"
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Date.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Date.Tests.ps1
index d3c2295fa11..f72f1fc4ddb 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Date.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Date.Tests.ps1
@@ -56,7 +56,7 @@ Describe "Get-Date DRT Unit Tests" -Tags "CI" {
     }
 
     # The 'week of year' test cases is from https://en.wikipedia.org/wiki/ISO_week_date
-    It "using -uformat 'V' produces the correct output" -TestCases @(
+    It "using -uformat 'V' produces the correct output (<date>:<week>)" -TestCases @(
         @{date="1998-01-02"; week = "01"},
         @{date="1998-01-03"; week = "01"},
         @{date="2003-01-03"; week = "01"},
@@ -98,7 +98,7 @@ Describe "Get-Date DRT Unit Tests" -Tags "CI" {
     }
 
     # Using the same test cases as V for ISO week date component parity, plus some more esoteric ones
-    It "using -uformat 'G' produces the correct output" -TestCases @(
+    It "using -uformat 'G' produces the correct output (<date>:<year>)" -TestCases @(
         @{date="0055-12-31"; year = "0055"},
         @{date="0325-01-01"; year = "0325"},
         @{date="0777-01-01"; year = "0776"},
@@ -143,7 +143,7 @@ Describe "Get-Date DRT Unit Tests" -Tags "CI" {
     }
 
     # Using the same test cases as V for ISO week date component parity, plus some more esoteric ones
-    It "using -uformat 'g' produces the correct output" -TestCases @(
+    It "using -uformat 'g' produces the correct output (<date>:<yy>" -TestCases @(
         @{date="0055-12-31"; yy = "55"},
         @{date="0325-01-01"; yy = "25"},
         @{date="0777-01-01"; yy = "76"},
@@ -188,7 +188,7 @@ Describe "Get-Date DRT Unit Tests" -Tags "CI" {
     }
 
     # Using the same test cases as V for ISO week date component parity
-    It "using -uformat 'u' produces the correct output" -TestCases @(
+    It "using -uformat 'u' produces the correct output (<date>:<dayOfWeek>)" -TestCases @(
         @{date="1998-01-02"; dayOfWeek = "5"},
         @{date="1998-01-03"; dayOfWeek = "6"},
         @{date="2003-01-03"; dayOfWeek = "5"},
@@ -228,7 +228,7 @@ Describe "Get-Date DRT Unit Tests" -Tags "CI" {
         param($date, $dayOfWeek)
         Get-Date -Date $date -UFormat %u | Should -BeExactly $dayOfWeek
     }
-    It "Passing '<name>' to -uformat produces a descriptive error" -TestCases @(
+    It "Passing '<name>' to -uformat produces a descriptive error (<errorId>)" -TestCases @(
         @{ name = "`$null"      ; value = $null; errorId = "ParameterArgumentValidationErrorNullNotAllowed" }
         @{ name = "empty string"; value = ""; errorId = "ParameterArgumentValidationErrorEmptyStringNotAllowed" }
     ) {
@@ -286,11 +286,11 @@ Describe "Get-Date" -Tags "CI" {
         Get-Date -Date 0030-01-01T01:02:03.0004 -Format FileDateTime | Should -Be "00300101T0102030004"
     }
 
-    It "-Format FileDateTimeUniversal works" {
+    It "-Format FileDateTimeUniversal works (1)" {
         Get-Date -Date 0030-01-01T01:02:03.0004z -Format FileDateTimeUniversal | Should -Be "00300101T0102030004Z"
     }
 
-    It "-Format FileDateTimeUniversal works" {
+    It "-Format FileDateTimeUniversal works (2)" {
         Get-Date -Date 0030-01-01T01:02:03.0004z -Format FileDateUniversal | Should -Be "00300101Z"
     }
 
@@ -324,7 +324,7 @@ Describe "Get-Date" -Tags "CI" {
         $timeDifference.Ticks        | Should -BeLessThan 10000
     }
 
-    It "-UnixTimeSeconds works" -TestCases @(
+    It "-UnixTimeSeconds works (<Expected>)" -TestCases @(
         @{ UnixTimeSeconds = 1577836800; Expected = [System.DateTimeOffset]::FromUnixTimeSeconds(1577836800).LocalDateTime },
         @{ UnixTimeSeconds = 0;          Expected = [System.DateTimeOffset]::UnixEpoch.LocalDateTime },
         @{ UnixTimeSeconds = -1;         Expected = [System.DateTimeOffset]::FromUnixTimeSeconds(-1).LocalDateTime }
@@ -360,7 +360,7 @@ Describe "Get-Date -UFormat tests" -Tags "CI" {
         $timeZone1 = [String]::Format("{0:+00;-00}", [Timezone]::CurrentTimeZone.GetUtcOffset( $date1 ).Hours)
     }
 
-    It "Get-Date -UFormat <format>" -TestCases @(
+    It "Get-Date -UFormat <format> (<result>)" -TestCases @(
             # Some format specifiers is locale sensetive:
             #   - and tests work on EN-US only
             #   - and can not be full compatible with Unix 'date' utility.
diff --git a/test/powershell/engine/ParameterBinding/BooleanParameterDCR.Tests.ps1 b/test/powershell/engine/ParameterBinding/BooleanParameterDCR.Tests.ps1
index 1dd49f56eca..7e84b964b94 100644
--- a/test/powershell/engine/ParameterBinding/BooleanParameterDCR.Tests.ps1
+++ b/test/powershell/engine/ParameterBinding/BooleanParameterDCR.Tests.ps1
@@ -18,12 +18,12 @@ Describe "BooleanParameterDCR Tests" -tags "CI" {
     }
 
     $tests = @(
-            @{ inputTest = 0; expected = $false },
-            @{ inputTest = 000; expected = $false },
-            @{ inputTest = 0x00; expected = $false },
-            @{ inputTest = 0.00; expected = $false }
+            @{ inputTest = 0;    expected = $false; iteration = 1 },
+            @{ inputTest = 000;  expected = $false; iteration = 2 },
+            @{ inputTest = 0x00; expected = $false; iteration = 3 },
+            @{ inputTest = 0.00; expected = $false; iteration = 4 }
     )
-    It "Test that passing zero works as the value for a Switch parameter, inputTest:<inputTest>,expect:<expected>" -TestCases $tests {
+    It "Test <iteration> that passing zero works as the value for a Switch parameter, inputTest:<inputTest>,expect:<expected>" -TestCases $tests {
             param ( $inputTest, $expected )
             [bool]$switchTestParam = $inputTest
             $result = ParserTestSwitchCmdlet -switchParam:$switchTestParam
@@ -31,11 +31,11 @@ Describe "BooleanParameterDCR Tests" -tags "CI" {
     }
 
     $tests = @(
-            @{ inputTest = $(1 -eq 1); expected = $true },
-            @{ inputTest = $true; expected = $true },
-            @{ inputTest = $TRUE; expected = $true }
+            @{ inputTest = $(1 -eq 1); expected = $true; iteration = 1},
+            @{ inputTest = $true;      expected = $true; iteration = 2},
+            @{ inputTest = $TRUE;      expected = $true; iteration = 3}
     )
-    It "Test that $true is accepted as a true value for Switch parameters, inputTest:<inputTest>,expect:<expected>" -TestCases $tests {
+    It "Test <iteration> that $true is accepted as a true value for Switch parameters, inputTest:<inputTest>,expect:<expected>" -TestCases $tests {
             param ( $inputTest, $expected )
             [bool]$switchTestParam = $inputTest
             $result = ParserTestSwitchCmdlet -switchParam:$switchTestParam

From 123373e425716d1ff530406fca7d97b3d514199d Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Wed, 23 Mar 2022 20:38:05 +0100
Subject: [PATCH 282/645] Prioritize `ValidateSet` completions over Enums for
 parameters (#15257)

---
 .../CommandCompletion/CompletionCompleters.cs | 125 +++++++++---------
 .../TabCompletion/TabCompletion.Tests.ps1     |   9 ++
 2 files changed, 73 insertions(+), 61 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index b9f2ef70dba..33911cfceea 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -1658,9 +1658,9 @@ private static void CompletePositionalArgument(
         /// </summary>
         /// <remarks>
         /// If the argument completion falls into these pre-defined cases:
-        ///   1. The matching parameter is of type Enum
-        ///   2. The matching parameter is of type SwitchParameter
-        ///   3. The matching parameter is declared with ValidateSetAttribute
+        ///   1. The matching parameter is declared with ValidateSetAttribute
+        ///   2. The matching parameter is of type Enum
+        ///   3. The matching parameter is of type SwitchParameter
         ///   4. Falls into the native command argument completion
         /// a null instance of CompletionResult is added to the end of the
         /// "result" list, to indicate that this particular argument completion
@@ -1683,63 +1683,6 @@ private static void ProcessParameter(
                 parameterType = parameterType.GetElementType();
             }
 
-            if (parameterType.IsEnum)
-            {
-                RemoveLastNullCompletionResult(result);
-
-                string enumString = LanguagePrimitives.EnumSingleTypeConverter.EnumValues(parameterType);
-                string separator = CultureInfo.CurrentUICulture.TextInfo.ListSeparator;
-                string[] enumArray = enumString.Split(separator, StringSplitOptions.RemoveEmptyEntries);
-
-                string wordToComplete = context.WordToComplete;
-                string quote = HandleDoubleAndSingleQuote(ref wordToComplete);
-
-                var pattern = WildcardPattern.Get(wordToComplete + "*", WildcardOptions.IgnoreCase);
-                var enumList = new List<string>();
-
-                foreach (string value in enumArray)
-                {
-                    if (wordToComplete.Equals(value, StringComparison.OrdinalIgnoreCase))
-                    {
-                        string completionText = quote == string.Empty ? value : quote + value + quote;
-                        fullMatch = new CompletionResult(completionText, value, CompletionResultType.ParameterValue, value);
-                        continue;
-                    }
-
-                    if (pattern.IsMatch(value))
-                    {
-                        enumList.Add(value);
-                    }
-                }
-
-                if (fullMatch != null)
-                {
-                    result.Add(fullMatch);
-                }
-
-                enumList.Sort();
-                result.AddRange(from entry in enumList
-                                let completionText = quote == string.Empty ? entry : quote + entry + quote
-                                select new CompletionResult(completionText, entry, CompletionResultType.ParameterValue, entry));
-
-                result.Add(CompletionResult.Null);
-                return;
-            }
-
-            if (parameterType.Equals(typeof(SwitchParameter)))
-            {
-                RemoveLastNullCompletionResult(result);
-
-                if (context.WordToComplete == string.Empty || context.WordToComplete.Equals("$", StringComparison.Ordinal))
-                {
-                    result.Add(new CompletionResult("$true", "$true", CompletionResultType.ParameterValue, "$true"));
-                    result.Add(new CompletionResult("$false", "$false", CompletionResultType.ParameterValue, "$false"));
-                }
-
-                result.Add(CompletionResult.Null);
-                return;
-            }
-
             foreach (ValidateArgumentsAttribute att in parameter.Parameter.ValidationAttributes)
             {
                 if (att is ValidateSetAttribute setAtt)
@@ -1754,7 +1697,10 @@ private static void ProcessParameter(
 
                     foreach (string value in setAtt.ValidValues)
                     {
-                        if (value == string.Empty) { continue; }
+                        if (value == string.Empty)
+                        {
+                            continue;
+                        }
 
                         if (wordToComplete.Equals(value, StringComparison.OrdinalIgnoreCase))
                         {
@@ -1805,6 +1751,63 @@ private static void ProcessParameter(
                 }
             }
 
+            if (parameterType.IsEnum)
+            {
+                RemoveLastNullCompletionResult(result);
+
+                string enumString = LanguagePrimitives.EnumSingleTypeConverter.EnumValues(parameterType);
+                string separator = CultureInfo.CurrentUICulture.TextInfo.ListSeparator;
+                string[] enumArray = enumString.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+
+                string wordToComplete = context.WordToComplete;
+                string quote = HandleDoubleAndSingleQuote(ref wordToComplete);
+
+                var pattern = WildcardPattern.Get(wordToComplete + "*", WildcardOptions.IgnoreCase);
+                var enumList = new List<string>();
+
+                foreach (string value in enumArray)
+                {
+                    if (wordToComplete.Equals(value, StringComparison.OrdinalIgnoreCase))
+                    {
+                        string completionText = quote == string.Empty ? value : quote + value + quote;
+                        fullMatch = new CompletionResult(completionText, value, CompletionResultType.ParameterValue, value);
+                        continue;
+                    }
+
+                    if (pattern.IsMatch(value))
+                    {
+                        enumList.Add(value);
+                    }
+                }
+
+                if (fullMatch != null)
+                {
+                    result.Add(fullMatch);
+                }
+
+                enumList.Sort();
+                result.AddRange(from entry in enumList
+                                let completionText = quote == string.Empty ? entry : quote + entry + quote
+                                select new CompletionResult(completionText, entry, CompletionResultType.ParameterValue, entry));
+
+                result.Add(CompletionResult.Null);
+                return;
+            }
+
+            if (parameterType.Equals(typeof(SwitchParameter)))
+            {
+                RemoveLastNullCompletionResult(result);
+
+                if (context.WordToComplete == string.Empty || context.WordToComplete.Equals("$", StringComparison.Ordinal))
+                {
+                    result.Add(new CompletionResult("$true", "$true", CompletionResultType.ParameterValue, "$true"));
+                    result.Add(new CompletionResult("$false", "$false", CompletionResultType.ParameterValue, "$false"));
+                }
+
+                result.Add(CompletionResult.Null);
+                return;
+            }
+
             NativeCommandArgumentCompletion(commandName, parameter.Parameter, result, commandAst, context, boundArguments);
         }
 
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 31d1aa5d10e..b5194cfe7dc 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -1001,6 +1001,15 @@ Describe "TabCompletion" -Tags CI {
             $res.CompletionMatches[1].CompletionText | Should -BeExactly 'dog'
         }
 
+        It "Tab completion for validateSet attribute takes precedence over enums" {
+            function foo { param([ValidateSet('DarkBlue','DarkCyan')][ConsoleColor]$p) }
+            $inputStr = "foo "
+            $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length
+            $res.CompletionMatches | Should -HaveCount 2
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly 'DarkBlue'
+            $res.CompletionMatches[1].CompletionText | Should -BeExactly 'DarkCyan'
+        }
+
         It "Tab completion for ArgumentCompleter when AST is passed to CompleteInput" {
             $scriptBl = {
                 function Test-Completion {

From 94eeb8e4230f92486845b8ae975b09baf20af069 Mon Sep 17 00:00:00 2001
From: PRASOON KARUNAN V <12897753+kvprasoon@users.noreply.github.com>
Date: Thu, 24 Mar 2022 02:16:49 +0530
Subject: [PATCH 283/645] Make `Stop-Service` only request needed privileges
 when not setting SDDL. (#16663)

* code changes to select permission based on input

* make the code more readable
---
 .../commands/management/Service.cs                          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
index a089f204654..8ac17c9f616 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
@@ -1756,10 +1756,14 @@ protected override void ProcessRecord()
                         return;
                     }
 
+                    var access = NativeMethods.SERVICE_CHANGE_CONFIG;
+                    if (!string.IsNullOrEmpty(SecurityDescriptorSddl))
+                        access |= NativeMethods.WRITE_DAC | NativeMethods.WRITE_OWNER;
+                    
                     hService = NativeMethods.OpenServiceW(
                         hScManager,
                         Name,
-                        NativeMethods.SERVICE_CHANGE_CONFIG | NativeMethods.WRITE_DAC | NativeMethods.WRITE_OWNER
+                        access
                         );
 
                     if (hService == IntPtr.Zero)

From 5e6e7ca449eed07cd2221acde5a5d1016b51f27f Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Thu, 24 Mar 2022 23:54:08 +0100
Subject: [PATCH 284/645] Add `OutputType` attribute to various commands
 (#16962)

---
 .../commands/management/Computer.cs                           | 1 +
 .../commands/management/TimeZoneCommands.cs                   | 4 +++-
 .../commands/utility/ConvertTo-Html.cs                        | 1 +
 .../commands/utility/TestJsonCommand.cs                       | 1 +
 .../commands/utility/Var.cs                                   | 1 +
 .../commands/utility/WebCmdlet/ConvertToJsonCommand.cs        | 1 +
 .../WebCmdlet/CoreCLR/InvokeWebRequestCommand.CoreClr.cs      | 1 +
 .../security/CertificateProvider.cs                           | 1 +
 src/Microsoft.WSMan.Management/CredSSP.cs                     | 2 ++
 src/Microsoft.WSMan.Management/InvokeWSManAction.cs           | 1 +
 src/Microsoft.WSMan.Management/NewWSManSession.cs             | 1 +
 src/Microsoft.WSMan.Management/PingWSMan.cs                   | 1 +
 src/Microsoft.WSMan.Management/Set-QuickConfig.cs             | 1 +
 src/Microsoft.WSMan.Management/WSManInstance.cs               | 3 +++
 .../engine/InitialSessionState.cs                             | 1 +
 .../namespaces/FileSystemProvider.cs                          | 1 +
 .../namespaces/RegistryProvider.cs                            | 3 +++
 17 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
index 73c2f309508..c12859cb048 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
@@ -1278,6 +1278,7 @@ private void ProcessWSManProtocol(object[] flags)
     /// </summary>
     [Cmdlet(VerbsCommon.Rename, "Computer", SupportsShouldProcess = true,
         HelpUri = "https://go.microsoft.com/fwlink/?LinkID=2097054", RemotingCapability = RemotingCapability.SupportedByCommand)]
+    [OutputType(typeof(RenameComputerChangeInfo))]
     public class RenameComputerCommand : PSCmdlet
     {
         #region Private Members
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/TimeZoneCommands.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/TimeZoneCommands.cs
index 69e8860f3ab..8fdb2c55acd 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/TimeZoneCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/TimeZoneCommands.cs
@@ -17,6 +17,7 @@ namespace Microsoft.PowerShell.Commands
     /// </summary>
     [Cmdlet(VerbsCommon.Get, "TimeZone", DefaultParameterSetName = "Name",
         HelpUri = "https://go.microsoft.com/fwlink/?LinkId=2096904")]
+    [OutputType(typeof(TimeZoneInfo))]
     [Alias("gtz")]
     public class GetTimeZoneCommand : PSCmdlet
     {
@@ -121,6 +122,7 @@ protected override void ProcessRecord()
         SupportsShouldProcess = true,
         DefaultParameterSetName = "Name",
         HelpUri = "https://go.microsoft.com/fwlink/?LinkId=2097056")]
+    [OutputType(typeof(TimeZoneInfo))]
     [Alias("stz")]
     public class SetTimeZoneCommand : PSCmdlet
     {
@@ -159,7 +161,7 @@ public class SetTimeZoneCommand : PSCmdlet
         #endregion Parameters
 
         /// <summary>
-        /// Implementation of the ProcessRecord method for Get-TimeZone.
+        /// Implementation of the ProcessRecord method for Set-TimeZone.
         /// </summary>
         [SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly", Justification = "Since Name is not a parameter of this method, it confuses FXCop. It is the appropriate value for the exception.")]
         protected override void ProcessRecord()
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs
index e72fc825e7c..e74e86a9ded 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs
@@ -19,6 +19,7 @@ namespace Microsoft.PowerShell.Commands
     /// </summary>
     [Cmdlet(VerbsData.ConvertTo, "Html", DefaultParameterSetName = "Page",
         HelpUri = "https://go.microsoft.com/fwlink/?LinkID=2096595", RemotingCapability = RemotingCapability.None)]
+    [OutputType(typeof(string))]
     public sealed
     class ConvertToHtmlCommand : PSCmdlet
     {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
index cfee0f78aa4..488cb4ab4ab 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
@@ -17,6 +17,7 @@ namespace Microsoft.PowerShell.Commands
     /// This class implements Test-Json command.
     /// </summary>
     [Cmdlet(VerbsDiagnostic.Test, "Json", DefaultParameterSetName = ParameterAttribute.AllParameterSets, HelpUri = "https://go.microsoft.com/fwlink/?LinkID=2096609")]
+    [OutputType(typeof(bool))]
     public class TestJsonCommand : PSCmdlet
     {
         private const string SchemaFileParameterSet = "SchemaFile";
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
index e228b309df2..f89a5ed537c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
@@ -374,6 +374,7 @@ protected override void ProcessRecord()
     /// </summary>
     [Cmdlet(VerbsCommon.New, "Variable", SupportsShouldProcess = true, ConfirmImpact = ConfirmImpact.Low,
         HelpUri = "https://go.microsoft.com/fwlink/?LinkID=2097121")]
+    [OutputType(typeof(PSVariable))]
     public sealed class NewVariableCommand : VariableCommandBase
     {
         #region parameters
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
index 2e33a100964..eb8c3e3cc08 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
@@ -16,6 +16,7 @@ namespace Microsoft.PowerShell.Commands
     /// This command converts an object to a Json string representation.
     /// </summary>
     [Cmdlet(VerbsData.ConvertTo, "Json", HelpUri = "https://go.microsoft.com/fwlink/?LinkID=2096925", RemotingCapability = RemotingCapability.None)]
+    [OutputType(typeof(string))]
     public class ConvertToJsonCommand : PSCmdlet, IDisposable
     {
         /// <summary>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/InvokeWebRequestCommand.CoreClr.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/InvokeWebRequestCommand.CoreClr.cs
index dafcf3b4295..1a46d074048 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/InvokeWebRequestCommand.CoreClr.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/InvokeWebRequestCommand.CoreClr.cs
@@ -13,6 +13,7 @@ namespace Microsoft.PowerShell.Commands
     /// This command makes an HTTP or HTTPS request to a web server and returns the results.
     /// </summary>
     [Cmdlet(VerbsLifecycle.Invoke, "WebRequest", HelpUri = "https://go.microsoft.com/fwlink/?LinkID=2097126", DefaultParameterSetName = "StandardMethod")]
+    [OutputType(typeof(BasicHtmlWebResponseObject))]
     public class InvokeWebRequestCommand : WebRequestPSCmdlet
     {
         #region Virtual Method Overrides
diff --git a/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs b/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
index 1292ecb9b55..7c7627fd521 100644
--- a/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
+++ b/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
@@ -556,6 +556,7 @@ internal enum CertificateProviderItem
     [CmdletProvider("Certificate", ProviderCapabilities.ShouldProcess)]
     [OutputType(typeof(string), typeof(PathInfo), ProviderCmdlet = ProviderCmdlet.ResolvePath)]
     [OutputType(typeof(PathInfo), ProviderCmdlet = ProviderCmdlet.PushLocation)]
+    [OutputType(typeof(PathInfo), ProviderCmdlet = ProviderCmdlet.PopLocation)]
     [OutputType(typeof(Microsoft.PowerShell.Commands.X509StoreLocation), typeof(X509Certificate2), ProviderCmdlet = ProviderCmdlet.GetItem)]
     [OutputType(typeof(X509Store), typeof(X509Certificate2), ProviderCmdlet = ProviderCmdlet.GetChildItem)]
     public sealed class CertificateProvider : NavigationCmdletProvider, ICmdletProviderSupportsHelp
diff --git a/src/Microsoft.WSMan.Management/CredSSP.cs b/src/Microsoft.WSMan.Management/CredSSP.cs
index cd5e6d3fc4d..2470a6fc3c4 100644
--- a/src/Microsoft.WSMan.Management/CredSSP.cs
+++ b/src/Microsoft.WSMan.Management/CredSSP.cs
@@ -389,6 +389,7 @@ protected override void BeginProcessing()
     /// authentication is achieved via a trusted X509 certificate or Kerberos.
     /// </summary>
     [Cmdlet(VerbsLifecycle.Enable, "WSManCredSSP", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=2096719")]
+    [OutputType(typeof(XmlElement))]
     [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Cred")]
     [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "SSP")]
     public class EnableWSManCredSSPCommand : WSManCredSSPCommandBase, IDisposable/*, IDynamicParameters*/
@@ -736,6 +737,7 @@ private void UpdateGPORegistrySettings(string applicationname, string[] delegate
     [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Cred")]
     [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "SSP")]
     [Cmdlet(VerbsCommon.Get, "WSManCredSSP", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=2096838")]
+    [OutputType(typeof(string))]
     public class GetWSManCredSSPCommand : PSCmdlet, IDisposable
     {
         #region private
diff --git a/src/Microsoft.WSMan.Management/InvokeWSManAction.cs b/src/Microsoft.WSMan.Management/InvokeWSManAction.cs
index 16e91cceae9..da92a680ab3 100644
--- a/src/Microsoft.WSMan.Management/InvokeWSManAction.cs
+++ b/src/Microsoft.WSMan.Management/InvokeWSManAction.cs
@@ -24,6 +24,7 @@ namespace Microsoft.WSMan.Management
     /// -SelectorSet {Name=Spooler}
     /// </summary>
     [Cmdlet(VerbsLifecycle.Invoke, "WSManAction", DefaultParameterSetName = "URI", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=2096843")]
+    [OutputType(typeof(XmlElement))]
     public class InvokeWSManActionCommand : AuthenticatingWSManCommand, IDisposable
     {
         /// <summary>
diff --git a/src/Microsoft.WSMan.Management/NewWSManSession.cs b/src/Microsoft.WSMan.Management/NewWSManSession.cs
index 25f5bdd5989..09b22af9924 100644
--- a/src/Microsoft.WSMan.Management/NewWSManSession.cs
+++ b/src/Microsoft.WSMan.Management/NewWSManSession.cs
@@ -26,6 +26,7 @@ namespace Microsoft.WSMan.Management
     /// Connect-WSMan.
     /// </summary>
     [Cmdlet(VerbsCommon.New, "WSManSessionOption", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=2096845")]
+    [OutputType(typeof(SessionOption))]
     public class NewWSManSessionOptionCommand : PSCmdlet
     {
         /// <summary>
diff --git a/src/Microsoft.WSMan.Management/PingWSMan.cs b/src/Microsoft.WSMan.Management/PingWSMan.cs
index b9a0e21f1f4..88b443a6ef0 100644
--- a/src/Microsoft.WSMan.Management/PingWSMan.cs
+++ b/src/Microsoft.WSMan.Management/PingWSMan.cs
@@ -23,6 +23,7 @@ namespace Microsoft.WSMan.Management
     /// service is running.
     /// </summary>
     [Cmdlet(VerbsDiagnostic.Test, "WSMan", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=2097114")]
+    [OutputType(typeof(XmlElement))]
     public class TestWSManCommand : AuthenticatingWSManCommand, IDisposable
     {
         /// <summary>
diff --git a/src/Microsoft.WSMan.Management/Set-QuickConfig.cs b/src/Microsoft.WSMan.Management/Set-QuickConfig.cs
index c318ea76477..1ee927558f4 100644
--- a/src/Microsoft.WSMan.Management/Set-QuickConfig.cs
+++ b/src/Microsoft.WSMan.Management/Set-QuickConfig.cs
@@ -30,6 +30,7 @@ namespace Microsoft.WSMan.Management
     /// 4. Enable firewall exception for WS-Management traffic.
     /// </summary>
     [Cmdlet(VerbsCommon.Set, "WSManQuickConfig", HelpUri = "https://go.microsoft.com/fwlink/?LinkID=2097112")]
+    [OutputType(typeof(string))]
     public class SetWSManQuickConfigCommand : PSCmdlet, IDisposable
     {
         /// <summary>
diff --git a/src/Microsoft.WSMan.Management/WSManInstance.cs b/src/Microsoft.WSMan.Management/WSManInstance.cs
index a60ba270104..a29741172e2 100644
--- a/src/Microsoft.WSMan.Management/WSManInstance.cs
+++ b/src/Microsoft.WSMan.Management/WSManInstance.cs
@@ -29,6 +29,7 @@ namespace Microsoft.WSMan.Management
     /// -SelectorSet {Name=Spooler}
     /// </summary>
     [Cmdlet(VerbsCommon.Get, "WSManInstance", DefaultParameterSetName = "GetInstance", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=2096627")]
+    [OutputType(typeof(XmlElement))]
     public class GetWSManInstanceCommand : AuthenticatingWSManCommand, IDisposable
     {
         #region parameter
@@ -685,6 +686,7 @@ protected override void EndProcessing()
     /// -SelectorSet {Name=Spooler}
     /// </summary>
     [Cmdlet(VerbsCommon.Set, "WSManInstance", DefaultParameterSetName = "ComputerName", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=2096937")]
+    [OutputType(typeof(XmlElement), typeof(string))]
     public class SetWSManInstanceCommand : AuthenticatingWSManCommand, IDisposable
     {
         #region Parameters
@@ -1324,6 +1326,7 @@ protected override void ProcessRecord()
     /// using specified ValueSet or input File.
     /// </summary>
     [Cmdlet(VerbsCommon.New, "WSManInstance", DefaultParameterSetName = "ComputerName", HelpUri = "https://go.microsoft.com/fwlink/?LinkId=2096933")]
+    [OutputType(typeof(XmlElement))]
     public class NewWSManInstanceCommand : AuthenticatingWSManCommand, IDisposable
     {
         /// <summary>
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index c0d4c2cb7cf..bfae1b3e6b4 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -3967,6 +3967,7 @@ internal void ImportCmdletsFromAssembly(Assembly assembly, PSModuleInfo module)
 #>
 
 [CmdletBinding(DefaultParameterSetName = 'ScriptInputSet')]
+[OutputType([System.Management.Automation.CommandCompletion])]
 Param(
     [Parameter(ParameterSetName = 'ScriptInputSet', Mandatory = $true, Position = 0)]
     [string] $inputScript,
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index fd855643703..12c1b193a69 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -37,6 +37,7 @@ namespace Microsoft.PowerShell.Commands
     [OutputType(typeof(FileSecurity), ProviderCmdlet = ProviderCmdlet.SetAcl)]
     [OutputType(typeof(string), typeof(PathInfo), ProviderCmdlet = ProviderCmdlet.ResolvePath)]
     [OutputType(typeof(PathInfo), ProviderCmdlet = ProviderCmdlet.PushLocation)]
+    [OutputType(typeof(PathInfo), ProviderCmdlet = ProviderCmdlet.PopLocation)]
     [OutputType(typeof(byte), typeof(string), ProviderCmdlet = ProviderCmdlet.GetContent)]
     [OutputType(typeof(FileInfo), ProviderCmdlet = ProviderCmdlet.GetItem)]
     [OutputType(typeof(FileInfo), typeof(DirectoryInfo), ProviderCmdlet = ProviderCmdlet.GetChildItem)]
diff --git a/src/System.Management.Automation/namespaces/RegistryProvider.cs b/src/System.Management.Automation/namespaces/RegistryProvider.cs
index 1898c960620..51f768c0277 100644
--- a/src/System.Management.Automation/namespaces/RegistryProvider.cs
+++ b/src/System.Management.Automation/namespaces/RegistryProvider.cs
@@ -61,6 +61,9 @@ namespace Microsoft.PowerShell.Commands
     [OutputType(typeof(RegistryKey), ProviderCmdlet = ProviderCmdlet.GetItem)]
     [OutputType(typeof(RegistryKey), typeof(string), typeof(Int32), typeof(Int64), ProviderCmdlet = ProviderCmdlet.GetItemProperty)]
     [OutputType(typeof(RegistryKey), ProviderCmdlet = ProviderCmdlet.NewItem)]
+    [OutputType(typeof(string), typeof(PathInfo), ProviderCmdlet = ProviderCmdlet.ResolvePath)]
+    [OutputType(typeof(PathInfo), ProviderCmdlet = ProviderCmdlet.PushLocation)]
+    [OutputType(typeof(PathInfo), ProviderCmdlet = ProviderCmdlet.PopLocation)]
     public sealed partial class RegistryProvider :
         NavigationCmdletProvider,
         IPropertyCmdletProvider,

From c904d7f376bda2878fbf0c3d71155964df59b98c Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Thu, 24 Mar 2022 23:55:27 +0100
Subject: [PATCH 285/645] Improve member auto completion (#16504)

---
 .../CommandCompletion/CompletionAnalysis.cs   | 114 ++++++++++++++---
 .../CommandCompletion/CompletionCompleters.cs | 106 ++++++++++++----
 .../TabCompletion/TabCompletion.Tests.ps1     | 119 +++++++++++++++++-
 3 files changed, 293 insertions(+), 46 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index eaac62ba33f..e11557c9610 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -416,7 +416,11 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                     case TokenKind.Generic:
                     case TokenKind.MinusMinus: // for native commands '--'
                     case TokenKind.Identifier:
-                        result = GetResultForIdentifier(completionContext, ref replacementIndex, ref replacementLength, isQuotedString);
+                        if (tokenAtCursor.TokenFlags != TokenFlags.TypeName)
+                        {
+                            result = GetResultForIdentifier(completionContext, ref replacementIndex, ref replacementLength, isQuotedString);
+                        }
+
                         break;
 
                     case TokenKind.Parameter:
@@ -466,7 +470,8 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                     case TokenKind.QuestionDot:
                         replacementIndex += tokenAtCursor.Text.Length;
                         replacementLength = 0;
-                        result = CompletionCompleters.CompleteMember(completionContext, @static: tokenAtCursor.Kind == TokenKind.ColonColon);
+                        result = CompletionCompleters.CompleteMember(completionContext, @static: tokenAtCursor.Kind == TokenKind.ColonColon, ref replacementLength);
+                        
                         break;
 
                     case TokenKind.Comment:
@@ -805,6 +810,35 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                                 result = GetResultForIdentifierInConfiguration(completionContext, configAst, keywordAst, out matched);
                             }
                         }
+
+                        // Handles following scenario where user is tab completing a member on an empty line:
+                        // "Hello".
+                        // <Tab>
+                        if ((result is null || result.Count == 0) && tokenBeforeCursor is not null)
+                        {
+                            switch (completionContext.TokenBeforeCursor.Kind)
+                            {
+                               
+                                case TokenKind.Dot:
+                                case TokenKind.ColonColon:
+                                case TokenKind.QuestionDot:
+                                    replacementIndex = cursor.Offset;
+                                    replacementLength = 0;
+                                    result = CompletionCompleters.CompleteMember(completionContext, @static: completionContext.TokenBeforeCursor.Kind == TokenKind.ColonColon, ref replacementLength);
+                                    break;
+
+                                case TokenKind.LParen:
+                                case TokenKind.Comma:
+                                    if (lastAst is AttributeAst)
+                                    {
+                                        result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
+                                    }
+
+                                    break;
+                                default:
+                                    break;
+                            }
+                        }
                     }
                     else if (completionContext.TokenAtCursor == null)
                     {
@@ -860,6 +894,18 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                                         }
                                         break;
                                     }
+                                case TokenKind.Dot:
+                                case TokenKind.ColonColon:
+                                case TokenKind.QuestionDot:
+                                    // Handles following scenario with whitespace after member access token: "Hello". <Tab>
+                                    replacementIndex = cursor.Offset;
+                                    replacementLength = 0;
+                                    result = CompletionCompleters.CompleteMember(completionContext, @static: tokenBeforeCursor.Kind == TokenKind.ColonColon, ref replacementLength);
+                                    if (result is not null && result.Count > 0)
+                                    {
+                                        return result;
+                                    }
+                                    break;
                                 default:
                                     break;
                             }
@@ -913,6 +959,11 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                         typeNameToComplete = FindTypeNameToComplete(typeConstraintAst.TypeName, _cursorPosition);
                     }
                 }
+                
+                if (typeNameToComplete is null && tokenAtCursor?.TokenFlags == TokenFlags.TypeName)
+                {
+                    typeNameToComplete = new TypeName(tokenAtCursor.Extent, tokenAtCursor.Text);
+                }
 
                 if (typeNameToComplete != null)
                 {
@@ -1989,8 +2040,24 @@ private List<CompletionResult> GetResultForIdentifier(CompletionContext completi
             }
 
             TokenKind memberOperator = TokenKind.Unknown;
-            bool isMemberCompletion = (lastAst.Parent is MemberExpressionAst);
-            bool isStatic = isMemberCompletion && ((MemberExpressionAst)lastAst.Parent).Static;
+            bool isMemberCompletion = lastAst.Parent is MemberExpressionAst;
+            bool isStatic = false;
+            if (isMemberCompletion)
+            {
+                var currentExpression = (MemberExpressionAst)lastAst.Parent;
+                // Handles following scenario with an incomplete member access token at the end of the statement:
+                // [System.IO.FileInfo]::new<Tab>().Directory.BaseName.Length.
+                // Traverses up the expressions until it finds one under at the cursor
+                while (currentExpression.Extent.EndOffset >= completionContext.CursorPosition.Offset
+                    && currentExpression.Expression is MemberExpressionAst memberExpression
+                    && memberExpression.Member.Extent.EndOffset >= completionContext.CursorPosition.Offset)
+                {
+                    currentExpression = memberExpression;
+                }
+
+                isStatic = currentExpression.Static;
+            }
+
             bool isWildcard = false;
 
             if (!isMemberCompletion)
@@ -2041,7 +2108,7 @@ private List<CompletionResult> GetResultForIdentifier(CompletionContext completi
 
             if (isMemberCompletion)
             {
-                result = CompletionCompleters.CompleteMember(completionContext, @static: (isStatic || memberOperator == TokenKind.ColonColon));
+                result = CompletionCompleters.CompleteMember(completionContext, @static: (isStatic || memberOperator == TokenKind.ColonColon), ref replacementLength);
 
                 // If the last token was just a '.', we tried to complete members.  That may
                 // have failed because it wasn't really an attempt to complete a member, in
@@ -2126,13 +2193,6 @@ private List<CompletionResult> GetResultForIdentifier(CompletionContext completi
             replacementIndex = completionContext.ReplacementIndex;
             replacementLength = completionContext.ReplacementLength;
 
-            if (result.Count == 0
-                && completionContext.TokenAtCursor.TokenFlags.HasFlag(TokenFlags.TypeName)
-                && lastAst?.Find(a => a is MemberExpressionAst, searchNestedScriptBlocks: false) is not null)
-            {
-                result = CompletionCompleters.CompleteType(completionContext.TokenAtCursor.Text).ToList();
-            }
-
             return result;
         }
 
@@ -2142,10 +2202,11 @@ private static List<CompletionResult> GetResultForAttributeArgument(CompletionCo
             Type attributeType = null;
             string argName = string.Empty;
             Ast argAst = completionContext.RelatedAsts.Find(static ast => ast is NamedAttributeArgumentAst);
-            NamedAttributeArgumentAst namedArgAst = argAst as NamedAttributeArgumentAst;
-            if (argAst != null && namedArgAst != null)
+            AttributeAst attAst;
+            if (argAst is NamedAttributeArgumentAst namedArgAst)
             {
-                attributeType = ((AttributeAst)namedArgAst.Parent).TypeName.GetReflectionAttributeType();
+                attAst = (AttributeAst)namedArgAst.Parent;
+                attributeType = attAst.TypeName.GetReflectionAttributeType();
                 argName = namedArgAst.ArgumentName;
                 replacementIndex = namedArgAst.Extent.StartOffset;
                 replacementLength = argName.Length;
@@ -2153,21 +2214,34 @@ private static List<CompletionResult> GetResultForAttributeArgument(CompletionCo
             else
             {
                 Ast astAtt = completionContext.RelatedAsts.Find(static ast => ast is AttributeAst);
-                AttributeAst attAst = astAtt as AttributeAst;
-                if (astAtt != null && attAst != null)
+                attAst = astAtt as AttributeAst;
+                if (attAst is not null)
                 {
                     attributeType = attAst.TypeName.GetReflectionAttributeType();
                 }
             }
 
-            if (attributeType != null)
+            if (attributeType is not null)
             {
+                int cursorPosition = completionContext.CursorPosition.Offset;
+                var existingArguments = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                foreach (var namedArgument in attAst.NamedArguments)
+                {
+                    if (cursorPosition < namedArgument.Extent.StartOffset || cursorPosition > namedArgument.Extent.EndOffset)
+                    {
+                        existingArguments.Add(namedArgument.ArgumentName);
+                    }
+                }
+
                 PropertyInfo[] propertyInfos = attributeType.GetProperties(BindingFlags.Public | BindingFlags.Instance);
                 List<CompletionResult> result = new List<CompletionResult>();
                 foreach (PropertyInfo property in propertyInfos)
                 {
-                    // Ignore getter-only properties, including 'TypeId' (all attributes inherit it).
-                    if (!property.CanWrite) { continue; }
+                    // Ignore getter-only properties and properties that have already been set.
+                    if (!property.CanWrite || existingArguments.Contains(property.Name))
+                    {
+                        continue; 
+                    }
 
                     if (property.Name.StartsWith(argName, StringComparison.OrdinalIgnoreCase))
                     {
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index 33911cfceea..a81027ed983 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -5634,10 +5634,10 @@ private static List<CompletionResult> CompleteCommentParameterValue(CompletionCo
         private static readonly HashSet<string> s_dscCollectionVariables =
             new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "SelectedNodes", "AllNodes" };
 
-        internal static List<CompletionResult> CompleteMember(CompletionContext context, bool @static)
+        internal static List<CompletionResult> CompleteMember(CompletionContext context, bool @static, ref int replacementLength)
         {
             // If we get here, we know that either:
-            //   * the cursor appeared immediately after a member access token ('.' or '::').
+            //   * the cursor appeared after a member access token ('.' or '::').
             //   * the parent of the ast on the cursor was a member expression.
             //
             // In the first case, we have 2 possibilities:
@@ -5645,31 +5645,35 @@ internal static List<CompletionResult> CompleteMember(CompletionContext context,
             //   * the last ast is a string constant, with something like:   echo $foo.
 
             var results = new List<CompletionResult>();
-
             var lastAst = context.RelatedAsts.Last();
-            var lastAstAsMemberExpr = lastAst as MemberExpressionAst;
+            var memberName = "*";
             Ast memberNameCandidateAst = null;
             ExpressionAst targetExpr = null;
-            if (lastAstAsMemberExpr != null)
+
+            if (lastAst is MemberExpressionAst LastAstAsMemberExpression)
             {
                 // If the cursor is not inside the member name in the member expression, assume
                 // that the user had incomplete input, but the parser got lucky and succeeded parsing anyway.
-                if (context.TokenAtCursor.Extent.StartOffset >= lastAstAsMemberExpr.Member.Extent.StartOffset)
+                if (context.TokenAtCursor is not null && context.TokenAtCursor.Extent.StartOffset >= LastAstAsMemberExpression.Member.Extent.StartOffset)
                 {
-                    memberNameCandidateAst = lastAstAsMemberExpr.Member;
+                    memberNameCandidateAst = LastAstAsMemberExpression.Member;
                 }
 
-                targetExpr = lastAstAsMemberExpr.Expression;
+                targetExpr = LastAstAsMemberExpression.Expression;
+                // Handles scenario where the cursor is after the member access token but before the text
+                // like: "".<Tab>Le
+                // which completes the member using the partial text after the cursor.
+                if (LastAstAsMemberExpression.Member is StringConstantExpressionAst stringExpression && stringExpression.Extent.StartOffset <= context.CursorPosition.Offset)
+                {
+                    memberName = $"{stringExpression.Value}*";
+                }
             }
             else
             {
                 memberNameCandidateAst = lastAst;
             }
 
-            var memberNameAst = memberNameCandidateAst as StringConstantExpressionAst;
-
-            var memberName = "*";
-            if (memberNameAst != null)
+            if (memberNameCandidateAst is StringConstantExpressionAst memberNameAst)
             {
                 // Make sure to correctly handle: echo $foo.
                 if (!memberNameAst.Value.Equals(".", StringComparison.OrdinalIgnoreCase) && !memberNameAst.Value.Equals("::", StringComparison.OrdinalIgnoreCase))
@@ -5683,8 +5687,7 @@ internal static List<CompletionResult> CompleteMember(CompletionContext context,
                 return results;
             }
 
-            var commandAst = lastAst.Parent as CommandAst;
-            if (commandAst != null)
+            if (lastAst.Parent is CommandAst commandAst)
             {
                 int i;
                 for (i = commandAst.CommandElements.Count - 1; i >= 0; --i)
@@ -5704,10 +5707,36 @@ internal static List<CompletionResult> CompleteMember(CompletionContext context,
                     targetExpr = nextToLastAst as ExpressionAst;
                 }
             }
-            else if (lastAst.Parent is MemberExpressionAst)
+            else if (lastAst.Parent is MemberExpressionAst parentAsMemberExpression)
             {
+                if (lastAst is ErrorExpressionAst)
+                {
+                    // Handles scenarios like $PSVersionTable.PSVersi<tab>.Major.
+                    // where the cursor is moved back to a previous member expression while
+                    // there's an incomplete member expression at the end
+                    targetExpr = parentAsMemberExpression;
+                    do
+                    {
+                        if (targetExpr is MemberExpressionAst memberExpression)
+                        {
+                            targetExpr = memberExpression.Expression;
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    } while (targetExpr.Extent.EndOffset >= context.CursorPosition.Offset);
+
+                    if (targetExpr.Parent != parentAsMemberExpression
+                        && targetExpr.Parent is MemberExpressionAst memberAst
+                        && memberAst.Member is StringConstantExpressionAst stringExpression
+                        && stringExpression.Extent.StartOffset <= context.CursorPosition.Offset)
+                    {
+                        memberName = $"{stringExpression.Value}*";
+                    }
+                }
                 // If 'targetExpr' has already been set, we should skip this step. This is for some member completion
-                // cases in ISE. In ISE, we may add a new statement in the middle of existing statements as follows:
+                // cases in VSCode, where we may add a new statement in the middle of existing statements as follows:
                 //     $xml = New-Object Xml
                 //     $xml.
                 //     $xml.Save("C:\data.xml")
@@ -5715,23 +5744,44 @@ internal static List<CompletionResult> CompleteMember(CompletionContext context,
                 // a MemberExpressionAst '$xml.$xml', whose parent is still a MemberExpressionAst '$xml.$xml.Save'.
                 // But here we DO NOT want to re-assign 'targetExpr' to be '$xml.$xml'. 'targetExpr' in this case
                 // should be '$xml'.
-                if (targetExpr == null)
+                else if (targetExpr is null)
+                {
+                    targetExpr = parentAsMemberExpression.Expression;
+                }
+            }
+            else if (lastAst.Parent is BinaryExpressionAst binaryExpression && context.TokenAtCursor.Kind.Equals(TokenKind.Multiply))
+            {
+                if (binaryExpression.Left is MemberExpressionAst memberExpression)
                 {
-                    var memberExprAst = (MemberExpressionAst)lastAst.Parent;
-                    targetExpr = memberExprAst.Expression;
+                    targetExpr = memberExpression.Expression;
+                    if (memberExpression.Member is StringConstantExpressionAst stringExpression)
+                    {
+                        memberName = $"{stringExpression.Value}*";
+                    }
                 }
             }
-            else if (lastAst.Parent is BinaryExpressionAst && context.TokenAtCursor.Kind.Equals(TokenKind.Multiply))
+            else if (lastAst.Parent is ErrorStatementAst errorStatement)
             {
-                var memberExprAst = ((BinaryExpressionAst)lastAst.Parent).Left as MemberExpressionAst;
-                if (memberExprAst != null)
+                // Handles switches like:
+                // switch ($x)
+                // {
+                //     'RandomString'.<tab>
+                //     { }
+                // }
+                Ast astBeforeMemberAccessToken = null;
+                for (int i = errorStatement.Bodies.Count - 1; i >= 0; i--)
                 {
-                    targetExpr = memberExprAst.Expression;
-                    if (memberExprAst.Member is StringConstantExpressionAst)
+                    astBeforeMemberAccessToken = errorStatement.Bodies[i];
+                    if (astBeforeMemberAccessToken.Extent.EndOffset < lastAst.Extent.EndOffset)
                     {
-                        memberName = ((StringConstantExpressionAst)memberExprAst.Member).Value + "*";
+                        break;
                     }
                 }
+
+                if (astBeforeMemberAccessToken is ExpressionAst expression)
+                {
+                    targetExpr = expression;
+                }
             }
 
             if (targetExpr == null)
@@ -5821,6 +5871,12 @@ internal static List<CompletionResult> CompleteMember(CompletionContext context,
                 }
             }
 
+            if (memberName != "*" && results.Count > 0)
+            {
+                // -1 because membername always has a trailing wildcard *
+                replacementLength = memberName.Length - 1;
+            }
+
             return results;
         }
 
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index b5194cfe7dc..9522ee56c30 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -74,6 +74,91 @@ Describe "TabCompletion" -Tags CI {
         $res.CompletionMatches[0].CompletionText | Should -BeExactly 'pscustomobject'
     }
 
+    It '<Intent>' -TestCases @(
+        @{
+            Intent = 'Complete member with space between dot and cursor'
+            Expected = 'value__'
+            TestString = '[System.Management.Automation.ActionPreference]::Break.  ^'
+        }
+        @{
+            Intent = 'Complete member when cursor is in-between existing members and spaces'
+            Expected = 'value__'
+            TestString = '[System.Management.Automation.ActionPreference]::Break. ^ ToString()'
+        }
+        @{
+            Intent = 'Complete static member with space between colons and cursor'
+            Expected = 'Break'
+            TestString = '[System.Management.Automation.ActionPreference]::  ^'
+        }
+        @{
+            Intent = 'Complete static member with new line between colons and cursor'
+            Expected = 'Break'
+            TestString = @'
+[System.Management.Automation.ActionPreference]::
+^
+'@
+        }
+        @{
+            Intent = 'Complete static member with partial input and incomplete input at end of line'
+            Expected = 'Break'
+            TestString = '[System.Management.Automation.ActionPreference]::  Brea^.   value__.'
+        }
+        @{
+            Intent = 'Complete static member with partial input and valid input at end of line'
+            Expected = 'Break'
+            TestString = '[System.Management.Automation.ActionPreference]::  Brea^.   value__'
+        }
+        @{
+            Intent = 'Complete member with new line between colons and cursor'
+            Expected = 'value__'
+            TestString = '[System.Management.Automation.ActionPreference]::Break. ^ ToString()'
+        }
+        @{
+            Intent = 'Complete type with incomplete expression input at end of line'
+            Expected = 'System.Management.Automation.ActionPreference'
+            TestString = '[System.Management.Automation.ActionPreference^]::'
+        }
+        @{
+            Intent = 'Complete member inside switch expression'
+            Expected = 'Length'
+            TestString = @'
+switch ($x)
+{
+    'RandomString'.^
+    {}
+}
+'@
+        }
+        @{
+            Intent = 'Complete member in commandast'
+            Expected = 'Length'
+            TestString = 'ls "".^'
+        }
+        ){
+            param($Expected, $TestString)
+            $CursorIndex = $TestString.IndexOf('^')
+            $res = TabExpansion2 -cursorColumn $CursorIndex -inputScript $TestString.Remove($CursorIndex, 1)
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly $Expected
+        }
+    
+    It 'Should Complete and replace existing member with space in front of cursor and cursor in front of word' {
+        $TestString = '[System.Management.Automation.ActionPreference]:: ^Break'
+        $CursorIndex = $TestString.IndexOf('^')
+        $res = TabExpansion2 -cursorColumn $CursorIndex -inputScript $TestString.Remove($CursorIndex, 1)
+        $res.ReplacementIndex | Should -BeExactly $CursorIndex
+        $res.ReplacementLength | Should -Be 5
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Break'
+    }
+
+    It 'Complete and replace existing member with colons in front of cursor and cursor in front of word' {
+        $TestString = '[System.Management.Automation.ActionPreference]::^Break'
+        $CursorIndex = $TestString.IndexOf('^')
+        $res = TabExpansion2 -cursorColumn $CursorIndex -inputScript $TestString.Remove($CursorIndex, 1)
+        $res.ReplacementIndex | Should -BeExactly $CursorIndex
+        $res.ReplacementLength | Should -Be 5
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Break'
+    }
+
     It 'Should complete namespaces' {
         $res = TabExpansion2 -inputScript 'using namespace Sys' -cursorColumn 'using namespace Sys'.Length
         $res.CompletionMatches[0].CompletionText | Should -BeExactly 'System'
@@ -1161,7 +1246,7 @@ Describe "TabCompletion" -Tags CI {
         It "Test Attribute member completion multiple members" {
             $inputStr = "function bar { [parameter(Position,]param() }"
             $res = TabExpansion2 -inputScript $inputStr -cursorColumn ($inputStr.IndexOf(',') + 1)
-            $res.CompletionMatches | Should -HaveCount 10
+            $res.CompletionMatches | Should -HaveCount 9
             $entry = $res.CompletionMatches | Where-Object CompletionText -EQ "Mandatory"
             $entry.CompletionText | Should -BeExactly "Mandatory"
         }
@@ -1174,6 +1259,38 @@ Describe "TabCompletion" -Tags CI {
             $entry.CompletionText | Should -BeExactly "Get-ChildItem"
         }
 
+        It '<Intent>' -TestCases @(
+            @{
+                Intent = 'Complete attribute members on empty line'
+                Expected = 'Position'
+                TestString = @'
+function bar { [parameter(
+
+
+^
+
+        )]param() }
+'@
+            }
+            @{
+                Intent = 'Complete attribute members on empty line with preceding member'
+                Expected = 'Position'
+                TestString = @'
+function bar { [parameter(
+Mandatory,
+
+^
+
+        )]param() }
+'@
+            }
+        ){
+            param($Expected, $TestString)
+            $CursorIndex = $TestString.IndexOf('^')
+            $res = TabExpansion2 -cursorColumn $CursorIndex -inputScript $TestString.Remove($CursorIndex, 1)
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly $Expected
+        }
+
         It "Test completion with line continuation" {
             $inputStr = @'
 dir -Recurse `

From 72e3d719d847ff965bc73c79e11652f104085bc4 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Thu, 24 Mar 2022 17:44:35 -0700
Subject: [PATCH 286/645] Update regex used to remove ANSI escape sequences to
 be more specific to decoration and hyperlinks (#16811)

* Update regex used to remove ANSI escape sequences to be more specific to decoration and hyperlinks

* add CSI sequence and change default back to `host`

* fix test for default outputrendering
fix regex for CSI by escaping the question mark

* remove hyperlink support
---
 .../FormatAndOutput/common/PSStyle.cs                     | 2 +-
 .../FormatAndOutput/common/StringDecorated.cs             | 8 +++++++-
 test/powershell/engine/Formatting/PSStyle.Tests.ps1       | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
index 8f8d6c29d55..3a641edc429 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
@@ -572,7 +572,7 @@ public FileInfoFormatting()
         /// <summary>
         /// Gets or sets the rendering mode for output.
         /// </summary>
-        public OutputRendering OutputRendering { get; set; } = OutputRendering.Ansi;
+        public OutputRendering OutputRendering { get; set; } = OutputRendering.Host;
 
         /// <summary>
         /// Gets value to turn off all attributes.
diff --git a/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs b/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
index 03a360ff5c1..9b82cf3d7a7 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
@@ -101,8 +101,14 @@ private string PlainText
             }
         }
 
+        // graphics/color mode ESC[1;2;...m
+        private const string GraphicsRegex = @"(\x1b\[\d+(;\d+)*m)";
+
+        // CSI escape sequences
+        private const string CsiRegex = @"(\x1b\[\?\d+[hl])";
+
         // replace regex with .NET 6 API once available
-        internal static readonly Regex AnsiRegex = new Regex(@"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])", RegexOptions.Compiled);
+        internal static readonly Regex AnsiRegex = new Regex($"{GraphicsRegex}|{CsiRegex}", RegexOptions.Compiled);
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ValueStringDecorated"/> struct.
diff --git a/test/powershell/engine/Formatting/PSStyle.Tests.ps1 b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
index 02ea4f57981..04c13c5e04e 100644
--- a/test/powershell/engine/Formatting/PSStyle.Tests.ps1
+++ b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
@@ -83,7 +83,7 @@ Describe 'Tests for $PSStyle automatic variable' {
 
     It '$PSStyle has correct default for OutputRendering' {
         $PSStyle | Should -Not -BeNullOrEmpty
-        $PSStyle.OutputRendering | Should -BeExactly 'Ansi'
+        $PSStyle.OutputRendering | Should -BeExactly 'Host'
     }
 
     It '$PSStyle has correct defaults for style <key>' -TestCases (Get-TestCases $styleDefaults) {

From b6b271c9e901bf85cece0794e2a7aa99d453ffa0 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Fri, 25 Mar 2022 11:22:07 -0700
Subject: [PATCH 287/645] Use new cask format (#17064)

---
 tools/installpsh-osx.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/installpsh-osx.sh b/tools/installpsh-osx.sh
index 0a4034cb0e1..dcc65dfc2a4 100755
--- a/tools/installpsh-osx.sh
+++ b/tools/installpsh-osx.sh
@@ -132,7 +132,7 @@ done
 
 if ! hash pwsh 2>/dev/null; then
     echo "Installing PowerShell..."
-    if ! brew cask install ${powershellpackageid}; then
+    if ! brew install ${powershellpackageid} --cask; then
         echo "ERROR: PowerShell failed to install! Cannot install powershell..." >&2
     fi
 else
@@ -142,7 +142,7 @@ fi
 if [[ "'$*'" =~ includeide ]] ; then
     echo "*** Installing VS Code PowerShell IDE..."
     if [[ ! -d $(brew --prefix visual-studio-code) ]]; then
-        if ! brew cask install visual-studio-code; then
+        if ! brew install visual-studio-code --cask; then
             echo "ERROR: Visual Studio Code failed to install..." >&2
             exit 1
         fi

From 1b609409224cc836670cc67eac420399863348e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Mar 2022 12:34:42 -0700
Subject: [PATCH 288/645] Bump `Microsoft.CodeAnalysis.NetAnalyzers` (#17065)

---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index 8c69e56237e..c96ced149d6 100644
--- a/Analyzers.props
+++ b/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="7.0.0-preview1.22068.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22174.1" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From 23eddc97002fa9bf6438f6e143a1c342b87f4590 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 25 Mar 2022 12:35:34 -0700
Subject: [PATCH 289/645] Create checksum file for global tools (#17056)

---
 .../azureDevOps/templates/nuget.yml           | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index 49e3e6f18c9..677e2b7c9b5 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -222,8 +222,35 @@ jobs:
       Write-Verbose -Verbose -Message $fileContent
 
       Copy-Item -Path "$packagePath\SHA512SUMS" -Destination '$(System.ArtifactsDirectory)\signed\' -verbose
+    displayName: Generate checksum file for packages
+
+  - pwsh: |
+      $packagePath = (Join-Path $(System.ArtifactsDirectory) checksum_gbltool)
+      New-Item $packagePath -ItemType Directory -Force > $null
+      $srcPaths = @("$(System.ArtifactsDirectory)\signed\globaltool")
+      $packages  = Get-ChildItem -Path $srcPaths -Include *.nupkg -Recurse
+      $packages | ForEach-Object { Copy-Item $_.FullName -Destination $packagePath -Verbose }
+
+      $packagePathList = Get-ChildItem $packagePath -Recurse | Select-Object -ExpandProperty FullName | Out-String
+      Write-Verbose -Verbose $packagePathList
+
+      $checksums = Get-ChildItem -Path $packagePath |
+          ForEach-Object {
+              Write-Verbose -Verbose "Generating checksum file for $($_.FullName)"
+              $packageName = $_.Name
+              $hash = (Get-FileHash -Path $_.FullName -Algorithm SHA512).Hash.ToLower()
+
+              # the '*' before the packagename signifies it is a binary
+              "$hash *$packageName"
+          }
+
+      $checksums | Out-File -FilePath "$packagePath\SHA512SUMS" -Force
+
+      $fileContent = Get-Content -Path "$packagePath\SHA512SUMS" -Raw | Out-String
+      Write-Verbose -Verbose -Message $fileContent
+
       Copy-Item -Path "$packagePath\SHA512SUMS" -Destination '$(System.ArtifactsDirectory)\signed\globaltool\' -verbose
-    displayName: Generate checksum file
+    displayName: Generate checksum for global tools
 
   - template: upload-final-results.yml
     parameters:

From dc0eff210e4582f15bdd57accb9ea764a45e0ef4 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 25 Mar 2022 13:50:38 -0700
Subject: [PATCH 290/645] Add mariner 1.0 amd64 package (#17057)

* add mariner package

* update signing

* update template branch

* Don't overwrite signed files

* use nevercopy

* update bom tests to support rpm

* switch to new output mode param

* more complex copy strategy

* change mariner distribution name

* Fix dependecies

* add error details

* fix variable name

* fix all distribution

* fix macos packaging error

* add diags

* fix macos

* fix package name validation

* check boms on ubuntu

* pend tests if rpm2cpio doesn't exist

* Revert "check boms on ubuntu"

This reverts commit e79cf86617bf0edc555548ccb2c716e429edaf01.

* use download task instead of azCopy

* Use ubuntu again

* filter symbol packages

* fix rpm test

* Get correct pshome

* skip hash check on

* Update tools/releaseBuild/azureDevOps/releaseBuild.yml
---
 tools/packaging/packaging.psm1                |  57 ++++++--
 tools/packaging/releaseTests/sbom.tests.ps1   | 125 ++++++++++++------
 .../azureDevOps/releasePipeline.yml           |   4 +-
 .../azureDevOps/templates/linux.yml           |  60 ++++++---
 .../templates/mac-package-build.yml           |  14 +-
 .../templates/release-ValidatePackageBOM.yml  |  20 +--
 .../release-ValidatePackageNames.yml          |   2 +-
 7 files changed, 196 insertions(+), 86 deletions(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 2a765619e10..3792e295cd4 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -7,7 +7,11 @@ $RepoRoot = (Resolve-Path -Path "$PSScriptRoot/../..").Path
 $packagingStrings = Import-PowerShellDataFile "$PSScriptRoot\packaging.strings.psd1"
 Import-Module "$PSScriptRoot\..\Xml" -ErrorAction Stop -Force
 $DebianDistributions = @("deb")
-$RedhatDistributions = @("rh")
+$RedhatDistributions = @("rh","cm1")
+$AllDistributions = @()
+$AllDistributions += $DebianDistributions
+$AllDistributions += $RedhatDistributions
+$AllDistributions += 'macOs'
 $script:netCoreRuntime = 'net7.0'
 $script:iconFileName = "Powershell_black_64.png"
 $script:iconPath = Join-Path -path $PSScriptRoot -ChildPath "../../assets/$iconFileName" -Resolve
@@ -523,6 +527,7 @@ function Start-PSPackage {
                 foreach ($Distro in $Script:RedhatDistributions) {
                     $Arguments["Distribution"] = $Distro
                     if ($PSCmdlet.ShouldProcess("Create RPM Package for $Distro")) {
+                        Write-Verbose -Verbose "Creating RPM Package for $Distro"
                         New-UnixPackage @Arguments
                     }
                 }
@@ -1041,7 +1046,7 @@ function New-UnixPackage {
         # Build package
         try {
             if ($PSCmdlet.ShouldProcess("Create $type package")) {
-                Write-Log "Creating package with fpm..."
+                Write-Log "Creating package with fpm $Arguments..."
                 try {
                     $Output = Start-NativeExecution { fpm $Arguments }
                 }
@@ -1303,7 +1308,7 @@ function Get-FpmArguments
         "-t", $Type,
         "-s", "dir"
     )
-    if ($Distribution -eq 'rh') {
+    if ($Distribution -in $script:RedHatDistributions) {
         $Arguments += @("--rpm-dist", $Distribution)
         $Arguments += @("--rpm-os", "linux")
         $Arguments += @("--license", "MIT")
@@ -1348,13 +1353,29 @@ function Get-FpmArguments
 
 function Get-PackageDependencies
 {
-    param(
-        [String]
-        [ValidateSet('rh','deb','macOS')]
-        $Distribution
-    )
+    [CmdletBinding()]
+    param()
+    DynamicParam {
+        # Add a dynamic parameter '-Distribution' when the specified package type is 'deb'.
+        # The '-Distribution' parameter can be used to indicate which Debian distro this pacakge is targeting.
+        $ParameterAttr = New-Object "System.Management.Automation.ParameterAttribute"
+        $ParameterAttr.Mandatory = $true
+        $ValidateSetAttr = New-Object "System.Management.Automation.ValidateSetAttribute" -ArgumentList $Script:AllDistributions
+        $Attributes = New-Object "System.Collections.ObjectModel.Collection``1[System.Attribute]"
+        $Attributes.Add($ParameterAttr) > $null
+        $Attributes.Add($ValidateSetAttr) > $null
+
+        $Parameter = New-Object "System.Management.Automation.RuntimeDefinedParameter" -ArgumentList ("Distribution", [string], $Attributes)
+        $Dict = New-Object "System.Management.Automation.RuntimeDefinedParameterDictionary"
+        $Dict.Add("Distribution", $Parameter) > $null
+        return $Dict
+    }
 
     End {
+        if ($PSBoundParameters.ContainsKey('Distribution')) {
+            $Distribution = $PSBoundParameters['Distribution']
+        }
+
         # These should match those in the Dockerfiles, but exclude tools like Git, which, and curl
         $Dependencies = @()
         if ($Distribution -eq 'deb') {
@@ -1373,6 +1394,22 @@ function Get-PackageDependencies
                 "openssl-libs",
                 "libicu"
             )
+        } elseif ($Distribution -eq 'cm1') {
+            # Taken from the list here:
+            # https://github.com/dotnet/dotnet-docker/blob/d451d6e9427f58c8508f1297c862663a27eb609f/src/runtime-deps/6.0/cbl-mariner1.0/amd64/Dockerfile#L6
+            $Dependencies = @(
+                "glibc"
+                "libgcc"
+                "krb5"
+                "libstdc++"
+                "zlib"
+                "icu"
+                "openssl-libs"
+            )
+        } elseif ($Distribution -eq 'macOS') {
+            # do nothing
+        } else {
+            throw "Unknown distribution $Distribution"
         }
 
         return $Dependencies
@@ -1423,7 +1460,7 @@ function New-AfterScripts
 
     Write-Verbose -Message "AfterScript Distribution: $Distribution" -Verbose
 
-    if ($Distribution -eq 'rh') {
+    if ($Distribution -in $script:RedHatDistributions) {
         $AfterInstallScript = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
         $AfterRemoveScript = (Join-Path $env:HOME $([System.IO.Path]::GetRandomFileName()))
         $packagingStrings.RedHatAfterInstallScript -f "$Link", $Destination  | Out-File -FilePath $AfterInstallScript -Encoding ascii
@@ -4401,7 +4438,7 @@ function Invoke-AzDevOpsLinuxPackageCreation {
     }
 
     try {
-        Write-Verbose "Packaging '$BuildType'-LTS:$LTS for $ReleaseTag ..." -Verbose
+        Write-Verbose "Packaging '$BuildType'; LTS:$LTS for $ReleaseTag ..." -Verbose
 
         Restore-PSOptions -PSOptionsPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${mainLinuxBuildFolder}-meta\psoptions.json"
 
diff --git a/tools/packaging/releaseTests/sbom.tests.ps1 b/tools/packaging/releaseTests/sbom.tests.ps1
index 0e64e6c5042..9469f68576e 100644
--- a/tools/packaging/releaseTests/sbom.tests.ps1
+++ b/tools/packaging/releaseTests/sbom.tests.ps1
@@ -8,57 +8,102 @@ Describe "Verify SBOMs" {
         $missingFromPackageCases = @()
         $missingFromManifestCases = @()
         Write-Verbose "${env:PACKAGE_FOLDER}" -Verbose
-        Get-ChildItem $env:PACKAGE_FOLDER -Filter *.zip | ForEach-Object {
-            Write-Verbose "Found $($_.Name)..." -Verbose
-            $testCases += @{
-                FilePath = $_.FullName
-                Name = $_.Name
+        Get-ChildItem $env:PACKAGE_FOLDER -Filter *.zip |
+            Where-Object { $_.Name -notlike 'powershell-symbols*' } |
+            ForEach-Object {
+                Write-Verbose "Found $($_.Name)..." -Verbose
+                $testCases += @{
+                    FilePath = $_.FullName
+                    Name = $_.Name
+                    Extension = $_.Extension
+            }
+        }
+
+        if ($IsLinux) {
+            Get-ChildItem $env:PACKAGE_FOLDER -Filter *.rpm | ForEach-Object {
+                Write-Verbose "Found $($_.Name)..." -Verbose
+                $testCases += @{
+                    FilePath  = $_.FullName
+                    Name      = $_.Name
+                    Extension = $_.Extension
+                }
             }
         }
 
         foreach($case in $testCases) {
+            $skip = $null
             $name = $case.Name
             Write-Verbose "Testing $name..." -Verbose
             $extractedPath = Join-Path Testdrive:\ -ChildPath ([System.io.path]::GetRandomFileName())
             $null = New-Item -Path $extractedPath -ItemType Directory -Force
-            Expand-Archive -Path $case.FilePath -DestinationPath $extractedPath
-            $manifestPath = Join-Path $extractedPath -ChildPath '/_manifest/spdx_2.2/manifest.spdx.json'
+            $resolvedPath = (Resolve-Path -Path $extractedPath).ProviderPath
+            switch ($case.Extension) {
+                '.zip' {
+                    Expand-Archive -Path $case.FilePath -DestinationPath $extractedPath
+                    $manifestPath = Join-Path $extractedPath -ChildPath '/_manifest/spdx_2.2/manifest.spdx.json'
+                }
+                '.rpm' {
+                    Push-Location $resolvedPath
+                    try {
+                        if (Get-Command -Name rpm2cpio -ErrorAction SilentlyContinue) {
+                            rpm2cpio $case.FilePath | cpio -i --make-directories 2>cpio.log
+                            $manifestPath = Get-ChildItem -Path manifest.spdx.json -Recurse | Select-Object -First 1 -ExpandProperty FullName
+                            $extractedPath = Get-ChildItem -Path system.management.automation.dll -Recurse  | Select-Object -First 1 -ExpandProperty DirectoryName
+                        } else {
+                            $skip = "rpm2cpio not found"
+                        }
+                    } finally {
+                        Pop-Location
+                    }
+                }
+                Default {
+                    throw "Unkown extension $($case.Extension)"
+                }
+            }
+
             It "$name has a BOM" {
+                if ($skip) {
+                    Set-ItResult -Pending -Because $skip
+                }
                 $manifestPath | Should -Exist
             }
-            Test-PackageManifest -PackagePath $extractedPath | ForEach-Object {
-                $status = $_.Status
-                $expectedHash = $_.ExpectedHash
-                $actual = $_.ActualHash
-                $file = $_.File
 
-                switch($status) {
-                    # cover match and mismatch
-                    default {
-                        $matchCases += @{
-                            Name = $name
-                            File = $file
-                            ActualHash = $actual
-                            ExpectedHash = $ExpectedHash
-                            Status = $status
+            # RPM hashes are broken, skip that
+            if ($case.Extension -in '.zip') {
+                Test-PackageManifest -PackagePath $extractedPath | ForEach-Object {
+                    $status = $_.Status
+                    $expectedHash = $_.ExpectedHash
+                    $actual = $_.ActualHash
+                    $file = $_.File
+
+                    switch ($status) {
+                        # cover match and mismatch
+                        default {
+                            $matchCases += @{
+                                Name         = $name
+                                File         = $file
+                                ActualHash   = $actual
+                                ExpectedHash = $ExpectedHash
+                                Status       = $status
+                            }
                         }
-                    }
-                    "MissingFromPackage" {
-                        $missingFromPackageCases = @{
-                            Name = $name
-                            File = $file
-                            ActualHash = $actual
-                            ExpectedHash = $ExpectedHash
-                            Status = $status
+                        "MissingFromPackage" {
+                            $missingFromPackageCases = @{
+                                Name         = $name
+                                File         = $file
+                                ActualHash   = $actual
+                                ExpectedHash = $ExpectedHash
+                                Status       = $status
+                            }
                         }
-                    }
-                    "MissingFromManifest" {
-                        $missingFromManifestCases = @{
-                            Name = $name
-                            File = $file
-                            ActualHash = $actual
-                            ExpectedHash = $ExpectedHash
-                            Status = $status
+                        "MissingFromManifest" {
+                            $missingFromManifestCases = @{
+                                Name         = $name
+                                File         = $file
+                                ActualHash   = $actual
+                                ExpectedHash = $ExpectedHash
+                                Status       = $status
+                            }
                         }
                     }
                 }
@@ -66,11 +111,7 @@ Describe "Verify SBOMs" {
         }
     }
 
-    Context "Zip files" {
-        BeforeAll {
-            Write-Verbose "In Context BeforeAll" -Verbose
-        }
-
+    Context "Package files" {
         It "<name> should have <file> with matching hash" -TestCases $matchCases {
             param(
                 $Name,
diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index c403aff28a1..e1334f9320d 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -122,9 +122,7 @@ stages:
     displayName: Validate Package BOM
     pool:
       # testing
-      vmImage: windows-latest
-    variables:
-    - group: 'Azure Blob variable group'
+      vmImage: ubuntu-latest
     steps:
       - template: templates/release-ValidatePackageBOM.yml
 
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index 3d9625201a0..6dd44eb219c 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -61,12 +61,16 @@ jobs:
     condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
     workingDirectory: $(PowerShellRoot)
 
-  - powershell: |
-
-      Import-Module "$env:POWERSHELLROOT/build.psm1"
-      Import-Module "$env:POWERSHELLROOT/tools/packaging"
-
-      Invoke-AzDevOpsLinuxPackageBuild -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
+  - pwsh: |
+      try {
+        Import-Module "$env:POWERSHELLROOT/build.psm1"
+        Import-Module "$env:POWERSHELLROOT/tools/packaging"
+
+        Invoke-AzDevOpsLinuxPackageBuild -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
+      } catch {
+        Get-Error
+        throw
+      }
     displayName: 'Build'
     condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
     workingDirectory: $(PowerShellRoot)
@@ -111,20 +115,25 @@ jobs:
         sourceScanPath: '$(PowerShellRoot)/tools'
 
   - powershell: |
-      Import-Module "$env:POWERSHELLROOT/build.psm1"
-      Import-Module "$env:POWERSHELLROOT/tools/packaging"
+      try {
+        Import-Module "$env:POWERSHELLROOT/build.psm1"
+        Import-Module "$env:POWERSHELLROOT/tools/packaging"
 
-      $metadata = Get-Content "$env:POWERSHELLROOT/tools/metadata.json" -Raw | ConvertFrom-Json
+        $metadata = Get-Content "$env:POWERSHELLROOT/tools/metadata.json" -Raw | ConvertFrom-Json
 
-      # LTSRelease.Package indicates that the release should be packaged as an LTS
-      $LTS = $metadata.LTSRelease.Package
-      Write-Verbose -Verbose -Message "LTS is set to: $LTS"
+        # LTSRelease.Package indicates that the release should be packaged as an LTS
+        $LTS = $metadata.LTSRelease.Package
+        Write-Verbose -Verbose -Message "LTS is set to: $LTS"
 
-      Invoke-AzDevOpsLinuxPackageCreation -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
+        Invoke-AzDevOpsLinuxPackageCreation -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
 
-      if ($LTS) {
-          Write-Verbose -Verbose "Packaging LTS"
-          Invoke-AzDevOpsLinuxPackageCreation -LTS  -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
+        if ($LTS) {
+            Write-Verbose -Verbose "Packaging LTS"
+            Invoke-AzDevOpsLinuxPackageCreation -LTS  -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
+        }
+      } catch {
+        Get-Error
+        throw
       }
     displayName: 'Package'
     condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
@@ -244,10 +253,25 @@ jobs:
           signOutputPath: $(Build.StagingDirectory)\signedPackages
           certificateId: "CP-450779-Pgp"
           pattern: |
-            **\*.rpm
+            **\*.rh.*.rpm
+          useMinimatch: true
+          shouldSign: $(SHOULD_SIGN)
+          displayName: Sign RedHat RPM
+          OutputMode: AlwaysCopy
+
+  - ${{ if eq(variables['buildName'], 'RPM') }}:
+    - template: EsrpSign.yml@ComplianceRepo
+      parameters:
+          # Sign in-place, previous task copied the files to this folder
+          buildOutputPath: $(Build.StagingDirectory)\signedPackages
+          signOutputPath: $(Build.StagingDirectory)\signedPackages
+          certificateId: "CP-459159-Pgp"
+          pattern: |
+            **\*.cm1.*.rpm
           useMinimatch: true
           shouldSign: $(SHOULD_SIGN)
-          displayName: Sign RPM
+          displayName: Sign Mariner RPM
+          OutputMode: NeverCopy
 
   # requires windows
   - ${{ if ne(variables['buildName'], 'RPM') }}:
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
index ef16761f707..69c683156d8 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
@@ -109,13 +109,23 @@ jobs:
     displayName: Compress signed files
 
   - pwsh: |
-      tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -location $(PowerShellRoot) -BootStrap
+      try {
+        tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -location $(PowerShellRoot) -BootStrap
+      } catch {
+        Get-Error
+        throw
+      }
     displayName: 'Bootstrap VM'
 
   - pwsh: |
       # Add -SkipReleaseChecks as a mitigation to unblock release.
       # macos-10.15 does not allow creating a folder under root. Hence, moving the folder.
-      $(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -location $(PowerShellRoot) -ArtifactName macosPkgResults -BuildZip $(BuildPackagePath) -ExtraPackage "tar" -Runtime 'osx-${{ parameters.buildArchitecture }}' -SkipReleaseChecks
+      try {
+        $(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -location $(PowerShellRoot) -ArtifactName macosPkgResults -BuildZip $(BuildPackagePath) -ExtraPackage "tar" -Runtime 'osx-${{ parameters.buildArchitecture }}' -SkipReleaseChecks
+      } catch {
+        Get-Error
+        throw
+      }
     displayName: 'Package'
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml
index 4778ebcaa1c..3fd560cbd00 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageBOM.yml
@@ -14,17 +14,17 @@ steps:
     Write-Host "##vso[build.updatebuildnumber]$name"
   displayName: Set Release Name
 
-- pwsh: |
-    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-    Install-AzCopy
-  displayName: Install AzCopy
-
-- pwsh: |
-    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-    $azcopy = Find-AzCopy
+- task: DownloadPipelineArtifact@2
+  inputs:
+    source: specific
+    project: PowerShellCore
+    pipeline: '696'
+    preferTriggeringPipeline: true
+    runVersion: latestFromBranch
+    runBranch: '$(Build.SourceBranch)'
+    artifact: finalResults
+    path: $(System.ArtifactsDirectory)
 
-    & $azcopy /Source:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) /Dest:$(System.ArtifactsDirectory) /S /SourceKey:$(StorageAccountKey)
-  displayName: Download Azure Artifacts
 
 - pwsh: |
     Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty Name
diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
index fa80c1d0c84..d50c94bcba1 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
@@ -30,7 +30,7 @@ steps:
 - pwsh: |
     $message = @()
     Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.rpm | ForEach-Object {
-        if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d\.\d\.\d(_[a-z]*\.\d+)?-1.rh.x86_64\.rpm')
+        if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d\.\d\.\d(_[a-z]*\.\d+)?-1.(rh|cm1).x86_64\.rpm')
         {
             $messageInstance = "$($_.Name) is not a valid package name"
             $message += $messageInstance

From fe11ba48b5c46228a214a7ceea4c1663fd45c961 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 25 Mar 2022 15:10:43 -0700
Subject: [PATCH 291/645] Re-enable `PowerShellGet` tests targeting PowerShell
 gallery (#17062)

---
 .../PackageManagement.Tests.ps1               | 21 +++--
 .../PowerShellGet/PowerShellGet.Tests.ps1     | 88 ++++++-------------
 2 files changed, 40 insertions(+), 69 deletions(-)

diff --git a/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1 b/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
index 0520860c8d1..3fea57db36f 100644
--- a/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
+++ b/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
@@ -13,16 +13,22 @@
 #
 # ------------------ PackageManagement Test  -----------------------------------
 
-$InternalGallery = "https://www.poshtestgallery.com/api/v2/"
-$InternalSource = 'OneGetTestSource'
+$gallery = "https://www.powershellgallery.com/api/v2"
+$source = 'OneGetTestSource'
 
 Describe "PackageManagement Acceptance Test" -Tags "Feature" {
 
  BeforeAll{
     Register-PackageSource -Name Nugettest -provider NuGet -Location https://www.nuget.org/api/v2 -Force
 
-    ## Comment out this line because 'poshtestgallery.com' is down, tracked by https://github.com/PowerShell/PowerShell/issues/17019
-    ## Register-PackageSource -Name $InternalSource -Location $InternalGallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue
+    $packageSource = Get-PackageSource -Location $gallery -ErrorAction SilentlyContinue
+    if ($packageSource) {
+        $source = $packageSource.Name
+        Set-PackageSource -Name $source -Trusted
+    } else {
+        Register-PackageSource -Name $source -Location $gallery -ProviderName 'PowerShellGet' -Trusted -ErrorAction SilentlyContinue
+    }
+
     $SavedProgressPreference = $ProgressPreference
     $ProgressPreference = "SilentlyContinue"
  }
@@ -43,10 +49,9 @@ Describe "PackageManagement Acceptance Test" -Tags "Feature" {
         $fpp | Should -Contain "PowerShellGet"
     }
 
-    ## Make this test pending because 'poshtestgallery.com' is down, tracked by https://github.com/PowerShell/PowerShell/issues/17019
-    It "install-packageprovider, Expect succeed" -Pending {
-        $ipp = (Install-PackageProvider -Name gistprovider -Force -Source $InternalSource -Scope CurrentUser).name
-        $ipp | Should -Contain "gistprovider"
+    It "install-packageprovider, Expect succeed" {
+        $ipp = (Install-PackageProvider -Name NanoServerPackage -Force -Source $source -Scope CurrentUser).name
+        $ipp | Should -Contain "NanoServerPackage"
     }
 
     It "Find-package"  {
diff --git a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1 b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
index d3cc46f2e91..1186c0f9601 100644
--- a/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
+++ b/test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
@@ -4,11 +4,10 @@
 # no progress output during these tests
 $ProgressPreference = "SilentlyContinue"
 
-$RepositoryName = 'INTGallery'
-$SourceLocation = 'https://www.poshtestgallery.com'
-$RegisteredINTRepo = $false
-$ContosoServer = 'ContosoServer'
-$FabrikamServerScript = 'Fabrikam-ServerScript'
+$RepositoryName = 'PSGallery'
+$SourceLocation = 'https://www.powershellgallery.com'
+$TestModule = 'newTestModule'
+$TestScript = 'TestTestScript'
 $Initialized = $false
 
 #region Utility functions
@@ -93,11 +92,11 @@ function Initialize
     if($repo)
     {
         $script:RepositoryName = $repo.Name
+        Set-PackageSource -Name $repo.Name -Trusted
     }
     else
     {
         Register-PSRepository -Name $RepositoryName -SourceLocation $SourceLocation -InstallationPolicy Trusted
-        $script:RegisteredINTRepo = $true
     }
 }
 
@@ -105,18 +104,12 @@ function Initialize
 
 function Remove-InstalledModules
 {
-    Get-InstalledModule -Name $ContosoServer -AllVersions -ErrorAction SilentlyContinue | PowerShellGet\Uninstall-Module -Force
+    Get-InstalledModule -Name $TestModule -AllVersions -ErrorAction SilentlyContinue | PowerShellGet\Uninstall-Module -Force
 }
 
 Describe "PowerShellGet - Module tests" -tags "Feature" {
 
     BeforeAll {
-        # Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019
-        # These should be re-enabled when the issue is fixed
-        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-        $PSDefaultParameterValues["it:pending"] = $true
-        return
-
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -128,26 +121,25 @@ Describe "PowerShellGet - Module tests" -tags "Feature" {
     }
 
     It "Should find a module correctly" {
-        $psgetModuleInfo = Find-Module -Name $ContosoServer -Repository $RepositoryName
-        $psgetModuleInfo.Name | Should -Be $ContosoServer
+        $psgetModuleInfo = Find-Module -Name $TestModule -Repository $RepositoryName
+        $psgetModuleInfo.Name | Should -Be $TestModule
         $psgetModuleInfo.Repository | Should -Be $RepositoryName
     }
 
     It "Should install a module correctly to the required location with default CurrentUser scope" {
-        Install-Module -Name $ContosoServer -Repository $RepositoryName
-        $installedModuleInfo = Get-InstalledModule -Name $ContosoServer
+        Install-Module -Name $TestModule -Repository $RepositoryName
+        $installedModuleInfo = Get-InstalledModule -Name $TestModule
 
         $installedModuleInfo | Should -Not -BeNullOrEmpty
-        $installedModuleInfo.Name | Should -Be $ContosoServer
+        $installedModuleInfo.Name | Should -Be $TestModule
         $installedModuleInfo.InstalledLocation.StartsWith($script:MyDocumentsModulesPath, [System.StringComparison]::OrdinalIgnoreCase) | Should -BeTrue
 
-        $module = Get-Module $ContosoServer -ListAvailable
-        $module.Name | Should -Be $ContosoServer
+        $module = Get-Module $TestModule -ListAvailable
+        $module.Name | Should -Be $TestModule
         $module.ModuleBase | Should -Be $installedModuleInfo.InstalledLocation
     }
 
     AfterAll {
-        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledModules
     }
 }
@@ -155,12 +147,6 @@ Describe "PowerShellGet - Module tests" -tags "Feature" {
 Describe "PowerShellGet - Module tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
 
     BeforeAll {
-        # Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019
-        # These should be re-enabled when the issue is fixed
-        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-        $PSDefaultParameterValues["it:pending"] = $true
-        return
-
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -172,38 +158,31 @@ Describe "PowerShellGet - Module tests (Admin)" -Tags @('Feature', 'RequireAdmin
     }
 
     It "Should install a module correctly to the required location with AllUsers scope" {
-        Install-Module -Name $ContosoServer -Repository $RepositoryName -Scope AllUsers
-        $installedModuleInfo = Get-InstalledModule -Name $ContosoServer
+        Install-Module -Name $TestModule -Repository $RepositoryName -Scope AllUsers
+        $installedModuleInfo = Get-InstalledModule -Name $TestModule
 
         $installedModuleInfo | Should -Not -BeNullOrEmpty
-        $installedModuleInfo.Name | Should -Be $ContosoServer
+        $installedModuleInfo.Name | Should -Be $TestModule
         $installedModuleInfo.InstalledLocation.StartsWith($script:programFilesModulesPath, [System.StringComparison]::OrdinalIgnoreCase) | Should -BeTrue
 
-        $module = Get-Module $ContosoServer -ListAvailable
-        $module.Name | Should -Be $ContosoServer
+        $module = Get-Module $TestModule -ListAvailable
+        $module.Name | Should -Be $TestModule
         $module.ModuleBase | Should -Be $installedModuleInfo.InstalledLocation
     }
 
     AfterAll {
-        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledModules
     }
 }
 
 function Remove-InstalledScripts
 {
-    Get-InstalledScript -Name $FabrikamServerScript -ErrorAction SilentlyContinue | Uninstall-Script -Force
+    Get-InstalledScript -Name $TestScript -ErrorAction SilentlyContinue | Uninstall-Script -Force
 }
 
 Describe "PowerShellGet - Script tests" -tags "Feature" {
 
     BeforeAll {
-        # Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019
-        # These should be re-enabled when the issue is fixed
-        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-        $PSDefaultParameterValues["it:pending"] = $true
-        return
-
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -215,22 +194,21 @@ Describe "PowerShellGet - Script tests" -tags "Feature" {
     }
 
     It "Should find a script correctly" {
-        $psgetScriptInfo = Find-Script -Name $FabrikamServerScript -Repository $RepositoryName
-        $psgetScriptInfo.Name | Should -Be $FabrikamServerScript
+        $psgetScriptInfo = Find-Script -Name $TestScript -Repository $RepositoryName
+        $psgetScriptInfo.Name | Should -Be $TestScript
         $psgetScriptInfo.Repository | Should -Be $RepositoryName
     }
 
     It "Should install a script correctly to the required location with default CurrentUser scope" {
-        Install-Script -Name $FabrikamServerScript -Repository $RepositoryName -NoPathUpdate
-        $installedScriptInfo = Get-InstalledScript -Name $FabrikamServerScript
+        Install-Script -Name $TestScript -Repository $RepositoryName -NoPathUpdate
+        $installedScriptInfo = Get-InstalledScript -Name $TestScript
 
         $installedScriptInfo | Should -Not -BeNullOrEmpty
-        $installedScriptInfo.Name | Should -Be $FabrikamServerScript
+        $installedScriptInfo.Name | Should -Be $TestScript
         $installedScriptInfo.InstalledLocation.StartsWith($script:MyDocumentsScriptsPath, [System.StringComparison]::OrdinalIgnoreCase) | Should -BeTrue
     }
 
     AfterAll {
-        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledScripts
     }
 }
@@ -238,12 +216,6 @@ Describe "PowerShellGet - Script tests" -tags "Feature" {
 Describe "PowerShellGet - Script tests (Admin)" -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
 
     BeforeAll {
-        # Setting all It block to pending as the test fail due to https://github.com/PowerShell/PowerShell/issues/17019
-        # These should be re-enabled when the issue is fixed
-        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-        $PSDefaultParameterValues["it:pending"] = $true
-        return
-
         if ($script:Initialized -eq $false) {
             Initialize
             $script:Initialized = $true
@@ -255,16 +227,15 @@ Describe "PowerShellGet - Script tests (Admin)" -Tags @('Feature', 'RequireAdmin
     }
 
     It "Should install a script correctly to the required location with AllUsers scope" {
-        Install-Script -Name $FabrikamServerScript -Repository $RepositoryName -NoPathUpdate -Scope AllUsers
-        $installedScriptInfo = Get-InstalledScript -Name $FabrikamServerScript
+        Install-Script -Name $TestScript -Repository $RepositoryName -NoPathUpdate -Scope AllUsers
+        $installedScriptInfo = Get-InstalledScript -Name $TestScript
 
         $installedScriptInfo | Should -Not -BeNullOrEmpty
-        $installedScriptInfo.Name | Should -Be $FabrikamServerScript
+        $installedScriptInfo.Name | Should -Be $TestScript
         $installedScriptInfo.InstalledLocation.StartsWith($script:ProgramFilesScriptsPath, [System.StringComparison]::OrdinalIgnoreCase) | Should -BeTrue
     }
 
     AfterAll {
-        $global:PSDefaultParameterValues = $originalDefaultParameterValues
         Remove-InstalledScripts
     }
 }
@@ -300,8 +271,3 @@ Describe 'PowerShellGet Type tests' -tags @('CI') {
         }
     }
 }
-
-if($RegisteredINTRepo)
-{
-    Get-PSRepository -Name $RepositoryName -ErrorAction SilentlyContinue | Unregister-PSRepository
-}

From 9fc0e80fb7df61aac6c6b738fd49ac4b5eabbc5f Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 25 Mar 2022 16:15:16 -0700
Subject: [PATCH 292/645] Update `dotnetmetadata.json` to accept .NET 7 preview
 3 builds (#17063)

---
 DotnetRuntimeMetadata.json                    |  8 +--
 .../Common/WebRequestPSCmdlet.Common.cs       |  8 +--
 .../WebCmdlets.Tests.ps1                      | 66 +++++++++++--------
 ...soft.PowerShell.NamedPipeConnection.csproj |  2 +-
 tools/UpdateDotnetRuntime.ps1                 | 12 +++-
 5 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index fcb9f330e2a..c11e7455ff7 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,13 +1,13 @@
 {
   "sdk": {
-    "channel": "7.0.1xx-preview2",
+    "channel": "7.0.1xx-preview3",
     "quality": "signed",
     "qualityFallback": "daily",
-    "packageVersionPattern": "7.0.0-preview.2",
+    "packageVersionPattern": "7.0.0-preview.3",
     "sdkImageVersion": "7.0.100",
-    "nextChannel": "7.0.1xx-preview2",
+    "nextChannel": "7.0.1xx-preview3",
     "azureFeed": "",
-    "sdkImageOverride": "7.0.100-preview.2.22153.17"
+    "sdkImageOverride": ""
   },
   "internalfeed": {
     "url": ""
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
index 30c55f506f0..7394b9f0933 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
@@ -63,14 +63,14 @@ public enum WebSslProtocol
         Default = 0,
 
         /// <summary>
-        /// Specifies the TLS 1.0 security protocol. The TLS protocol is defined in IETF RFC 2246.
+        /// Specifies the TLS 1.0 is obsolete. Using this value now defaults to TLS 1.2.
         /// </summary>
-        Tls = SslProtocols.Tls,
+        Tls = SslProtocols.Tls12,
 
         /// <summary>
-        /// Specifies the TLS 1.1 security protocol. The TLS protocol is defined in IETF RFC 4346.
+        /// Specifies the TLS 1.1 is obsolete. Using this value now defaults to TLS 1.2.
         /// </summary>
-        Tls11 = SslProtocols.Tls11,
+        Tls11 = SslProtocols.Tls12,
 
         /// <summary>
         /// Specifies the TLS 1.2 security protocol. The TLS protocol is defined in IETF RFC 5246.
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
index 0742578fa83..181cbbcf879 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
@@ -1730,46 +1730,51 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
             # We put Tls13 tests at pending due to modern OS limitations.
             # Tracking issue https://github.com/PowerShell/PowerShell/issues/13439
 
-            $skipForTls1OnLinux = $IsLinux -and $env:TF_BUILD
+            $skipForTls1 = $true
 
             ## Test cases for the 1st 'It'
             $testCases1 = @(
                 @{ Test = @{SslProtocol = 'Default'; ActualProtocol = 'Default'}; Pending = $false }
-                @{ Test = @{SslProtocol = 'Tls'; ActualProtocol = 'Tls'}; Pending = $skipForTls1OnLinux }
-                @{ Test = @{SslProtocol = 'Tls11'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1OnLinux }
+                @{ Test = @{SslProtocol = 'Tls'; ActualProtocol = 'Tls'}; Pending = $skipForTls1 }
+                @{ Test = @{SslProtocol = 'Tls11'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1 }
                 @{ Test = @{SslProtocol = 'Tls12'; ActualProtocol = 'Tls12'}; Pending = $false }
                 @{ Test = @{SslProtocol = 'Tls13'; ActualProtocol = 'Tls13'}; Pending = $true }
                 @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12'; ActualProtocol = 'Tls12'}; Pending = $false }
                 @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12, Tls13'; ActualProtocol = 'Tls13'}; Pending = $true }
                 @{ Test = @{SslProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls12'}; Pending = $false }
-                @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1OnLinux }
-                @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12, Tls13'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1OnLinux }
-                @{ Test = @{SslProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1OnLinux }
-                @{ Test = @{SslProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1OnLinux }
-                @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $skipForTls1OnLinux }
+                @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1 }
+                @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12, Tls13'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1 }
+                @{ Test = @{SslProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1 }
+                @{ Test = @{SslProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1 }
+                @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $skipForTls1 }
                 @{ Test = @{SslProtocol = 'Tls, Tls11, Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
-                @{ Test = @{SslProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls'}; Pending = $skipForTls1OnLinux }
+                @{ Test = @{SslProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls'}; Pending = $skipForTls1 }
                 # Skipping intermediary protocols is not supported on all platforms
-                @{ Test = @{SslProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls'}; Pending = -not $IsWindows }
+                # Removed this as Tls now default to Tls12
+                # @{ Test = @{SslProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls'}; Pending = -not $IsWindows }
                 @{ Test = @{SslProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls12'}; Pending = -not $IsWindows }
             )
 
             $testCases2 = @(
                 @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls13'}; Pending = $true }
-                @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls12'}; Pending = $false }
+                # Removed this as Tls now default to Tls12
+                # @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls12'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls11'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
-                @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
+                # Removed this as Tls now default to Tls12
+                # @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
-                @{ Test = @{IntendedProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
+                # Removed this as Tls now default to Tls12
+                # @{ Test = @{IntendedProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls11, Tls12, Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
                 @{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls13'}; Pending = $true }
                 @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
                 @{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
-                @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
+                # Removed this as Tls now default to Tls12
+                # @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
             )
         }
 
@@ -3327,45 +3332,50 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
             # We put Tls13 tests at pending due to modern OS limitations.
             # Tracking issue https://github.com/PowerShell/PowerShell/issues/13439
 
-            $skipForTls1OnLinux = $IsLinux -and $env:TF_BUILD
+            $skipForTls1 = $true
 
             $testCases1 = @(
                 @{ Test = @{SslProtocol = 'Default'; ActualProtocol = 'Default'}; Pending = $false }
-                @{ Test = @{SslProtocol = 'Tls'; ActualProtocol = 'Tls'}; Pending = $skipForTls1OnLinux }
-                @{ Test = @{SslProtocol = 'Tls11'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1OnLinux }
+                @{ Test = @{SslProtocol = 'Tls'; ActualProtocol = 'Tls'}; Pending = $skipForTls1 }
+                @{ Test = @{SslProtocol = 'Tls11'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1 }
                 @{ Test = @{SslProtocol = 'Tls12'; ActualProtocol = 'Tls12'}; Pending = $false }
                 @{ Test = @{SslProtocol = 'Tls13'; ActualProtocol = 'Tls13'}; Pending = $true }
                 @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12'; ActualProtocol = 'Tls12'}; Pending = $false }
                 @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12, Tls13'; ActualProtocol = 'Tls13'}; Pending = $true }
                 @{ Test = @{SslProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls12'}; Pending = $false }
-                @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1OnLinux }
-                @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12, Tls13'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1OnLinux }
-                @{ Test = @{SslProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1OnLinux }
-                @{ Test = @{SslProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1OnLinux }
-                @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $skipForTls1OnLinux }
+                @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1 }
+                @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12, Tls13'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1 }
+                @{ Test = @{SslProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1 }
+                @{ Test = @{SslProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls11'}; Pending = $skipForTls1 }
+                @{ Test = @{SslProtocol = 'Tls, Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $skipForTls1 }
                 @{ Test = @{SslProtocol = 'Tls, Tls11, Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
-                @{ Test = @{SslProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls'}; Pending = $skipForTls1OnLinux }
+                @{ Test = @{SslProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls'}; Pending = $skipForTls1 }
                 # Skipping intermediary protocols is not supported on all platforms
-                @{ Test = @{SslProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls'}; Pending = -not $IsWindows }
+                # Removed this as Tls now default to Tls12
+                # @{ Test = @{SslProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls'}; Pending = -not $IsWindows }
                 @{ Test = @{SslProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls12'}; Pending = -not $IsWindows }
             )
 
             $testCases2 = @(
                 @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls13'}; Pending = $true }
-                @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls12'}; Pending = $false }
+                # Removed this as Tls now default to Tls12
+                # @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls12'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls11'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
-                @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
+                # Removed this as Tls now default to Tls12
+                # @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
-                @{ Test = @{IntendedProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
+                # Removed this as Tls now default to Tls12
+                # @{ Test = @{IntendedProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls11, Tls12, Tls13'; ActualProtocol = 'Tls'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls13'}; Pending = $true }
                 @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
                 @{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
-                @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
+                # Removed this as Tls now default to Tls12
+                # @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
             )
         }
 
diff --git a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
index fbaf1254a14..07d33c9a11d 100644
--- a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
+++ b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" version="4.5.0-*" />
+    <PackageReference Include="Microsoft.CSharp" version="4.5.0" />
     <Reference Include="System.Management.Automation">
       <HintPath>.\Ref\System.Management.Automation.dll</HintPath>
     </Reference>
diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index 40b83623375..cf31c695936 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -128,9 +128,15 @@ function Update-PackageVersion {
             foreach ($p in $pkgs.Values) {
                 # some packages are directly updated on nuget.org so need to check that too.
                 if ($p.Version -like "$versionPattern*" -or $p.Source -eq 'nuget.org') {
-                    if ([System.Management.Automation.SemanticVersion] ($version) -lt [System.Management.Automation.SemanticVersion] ($p.Version)) {
-                        $v.NewVersion = $p.Version
-                        break
+                    try {
+                        if ([System.Management.Automation.SemanticVersion] ($version) -lt [System.Management.Automation.SemanticVersion] ($p.Version)) {
+                            $v.NewVersion = $p.Version
+                            break
+                        }
+                    } catch {
+                        if ($_.FullyQualifiedErrorId -ne 'InvalidCastParseTargetInvocation') {
+                            throw $_
+                        }
                     }
                 }
             }

From 93a0f9b8dc4149fb8ac65a3e6fa47faff099091e Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 28 Mar 2022 11:12:21 -0700
Subject: [PATCH 293/645] Fix the version of the
 `Microsoft.CodeAnalysis.NetAnalyzers` package (#17075)

---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index c96ced149d6..8688f4f5f37 100644
--- a/Analyzers.props
+++ b/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="7.0.0-preview1.22174.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22116.1" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From 788ffde65c96dbb0f815faebbc60fa9901ed52c8 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Tue, 29 Mar 2022 21:49:40 -0700
Subject: [PATCH 294/645] Ignore failure attempting to set console window title
 (#16948)

---
 .../host/msh/ConsoleControl.cs                  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
index 88964ea7a25..5f453a1d5c4 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
@@ -2494,6 +2494,8 @@ internal static string GetConsoleWindowTitle()
             return consoleTitle.ToString();
         }
 
+        private static bool s_dontsetConsoleWindowTitle;
+
         /// <summary>
         /// Wraps Win32 SetConsoleTitle.
         /// </summary>
@@ -2505,12 +2507,27 @@ internal static string GetConsoleWindowTitle()
         /// </exception>
         internal static void SetConsoleWindowTitle(string consoleTitle)
         {
+            if (s_dontsetConsoleWindowTitle)
+            {
+                return;
+            }
+
             bool result = NativeMethods.SetConsoleTitle(consoleTitle);
 
             if (!result)
             {
                 int err = Marshal.GetLastWin32Error();
 
+                // ERROR_GEN_FAILURE is returned if this api can't be used with the terminal
+                if (err == 0x1f)
+                {
+                    tracer.WriteLine("Call to SetConsoleTitle failed: {0}", err);
+                    s_dontsetConsoleWindowTitle = true;
+
+                    // We ignore this specific error as the console can still continue to operate
+                    return;
+                }
+
                 HostException e = CreateHostException(err, "SetConsoleWindowTitle",
                     ErrorCategory.ResourceUnavailable, ConsoleControlStrings.SetConsoleWindowTitleExceptionTemplate);
                 throw e;

From ada5e951bd34abf096fe20228cf68dfb53e497d9 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Wed, 30 Mar 2022 16:17:48 -0700
Subject: [PATCH 295/645] Update dotnet-install script download link (#17086)

* Update dotnet-install link

* Add alternative dotnet-install link
---
 build.psm1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index aabc3b380b5..b20aa6ad175 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1813,7 +1813,8 @@ function Install-Dotnet {
     # Note that when it is null, Invoke-Expression (but not &) must be used to interpolate properly
     $sudo = if (!$NoSudo) { "sudo" }
 
-    $installObtainUrl = "https://dotnet.microsoft.com/download/dotnet-core/scripts/v1"
+    # $installObtainUrl = "https://dot.net/v1"
+    $installObtainUrl = "https://dotnet.microsoft.com/download/dotnet/scripts/v1"
     $uninstallObtainUrl = "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain"
 
     # Install for Linux and OS X

From 6d4c56657bca62aa14e9b13c3f31378a9eeb17ae Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Thu, 31 Mar 2022 12:24:58 -0700
Subject: [PATCH 296/645] Skip failing scriptblock tests (#17093)

---
 test/powershell/Host/Logging.Tests.ps1 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/powershell/Host/Logging.Tests.ps1 b/test/powershell/Host/Logging.Tests.ps1
index 5250d2ef5ae..628bd8ac95e 100644
--- a/test/powershell/Host/Logging.Tests.ps1
+++ b/test/powershell/Host/Logging.Tests.ps1
@@ -188,7 +188,9 @@ Creating Scriptblock text \(1 of 1\):#012{0}(⏎|#012)*ScriptBlock ID: [0-9a-z\-
         }
     }
 
-    It 'Verifies scriptblock logging' -Skip:(!$IsSupportedEnvironment) {
+    # Skip test as it is failing in PowerShell CI on Linux platform.
+    # Tracking Issue: https://github.com/PowerShell/PowerShell/issues/17092
+    It 'Verifies scriptblock logging' -Skip <#-Skip:(!$IsSupportedEnvironment)#> {
         $configFile = WriteLogSettings -LogId $logId -ScriptBlockLogging -LogLevel Verbose
         $script = @'
 $PID
@@ -217,7 +219,9 @@ $PID
         $createdEvents[2].Message | Should -Match ($scriptBlockCreatedRegExTemplate -f "Write\-Verbose 'testheader123' ;Write\-verbose 'after'")
     }
 
-    It 'Verifies scriptblock logging with null character' -Skip:(!$IsSupportedEnvironment) {
+    # Skip test as it is failing in PowerShell CI on Linux platform.
+    # Tracking Issue: https://github.com/PowerShell/PowerShell/issues/17092
+    It 'Verifies scriptblock logging with null character' -Skip <#-Skip:(!$IsSupportedEnvironment)#> {
         $configFile = WriteLogSettings -LogId $logId -ScriptBlockLogging -LogLevel Verbose
         $script = @'
 $PID

From be998816f7c5346b1120c6b2eba0b90729f21086 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 11:22:54 -0700
Subject: [PATCH 297/645] Update to the latest notice file (#16437)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 ThirdPartyNotices.txt | 521 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 447 insertions(+), 74 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 73301c45a84..7ff8ad1b7f5 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -142,7 +142,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 ---------------------------------------------------------
 
-Microsoft.ApplicationInsights 2.18.0 - MIT
+Microsoft.ApplicationInsights 2.20.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -232,11 +232,11 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.CodeAnalysis.Common 4.0.0-6.final - MIT
+Microsoft.CodeAnalysis.Common 4.1.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) .NET Foundation and Contributors
 
 MIT License
@@ -253,18 +253,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Microsoft.CodeAnalysis.CSharp 4.0.0-6.final - MIT
+Microsoft.CodeAnalysis.CSharp 4.1.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) Microsoft Corporation.
-9Copyright (c) Microsoft Corporation.
-ACopyright (c) Microsoft Corporation.
-BCopyright (c) Microsoft Corporation.
-CCopyright (c) Microsoft Corporation.
-DCopyright (c) Microsoft Corporation.
-OCopyright (c) Microsoft Corporation.
+(c) Microsoft Corporation
+Copyright (c) Microsoft Corporation
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) Microsoft Corporation. Alle Rechte
 
@@ -282,6 +276,46 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
+Microsoft.Management.Infrastructure 2.0.0 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+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.
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Microsoft.Management.Infrastructure.Runtime.Unix 2.0.0 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+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.
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
 Microsoft.PowerShell.MarkdownRender 7.2.0 - MIT
 
 
@@ -378,7 +412,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.Win32.Registry.AccessControl 6.0.0-rc.2.21480.5 - MIT
+Microsoft.Win32.Registry.AccessControl 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -449,7 +483,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.Win32.SystemEvents 6.0.0-rc.2.21480.5 - MIT
+Microsoft.Win32.SystemEvents 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -520,7 +554,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.Windows.Compatibility 6.0.0-rc.2.21480.5 - MIT
+Microsoft.Windows.Compatibility 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -591,7 +625,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Namotion.Reflection 2.0.3 - MIT
+Namotion.Reflection 2.0.10 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -644,12 +678,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-NJsonSchema 10.5.2 - MIT
+NJsonSchema 10.6.9 - MIT
 
 
-Copyright Rico Suter
 (c) 2008 VeriSign, Inc.
-Copyright (c) Rico Suter
+Copyright Rico Suter, 2021
+Copyright (c) Rico Suter, 2021
+Copyright Rico Suter, 2021 4JSON Schema
 
 MIT License
 
@@ -665,7 +700,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-runtime.linux-arm.runtime.native.System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
+runtime.linux-arm.runtime.native.System.IO.Ports 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -736,9 +771,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.linux-arm64.runtime.native.System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
+runtime.linux-arm64.runtime.native.System.IO.Ports 6.0.0 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -769,9 +842,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.linux-x64.runtime.native.System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
+runtime.linux-x64.runtime.native.System.IO.Ports 6.0.0 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -856,9 +967,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.native.System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
+runtime.native.System.IO.Ports 6.0.0 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -889,9 +1038,118 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.osx-x64.runtime.native.System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
+runtime.osx-arm64.runtime.native.System.IO.Ports 6.0.0 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+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.
+
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+runtime.osx-x64.runtime.native.System.IO.Ports 6.0.0 - MIT
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -922,7 +1180,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.CodeDom 6.0.0-rc.2.21480.5 - MIT
+System.CodeDom 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1063,7 +1321,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ComponentModel.Composition 6.0.0-rc.2.21480.5 - MIT
+System.ComponentModel.Composition 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1134,7 +1392,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ComponentModel.Composition.Registration 6.0.0-rc.2.21480.5 - MIT
+System.ComponentModel.Composition.Registration 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1205,7 +1463,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Configuration.ConfigurationManager 6.0.0-rc.2.21480.5 - MIT
+System.Configuration.ConfigurationManager 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1276,7 +1534,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Data.Odbc 6.0.0-rc.2.21480.5 - MIT
+System.Data.Odbc 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1347,7 +1605,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Data.OleDb 6.0.0-rc.2.21480.5 - MIT
+System.Data.OleDb 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1543,7 +1801,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Diagnostics.EventLog 6.0.0-rc.2.21480.5 - MIT
+System.Diagnostics.EventLog 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1614,7 +1872,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Diagnostics.PerformanceCounter 6.0.0-rc.2.21480.5 - MIT
+System.Diagnostics.PerformanceCounter 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1685,7 +1943,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.DirectoryServices 6.0.0-rc.2.21480.5 - MIT
+System.DirectoryServices 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1756,7 +2014,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.DirectoryServices.AccountManagement 6.0.0-rc.2.21480.5 - MIT
+System.DirectoryServices.AccountManagement 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -1827,46 +2085,50 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.DirectoryServices.Protocols 6.0.0-rc.2.21480.5 - MIT
+System.DirectoryServices.Protocols 6.0.1 - MIT
 
 
 (c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2020 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -1898,9 +2160,47 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Drawing.Common 6.0.0-rc.2.21480.5 - MIT
+System.Drawing.Common 6.0.0 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
+Copyright (c) .NET Foundation.
+Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
+(c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
+Portions (c) International Organization
+Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1931,7 +2231,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Formats.Asn1 6.0.0-rc.2.21480.5 - MIT
+System.Formats.Asn1 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2002,7 +2302,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.IO.Packaging 6.0.0-rc.2.21480.5 - MIT
+System.IO.Packaging 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2073,7 +2373,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.IO.Ports 6.0.0-rc.2.21480.5 - MIT
+System.IO.Ports 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2144,7 +2444,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Management 6.0.0-rc.2.21480.5 - MIT
+System.Management 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2263,7 +2563,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Net.Http.WinHttpHandler 6.0.0-rc.2.21480.5 - MIT
+System.Net.Http.WinHttpHandler 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2382,7 +2682,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Private.ServiceModel 4.9.0-rc2.21473.1 - MIT
+System.Private.ServiceModel 4.9.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2419,7 +2719,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Reflection.Context 6.0.0-rc.2.21480.5 - MIT
+System.Reflection.Context 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2614,7 +2914,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Runtime.Caching 6.0.0-rc.2.21480.5 - MIT
+System.Runtime.Caching 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2685,7 +2985,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Runtime.CompilerServices.Unsafe 6.0.0-rc.2.21480.5 - MIT
+System.Runtime.CompilerServices.Unsafe 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2756,7 +3056,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.AccessControl 6.0.0-rc.2.21480.5 - MIT
+System.Security.AccessControl 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2827,7 +3127,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.Pkcs 6.0.0-rc.2.21480.5 - MIT
+System.Security.Cryptography.Pkcs 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2898,7 +3198,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.ProtectedData 6.0.0-rc.2.21480.5 - MIT
+System.Security.Cryptography.ProtectedData 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -2969,7 +3269,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.Xml 6.0.0-rc.2.21480.5 - MIT
+System.Security.Cryptography.Xml 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -3040,7 +3340,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Permissions 6.0.0-rc.2.21480.5 - MIT
+System.Security.Permissions 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -3181,7 +3481,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Duplex 4.9.0-rc2.21473.1 - MIT
+System.ServiceModel.Duplex 4.9.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -3218,9 +3518,13 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Http 4.9.0-rc2.21473.1 - MIT
+System.ServiceModel.Http 4.9.0 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -3251,9 +3555,13 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.NetTcp 4.9.0-rc2.21473.1 - MIT
+System.ServiceModel.NetTcp 4.9.0 - MIT
 
 
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -3284,7 +3592,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Primitives 4.9.0-rc2.21473.1 - MIT
+System.ServiceModel.Primitives 4.9.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -3321,7 +3629,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Security 4.9.0-rc2.21473.1 - MIT
+System.ServiceModel.Security 4.9.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -3358,7 +3666,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Syndication 6.0.0-rc.2.21480.5 - MIT
+System.ServiceModel.Syndication 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -3429,7 +3737,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceProcess.ServiceController 6.0.0-rc.2.21480.5 - MIT
+System.ServiceProcess.ServiceController 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -3500,7 +3808,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Speech 6.0.0-rc.2.21480.5 - MIT
+System.Speech 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -3571,7 +3879,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Text.Encoding.CodePages 6.0.0-rc.2.21480.5 - MIT
+System.Text.Encoding.CodePages 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -3642,7 +3950,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Text.Encodings.Web 6.0.0-rc.2.21480.5 - MIT
+System.Text.Encodings.Web 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -3713,7 +4021,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Threading.AccessControl 6.0.0-rc.2.21480.5 - MIT
+System.Threading.AccessControl 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -3869,7 +4177,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Windows.Extensions 6.0.0-rc.2.21480.5 - MIT
+System.Windows.Extensions 6.0.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.
@@ -3936,6 +4244,71 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Microsoft.Management.Infrastructure.Runtime.Win 2.0.0
+
+
+(c) 2008 VeriSign, Inc.
+(c) Microsoft Corporation.
+Copyright (c) Microsoft Corporation.
+9Copyright (c) Microsoft Corporation.
+
+MICROSOFT SOFTWARE LICENSE TERMS
+Microsoft.Management.Infrastructure.dll 
+Microsoft.Management.Infrastructure.Native.dll
+Microsoft.Management.Infrastructure.Unmanaged.dll 
+Mi.dll 
+Miutils.dll
+________________________________________
+IF YOU LIVE IN (OR ARE A BUSINESS WITH A PRINCIPAL PLACE OF BUSINESS IN) THE UNITED STATES, PLEASE READ THE “BINDING ARBITRATION AND CLASS ACTION WAIVER” SECTION BELOW. IT AFFECTS HOW DISPUTES ARE RESOLVED.
+________________________________________
+
+These license terms are an agreement between you and Microsoft Corporation (or one of its affiliates). They apply to the software named above and any Microsoft services or software updates (except to the extent such services or updates are accompanied by new or additional terms, in which case those different terms apply prospectively and do not alter your or Microsoft’s rights relating to pre-updated software or services). IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE RIGHTS BELOW. BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS.
+1.	INSTALLATION AND USE RIGHTS.
+a)	General. You may install and use any number of copies of the software solely for use with Microsoft PowerShell.
+b)	Third Party Software. The software may include third party applications that Microsoft, not the third party, licenses to you under this agreement. Any included notices for third party applications are for your information only.
+2.	DATA COLLECTION. The software may collect information about you and your use of the software and send that to Microsoft. Microsoft may use this information to provide services and improve Microsoft’s products and services. Your opt-out rights, if any, are described in the product documentation. Some features in the software may enable collection of data from users of your applications that access or use the software. If you use these features to enable data collection in your applications, you must comply with applicable law, including getting any required user consent, and maintain a prominent privacy policy that accurately informs users about how you use, collect, and share their data. You can learn more about Microsoft’s data collection and use in the product documentation and the Microsoft Privacy Statement at aka.ms/privacy. You agree to comply with all applicable provisions of the Microsoft Privacy Statement.   
+a.	Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection Regulation Terms of the Online Services Terms to all customers effective May 25, 2018, at http://go.microsoft.com/?linkid=9840733.
+3.	SCOPE OF LICENSE. The software is licensed, not sold. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you will not (and have no right to):
+a)	work around any technical limitations in the software that only allow you to use it in certain ways;
+b)	reverse engineer, decompile or disassemble the software;
+c)	remove, minimize, block, or modify any notices of Microsoft or its suppliers in the software;
+d)	use the software in any way that is against the law or to create or propagate malware; or
+e)	share, publish, distribute, or lend the software, provide the software as a stand-alone hosted solution for others to use, or transfer the software or this agreement to any third party.
+4.	EXPORT RESTRICTIONS. You must comply with all domestic and international export laws and regulations that apply to the software, which include restrictions on destinations, end users, and end use. For further information on export restrictions, visit http://aka.ms/exporting.
+5.	SUPPORT SERVICES. Microsoft is not obligated under this agreement to provide any support services for the software. Any support provided is “as is”, “with all faults”, and without warranty of any kind.
+6.	UPDATES. The software may periodically check for updates, and download and install them for you. You may obtain updates only from Microsoft or authorized sources. Microsoft may need to update your system to provide you with updates. You agree to receive these automatic updates without any additional notice. Updates may not include or support all existing software features, services, or peripheral devices.
+7.	BINDING ARBITRATION AND CLASS ACTION WAIVER. This Section applies if you live in (or, if a business, your principal place of business is in) the United States.  If you and Microsoft have a dispute, you and Microsoft agree to try for 60 days to resolve it informally. If you and Microsoft can’t, you and Microsoft agree to binding individual arbitration before the American Arbitration Association under the Federal Arbitration Act (“FAA”), and not to sue in court in front of a judge or jury. Instead, a neutral arbitrator will decide. Class action lawsuits, class-wide arbitrations, private attorney-general actions, and any other proceeding where someone acts in a representative capacity are not allowed; nor is combining individual proceedings without the consent of all parties. The complete Arbitration Agreement contains more terms and is at http://aka.ms/arb-agreement-1. You and Microsoft agree to these terms.
+8.	TERMINATION. Without prejudice to any other rights, Microsoft may terminate this agreement if you fail to comply with any of its terms or conditions. In such event, you must destroy all copies of the software and all of its component parts.
+9.	ENTIRE AGREEMENT. This agreement, and any other terms Microsoft may provide for supplements, updates, or third-party applications, is the entire agreement for the software.
+10.	APPLICABLE LAW AND PLACE TO RESOLVE DISPUTES. If you acquired the software in the United States or Canada, the laws of the state or province where you live (or, if a business, where your principal place of business is located) govern the interpretation of this agreement, claims for its breach, and all other claims (including consumer protection, unfair competition, and tort claims), regardless of conflict of laws principles, except that the FAA governs everything related to arbitration. If you acquired the software in any other country, its laws apply, except that the FAA governs everything related to arbitration. If U.S. federal jurisdiction exists, you and Microsoft consent to exclusive jurisdiction and venue in the federal court in King County, Washington for all disputes heard in court (excluding arbitration). If not, you and Microsoft consent to exclusive jurisdiction and venue in the Superior Court of King County, Washington for all disputes heard in court (excluding arbitration).
+11.	CONSUMER RIGHTS; REGIONAL VARIATIONS. This agreement describes certain legal rights. You may have other rights, including consumer rights, under the laws of your state, province, or country. Separate and apart from your relationship with Microsoft, you may also have rights with respect to the party from which you acquired the software. This agreement does not change those other rights if the laws of your state, province, or country do not permit it to do so. For example, if you acquired the software in one of the below regions, or mandatory country law applies, then the following provisions apply to you:
+a)	Australia. You have statutory guarantees under the Australian Consumer Law and nothing in this agreement is intended to affect those rights.
+b)	Canada. If you acquired this software in Canada, you may stop receiving updates by turning off the automatic update feature, disconnecting your device from the Internet (if and when you re-connect to the Internet, however, the software will resume checking for and installing updates), or uninstalling the software. The product documentation, if any, may also specify how to turn off updates for your specific device or software.
+c)	Germany and Austria.
+i.	Warranty. The properly licensed software will perform substantially as described in any Microsoft materials that accompany the software. However, Microsoft gives no contractual guarantee in relation to the licensed software.
+ii.	Limitation of Liability. In case of intentional conduct, gross negligence, claims based on the Product Liability Act, as well as, in case of death or personal or physical injury, Microsoft is liable according to the statutory law.
+Subject to the foregoing clause ii., Microsoft will only be liable for slight negligence if Microsoft is in breach of such material contractual obligations, the fulfillment of which facilitate the due performance of this agreement, the breach of which would endanger the purpose of this agreement and the compliance with which a party may constantly trust in (so-called "cardinal obligations"). In other cases of slight negligence, Microsoft will not be liable for slight negligence.
+12.	DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED “AS IS.” YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES, OR CONDITIONS. TO THE EXTENT PERMITTED UNDER APPLICABLE LAWS, MICROSOFT EXCLUDES ALL IMPLIED WARRANTIES, INCLUDING MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+13.	LIMITATION ON AND EXCLUSION OF DAMAGES. IF YOU HAVE ANY BASIS FOR RECOVERING DAMAGES DESPITE THE PRECEDING DISCLAIMER OF WARRANTY, YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.
+This limitation applies to (a) anything related to the software, services, content (including code) on third party Internet sites, or third party applications; and (b) claims for breach of contract, warranty, guarantee, or condition; strict liability, negligence, or other tort; or any other claim; in each case to the extent permitted by applicable law.
+It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your state, province, or country may not allow the exclusion or limitation of incidental, consequential, or other damages.
+
+Please note: As this software is distributed in Canada, some of the clauses in this agreement are provided below in French.
+Remarque: Ce logiciel étant distribué au Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en français.
+EXONÉRATION DE GARANTIE. Le logiciel visé par une licence est offert « tel quel ». Toute utilisation de ce logiciel est à votre seule risque et péril. Microsoft n’accorde aucune autre garantie expresse. Vous pouvez bénéficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualité marchande, d’adéquation à un usage particulier et d’absence de contrefaçon sont exclues.
+LIMITATION DES DOMMAGES-INTÉRÊTS ET EXCLUSION DE RESPONSABILITÉ POUR LES DOMMAGES. Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement à hauteur de 5,00 $ US. Vous ne pouvez prétendre à aucune indemnisation pour les autres dommages, y compris les dommages spéciaux, indirects ou accessoires et pertes de bénéfices.
+Cette limitation concerne:
+•	tout ce qui est relié au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers; et
+•	les réclamations au titre de violation de contrat ou de garantie, ou au titre de responsabilité stricte, de négligence ou d’une autre faute dans la limite autorisée par la loi en vigueur.
+Elle s’applique également, même si Microsoft connaissait ou devrait connaître l’éventualité d’un tel dommage. Si votre pays n’autorise pas l’exclusion ou la limitation de responsabilité pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l’exclusion ci-dessus ne s’appliquera pas à votre égard.
+EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous pourriez avoir d’autres droits prévus par les lois de votre pays. Le présent contrat ne modifie pas les droits que vous confèrent les lois de votre pays si celles-ci ne le permettent pas.
+
+
+
 ---------------------------------------------------------
 
 

From 5e37308e1b4dbfff2eb89a21c38d401def40cb26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 10:51:09 -0700
Subject: [PATCH 298/645] Bump `Microsoft.CodeAnalysis.NetAnalyzers` (#17105)

---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index 8688f4f5f37..d0dc67350f9 100644
--- a/Analyzers.props
+++ b/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="7.0.0-preview1.22116.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22202.1" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From 7cc9c874730e87b06dbe54d50e77c1c472996c54 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 5 Apr 2022 12:00:41 -0700
Subject: [PATCH 299/645] Do not generate clean block in proxy function when
 the feature is disabled (#17112)

---
 .../engine/CommandMetadata.cs                     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandMetadata.cs b/src/System.Management.Automation/engine/CommandMetadata.cs
index a9094f54b36..75d02ed59d5 100644
--- a/src/System.Management.Automation/engine/CommandMetadata.cs
+++ b/src/System.Management.Automation/engine/CommandMetadata.cs
@@ -864,6 +864,15 @@ internal string GetProxyCommand(string helpComment, bool generateDynamicParamete
 ", GetDynamicParamBlock());
             }
 
+            string cleanBlock = string.Empty;
+            if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSCleanBlockFeatureName))
+            {
+                cleanBlock = string.Format(CultureInfo.InvariantCulture, @"
+clean
+{{{0}}}
+", GetCleanBlock());
+            }
+
             string result = string.Format(CultureInfo.InvariantCulture, @"{0}
 param({1})
 
@@ -875,9 +884,7 @@ internal string GetProxyCommand(string helpComment, bool generateDynamicParamete
 
 end
 {{{5}}}
-
-clean
-{{{6}}}
+{6}
 <#
 {7}
 #>
@@ -888,7 +895,7 @@ internal string GetProxyCommand(string helpComment, bool generateDynamicParamete
                 GetBeginBlock(),
                 GetProcessBlock(),
                 GetEndBlock(),
-                GetCleanBlock(),
+                cleanBlock,
                 CodeGeneration.EscapeBlockCommentContent(helpComment));
 
             return result;

From 4acf6b39d49ec50530722ddf72a098b97fe1a40a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20BARIZIEN?= <github.nospam4sba@xoxy.net>
Date: Tue, 12 Apr 2022 18:00:16 +0200
Subject: [PATCH 300/645] Support forward slashes in network share (UNC path)
 completion (#17111) (#17117)

---
 .../CommandCompletion/CompletionCompleters.cs    |  3 ++-
 .../Host/TabCompletion/TabCompletion.Tests.ps1   | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index a81027ed983..acdbe2233bc 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -4301,7 +4301,8 @@ internal static IEnumerable<CompletionResult> CompleteFilename(CompletionContext
             var results = new List<CompletionResult>();
 
             // First, try to match \\server\share
-            var shareMatch = Regex.Match(wordToComplete, "^\\\\\\\\([^\\\\]+)\\\\([^\\\\]*)$");
+            // support both / and \ when entering UNC paths for typing convenience (#17111)
+            var shareMatch = Regex.Match(wordToComplete, @"^(?:\\\\|//)([^\\/]+)(?:\\|/)([^\\/]*)$");
             if (shareMatch.Success)
             {
                 // Only match share names, no filenames.
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 9522ee56c30..f984e3b72c0 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -140,7 +140,7 @@ switch ($x)
             $res = TabExpansion2 -cursorColumn $CursorIndex -inputScript $TestString.Remove($CursorIndex, 1)
             $res.CompletionMatches[0].CompletionText | Should -BeExactly $Expected
         }
-    
+
     It 'Should Complete and replace existing member with space in front of cursor and cursor in front of word' {
         $TestString = '[System.Management.Automation.ActionPreference]:: ^Break'
         $CursorIndex = $TestString.IndexOf('^')
@@ -985,6 +985,16 @@ switch ($x)
             $res.CompletionMatches[0].CompletionText | Should -BeExactly $afterTab
         }
 
+        It "Tab completion UNC path with forward slashes" -Skip:(!$IsWindows) {
+            $beforeTab = "//localhost/admin"
+            # it is expected that tab completion turns forward slashes into backslashes
+            $afterTab = "\\localhost\ADMIN$"
+            $res = TabExpansion2 -inputScript $beforeTab -cursorColumn $beforeTab.Length
+            $res.CompletionMatches.Count | Should -BeGreaterThan 0
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly $afterTab
+        }
+
+
         It "Tab completion for registry" -Skip:(!$IsWindows) {
             $beforeTab = 'registry::HKEY_l'
             $afterTab = 'registry::HKEY_LOCAL_MACHINE'
@@ -1349,12 +1359,12 @@ dir -Recurse `
             $res.CompletionMatches | Should -HaveCount 2
             [string]::Join(',', ($res.CompletionMatches.completiontext | Sort-Object)) | Should -BeExactly "1.0,1.1"
         }
-        
+
         It 'Should complete Select-Object properties without duplicates' {
             $res = TabExpansion2 -inputScript '$PSVersionTable | Select-Object -Property Count,'
             $res.CompletionMatches.CompletionText | Should -Not -Contain "Count"
         }
-        
+
         It '<Intent>' -TestCases @(
             @{
                 Intent = 'Complete loop labels with no input'

From 9c13c0494fbedd50b1752c322ededd27ee2568de Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Tue, 12 Apr 2022 14:26:52 -0700
Subject: [PATCH 301/645] Allow multiple installations of dotnet. (#17141)

* Allow multiple installations of dotnet.

A new flag for removal is now provided, but by default we will add a new version of dotnet.

* Add updated CG manifest.
---
 build.psm1            | 33 +++++++++++++++++++++------------
 tools/cgmanifest.json |  6 +++---
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/build.psm1 b/build.psm1
index b20aa6ad175..89714cc2dfc 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1801,6 +1801,7 @@ function Install-Dotnet {
         [string]$Channel = $dotnetCLIChannel,
         [string]$Version = $dotnetCLIRequiredVersion,
         [string]$Quality = $dotnetCLIQuality,
+        [switch]$RemovePreviousVersion,
         [switch]$NoSudo,
         [string]$InstallDir,
         [string]$AzureFeed,
@@ -1821,20 +1822,22 @@ function Install-Dotnet {
     if ($environment.IsLinux -or $environment.IsMacOS) {
         $wget = Get-Command -Name wget -CommandType Application -TotalCount 1 -ErrorAction Stop
 
-        # Uninstall all previous dotnet packages
-        $uninstallScript = if ($environment.IsLinux -and $environment.IsUbuntu) {
-            "dotnet-uninstall-debian-packages.sh"
-        } elseif ($environment.IsMacOS) {
-            "dotnet-uninstall-pkgs.sh"
-        }
+        # Attempt to uninstall previous dotnet packages if requested
+        if ($RemovePreviousVersion) {
+            $uninstallScript = if ($environment.IsLinux -and $environment.IsUbuntu) {
+                "dotnet-uninstall-debian-packages.sh"
+            } elseif ($environment.IsMacOS) {
+                "dotnet-uninstall-pkgs.sh"
+            }
 
-        if ($uninstallScript) {
-            Start-NativeExecution {
-                & $wget $uninstallObtainUrl/uninstall/$uninstallScript
-                Invoke-Expression "$sudo bash ./$uninstallScript"
+            if ($uninstallScript) {
+                Start-NativeExecution {
+                    & $wget $uninstallObtainUrl/uninstall/$uninstallScript
+                    Invoke-Expression "$sudo bash ./$uninstallScript"
+                }
+            } else {
+                Write-Warning "This script only removes prior versions of dotnet for Ubuntu and OS X"
             }
-        } else {
-            Write-Warning "This script only removes prior versions of dotnet for Ubuntu and OS X"
         }
 
         Write-Verbose -Verbose "Invoking install script"
@@ -1868,6 +1871,8 @@ function Install-Dotnet {
                 $bashArgs += @('-FeedCredential', $FeedCredential)
             }
 
+            $bashArgs += @('-skipnonversionedfiles')
+
             $bashArgs | Out-String | Write-Verbose -Verbose
 
         Start-NativeExecution {
@@ -1898,6 +1903,8 @@ function Install-Dotnet {
                 $installArgs += @{FeedCredential = $FeedCredential}
             }
 
+            $installArgs += @{ SkipNonVersionedFiles = $true }
+
             $installArgs | Out-String | Write-Verbose -Verbose
 
             & ./$installScript @installArgs
@@ -1926,6 +1933,8 @@ function Install-Dotnet {
                 $psArgs += @('-FeedCredential', $FeedCredential)
             }
 
+            $psArgs += @('-SkipNonVersionedFiles')
+
             $psArgs | Out-String | Write-Verbose -Verbose
 
             Start-NativeExecution {
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 11b27afff68..21e6016472e 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -215,7 +215,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Win32.SystemEvents",
-          "Version": "6.0.0"
+          "Version": "6.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -825,7 +825,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Diagnostics.PerformanceCounter",
-          "Version": "6.0.0"
+          "Version": "6.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -975,7 +975,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Net.Http.WinHttpHandler",
-          "Version": "6.0.0"
+          "Version": "6.0.1"
         }
       },
       "DevelopmentDependency": false

From 2bc1308772e6738227a4eb21e9dfe79c93e93b95 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Wed, 13 Apr 2022 08:45:18 +0900
Subject: [PATCH 302/645] Fix typo in `ComRuntimeHelpers.cs` (#17104)

---
 .../engine/ComInterop/ComRuntimeHelpers.cs                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/ComInterop/ComRuntimeHelpers.cs b/src/System.Management.Automation/engine/ComInterop/ComRuntimeHelpers.cs
index 39038595abc..436aad04e6d 100644
--- a/src/System.Management.Automation/engine/ComInterop/ComRuntimeHelpers.cs
+++ b/src/System.Management.Automation/engine/ComInterop/ComRuntimeHelpers.cs
@@ -381,7 +381,7 @@ public static unsafe int IDispatchInvoke(
                     && (flags & ComTypes.INVOKEKIND.INVOKE_FUNC) != 0
                     && (flags & (ComTypes.INVOKEKIND.INVOKE_PROPERTYPUT | ComTypes.INVOKEKIND.INVOKE_PROPERTYPUTREF)) == 0)
                 {
-                    // Re-invoke with no result argument to accomodate Word
+                    // Re-invoke with no result argument to accommodate Word
                     hresult = pfnIDispatchInvoke(dispatchPointer,
                         memberDispId, &IID_NULL, 0, (ushort)ComTypes.INVOKEKIND.INVOKE_FUNC, pDispParams, null, pExcepInfo, pArgErr);
                 }

From 5134410d795e6fd51e10e187168636473acc7331 Mon Sep 17 00:00:00 2001
From: Charlton Stanley <websites+git@charltonstanley.com>
Date: Tue, 12 Apr 2022 18:46:23 -0500
Subject: [PATCH 303/645] Correct Typo in the resource string
 `PathResolvedToMultiple` (#17098)

---
 .../resources/SessionStateStrings.resx                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/resources/SessionStateStrings.resx b/src/System.Management.Automation/resources/SessionStateStrings.resx
index 39dd766d749..f5d817ccd02 100644
--- a/src/System.Management.Automation/resources/SessionStateStrings.resx
+++ b/src/System.Management.Automation/resources/SessionStateStrings.resx
@@ -457,7 +457,7 @@
     <value>Cannot find alias because alias '{0}' does not exist.</value>
   </data>
   <data name="PathResolvedToMultiple" xml:space="preserve">
-    <value>Cannot set the location because path '{0}' resolved to multiple containers. You can only the set location to a single container at a time.</value>
+    <value>Cannot set the location because path '{0}' resolved to multiple containers. You can only set the location to a single container at a time.</value>
   </data>
   <data name="VariablePathResolvedToMultiple" xml:space="preserve">
     <value>Cannot process variable because variable path '{0}' resolved to multiple items. You can get or set the variable value only one item at a time.</value>

From 84e73b2b45fa0630f1a9af1069c6bd1a8647592b Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Thu, 14 Apr 2022 10:02:55 -0700
Subject: [PATCH 304/645] Do not include node names when sending telemetry.
 (#16981)

---
 .../utils/Telemetry.cs                        | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/System.Management.Automation/utils/Telemetry.cs b/src/System.Management.Automation/utils/Telemetry.cs
index 357eed7c5c2..74318d1e058 100644
--- a/src/System.Management.Automation/utils/Telemetry.cs
+++ b/src/System.Management.Automation/utils/Telemetry.cs
@@ -9,6 +9,7 @@
 using System.Threading;
 
 using Microsoft.ApplicationInsights;
+using Microsoft.ApplicationInsights.Channel;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.ApplicationInsights.Extensibility.Implementation;
 
@@ -61,6 +62,26 @@ internal enum TelemetryType
         RemoteSessionOpen,
     }
 
+    /// <summary>
+    /// Set up the telemetry initializer to mask the platform specific names.
+    /// </summary>
+    public class NameObscurerTelemetryInitializer : ITelemetryInitializer
+    {
+        // Report the platform name information as "na".
+        private const string _notavailable = "na";
+
+        /// <summary>
+        /// Initialize properties we are obscuring to "na".
+        /// </summary>
+        /// <param name="telemetry">The instance of our telemetry.</param>
+        public void Initialize(ITelemetry telemetry)
+        {
+            telemetry.Context.Cloud.RoleName = _notavailable;
+            telemetry.Context.GetInternalContext().NodeName = _notavailable;
+            telemetry.Context.Cloud.RoleInstance = _notavailable;
+        }
+    }
+
     /// <summary>
     /// Send up telemetry for startup.
     /// </summary>
@@ -112,17 +133,17 @@ static ApplicationInsightsTelemetry()
             CanSendTelemetry = !GetEnvironmentVariableAsBool(name: _telemetryOptoutEnvVar, defaultValue: false);
             if (CanSendTelemetry)
             {
+                s_sessionId = Guid.NewGuid().ToString();
                 TelemetryConfiguration configuration = TelemetryConfiguration.CreateDefault();
                 configuration.InstrumentationKey = _psCoreTelemetryKey;
 
                 // Set this to true to reduce latency during development
                 configuration.TelemetryChannel.DeveloperMode = false;
 
+                // Be sure to obscure any information about the client node name.
+                configuration.TelemetryInitializers.Add(new NameObscurerTelemetryInitializer());
+
                 s_telemetryClient = new TelemetryClient(configuration);
-                // Be sure to obscure any information about the client node.
-                s_telemetryClient.Context.Cloud.RoleInstance = string.Empty;
-                s_telemetryClient.Context.GetInternalContext().NodeName = string.Empty;
-                s_sessionId = Guid.NewGuid().ToString();
 
                 // use a hashset when looking for module names, it should be quicker than a string comparison
                 s_knownModules = new HashSet<string>(StringComparer.OrdinalIgnoreCase)

From 94c632866f387a379e84fafb483c8dc383d569ba Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 18 Apr 2022 10:37:54 -0700
Subject: [PATCH 305/645] Replace `.` in notices container name (#17154)

---
 .../azureDevOps/templates/compliance/generateNotice.yml         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
index 0e63dd9007b..d56d8c1176b 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/generateNotice.yml
@@ -32,6 +32,7 @@ jobs:
       if ($branchOnly -eq 'master') {
         $container = 'tpn'
       } else {
+        $branchOnly = $branchOnly -replace '[\./]', '-'
         $container = "tpn-$branchOnly"
       }
 
@@ -81,3 +82,4 @@ jobs:
       targetPath: $(System.ArtifactsDirectory)
       artifactName: notice
     displayName: Publish notice artifacts
+    condition: always()

From b9b3d5f72be48fa870744efd3302eee7fedd9f73 Mon Sep 17 00:00:00 2001
From: Patrick Meinecke <SeeminglyScience@users.noreply.github.com>
Date: Wed, 20 Apr 2022 14:17:44 -0700
Subject: [PATCH 306/645] Update link to PowerShell remoting in depth video
 (#17166)

---
 docs/learning-powershell/powershell-beginners-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/learning-powershell/powershell-beginners-guide.md b/docs/learning-powershell/powershell-beginners-guide.md
index 2017b191066..1f84722c8ab 100644
--- a/docs/learning-powershell/powershell-beginners-guide.md
+++ b/docs/learning-powershell/powershell-beginners-guide.md
@@ -330,7 +330,7 @@ For more details, see [Create and Run PowerShell Script Guide][create-run-script
 [ps-module]:https://docs.microsoft.com/powershell/scripting/developer/module/understanding-a-windows-powershell-module
 [create-ps-module]:https://www.business.com/articles/powershell-modules/
 [remoting]:https://channel9.msdn.com/Series/GetStartedPowerShell3/06
-[in-depth]: https://channel9.msdn.com/events/MMS/2012/SV-B406
+[in-depth]: https://docs.microsoft.com/en-us/events/mms-2012/sv-b406
 [remote-mgmt]:https://www.itprotoday.com/powershell/powershell-basics-remote-management
 [remote-commands]:https://docs.microsoft.com/powershell/scripting/learn/remoting/running-remote-commands
 [examples-ps-module]:https://docs.microsoft.com/powershell/scripting/developer/module/how-to-write-a-powershell-script-module

From c2e11e932993683625afd08e081c28f52e4636a3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 20 Apr 2022 14:20:12 -0700
Subject: [PATCH 307/645] Update to the latest notice file (#17146)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 ThirdPartyNotices.txt | 120 ++----------------------------------------
 1 file changed, 3 insertions(+), 117 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 7ff8ad1b7f5..50bc8e28cdc 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -483,47 +483,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.Win32.SystemEvents 6.0.0 - MIT
+Microsoft.Win32.SystemEvents 6.0.1 - MIT
 
 
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) Andrew Arnott
-Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2017 Yoshifumi Kawai
-Copyright (c) Microsoft Corporation
-Copyright (c) 2007 James Newton-King
-Copyright (c) 2012-2014, Yann Collet
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Copyright (c) 2018 Alexander Chermyanin
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2013-2017, Milosz Krajewski
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2019 Microsoft Corporation, Daan Leijen
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
-Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1872,47 +1834,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Diagnostics.PerformanceCounter 6.0.0 - MIT
+System.Diagnostics.PerformanceCounter 6.0.1 - MIT
 
 
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) Andrew Arnott
-Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2017 Yoshifumi Kawai
-Copyright (c) Microsoft Corporation
-Copyright (c) 2007 James Newton-King
-Copyright (c) 2012-2014, Yann Collet
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Copyright (c) 2018 Alexander Chermyanin
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2013-2017, Milosz Krajewski
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2019 Microsoft Corporation, Daan Leijen
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
-Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -2563,47 +2487,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Net.Http.WinHttpHandler 6.0.0 - MIT
+System.Net.Http.WinHttpHandler 6.0.1 - MIT
 
 
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) Andrew Arnott
-Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2017 Yoshifumi Kawai
-Copyright (c) Microsoft Corporation
-Copyright (c) 2007 James Newton-King
-Copyright (c) 2012-2014, Yann Collet
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Copyright (c) 2018 Alexander Chermyanin
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2013-2017, Milosz Krajewski
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2019 Microsoft Corporation, Daan Leijen
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
-Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 

From 8d453da283162a32f0296b49068c247b2d41b315 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Wed, 20 Apr 2022 14:26:57 -0700
Subject: [PATCH 308/645] Use new Windows signature APIs from
 `Microsoft.Security.Extensions` package (#17159)

Co-authored-by: Anam Navied <anam.naviyou@gmail.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .../security/CertificateProvider.cs           | 186 ++++++++--------
 .../System.Management.Automation.csproj       |   2 +
 .../security/Authenticode.cs                  | 199 ++++++++----------
 .../security/MshSignature.cs                  |   2 +-
 .../security/SecuritySupport.cs               |   2 +-
 .../security/nativeMethods.cs                 |  56 -----
 .../engine/Security/FileSignature.Tests.ps1   |  22 ++
 tools/cgmanifest.json                         |  10 +
 8 files changed, 211 insertions(+), 268 deletions(-)
 create mode 100644 test/powershell/engine/Security/FileSignature.Tests.ps1

diff --git a/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs b/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
index 7c7627fd521..d6154a88857 100644
--- a/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
+++ b/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
@@ -26,7 +26,7 @@
 using Dbg = System.Management.Automation;
 using DWORD = System.UInt32;
 using Runspaces = System.Management.Automation.Runspaces;
-using Security = System.Management.Automation.Security;
+using SMASecurity = System.Management.Automation.Security;
 
 namespace Microsoft.PowerShell.Commands
 {
@@ -275,7 +275,7 @@ protected override bool ReleaseHandle()
 
             if (handle != IntPtr.Zero)
             {
-                fResult = Security.NativeMethods.CertCloseStore(handle, 0);
+                fResult = SMASecurity.NativeMethods.CertCloseStore(handle, 0);
                 handle = IntPtr.Zero;
             }
 
@@ -318,25 +318,25 @@ public void Open(bool includeArchivedCerts)
                 _valid = false;
                 _open = false;
 
-                Security.NativeMethods.CertOpenStoreFlags StoreFlags =
-                    Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_SHARE_STORE_FLAG |
-                    Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_SHARE_CONTEXT_FLAG |
-                    Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_OPEN_EXISTING_FLAG |
-                    Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_MAXIMUM_ALLOWED_FLAG;
+                SMASecurity.NativeMethods.CertOpenStoreFlags StoreFlags =
+                    SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_STORE_SHARE_STORE_FLAG |
+                    SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_STORE_SHARE_CONTEXT_FLAG |
+                    SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_STORE_OPEN_EXISTING_FLAG |
+                    SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_STORE_MAXIMUM_ALLOWED_FLAG;
 
                 if (includeArchivedCerts)
                 {
-                    StoreFlags |= Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_ENUM_ARCHIVED_FLAG;
+                    StoreFlags |= SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_STORE_ENUM_ARCHIVED_FLAG;
                 }
 
                 switch (_storeLocation.Location)
                 {
                     case StoreLocation.LocalMachine:
-                        StoreFlags |= Security.NativeMethods.CertOpenStoreFlags.CERT_SYSTEM_STORE_LOCAL_MACHINE;
+                        StoreFlags |= SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_SYSTEM_STORE_LOCAL_MACHINE;
                         break;
 
                     case StoreLocation.CurrentUser:
-                        StoreFlags |= Security.NativeMethods.CertOpenStoreFlags.CERT_SYSTEM_STORE_CURRENT_USER;
+                        StoreFlags |= SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_SYSTEM_STORE_CURRENT_USER;
                         break;
 
                     default:
@@ -344,9 +344,9 @@ public void Open(bool includeArchivedCerts)
                         break;
                 }
 
-                IntPtr hCertStore = Security.NativeMethods.CertOpenStore(
-                                Security.NativeMethods.CertOpenStoreProvider.CERT_STORE_PROV_SYSTEM,
-                                Security.NativeMethods.CertOpenStoreEncodingType.X509_ASN_ENCODING,
+                IntPtr hCertStore = SMASecurity.NativeMethods.CertOpenStore(
+                                SMASecurity.NativeMethods.CertOpenStoreProvider.CERT_STORE_PROV_SYSTEM,
+                                SMASecurity.NativeMethods.CertOpenStoreEncodingType.X509_ASN_ENCODING,
                                 IntPtr.Zero,  // hCryptProv
                                 StoreFlags,
                                 _storeName);
@@ -364,10 +364,10 @@ public void Open(bool includeArchivedCerts)
                                 "UserDS",
                                 StringComparison.OrdinalIgnoreCase))
                 {
-                    if (!Security.NativeMethods.CertControlStore(
+                    if (!SMASecurity.NativeMethods.CertControlStore(
                                 _storeHandle.Handle,
                                 0,
-                                Security.NativeMethods.CertControlStoreType.CERT_STORE_CTRL_AUTO_RESYNC,
+                                SMASecurity.NativeMethods.CertControlStoreType.CERT_STORE_CTRL_AUTO_RESYNC,
                                 IntPtr.Zero))
                     {
                         _storeHandle = null;
@@ -391,12 +391,12 @@ public IntPtr GetNextCert(IntPtr certContext)
             if (!_open)
             {
                 throw Marshal.GetExceptionForHR(
-                                    Security.NativeMethods.CRYPT_E_NOT_FOUND);
+                                    SMASecurity.NativeMethods.CRYPT_E_NOT_FOUND);
             }
 
             if (Valid)
             {
-                certContext = Security.NativeMethods.CertEnumCertificatesInStore(
+                certContext = SMASecurity.NativeMethods.CertEnumCertificatesInStore(
                                                     _storeHandle.Handle,
                                                     certContext);
             }
@@ -415,18 +415,18 @@ public IntPtr GetCertByName(string Name)
             if (!_open)
             {
                 throw Marshal.GetExceptionForHR(
-                                    Security.NativeMethods.CRYPT_E_NOT_FOUND);
+                                    SMASecurity.NativeMethods.CRYPT_E_NOT_FOUND);
             }
 
             if (Valid)
             {
                 if (DownLevelHelper.HashLookupSupported())
                 {
-                    certContext = Security.NativeMethods.CertFindCertificateInStore(
+                    certContext = SMASecurity.NativeMethods.CertFindCertificateInStore(
                             _storeHandle.Handle,
-                            Security.NativeMethods.CertOpenStoreEncodingType.X509_ASN_ENCODING,
+                            SMASecurity.NativeMethods.CertOpenStoreEncodingType.X509_ASN_ENCODING,
                             0,                                // dwFindFlags
-                            Security.NativeMethods.CertFindType.CERT_FIND_HASH_STR,
+                            SMASecurity.NativeMethods.CertFindType.CERT_FIND_HASH_STR,
                             Name,
                             IntPtr.Zero);                     // pPrevCertContext
                 }
@@ -464,7 +464,7 @@ public IntPtr GetCertByName(string Name)
 
         public void FreeCert(IntPtr certContext)
         {
-            Security.NativeMethods.CertFreeCertificateContext(certContext);
+            SMASecurity.NativeMethods.CertFreeCertificateContext(certContext);
         }
 
         /// <summary>
@@ -974,15 +974,15 @@ protected override void NewItem(
                 ThrowInvalidOperation(errorId, message);
             }
 
-            const Security.NativeMethods.CertOpenStoreFlags StoreFlags =
-                    Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_CREATE_NEW_FLAG |
-                    Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_MAXIMUM_ALLOWED_FLAG |
-                    Security.NativeMethods.CertOpenStoreFlags.CERT_SYSTEM_STORE_LOCAL_MACHINE;
+            const SMASecurity.NativeMethods.CertOpenStoreFlags StoreFlags =
+                    SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_STORE_CREATE_NEW_FLAG |
+                    SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_STORE_MAXIMUM_ALLOWED_FLAG |
+                    SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_SYSTEM_STORE_LOCAL_MACHINE;
 
             // Create new store
-            IntPtr hCertStore = Security.NativeMethods.CertOpenStore(
-                                Security.NativeMethods.CertOpenStoreProvider.CERT_STORE_PROV_SYSTEM,
-                                Security.NativeMethods.CertOpenStoreEncodingType.X509_ASN_ENCODING,
+            IntPtr hCertStore = SMASecurity.NativeMethods.CertOpenStore(
+                                SMASecurity.NativeMethods.CertOpenStoreProvider.CERT_STORE_PROV_SYSTEM,
+                                SMASecurity.NativeMethods.CertOpenStoreEncodingType.X509_ASN_ENCODING,
                                 IntPtr.Zero,  // hCryptProv
                                 StoreFlags,
                                 pathElements[1]);
@@ -993,7 +993,7 @@ protected override void NewItem(
             else // free native store handle
             {
                 bool fResult = false;
-                fResult = Security.NativeMethods.CertCloseStore(hCertStore, 0);
+                fResult = SMASecurity.NativeMethods.CertCloseStore(hCertStore, 0);
             }
 
             X509Store outStore = new(pathElements[1], StoreLocation.LocalMachine);
@@ -1616,8 +1616,8 @@ private static string[] GetPathElements(string path)
         private void DoDeleteKey(IntPtr pProvInfo)
         {
             IntPtr hProv = IntPtr.Zero;
-            Security.NativeMethods.CRYPT_KEY_PROV_INFO keyProvInfo =
-                Marshal.PtrToStructure<Security.NativeMethods.CRYPT_KEY_PROV_INFO>(pProvInfo);
+            SMASecurity.NativeMethods.CRYPT_KEY_PROV_INFO keyProvInfo =
+                Marshal.PtrToStructure<SMASecurity.NativeMethods.CRYPT_KEY_PROV_INFO>(pProvInfo);
 
             IntPtr hWnd = DetectUIHelper.GetOwnerWindow(Host);
 
@@ -1625,33 +1625,33 @@ private void DoDeleteKey(IntPtr pProvInfo)
             {
                 if (hWnd != IntPtr.Zero)
                 {
-                    if (Security.NativeMethods.CryptAcquireContext(
+                    if (SMASecurity.NativeMethods.CryptAcquireContext(
                         ref hProv,
                         keyProvInfo.pwszContainerName,
                         keyProvInfo.pwszProvName,
                         (int)keyProvInfo.dwProvType,
-                        (uint)Security.NativeMethods.ProviderFlagsEnum.CRYPT_VERIFYCONTEXT))
+                        (uint)SMASecurity.NativeMethods.ProviderFlagsEnum.CRYPT_VERIFYCONTEXT))
                     {
                         unsafe
                         {
                             void* pWnd = hWnd.ToPointer();
-                            Security.NativeMethods.CryptSetProvParam(
+                            SMASecurity.NativeMethods.CryptSetProvParam(
                                 hProv,
-                                Security.NativeMethods.ProviderParam.PP_CLIENT_HWND,
+                                SMASecurity.NativeMethods.ProviderParam.PP_CLIENT_HWND,
                                 &pWnd,
                                 0);
-                            Security.NativeMethods.CryptReleaseContext(hProv, 0);
+                            SMASecurity.NativeMethods.CryptReleaseContext(hProv, 0);
                         }
                     }
                 }
 
-                if (!Security.NativeMethods.CryptAcquireContext(
+                if (!SMASecurity.NativeMethods.CryptAcquireContext(
                                 ref hProv,
                                 keyProvInfo.pwszContainerName,
                                 keyProvInfo.pwszProvName,
                                 (int)keyProvInfo.dwProvType,
-                                keyProvInfo.dwFlags | (uint)Security.NativeMethods.ProviderFlagsEnum.CRYPT_DELETEKEYSET |
-                                (hWnd == IntPtr.Zero ? (uint)Security.NativeMethods.ProviderFlagsEnum.CRYPT_SILENT : 0)))
+                                keyProvInfo.dwFlags | (uint)SMASecurity.NativeMethods.ProviderFlagsEnum.CRYPT_DELETEKEYSET |
+                                (hWnd == IntPtr.Zero ? (uint)SMASecurity.NativeMethods.ProviderFlagsEnum.CRYPT_SILENT : 0)))
                 {
                     ThrowErrorRemoting(Marshal.GetLastWin32Error());
                 }
@@ -1664,21 +1664,21 @@ private void DoDeleteKey(IntPtr pProvInfo)
                 IntPtr hCNGProv = IntPtr.Zero;
                 IntPtr hCNGKey = IntPtr.Zero;
 
-                if ((keyProvInfo.dwFlags & (uint)Security.NativeMethods.ProviderFlagsEnum.CRYPT_MACHINE_KEYSET) != 0)
+                if ((keyProvInfo.dwFlags & (uint)SMASecurity.NativeMethods.ProviderFlagsEnum.CRYPT_MACHINE_KEYSET) != 0)
                 {
-                    cngKeyFlag = (uint)Security.NativeMethods.NCryptDeletKeyFlag.NCRYPT_MACHINE_KEY_FLAG;
+                    cngKeyFlag = (uint)SMASecurity.NativeMethods.NCryptDeletKeyFlag.NCRYPT_MACHINE_KEY_FLAG;
                 }
 
                 if (hWnd == IntPtr.Zero ||
-                    (keyProvInfo.dwFlags & (uint)Security.NativeMethods.ProviderFlagsEnum.CRYPT_SILENT) != 0)
+                    (keyProvInfo.dwFlags & (uint)SMASecurity.NativeMethods.ProviderFlagsEnum.CRYPT_SILENT) != 0)
                 {
-                    cngKeyFlag |= (uint)Security.NativeMethods.NCryptDeletKeyFlag.NCRYPT_SILENT_FLAG;
+                    cngKeyFlag |= (uint)SMASecurity.NativeMethods.NCryptDeletKeyFlag.NCRYPT_SILENT_FLAG;
                 }
 
                 int stat = 0;
                 try
                 {
-                    stat = Security.NativeMethods.NCryptOpenStorageProvider(
+                    stat = SMASecurity.NativeMethods.NCryptOpenStorageProvider(
                                     ref hCNGProv,
                                     keyProvInfo.pwszProvName,
                                     0);
@@ -1687,7 +1687,7 @@ private void DoDeleteKey(IntPtr pProvInfo)
                         ThrowErrorRemoting(stat);
                     }
 
-                    stat = Security.NativeMethods.NCryptOpenKey(
+                    stat = SMASecurity.NativeMethods.NCryptOpenKey(
                                         hCNGProv,
                                         ref hCNGKey,
                                         keyProvInfo.pwszContainerName,
@@ -1698,21 +1698,21 @@ private void DoDeleteKey(IntPtr pProvInfo)
                         ThrowErrorRemoting(stat);
                     }
 
-                    if ((cngKeyFlag & (uint)Security.NativeMethods.NCryptDeletKeyFlag.NCRYPT_SILENT_FLAG) != 0)
+                    if ((cngKeyFlag & (uint)SMASecurity.NativeMethods.NCryptDeletKeyFlag.NCRYPT_SILENT_FLAG) != 0)
                     {
                         unsafe
                         {
                             void* pWnd = hWnd.ToPointer();
-                            Security.NativeMethods.NCryptSetProperty(
+                            SMASecurity.NativeMethods.NCryptSetProperty(
                                 hCNGProv,
-                                Security.NativeMethods.NCRYPT_WINDOW_HANDLE_PROPERTY,
+                                SMASecurity.NativeMethods.NCRYPT_WINDOW_HANDLE_PROPERTY,
                                 &pWnd,
                                 sizeof(void*),
                                 0); // dwFlags
                         }
                     }
 
-                    stat = Security.NativeMethods.NCryptDeleteKey(hCNGKey, 0);
+                    stat = SMASecurity.NativeMethods.NCryptDeleteKey(hCNGKey, 0);
                     if (stat != 0)
                     {
                         ThrowErrorRemoting(stat);
@@ -1723,10 +1723,10 @@ private void DoDeleteKey(IntPtr pProvInfo)
                 finally
                 {
                     if (hCNGProv != IntPtr.Zero)
-                        result = Security.NativeMethods.NCryptFreeObject(hCNGProv);
+                        result = SMASecurity.NativeMethods.NCryptFreeObject(hCNGProv);
 
                     if (hCNGKey != IntPtr.Zero)
-                        result = Security.NativeMethods.NCryptFreeObject(hCNGKey);
+                        result = SMASecurity.NativeMethods.NCryptFreeObject(hCNGKey);
                 }
             }
         }
@@ -1742,7 +1742,7 @@ private void DoDeleteKey(IntPtr pProvInfo)
         private void RemoveCertStore(string storeName, bool fDeleteKey, string sourcePath)
         {
             // if recurse is true, remove every cert in the store
-            IntPtr localName = Security.NativeMethods.CryptFindLocalizedName(storeName);
+            IntPtr localName = SMASecurity.NativeMethods.CryptFindLocalizedName(storeName);
             string[] pathElements = GetPathElements(sourcePath);
             if (localName == IntPtr.Zero)//not find, we can remove
             {
@@ -1767,17 +1767,17 @@ private void RemoveCertStore(string storeName, bool fDeleteKey, string sourcePat
                     certContext = store.GetNextCert(certContext);
                 }
                 // remove the cert store
-                const Security.NativeMethods.CertOpenStoreFlags StoreFlags =
-                        Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_READONLY_FLAG |
-                        Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_OPEN_EXISTING_FLAG |
-                        Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG |
-                        Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_DELETE_FLAG |
-                        Security.NativeMethods.CertOpenStoreFlags.CERT_SYSTEM_STORE_LOCAL_MACHINE;
+                const SMASecurity.NativeMethods.CertOpenStoreFlags StoreFlags =
+                        SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_STORE_READONLY_FLAG |
+                        SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_STORE_OPEN_EXISTING_FLAG |
+                        SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG |
+                        SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_STORE_DELETE_FLAG |
+                        SMASecurity.NativeMethods.CertOpenStoreFlags.CERT_SYSTEM_STORE_LOCAL_MACHINE;
 
                 // delete store
-                IntPtr hCertStore = Security.NativeMethods.CertOpenStore(
-                                Security.NativeMethods.CertOpenStoreProvider.CERT_STORE_PROV_SYSTEM,
-                                Security.NativeMethods.CertOpenStoreEncodingType.X509_ASN_ENCODING,
+                IntPtr hCertStore = SMASecurity.NativeMethods.CertOpenStore(
+                                SMASecurity.NativeMethods.CertOpenStoreProvider.CERT_STORE_PROV_SYSTEM,
+                                SMASecurity.NativeMethods.CertOpenStoreEncodingType.X509_ASN_ENCODING,
                                 IntPtr.Zero,  // hCryptProv
                                 StoreFlags,
                                 storeName);
@@ -1849,17 +1849,17 @@ private void DoRemove(X509Certificate2 cert, bool fDeleteKey, bool fMachine, str
                 if (fDeleteKey)
                 {
                     // it is fine if below call fails
-                    if (Security.NativeMethods.CertGetCertificateContextProperty(
+                    if (SMASecurity.NativeMethods.CertGetCertificateContextProperty(
                                 cert.Handle,
-                                Security.NativeMethods.CertPropertyId.CERT_KEY_PROV_INFO_PROP_ID,
+                                SMASecurity.NativeMethods.CertPropertyId.CERT_KEY_PROV_INFO_PROP_ID,
                                 IntPtr.Zero,
                                 ref provSize))
                     {
                         pProvInfo = Marshal.AllocHGlobal((int)provSize);
 
-                        if (Security.NativeMethods.CertGetCertificateContextProperty(
+                        if (SMASecurity.NativeMethods.CertGetCertificateContextProperty(
                                 cert.Handle,
-                                Security.NativeMethods.CertPropertyId.CERT_KEY_PROV_INFO_PROP_ID,
+                                SMASecurity.NativeMethods.CertPropertyId.CERT_KEY_PROV_INFO_PROP_ID,
                                 pProvInfo,
                                 ref provSize))
                         {
@@ -1879,8 +1879,8 @@ private void DoRemove(X509Certificate2 cert, bool fDeleteKey, bool fMachine, str
                 // do remove certificate
                 // should not use the original handle
 
-                if (!Security.NativeMethods.CertDeleteCertificateFromStore(
-                            Security.NativeMethods.CertDuplicateCertificateContext(cert.Handle)))
+                if (!SMASecurity.NativeMethods.CertDeleteCertificateFromStore(
+                            SMASecurity.NativeMethods.CertDuplicateCertificateContext(cert.Handle)))
                 {
                     throw new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error());
                 }
@@ -1888,8 +1888,8 @@ private void DoRemove(X509Certificate2 cert, bool fDeleteKey, bool fMachine, str
                 // commit the change to physical store
                 if (sourcePath.Contains("UserDS"))
                 {
-                    Security.NativeMethods.CERT_CONTEXT context =
-                        Marshal.PtrToStructure<Security.NativeMethods.CERT_CONTEXT>(cert.Handle);
+                    SMASecurity.NativeMethods.CERT_CONTEXT context =
+                        Marshal.PtrToStructure<SMASecurity.NativeMethods.CERT_CONTEXT>(cert.Handle);
 
                     CommitUserDS(context.hCertStore);
                 }
@@ -1916,10 +1916,10 @@ private void DoRemove(X509Certificate2 cert, bool fDeleteKey, bool fMachine, str
         /// <returns>No return.</returns>
         private static void CommitUserDS(IntPtr storeHandle)
         {
-            if (!Security.NativeMethods.CertControlStore(
+            if (!SMASecurity.NativeMethods.CertControlStore(
                                         storeHandle,
                                         0,
-                                        Security.NativeMethods.CertControlStoreType.CERT_STORE_CTRL_COMMIT,
+                                        SMASecurity.NativeMethods.CertControlStoreType.CERT_STORE_CTRL_COMMIT,
                                         IntPtr.Zero))
             {
                 throw new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error());
@@ -1941,7 +1941,7 @@ private void DoMove(string destination, X509Certificate2 cert, X509NativeStore s
             IntPtr outCert = IntPtr.Zero;
 
             // duplicate cert first
-            dupCert = Security.NativeMethods.CertDuplicateCertificateContext(cert.Handle);
+            dupCert = SMASecurity.NativeMethods.CertDuplicateCertificateContext(cert.Handle);
 
             if (dupCert == IntPtr.Zero)
             {
@@ -1949,16 +1949,16 @@ private void DoMove(string destination, X509Certificate2 cert, X509NativeStore s
             }
             else
             {
-                if (!Security.NativeMethods.CertAddCertificateContextToStore(
+                if (!SMASecurity.NativeMethods.CertAddCertificateContextToStore(
                                              store.StoreHandle,
                                              cert.Handle,
-                                             (uint)Security.NativeMethods.AddCertificateContext.CERT_STORE_ADD_ALWAYS,
+                                             (uint)SMASecurity.NativeMethods.AddCertificateContext.CERT_STORE_ADD_ALWAYS,
                                              ref outCert))
                 {
                     throw new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error());
                 }
 
-                if (!Security.NativeMethods.CertDeleteCertificateFromStore(dupCert))
+                if (!SMASecurity.NativeMethods.CertDeleteCertificateFromStore(dupCert))
                 {
                     throw new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error());
                 }
@@ -1974,7 +1974,7 @@ private void DoMove(string destination, X509Certificate2 cert, X509NativeStore s
 
             if (sourcePath.Contains("UserDS"))
             {
-                Security.NativeMethods.CERT_CONTEXT context = Marshal.PtrToStructure<Security.NativeMethods.CERT_CONTEXT>(cert.Handle);
+                SMASecurity.NativeMethods.CERT_CONTEXT context = Marshal.PtrToStructure<SMASecurity.NativeMethods.CERT_CONTEXT>(cert.Handle);
 
                 CommitUserDS(context.hCertStore);
             }
@@ -3152,9 +3152,9 @@ public static bool ReadSendAsTrustedIssuerProperty(X509Certificate2 cert)
                 int propSize = 0;
                 // try to get the property
                 // it is fine if fail for not there
-                if (Security.NativeMethods.CertGetCertificateContextProperty(
+                if (SMASecurity.NativeMethods.CertGetCertificateContextProperty(
                                 cert.Handle,
-                                Security.NativeMethods.CertPropertyId.CERT_SEND_AS_TRUSTED_ISSUER_PROP_ID,
+                                SMASecurity.NativeMethods.CertPropertyId.CERT_SEND_AS_TRUSTED_ISSUER_PROP_ID,
                                 IntPtr.Zero,
                                 ref propSize))
                 {
@@ -3165,7 +3165,7 @@ public static bool ReadSendAsTrustedIssuerProperty(X509Certificate2 cert)
                 {
                     // if fail
                     int error = Marshal.GetLastWin32Error();
-                    if (error != Security.NativeMethods.CRYPT_E_NOT_FOUND)
+                    if (error != SMASecurity.NativeMethods.CRYPT_E_NOT_FOUND)
                     {
                         throw new System.ComponentModel.Win32Exception(error);
                     }
@@ -3184,7 +3184,7 @@ public static void WriteSendAsTrustedIssuerProperty(X509Certificate2 cert, strin
             if (DownLevelHelper.TrustedIssuerSupported())
             {
                 IntPtr propertyPtr = IntPtr.Zero;
-                Security.NativeMethods.CRYPT_DATA_BLOB dataBlob = new();
+                SMASecurity.NativeMethods.CRYPT_DATA_BLOB dataBlob = new();
                 dataBlob.cbData = 0;
                 dataBlob.pbData = IntPtr.Zero;
                 X509Certificate certFromStore = null;
@@ -3231,9 +3231,9 @@ public static void WriteSendAsTrustedIssuerProperty(X509Certificate2 cert, strin
                     }
 
                     // set property
-                    if (!Security.NativeMethods.CertSetCertificateContextProperty(
+                    if (!SMASecurity.NativeMethods.CertSetCertificateContextProperty(
                                 certFromStore != null ? certFromStore.Handle : cert.Handle,
-                                Security.NativeMethods.CertPropertyId.CERT_SEND_AS_TRUSTED_ISSUER_PROP_ID,
+                                SMASecurity.NativeMethods.CertPropertyId.CERT_SEND_AS_TRUSTED_ISSUER_PROP_ID,
                                 0,
                                 propertyPtr))
                     {
@@ -3250,7 +3250,7 @@ public static void WriteSendAsTrustedIssuerProperty(X509Certificate2 cert, strin
             }
             else
             {
-                Marshal.ThrowExceptionForHR(Security.NativeMethods.NTE_NOT_SUPPORTED);
+                Marshal.ThrowExceptionForHR(SMASecurity.NativeMethods.NTE_NOT_SUPPORTED);
             }
         }
 
@@ -3487,12 +3487,12 @@ internal static IntPtr GetOwnerWindow(PSHost host)
 
                     if (hWnd == IntPtr.Zero)
                     {
-                        hWnd = Security.NativeMethods.GetConsoleWindow();
+                        hWnd = SMASecurity.NativeMethods.GetConsoleWindow();
                     }
 
                     if (hWnd == IntPtr.Zero)
                     {
-                        hWnd = Security.NativeMethods.GetDesktopWindow();
+                        hWnd = SMASecurity.NativeMethods.GetDesktopWindow();
                     }
                 }
             }
@@ -3507,7 +3507,7 @@ private static bool IsUIAllowed(PSHost host)
 
             uint SessionId;
             uint ProcessId = (uint)System.Diagnostics.Process.GetCurrentProcess().Id;
-            if (!Security.NativeMethods.ProcessIdToSessionId(ProcessId, out SessionId))
+            if (!SMASecurity.NativeMethods.ProcessIdToSessionId(ProcessId, out SessionId))
                 return false;
 
             if (SessionId == 0)
@@ -3553,17 +3553,17 @@ internal static class Crypt32Helpers
         [ArchitectureSensitive]
         internal static List<string> GetStoreNamesAtLocation(StoreLocation location)
         {
-            Security.NativeMethods.CertStoreFlags locationFlag =
-                Security.NativeMethods.CertStoreFlags.CERT_SYSTEM_STORE_CURRENT_USER;
+            SMASecurity.NativeMethods.CertStoreFlags locationFlag =
+                SMASecurity.NativeMethods.CertStoreFlags.CERT_SYSTEM_STORE_CURRENT_USER;
 
             switch (location)
             {
                 case StoreLocation.CurrentUser:
-                    locationFlag = Security.NativeMethods.CertStoreFlags.CERT_SYSTEM_STORE_CURRENT_USER;
+                    locationFlag = SMASecurity.NativeMethods.CertStoreFlags.CERT_SYSTEM_STORE_CURRENT_USER;
                     break;
 
                 case StoreLocation.LocalMachine:
-                    locationFlag = Security.NativeMethods.CertStoreFlags.CERT_SYSTEM_STORE_LOCAL_MACHINE;
+                    locationFlag = SMASecurity.NativeMethods.CertStoreFlags.CERT_SYSTEM_STORE_LOCAL_MACHINE;
                     break;
 
                 default:
@@ -3571,7 +3571,7 @@ internal static List<string> GetStoreNamesAtLocation(StoreLocation location)
                     break;
             }
 
-            Security.NativeMethods.CertEnumSystemStoreCallBackProto callBack = new(CertEnumSystemStoreCallBack);
+            SMASecurity.NativeMethods.CertEnumSystemStoreCallBackProto callBack = new(CertEnumSystemStoreCallBack);
 
             // Return a new list to avoid synchronization issues.
 
@@ -3580,7 +3580,7 @@ internal static List<string> GetStoreNamesAtLocation(StoreLocation location)
             {
                 storeNames.Clear();
 
-                Security.NativeMethods.CertEnumSystemStore(locationFlag, IntPtr.Zero,
+                SMASecurity.NativeMethods.CertEnumSystemStore(locationFlag, IntPtr.Zero,
                                                   IntPtr.Zero, callBack);
                 foreach (string name in storeNames)
                 {
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index e798d80ef70..56a1e8adeb3 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -29,6 +29,8 @@
     <!-- 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.3.0-preview.1" />
+    <!-- Signing APIs -->
+    <PackageReference Include="Microsoft.Security.Extensions" Version="1.2.0" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/security/Authenticode.cs b/src/System.Management.Automation/security/Authenticode.cs
index 70b6778c37e..a2e7c07ab94 100644
--- a/src/System.Management.Automation/security/Authenticode.cs
+++ b/src/System.Management.Automation/security/Authenticode.cs
@@ -4,12 +4,16 @@
 #pragma warning disable 1634, 1691
 #pragma warning disable 56523
 
-using Dbg = System.Management.Automation;
+#if !UNIX
+using Microsoft.Security.Extensions;
+#endif
 using System.IO;
 using System.Management.Automation.Internal;
 using System.Management.Automation.Security;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography.X509Certificates;
+
+using Dbg = System.Management.Automation;
 using DWORD = System.UInt32;
 
 namespace System.Management.Automation
@@ -275,12 +279,12 @@ internal static Signature GetSignature(string fileName, string fileContent)
 
             if (fileContent == null)
             {
-                // First, try to get the signature from the catalog signature APIs.
-                signature = GetSignatureFromCatalog(fileName);
+                // First, try to get the signature from the latest dotNet signing API.
+                signature = GetSignatureFromMSSecurityExtensions(fileName);
             }
 
             // If there is no signature or it is invalid, go by the file content
-            // with the older WinVerifyTrust APIs
+            // with the older WinVerifyTrust APIs.
             if ((signature == null) || (signature.Status != SignatureStatus.Valid))
             {
                 signature = GetSignatureFromWinVerifyTrust(fileName, fileContent);
@@ -289,147 +293,108 @@ internal static Signature GetSignature(string fileName, string fileContent)
             return signature;
         }
 
+        /// <summary>
+        /// Gets the file signature using the dotNet Microsoft.Security.Extensions package.
+        /// This supports both Windows catalog file signatures and embedded file signatures.
+        /// But it is not supported on all Windows platforms/skus, noteably Win7 and nanoserver.
+        /// </summary>
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods")]
-        private static Signature GetSignatureFromCatalog(string filename)
+        private static Signature GetSignatureFromMSSecurityExtensions(string filename)
         {
+#if UNIX
+            return null;
+#else
             if (Signature.CatalogApiAvailable.HasValue && !Signature.CatalogApiAvailable.Value)
             {
-                // Signature.CatalogApiAvailable would be set to false the first time it is detected that
-                // WTGetSignatureInfo API does not exist on the platform, or if the API is not functional on the target platform.
-                // Just return from the function instead of revalidating.
                 return null;
             }
 
-            Signature signature = null;
-
             Utils.CheckArgForNullOrEmpty(filename, "fileName");
             SecuritySupport.CheckIfFileExists(filename);
 
-            try
+            Signature signature = null;
+            FileSignatureInfo fileSigInfo;
+            using (FileStream fileStream = File.OpenRead(filename))
             {
-                using (FileStream stream = File.OpenRead(filename))
+                try
+                {
+                    fileSigInfo = FileSignatureInfo.GetFromFileStream(fileStream);
+                    System.Diagnostics.Debug.Assert(fileSigInfo is not null, "Returned FileSignatureInfo should never be null.");
+                }
+                catch (Exception)
                 {
-                    NativeMethods.SIGNATURE_INFO sigInfo = new NativeMethods.SIGNATURE_INFO();
-                    sigInfo.cbSize = (uint)Marshal.SizeOf(sigInfo);
+                    // For any API error, enable fallback to WinVerifyTrust APIs.
+                    Signature.CatalogApiAvailable = false;
+                    return null;
+                }
+            }
 
-                    IntPtr ppCertContext = IntPtr.Zero;
-                    IntPtr phStateData = IntPtr.Zero;
+            DWORD error = GetErrorFromSignatureState(fileSigInfo.State);
 
-                    try
-                    {
-                        int hresult = NativeMethods.WTGetSignatureInfo(filename, stream.SafeFileHandle.DangerousGetHandle(),
-                            NativeMethods.SIGNATURE_INFO_FLAGS.SIF_CATALOG_SIGNED |
-                            NativeMethods.SIGNATURE_INFO_FLAGS.SIF_CATALOG_FIRST |
-                            NativeMethods.SIGNATURE_INFO_FLAGS.SIF_AUTHENTICODE_SIGNED |
-                            NativeMethods.SIGNATURE_INFO_FLAGS.SIF_BASE_VERIFICATION |
-                            NativeMethods.SIGNATURE_INFO_FLAGS.SIF_CHECK_OS_BINARY,
-                            ref sigInfo, ref ppCertContext, ref phStateData);
-
-                        if (Utils.Succeeded(hresult))
-                        {
-                            DWORD error = GetErrorFromSignatureState(sigInfo.nSignatureState);
-
-                            X509Certificate2 cert = null;
-
-                            if (ppCertContext != IntPtr.Zero)
-                            {
-                                cert = new X509Certificate2(ppCertContext);
-
-                                // Get the time stamper certificate if available
-                                TryGetProviderSigner(phStateData, out IntPtr pProvSigner, out X509Certificate2 timestamperCert);
-                                if (timestamperCert != null)
-                                {
-                                    signature = new Signature(filename, error, cert, timestamperCert);
-                                }
-                                else
-                                {
-                                    signature = new Signature(filename, error, cert);
-                                }
-
-                                switch (sigInfo.nSignatureType)
-                                {
-                                    case NativeMethods.SIGNATURE_INFO_TYPE.SIT_AUTHENTICODE: signature.SignatureType = SignatureType.Authenticode; break;
-                                    case NativeMethods.SIGNATURE_INFO_TYPE.SIT_CATALOG: signature.SignatureType = SignatureType.Catalog; break;
-                                }
-
-                                if (sigInfo.fOSBinary == 1)
-                                {
-                                    signature.IsOSBinary = true;
-                                }
-                            }
-                            else
-                            {
-                                signature = new Signature(filename, error);
-                            }
-
-                            if (!Signature.CatalogApiAvailable.HasValue)
-                            {
-                                string productFile = Path.Combine(Utils.DefaultPowerShellAppBase, "Modules\\PSDiagnostics\\PSDiagnostics.psm1");
-                                if (signature.Status != SignatureStatus.Valid)
-                                {
-                                    if (string.Equals(filename, productFile, StringComparison.OrdinalIgnoreCase))
-                                    {
-                                        Signature.CatalogApiAvailable = false;
-                                    }
-                                    else
-                                    {
-                                        // ProductFile has to be Catalog signed. Hence validating
-                                        // to see if the Catalog API is functional using the ProductFile.
-                                        Signature productFileSignature = GetSignatureFromCatalog(productFile);
-                                        Signature.CatalogApiAvailable = (productFileSignature != null && productFileSignature.Status == SignatureStatus.Valid);
-                                    }
-                                }
-                            }
-                        }
-                        else
-                        {
-                            // If calling NativeMethods.WTGetSignatureInfo failed (returned a non-zero value), we still want to set Signature.CatalogApiAvailable to false.
-                            Signature.CatalogApiAvailable = false;
-                        }
-                    }
-                    finally
-                    {
-                        if (phStateData != IntPtr.Zero)
-                        {
-                            NativeMethods.FreeWVTStateData(phStateData);
-                        }
+            if (fileSigInfo.SigningCertificate is null)
+            {
+                signature = new Signature(filename, error);
+            }
+            else
+            {
+                signature = fileSigInfo.TimestampCertificate is null ?
+                    new Signature(filename, error, fileSigInfo.SigningCertificate) :
+                    new Signature(filename, error, fileSigInfo.SigningCertificate, fileSigInfo.TimestampCertificate);
+            }
 
-                        if (ppCertContext != IntPtr.Zero)
-                        {
-                            NativeMethods.CertFreeCertificateContext(ppCertContext);
-                        }
-                    }
-                }
+            switch (fileSigInfo.Kind)
+            {
+                case SignatureKind.None:
+                    signature.SignatureType = SignatureType.None;
+                    break;
+
+                case SignatureKind.Embedded:
+                    signature.SignatureType = SignatureType.Authenticode;
+                    break;
+
+                case SignatureKind.Catalog:
+                    signature.SignatureType = SignatureType.Catalog;
+                    break;
+
+                default:
+                    System.Diagnostics.Debug.Fail("Signature type can only be None, Authenticode or Catalog.");
+                    break;
             }
-            catch (TypeLoadException)
+
+            signature.IsOSBinary = fileSigInfo.IsOSBinary;
+
+            if (signature.SignatureType == SignatureType.Catalog && !Signature.CatalogApiAvailable.HasValue)
             {
-                // If we don't have WTGetSignatureInfo, don't return a Signature.
-                Signature.CatalogApiAvailable = false;
-                return null;
+                Signature.CatalogApiAvailable = fileSigInfo.State != SignatureState.Invalid;
             }
 
             return signature;
+#endif
         }
 
-        private static DWORD GetErrorFromSignatureState(NativeMethods.SIGNATURE_STATE state)
+#if !UNIX
+        private static DWORD GetErrorFromSignatureState(SignatureState signatureState)
         {
-            switch (state)
+            switch (signatureState)
             {
-                case NativeMethods.SIGNATURE_STATE.SIGNATURE_STATE_UNSIGNED_MISSING: return Win32Errors.TRUST_E_NOSIGNATURE;
-                case NativeMethods.SIGNATURE_STATE.SIGNATURE_STATE_UNSIGNED_UNSUPPORTED: return Win32Errors.TRUST_E_NOSIGNATURE;
-                case NativeMethods.SIGNATURE_STATE.SIGNATURE_STATE_UNSIGNED_POLICY: return Win32Errors.TRUST_E_NOSIGNATURE;
-                case NativeMethods.SIGNATURE_STATE.SIGNATURE_STATE_INVALID_CORRUPT: return Win32Errors.TRUST_E_BAD_DIGEST;
-                case NativeMethods.SIGNATURE_STATE.SIGNATURE_STATE_INVALID_POLICY: return Win32Errors.CRYPT_E_BAD_MSG;
-                case NativeMethods.SIGNATURE_STATE.SIGNATURE_STATE_VALID: return Win32Errors.NO_ERROR;
-                case NativeMethods.SIGNATURE_STATE.SIGNATURE_STATE_TRUSTED: return Win32Errors.NO_ERROR;
-                case NativeMethods.SIGNATURE_STATE.SIGNATURE_STATE_UNTRUSTED: return Win32Errors.TRUST_E_EXPLICIT_DISTRUST;
-
-                // Should not happen
+                case SignatureState.Unsigned:
+                    return Win32Errors.TRUST_E_NOSIGNATURE;
+
+                case SignatureState.SignedAndTrusted:
+                    return Win32Errors.NO_ERROR;
+
+                case SignatureState.SignedAndNotTrusted:
+                    return Win32Errors.TRUST_E_EXPLICIT_DISTRUST;
+
+                case SignatureState.Invalid:
+                    return Win32Errors.TRUST_E_BAD_DIGEST;
+
                 default:
-                    System.Diagnostics.Debug.Fail("Should not get here - could not map SIGNATURE_STATE");
+                    System.Diagnostics.Debug.Fail("Should not get here - could not map FileSignatureInfo.State");
                     return Win32Errors.TRUST_E_NOSIGNATURE;
             }
         }
+#endif
 
         private static Signature GetSignatureFromWinVerifyTrust(string fileName, string fileContent)
         {
diff --git a/src/System.Management.Automation/security/MshSignature.cs b/src/System.Management.Automation/security/MshSignature.cs
index 96ff8a9638a..fd8dd4f67ef 100644
--- a/src/System.Management.Automation/security/MshSignature.cs
+++ b/src/System.Management.Automation/security/MshSignature.cs
@@ -110,7 +110,7 @@ public sealed class Signature
 
         // Three states:
         //   - True: we can rely on the catalog API to check catalog signature.
-        //   - False: we cannot rely on the catalog API, either because it doesn't exist in the OS (win7),
+        //   - False: we cannot rely on the catalog API, either because it doesn't exist in the OS (win7, nano),
         //            or it's not working properly (OneCore SKUs or dev environment where powershell might
         //            be updated/refreshed).
         //   - Null: it's not determined yet whether catalog API can be relied on or not.
diff --git a/src/System.Management.Automation/security/SecuritySupport.cs b/src/System.Management.Automation/security/SecuritySupport.cs
index 6321d301ced..03cf24d80f3 100644
--- a/src/System.Management.Automation/security/SecuritySupport.cs
+++ b/src/System.Management.Automation/security/SecuritySupport.cs
@@ -412,7 +412,7 @@ public static bool IsProductBinary(string file)
                 return true;
             }
 
-            // WTGetSignatureInfo is used to verify catalog signature.
+            // WTGetSignatureInfo, via Microsoft.Security.Extensions, is used to verify catalog signature.
             // On Win7, catalog API is not available.
             // On OneCore SKUs like NanoServer/IoT, the API has a bug that makes it not able to find the
             // corresponding catalog file for a given product file, so it doesn't work properly.
diff --git a/src/System.Management.Automation/security/nativeMethods.cs b/src/System.Management.Automation/security/nativeMethods.cs
index 165c4063003..69ed655963d 100644
--- a/src/System.Management.Automation/security/nativeMethods.cs
+++ b/src/System.Management.Automation/security/nativeMethods.cs
@@ -1145,62 +1145,6 @@ internal static extern
                 DWORD idxCert
             );
 
-        /// Return Type: HRESULT->LONG->int
-        ///pszFile: PCWSTR->WCHAR*
-        ///hFile: HANDLE->void*
-        ///sigInfoFlags: SIGNATURE_INFO_FLAGS->Anonymous_5157c654_2076_48e7_9241_84ac648615e9
-        ///psiginfo: SIGNATURE_INFO*
-        ///ppCertContext: void**
-        ///phWVTStateData: HANDLE*
-        [DllImportAttribute("wintrust.dll", EntryPoint = "WTGetSignatureInfo", CallingConvention = CallingConvention.StdCall)]
-        internal static extern int WTGetSignatureInfo([InAttribute()][MarshalAsAttribute(UnmanagedType.LPWStr)] string pszFile, [InAttribute()] System.IntPtr hFile, SIGNATURE_INFO_FLAGS sigInfoFlags, ref SIGNATURE_INFO psiginfo, ref System.IntPtr ppCertContext, ref System.IntPtr phWVTStateData);
-
-        internal static void FreeWVTStateData(System.IntPtr phWVTStateData)
-        {
-            WINTRUST_DATA wtd = new WINTRUST_DATA();
-            DWORD dwResult = Win32Errors.E_FAIL;
-            IntPtr WINTRUST_ACTION_GENERIC_VERIFY_V2 = IntPtr.Zero;
-            IntPtr wtdBuffer = IntPtr.Zero;
-
-            Guid actionVerify =
-                new Guid("00AAC56B-CD44-11d0-8CC2-00C04FC295EE");
-
-            try
-            {
-                WINTRUST_ACTION_GENERIC_VERIFY_V2 =
-                    Marshal.AllocCoTaskMem(Marshal.SizeOf(actionVerify));
-                Marshal.StructureToPtr(actionVerify,
-                                       WINTRUST_ACTION_GENERIC_VERIFY_V2,
-                                       false);
-
-                wtd.cbStruct = (DWORD)Marshal.SizeOf(wtd);
-                wtd.dwUIChoice = (DWORD)WintrustUIChoice.WTD_UI_NONE;
-                wtd.fdwRevocationChecks = 0;
-                wtd.dwUnionChoice = (DWORD)WintrustUnionChoice.WTD_CHOICE_BLOB;
-                wtd.dwStateAction = (DWORD)WintrustAction.WTD_STATEACTION_CLOSE;
-                wtd.hWVTStateData = phWVTStateData;
-
-                wtdBuffer = Marshal.AllocCoTaskMem(Marshal.SizeOf(wtd));
-                Marshal.StructureToPtr(wtd, wtdBuffer, false);
-
-                // The GetLastWin32Error of this is checked, but PreSharp doesn't seem to be
-                // able to see that.
-#pragma warning disable 56523
-                dwResult = WinVerifyTrust(
-                    IntPtr.Zero,
-                    WINTRUST_ACTION_GENERIC_VERIFY_V2,
-                    wtdBuffer);
-#pragma warning restore 56523
-            }
-            finally
-            {
-                Marshal.DestroyStructure<WINTRUST_DATA>(wtdBuffer);
-                Marshal.FreeCoTaskMem(wtdBuffer);
-                Marshal.DestroyStructure<Guid>(WINTRUST_ACTION_GENERIC_VERIFY_V2);
-                Marshal.FreeCoTaskMem(WINTRUST_ACTION_GENERIC_VERIFY_V2);
-            }
-        }
-
         //
         // stuff required for getting cert extensions
         //
diff --git a/test/powershell/engine/Security/FileSignature.Tests.ps1 b/test/powershell/engine/Security/FileSignature.Tests.ps1
new file mode 100644
index 00000000000..892aa0e40ea
--- /dev/null
+++ b/test/powershell/engine/Security/FileSignature.Tests.ps1
@@ -0,0 +1,22 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe "Windows platform file signatures" -Tags 'Feature' {
+
+    It "Verifies Get-AuthenticodeSignature returns correct signature for catalog signed file" -Skip:(!$IsWindows) {
+
+        if ($null -eq $env:windir) {
+            throw "Expected Windows platform environment path variable '%windir%' not available."
+        }
+
+        $filePath = Join-Path -Path $env:windir -ChildPath 'System32\ntdll.dll'
+        if (! (Test-Path -Path $filePath)) {
+            throw "Expected Windows PowerShell platform module path '$filePath' not found."
+        }
+
+        $signature = Get-AuthenticodeSignature -FilePath $filePath
+        $signature | Should -Not -BeNullOrEmpty
+        $signature.Status | Should -BeExactly 'Valid'
+        $signature.SignatureType | Should -BeExactly 'Catalog'
+    }
+}
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 21e6016472e..8a3f50c7713 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -190,6 +190,16 @@
       },
       "DevelopmentDependency": false
     },
+    {
+      "Component": {
+        "Type": "nuget",
+        "Nuget": {
+          "Name": "Microsoft.Security.Extensions",
+          "Version": "1.2.0"
+        }
+      },
+      "DevelopmentDependency": false
+    },
     {
       "Component": {
         "Type": "nuget",

From 3446e55667a15ae204858c9ef3652428d9135f7c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 21 Apr 2022 09:44:02 -0700
Subject: [PATCH 309/645] Update to the latest notice file (#17169)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 ThirdPartyNotices.txt | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 50bc8e28cdc..b19d3b42069 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -344,6 +344,24 @@ Microsoft.PowerShell.Native 7.2.0 - MIT
 (c) Microsoft Corporation.
 Copyright (c) by P.J. Plauger
 
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+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.
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+Microsoft.Security.Extensions 1.2.0 - MIT
+
+
+
 MIT License
 
 Copyright (c) <year> <copyright holders>

From 6c171610a3c57b50673971e5d0d9ae5e8866a78c Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 21 Apr 2022 09:46:28 -0700
Subject: [PATCH 310/645] Make mariner packages Framework dependent (#17151)

---
 build.psm1                                | 20 +++++--
 tools/packages.microsoft.com/mapping.json | 10 ++++
 tools/packaging/packaging.psm1            | 63 +++++++++++++++++++++--
 3 files changed, 86 insertions(+), 7 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 89714cc2dfc..2834b22a22d 100644
--- a/build.psm1
+++ b/build.psm1
@@ -269,6 +269,8 @@ function Test-IsReleaseCandidate
     return $false
 }
 
+$optimizedFddRegex = 'fxdependent-(linux|alpine|win|win7|osx)-(x64|x86|arm64|arm)'
+
 function Start-PSBuild {
     [CmdletBinding(DefaultParameterSetName="Default")]
     param(
@@ -303,6 +305,7 @@ function Start-PSBuild {
         # If this parameter is not provided it will get determined automatically.
         [ValidateSet("alpine-x64",
                      "fxdependent",
+                     "fxdependent-linux-x64",
                      "fxdependent-win-desktop",
                      "linux-arm",
                      "linux-arm64",
@@ -457,7 +460,7 @@ Fix steps:
     # Framework Dependent builds do not support ReadyToRun as it needs a specific runtime to optimize for.
     # The property is set in Powershell.Common.props file.
     # We override the property through the build command line.
-    if($Options.Runtime -like 'fxdependent*' -or $ForMinimalSize) {
+    if(($Options.Runtime -like 'fxdependent*' -or $ForMinimalSize) -and $Options.Runtime -notmatch $optimizedFddRegex) {
         $Arguments += "/property:PublishReadyToRun=false"
     }
 
@@ -472,6 +475,9 @@ Fix steps:
     if (-not $SMAOnly -and $Options.Runtime -notlike 'fxdependent*') {
         # libraries should not have runtime
         $Arguments += "--runtime", $Options.Runtime
+    } elseif ($Options.Runtime -match $optimizedFddRegex) {
+        $runtime = $Options.Runtime -replace 'fxdependent-', ''
+        $Arguments += "--runtime", $runtime
     }
 
     if ($ReleaseTag) {
@@ -495,7 +501,12 @@ Fix steps:
 
     # Handle TypeGen
     # .inc file name must be different for Windows and Linux to allow build on Windows and WSL.
-    $incFileName = "powershell_$($Options.Runtime).inc"
+    $runtime = $Options.Runtime
+    if ($Options.Runtime -match $optimizedFddRegex) {
+        $runtime = $Options.Runtime -replace 'fxdependent-', ''
+    }
+
+    $incFileName = "powershell_$runtime.inc"
     if ($TypeGen -or -not (Test-Path "$PSScriptRoot/src/TypeCatalogGen/$incFileName")) {
         Write-Log -message "Run TypeGen (generating CorePsTypeCatalog.cs)"
         Start-TypeGen -IncFileName $incFileName
@@ -513,7 +524,8 @@ Fix steps:
         # Relative paths do not work well if cwd is not changed to project
         Push-Location $Options.Top
 
-        if ($Options.Runtime -notlike 'fxdependent*') {
+        if ($Options.Runtime -notlike 'fxdependent*' -or $Options.Runtime -match $optimizedFddRegex) {
+            Write-Verbose "Building without shim" -Verbose
             $sdkToUse = 'Microsoft.NET.Sdk'
             if ($Options.Runtime -like 'win7-*' -and !$ForMinimalSize) {
                 ## WPF/WinForm and the PowerShell GraphicalHost assemblies are included
@@ -527,6 +539,7 @@ Fix steps:
             Start-NativeExecution { dotnet $Arguments }
             Write-Log -message "PowerShell output: $($Options.Output)"
         } else {
+            Write-Verbose "Building with shim" -Verbose
             $globalToolSrcFolder = Resolve-Path (Join-Path $Options.Top "../Microsoft.PowerShell.GlobalTool.Shim") | Select-Object -ExpandProperty Path
 
             if ($Options.Runtime -eq 'fxdependent') {
@@ -811,6 +824,7 @@ function New-PSOptions {
         [ValidateSet("",
                      "alpine-x64",
                      "fxdependent",
+                     "fxdependent-linux-x64",
                      "fxdependent-win-desktop",
                      "linux-arm",
                      "linux-arm64",
diff --git a/tools/packages.microsoft.com/mapping.json b/tools/packages.microsoft.com/mapping.json
index c9ac168a43d..ba0b2def317 100644
--- a/tools/packages.microsoft.com/mapping.json
+++ b/tools/packages.microsoft.com/mapping.json
@@ -15,6 +15,16 @@
           "distribution" : ["trusty"],
           "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.rh.x86_64.rpm"
       },
+      {
+          "url": "cbl-mariner-1.0-prod-Microsoft-x86_64-rpms",
+          "distribution" : ["bionic"],
+          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm"
+      },
+      {
+          "url": "cbl-mariner-2.0-prod-Microsoft-x86_64-rpms",
+          "distribution" : ["bionic"],
+          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm"
+      },
       {
           "distribution" : ["stretch"],
           "PackageFormat" : "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 3792e295cd4..f31a30f6cbf 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -7,7 +7,11 @@ $RepoRoot = (Resolve-Path -Path "$PSScriptRoot/../..").Path
 $packagingStrings = Import-PowerShellDataFile "$PSScriptRoot\packaging.strings.psd1"
 Import-Module "$PSScriptRoot\..\Xml" -ErrorAction Stop -Force
 $DebianDistributions = @("deb")
-$RedhatDistributions = @("rh","cm1")
+$RedhatFullDistributions = @("rh")
+$RedhatFddDistributions = @("cm1")
+$RedhatDistributions = @()
+$RedhatDistributions += $RedhatFullDistributions
+$RedhatDistributions += $RedhatFddDistributions
 $AllDistributions = @()
 $AllDistributions += $DebianDistributions
 $AllDistributions += $RedhatDistributions
@@ -33,7 +37,7 @@ function Start-PSPackage {
         [string]$Name = "powershell",
 
         # Ubuntu, CentOS, Fedora, macOS, and Windows packages are supported
-        [ValidateSet("msix", "deb", "osxpkg", "rpm", "msi", "zip", "zip-pdb", "nupkg", "tar", "tar-arm", "tar-arm64", "tar-alpine", "fxdependent", "fxdependent-win-desktop", "min-size")]
+        [ValidateSet("msix", "deb", "osxpkg", "rpm", "rpm-fxdependent", "msi", "zip", "zip-pdb", "nupkg", "tar", "tar-arm", "tar-arm64", "tar-alpine", "fxdependent", "fxdependent-win-desktop", "min-size")]
         [string[]]$Type,
 
         # Generate windows downlevel package
@@ -91,6 +95,8 @@ function Start-PSPackage {
             } else {
                 New-PSOptions -Configuration "Release" -Runtime "Linux-ARM64" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
             }
+        } elseif ($Type.Count -eq 1 -and $Type[0] -eq "rpm-fxdependent") {
+            New-PSOptions -Configuration "Release" -Runtime 'fxdependent-linux-x64' -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
         } else {
             New-PSOptions -Configuration "Release" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
         }
@@ -524,7 +530,25 @@ function Start-PSPackage {
                     NoSudo = $NoSudo
                     LTS = $LTS
                 }
-                foreach ($Distro in $Script:RedhatDistributions) {
+                foreach ($Distro in $Script:RedhatFullDistributions) {
+                    $Arguments["Distribution"] = $Distro
+                    if ($PSCmdlet.ShouldProcess("Create RPM Package for $Distro")) {
+                        Write-Verbose -Verbose "Creating RPM Package for $Distro"
+                        New-UnixPackage @Arguments
+                    }
+                }
+            }
+            'rpm-fxdependent' {
+                $Arguments = @{
+                    Type = 'rpm'
+                    PackageSourcePath = $Source
+                    Name = $Name
+                    Version = $Version
+                    Force = $Force
+                    NoSudo = $NoSudo
+                    LTS = $LTS
+                }
+                foreach ($Distro in $Script:RedhatFddDistributions) {
                     $Arguments["Distribution"] = $Distro
                     if ($PSCmdlet.ShouldProcess("Create RPM Package for $Distro")) {
                         Write-Verbose -Verbose "Creating RPM Package for $Distro"
@@ -834,7 +858,7 @@ function New-UnixPackage {
     )
 
     DynamicParam {
-        if ($Type -eq "deb" -or $Type -eq 'rpm') {
+        if ($Type -eq "deb" -or $Type -like 'rpm*') {
             # Add a dynamic parameter '-Distribution' when the specified package type is 'deb'.
             # The '-Distribution' parameter can be used to indicate which Debian distro this pacakge is targeting.
             $ParameterAttr = New-Object "System.Management.Automation.ParameterAttribute"
@@ -1406,6 +1430,11 @@ function Get-PackageDependencies
                 "icu"
                 "openssl-libs"
             )
+            if($Script:Options.Runtime -like 'fx*') {
+                $Dependencies += @(
+                    "dotnet-runtime-7.0"
+                )
+            }
         } elseif ($Distribution -eq 'macOS') {
             # do nothing
         } else {
@@ -4414,6 +4443,7 @@ ${mainLinuxBuildFolder} = 'pwshLinuxBuild'
 ${minSizeLinuxBuildFolder} = 'pwshLinuxBuildMinSize'
 ${arm32LinuxBuildFolder} = 'pwshLinuxBuildArm32'
 ${arm64LinuxBuildFolder} = 'pwshLinuxBuildArm64'
+${amd64MarinerBuildFolder} = 'pwshMarinerBuildAmd64'
 
 <#
     Used in Azure DevOps Yaml to package all the linux packages for a channel.
@@ -4479,6 +4509,14 @@ function Invoke-AzDevOpsLinuxPackageCreation {
             ## Note that 'linux-arm64' can only be built on Ubuntu environment.
             Restore-PSOptions -PSOptionsPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${arm64LinuxBuildFolder}-meta\psoptions.json"
             Start-PSPackage -Type tar-arm64 @releaseTagParam -LTS:$LTS
+        } elseif ($BuildType -eq 'rpm') {
+            Restore-PSOptions -PSOptionsPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${amd64MarinerBuildFolder}-meta\psoptions.json"
+
+            Write-Verbose -Verbose "---- rpm-fxdependent ----"
+            Write-Verbose -Verbose "options.Output: $($options.Output)"
+            Write-Verbose -Verbose "options.Top $($options.Top)"
+
+            Start-PSPackage -Type rpm-fxdependent @releaseTagParam -LTS:$LTS
         }
     }
     catch {
@@ -4558,6 +4596,23 @@ function Invoke-AzDevOpsLinuxPackageBuild {
             Start-PSBuild -Configuration Release -Restore -Runtime linux-arm64 -PSModuleRestore @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
             # Remove symbol files.
             Remove-Item "${buildFolder}\*.pdb" -Force
+        } elseif ($BuildType -eq 'rpm') {
+            ## Build 'min-size'
+            $options = Get-PSOptions
+            Write-Verbose -Verbose "---- Min-Size ----"
+            Write-Verbose -Verbose "options.Output: $($options.Output)"
+            Write-Verbose -Verbose "options.Top $($options.Top)"
+            $binDir = Join-Path -Path $options.Top -ChildPath 'bin'
+            if (Test-Path -Path $binDir) {
+                Write-Verbose -Verbose "Remove $binDir, to get a clean build for min-size package"
+                Remove-Item -Path $binDir -Recurse -Force
+            }
+
+            $buildParams['Runtime'] = 'fxdependent-linux-x64'
+            $buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${amd64MarinerBuildFolder}"
+            Start-PSBuild -Clean @buildParams @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
+            # Remove symbol files, xml document files.
+            Remove-Item "${buildFolder}\*.pdb", "${buildFolder}\*.xml" -Force
         }
     }
     catch {

From 8c238652b5ecd1b8b7f21d012313965589ccdbf0 Mon Sep 17 00:00:00 2001
From: ngharo <ngharo@gmail.com>
Date: Thu, 21 Apr 2022 11:50:04 -0500
Subject: [PATCH 311/645] Adds sha256 digests to RPM packages (#16896)

Co-authored-by: Nick Hall <nhall@optumserve.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 tools/packaging/packaging.psm1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index f31a30f6cbf..72e488d2ff9 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -1333,6 +1333,7 @@ function Get-FpmArguments
         "-s", "dir"
     )
     if ($Distribution -in $script:RedHatDistributions) {
+        $Arguments += @("--rpm-digest", "sha256")
         $Arguments += @("--rpm-dist", $Distribution)
         $Arguments += @("--rpm-os", "linux")
         $Arguments += @("--license", "MIT")

From 1c568d42d82793094de1dccdf648ab8ed450e78f Mon Sep 17 00:00:00 2001
From: Patrick Meinecke <SeeminglyScience@users.noreply.github.com>
Date: Thu, 21 Apr 2022 09:54:50 -0700
Subject: [PATCH 312/645] Make `NameObscurerTelemetryInitializer` internal
 (#17167)

Making NameObscurerTelemetryInitializer internal

Co-authored-by: Andrew Menagarishvili <anmenaga@microsoft.com>
---
 src/System.Management.Automation/utils/Telemetry.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/utils/Telemetry.cs b/src/System.Management.Automation/utils/Telemetry.cs
index 74318d1e058..1c1f1b8d2c2 100644
--- a/src/System.Management.Automation/utils/Telemetry.cs
+++ b/src/System.Management.Automation/utils/Telemetry.cs
@@ -65,7 +65,7 @@ internal enum TelemetryType
     /// <summary>
     /// Set up the telemetry initializer to mask the platform specific names.
     /// </summary>
-    public class NameObscurerTelemetryInitializer : ITelemetryInitializer
+    internal class NameObscurerTelemetryInitializer : ITelemetryInitializer
     {
         // Report the platform name information as "na".
         private const string _notavailable = "na";

From 89ae02de4039147deeea87f566838a29f352d1a7 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 21 Apr 2022 10:24:01 -0700
Subject: [PATCH 313/645] Update rebase.yml (#17170)

---
 .github/workflows/rebase.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index f54254f1435..f0c61ca2636 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -16,6 +16,6 @@ jobs:
       with:
         fetch-depth: 0
     - name: Automatic Rebase
-      uses: cirrus-actions/rebase@1.4
+      uses: cirrus-actions/rebase@1.6
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From db1c8658fb5579dd31aac30b6faf0095e4eb2954 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Thu, 21 Apr 2022 11:01:45 -0700
Subject: [PATCH 314/645] Update `wix` to include security extensions package
 (#17171)

---
 assets/wix/files.wxs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 65fe6f17e61..0e4db18cd28 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3183,6 +3183,12 @@
       <Component Id="cmp05AA3332D604464298B922F34672061F">
         <File Id="fil45EB1A6088AA4475B1B9B0413BC0FE02" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.15202.dll" />
       </Component>
+      <Component Id="cmpFE56825F03274064A69AA43CA4B597C7">
+        <File Id="filAAE3E9B665914FF7A0164F83BD421829" KeyPath="yes" Source="$(var.ProductSourcePath)\getfilesiginforedist.dll" />
+      </Component>
+      <Component Id="cmp0AB1EF494922410AB17DC61097295172">
+        <File Id="fil70AB7246AA664FFCADD71E79322934EA" KeyPath="yes" Source="$(var.ProductSourcePath)\getfilesiginforedistwrapper.dll" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -4206,6 +4212,8 @@
       <ComponentRef Id="cmpE5993DB9118640FD8C180A2D61C89C01" />
       <ComponentRef Id="cmpE0DEAA289B2D4594A0C4791B2808C97C" />
       <ComponentRef Id="cmp05AA3332D604464298B922F34672061F" />
+      <ComponentRef Id="cmpFE56825F03274064A69AA43CA4B597C7" />
+      <ComponentRef Id="cmp0AB1EF494922410AB17DC61097295172" />
     </ComponentGroup>
   </Fragment>
 </Wix>

From b898da8842c75066d2b80cb157d00c8a984e33f7 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 22 Apr 2022 10:55:38 -0700
Subject: [PATCH 315/645] Make a variable assignment in a `ParenExpression` to
 return the variable value (#17174)

---
 .../engine/ShellVariable.cs                         | 13 +++++++++++++
 .../engine/runtime/Operations/VariableOps.cs        |  9 ++++++++-
 .../Language/Scripting/Scripting.Followup.Tests.ps1 |  6 ++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/ShellVariable.cs b/src/System.Management.Automation/engine/ShellVariable.cs
index 424be295346..8440845a32d 100644
--- a/src/System.Management.Automation/engine/ShellVariable.cs
+++ b/src/System.Management.Automation/engine/ShellVariable.cs
@@ -244,6 +244,14 @@ internal void DebuggerCheckVariableWrite()
             }
         }
 
+        /// <summary>
+        /// Gets the value without triggering debugger check.
+        /// </summary>
+        internal virtual object GetValueRaw()
+        {
+            return _value;
+        }
+
         /// <summary>
         /// Gets or sets the value of the variable.
         /// </summary>
@@ -796,6 +804,11 @@ public override object Value
             }
         }
 
+        internal override object GetValueRaw()
+        {
+            return _tuple.GetValue(_tupleSlot);
+        }
+
         internal override void SetValueRaw(object newValue, bool preserveValueTypeSemantics)
         {
             if (preserveValueTypeSemantics)
diff --git a/src/System.Management.Automation/engine/runtime/Operations/VariableOps.cs b/src/System.Management.Automation/engine/runtime/Operations/VariableOps.cs
index 6799d1bd989..72126c726c9 100644
--- a/src/System.Management.Automation/engine/runtime/Operations/VariableOps.cs
+++ b/src/System.Management.Automation/engine/runtime/Operations/VariableOps.cs
@@ -46,6 +46,13 @@ internal static object SetVariableValue(VariablePath variablePath, object value,
                                      : GetAttributeCollection(attributeAsts);
                 var = new PSVariable(variablePath.UnqualifiedPath, value, ScopedItemOptions.None, attributes);
 
+                if (attributes.Count > 0)
+                {
+                    // When there are any attributes, it's possible the value was converted/transformed.
+                    // Use 'GetValueRaw' here so the debugger check won't be triggered.
+                    value = var.GetValueRaw();
+                }
+
                 // Marking untrusted values for assignments in 'ConstrainedLanguage' mode is done in
                 // SessionStateScope.SetVariable.
                 sessionState.SetVariable(variablePath, var, false, origin);
@@ -81,7 +88,7 @@ internal static object SetVariableValue(VariablePath variablePath, object value,
                             null,
                             Metadata.InvalidValueFailure,
                             var.Name,
-                            ((value != null) ? value.ToString() : "$null"));
+                            (value != null) ? value.ToString() : "$null");
 
                         throw e;
                     }
diff --git a/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1 b/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1
index 31bc8bc9fc3..1cff5295027 100644
--- a/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1
+++ b/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1
@@ -29,4 +29,10 @@ Describe "Scripting.Followup.Tests" -Tags "CI" {
         ## $arraylist.Clear() should be executed
         $arraylist.Count | Should -Be 0
     }
+
+    ## fix https://github.com/PowerShell/PowerShell/issues/17165
+    It "([bool] `$var = 42) should return the varaible value" {
+        ([bool]$var = 42).GetType().FullName | Should -Be "System.Boolean"
+        . { ([bool]$var = 42).GetType().FullName } | Should -Be "System.Boolean"
+    }
 }

From ad5a6ffbf2eb2ba87c92388fe8f85204549e4613 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Mon, 25 Apr 2022 13:55:25 -0400
Subject: [PATCH 316/645] Update package fallback list for ubuntu (from those
 updated for ubuntu 22.04) (deb) (#17180)

---
 tools/packaging/packaging.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 72e488d2ff9..469c343ab0b 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -1411,7 +1411,7 @@ function Get-PackageDependencies
                 "libstdc++6",
                 "zlib1g",
                 "libicu72|libicu71|libicu70|libicu69|libicu68|libicu67|libicu66|libicu65|libicu63|libicu60|libicu57|libicu55|libicu52",
-                "libssl1.1|libssl1.0.2|libssl1.0.0"
+                "libssl3|libssl1.1|libssl1.0.2|libssl1.0.0"
             )
 
         } elseif ($Distribution -eq 'rh') {

From 0067decae87c5659435c156b90b7513c7fd024c7 Mon Sep 17 00:00:00 2001
From: m1k0net <78430630+m1k0net@users.noreply.github.com>
Date: Tue, 26 Apr 2022 19:58:37 -0400
Subject: [PATCH 317/645] Fix `Sort-Object -Stable -Unique` to actually do
 stable sorting (#17189)

---
 .../commands/utility/Sort-Object.cs           | 19 +++++++++----------
 .../Sort-Object.Tests.ps1                     | 12 ++++++++++++
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Sort-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Sort-Object.cs
index 06f5ebfffad..365a669c186 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Sort-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Sort-Object.cs
@@ -147,7 +147,7 @@ private int Heapify(List<OrderByPropertyEntry> dataToSort, OrderByPropertyCompar
 
             // Tracking the index is necessary so that unsortable items can be output at the end, in the order
             // in which they were received.
-            for (int dataIndex = 0, discardedDuplicates = 0; dataIndex < dataToSort.Count - discardedDuplicates; dataIndex++)
+            for (int dataIndex = 0, discardedDuplicates = 0; dataIndex + discardedDuplicates < dataToSort.Count; dataIndex++)
             {
                 // Min-heap: if the heap is full and the root item is larger than the entry, discard the entry
                 // Max-heap: if the heap is full and the root item is smaller than the entry, discard the entry
@@ -157,20 +157,19 @@ private int Heapify(List<OrderByPropertyEntry> dataToSort, OrderByPropertyCompar
                 }
 
                 // If we're doing a unique sort and the entry is not unique, discard the duplicate entry
-                if (Unique && !uniqueSet.Add(dataToSort[dataIndex]))
+                if (Unique && !uniqueSet.Add(dataToSort[dataIndex + discardedDuplicates]))
                 {
                     discardedDuplicates++;
-                    if (dataIndex != dataToSort.Count - discardedDuplicates)
-                    {
-                        // When discarding duplicates, replace them with an item at the end of the list and
-                        // adjust our counter so that we check the item we just swapped in next
-                        dataToSort[dataIndex] = dataToSort[dataToSort.Count - discardedDuplicates];
-                        dataIndex--;
-                    }
-
+                    dataIndex--;
                     continue;
                 }
 
+                // Shift next non-duplicate entry into place
+                if (discardedDuplicates > 0)
+                {
+                    dataToSort[dataIndex] = dataToSort[dataIndex + discardedDuplicates];
+                }
+
                 // Add the current item to the heap and bubble it up into the correct position
                 int childIndex = dataIndex;
                 while (childIndex > 0)
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Sort-Object.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Sort-Object.Tests.ps1
index 7b40334d233..eefd8e2e605 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Sort-Object.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Sort-Object.Tests.ps1
@@ -296,6 +296,18 @@ Describe 'Sort-Object Stable Unit Tests' -Tags 'CI' {
 			$results[1]  | Should -Be 1
 			$results[2]  | Should -Be 3
 		}
+		
+		It "Sort-Object with Unique Stable should return proper records"{
+			$Record1=[PSCustomObject]@{Key="A";Record="A1"}
+			$Record2=[PSCustomObject]@{Key="A";Record="A2"}
+			$Record3=[PSCustomObject]@{Key="B";Record="B1"}
+			$Record4=[PSCustomObject]@{Key="B";Record="B2"}
+			$Records = @($Record1,$Record2,$Record3,$Record4)
+			$results = $Records | Sort-Object -Stable -Unique -Property Key
+	
+			$results[0] | Should -Be $Records[0]
+			$results[1] | Should -Be $Records[2]
+		}
 	}
 }
 

From f4e38e8fa73e9409f83db619eb5655ff565bd01d Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Tue, 26 Apr 2022 20:01:53 -0700
Subject: [PATCH 318/645] Updated metadata.json and README.md for v7.2.3 and
 v7.0.10 (#17158)

---
 README.md           | 54 ++++++++++++++++++++++-----------------------
 tools/metadata.json |  8 +++----
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 52f1376c6ce..fecde3d1e5c 100644
--- a/README.md
+++ b/README.md
@@ -64,33 +64,33 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 | 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.2/PowerShell-7.2.2-win-x86.msi
-[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x64.msi
-[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-lts_7.2.2-1.deb_amd64.deb
-[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-lts-7.2.2-1.rh.x86_64.rpm
-[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-lts-7.2.2-osx-x64.pkg
-[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-lts-7.2.2-osx-arm64.pkg
-
-[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x64.msi
-[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x86.msi
-[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell_7.2.2-1.deb_amd64.deb
-[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell_7.2.2-1.deb_amd64.deb
-[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell_7.2.2-1.deb_amd64.deb
-[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell_7.2.2-1.deb_amd64.deb
-[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell_7.2.2-1.deb_amd64.deb
-[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell_7.2.2-1.deb_amd64.deb
-[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-1.rh.x86_64.rpm
-[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-1.rh.x86_64.rpm
-[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-osx-x64.pkg
-[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-osx-arm64.pkg
-[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-arm64.zip
-[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x86.zip
-[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x64.zip
-[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-osx-x64.tar.gz
-[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-osx-arm64.tar.gz
-[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-linux-x64.tar.gz
-[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-linux-arm32.tar.gz
-[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/powershell-7.2.2-linux-arm64.tar.gz
+[lts-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x86.msi
+[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x64.msi
+[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-lts_7.2.3-1.deb_amd64.deb
+[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-lts-7.2.3-1.rh.x86_64.rpm
+[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-lts-7.2.3-osx-x64.pkg
+[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-lts-7.2.3-osx-arm64.pkg
+
+[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x64.msi
+[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x86.msi
+[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell_7.2.3-1.deb_amd64.deb
+[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell_7.2.3-1.deb_amd64.deb
+[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell_7.2.3-1.deb_amd64.deb
+[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell_7.2.3-1.deb_amd64.deb
+[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell_7.2.3-1.deb_amd64.deb
+[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell_7.2.3-1.deb_amd64.deb
+[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-1.rh.x86_64.rpm
+[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-1.rh.x86_64.rpm
+[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-osx-x64.pkg
+[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-osx-arm64.pkg
+[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-arm64.zip
+[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x86.zip
+[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x64.zip
+[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-osx-x64.tar.gz
+[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-osx-arm64.tar.gz
+[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-linux-x64.tar.gz
+[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-linux-arm32.tar.gz
+[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-linux-arm64.tar.gz
 [rl-snap]: https://snapcraft.io/powershell
 
 [pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/PowerShell-7.3.0-preview.3-win-x64.msi
diff --git a/tools/metadata.json b/tools/metadata.json
index 3a10dcebd56..ae1d2549f0a 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,9 +1,9 @@
 {
-  "StableReleaseTag": "v7.2.2",
+  "StableReleaseTag": "v7.2.3",
   "PreviewReleaseTag": "v7.3.0-preview.3",
-  "ServicingReleaseTag": "v7.0.9",
-  "ReleaseTag": "v7.2.2",
-  "LTSReleaseTag" : ["v7.2.2", "v7.0.9"],
+  "ServicingReleaseTag": "v7.0.10",
+  "ReleaseTag": "v7.2.3",
+  "LTSReleaseTag" : ["v7.2.3", "v7.0.10"],
   "NextReleaseTag": "v7.3.0-preview.4",
   "LTSRelease": { "Latest": false, "Package": false },
   "StableRelease":  { "Latest": false, "Package": false }

From 8fb34e87e55725fc08764f19d2b8fee0fee9642e Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Thu, 28 Apr 2022 11:16:16 -0700
Subject: [PATCH 319/645] Updated change logs for v7.0.9 / v7.0.10 / v7.1.6 /
 v7.1.7 / v7.2.2 / v7.2.3  (#17207)

* Merged PR 19472: Update change log for the v7.2.2 release

Update change log for the v7.2.2 release

* Merged PR 20440: Changelog for v7.2.3

Changelog for 7.2.3

* Update change log for v7.1.6 release

* Merged PR 20441: Changelog for v7.1.7

Changelog for 7.1.7

* Update change log for v7.0.9 release

* Merged PR 20442: Changelog for v7.0.10

Changelog for 7.0.10

* Cleaned merge conflicts in spelling file

* Cleaned conflicts in spelling file

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
---
 .spelling        | 23 ++++++++++++++
 CHANGELOG/7.0.md | 78 ++++++++++++++++++++++++++++++++++++++++++++++++
 CHANGELOG/7.1.md | 76 ++++++++++++++++++++++++++++++++++++++++++++++
 CHANGELOG/7.2.md | 73 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 250 insertions(+)

diff --git a/.spelling b/.spelling
index 85ca1f2bb21..b0dc84c87da 100644
--- a/.spelling
+++ b/.spelling
@@ -284,10 +284,12 @@ filecatalog
 filename
 filesystem
 filesystemprovider
+files.wxs
 filterhashtable
 find-dscresource
 find-packageprovider
 find-rolecapability
+findMissingNotices.ps1
 firefox
 folderName
 foreach
@@ -544,6 +546,7 @@ mwrock
 myget
 namedpipe
 nameof
+NameObscurerTelemetryInitializer
 namespace
 nano
 nanoserver
@@ -988,6 +991,7 @@ v7.0.0
 v7.0.3
 v7.0.4
 v7.1.0
+v7.1.7
 validatenotnullorempty
 versioned
 versioning
@@ -1070,6 +1074,7 @@ unvalidated
 Geweldig
 mjanko5
 v7.0.0
+v7.0.10
 renehernandez
 ece-jacob-scott
 st0le
@@ -1410,6 +1415,7 @@ SethFalco
 CodeQL
 slowy07
 rc.2.21505.57
+ThirdPartyNotices
 ThirdPartyNotices.txt
 cgmanifest.json
 buildinfo
@@ -1419,16 +1425,25 @@ manifest.spdx.json
 vPack
 kondratyev-nv
 v7.2.0
+v7.2.3
 cgmanifest.json
 pwsh.exe
 6.0.100-rtm.21527.11
 6.0.100-rc.2.21505.57
 ThirdPartyNotices.txt
 rtm.21527.11
+SKUs
+vmImage
  - CHANGELOG/7.0.md
 codesign
 release-BuildJson
 yml
+dotnet5
+buildinfo
+SKUs
+CGManifest
+vmImage
+ci.psm1
 centos-7
 PSDesiredStateConfiguration
 NoLanguage
@@ -1479,3 +1494,11 @@ psoptions.json
 manifest.spdx.json
 AzureFileCopy
 vPack
+dotnet5
+buildinfo
+SKUs
+CGManifest
+vmImage
+ci.psm1
+jcotton42
+centos-7
diff --git a/CHANGELOG/7.0.md b/CHANGELOG/7.0.md
index ddb2f558b0a..194b4b3d748 100644
--- a/CHANGELOG/7.0.md
+++ b/CHANGELOG/7.0.md
@@ -1,5 +1,83 @@
 # 7.0 Changelog
 
+## [7.0.10] - 2022-04-26
+
+### Engine Updates and Fixes
+
+- Fix for partial PowerShell module search paths, that can be resolved to CWD locations
+- Do not include node names when sending telemetry. (#16981) to v7.0.10 (Internal 20186,Internal 20261)
+
+### Tests
+
+- Re-enable `PowerShellGet` tests targeting PowerShell gallery (#17062)
+- Skip failing scriptblock tests (#17093)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 3.1.418</p>
+
+</summary>
+
+<ul>
+<li>Fixed package names verification to support multi-digit versions (Internal 20363)</li>
+<li>Fix build failure in `generate checksum file for packages` step - v7.0.10 (Internal 20275)</li>
+<li>Updated files.wxs for 7.0.10 (Internal 20208)</li>
+<li>Updated to .NET 3.1.24 / SDK 3.1.418 (Internal 20133)</li>
+<li>Disable broken macOS CI job, which is unused (Internal 20189)</li>
+<li>Update Ubuntu images to use Ubuntu 20.04 (#15906)</li>
+<li>Update dotnet-install script download link (Internal 19949)</li>
+<li>Create checksum file for global tools (Internal 19934)</li>
+<li>Make sure global tool packages are published in stable build (Internal 19623)</li>
+</ul>
+
+</details>
+
+[7.0.10]: https://github.com/PowerShell/PowerShell/compare/v7.0.9...v7.0.10
+
+## [7.0.9] - 2022-03-16
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 3.1.417</p>
+
+</summary>
+
+<ul>
+<li>Fix the NuGet SDK package creation (Internal 19569)</li>
+<li>Fix NuGet package compliance issues (#13045)</li>
+<li>Fix issues in release build (#16332)</li>
+<li>Enable ARM64 packaging for macOS (#15768)</li>
+<li>Update feed and analyzer dependency (#16327)</li>
+<li>Only upload stable <code>buildinfo</code> for stable releases (#16251)</li>
+<li>Opt-in to build security monitoring (#16911)</li>
+<li>Update experimental feature json files (#16838) (Thanks @!)</li>
+<li>Ensure alpine and arm SKUs have the PowerShell configuration file with experimental features enabled (#16823)</li>
+<li>Remove WiX install (#16834)</li>
+<li>Add Linux package dependencies for packaging (#16807)</li>
+<li>Switch to our custom images for build and release (#16801)</li>
+<li>Remove all references to <code>cmake</code> for the builds in this repo (#16578)</li>
+<li>Register NuGet source when generating <code>CGManifest</code> (#16570)</li>
+<li>Update Images used for release (#16580)</li>
+<li>Add Software Bill of Materials to the main packages (#16202, #16641, #16711)</li>
+<li>Add GitHub Workflow to keep notices up to date (#16284)</li>
+<li>Update the <code>vmImage</code> and PowerShell root directory for macOS builds (#16611)</li>
+<li>Update macOS build image and root folder for build (#16609)</li>
+<li>Add checkout to build json stage to get <code>ci.psm1</code> (#16399)</li>
+<li>Move mapping file into product repo and add Debian 11  (#16316)</li>
+</ul>
+
+</details>
+
+[7.0.9]: https://github.com/PowerShell/PowerShell/compare/v7.0.8...v7.0.9
+
 ## [7.0.8] - 2021-10-14
 
 ### Engine Updates and Fixes
diff --git a/CHANGELOG/7.1.md b/CHANGELOG/7.1.md
index 84872d552a0..eba1998e29c 100644
--- a/CHANGELOG/7.1.md
+++ b/CHANGELOG/7.1.md
@@ -1,5 +1,81 @@
 # 7.1 Changelog
 
+## [7.1.7] - 2022-04-26
+
+### Engine Updates and Fixes
+
+- Fix for partial PowerShell module search paths, that can be resolved to CWD locations
+- Do not include node names when sending telemetry. (#16981) to v7.1.7 (Internal 20187,Internal 20260)
+
+### Tests
+
+- Re-enable `PowerShellGet` tests targeting PowerShell gallery (#17062)
+- Skip failing scriptblock tests (#17093)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 5.0.407</p>
+
+</summary>
+
+<ul>
+<li>Fix build failure in `generate checksum file for packages` step - v7.1.7 (Internal 20274)</li>
+<li>Updated files.wxs for 7.1.7 (Internal 20210)</li>
+<li>Updated to .NET 5.0.16 / SDK 5.0.407 (Internal 20131)</li>
+<li>Update Ubuntu images to use Ubuntu 20.04 (#15906)</li>
+<li>Update dotnet-install script download link (Internal 19950)</li>
+<li>Create checksum file for global tools (#17056) (Internal 19928)</li>
+<li>Make sure global tool packages are published in stable build (Internal 19624)</li>
+</ul>
+
+</details>
+
+[7.1.7]: https://github.com/PowerShell/PowerShell/compare/v7.1.6...v7.1.7
+
+## [7.1.6] - 2022-03-16
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 5.0.406</p>
+
+</summary>
+
+<ul>
+<li>Update the mapping file (#16316, Internal 19528)</li>
+<li>Remove code that handles dotnet5 feed (Internal 19525)</li>
+<li>Fix issues in release build (#16332)</li>
+<li>Enable ARM64 packaging for macOS (#15768)</li>
+<li>Update feed and analyzer dependency (#16327)</li>
+<li>Only upload stable <code>buildinfo</code> for stable releases (#16251)</li>
+<li>Opt-in to build security monitoring (#16911)</li>
+<li>Update experimental feature json files (#16838)</li>
+<li>Ensure alpine and arm SKUs have the PowerShell configuration file with experimental features enabled (#16823)</li>
+<li>Remove WiX install (#16834)</li>
+<li>Add Linux package dependencies for packaging (#16807)</li>
+<li>Switch to our custom images for build and release (#16801)</li>
+<li>Remove all references to <code>cmake</code> for the builds in this repo (#16578)</li>
+<li>Register NuGet source when generating <code>CGManifest</code> (#16570)</li>
+<li>Update images used for release (#16580)</li>
+<li>Add GitHub Workflow to keep notices up to date (#16284)</li>
+<li>Update the <code>vmImage</code> and PowerShell root directory for macOS builds (#16611)</li>
+<li>Add Software Bill of Materials to the main packages (#16202, #16641, #16711)</li>
+<li>Update macOS build image and root folder for build (#16609)</li>
+<li>Add diagnostics used to take corrective action when releasing <code>buildInfo</code> JSON file (#16404)</li>
+<li>Add checkout to build json stage to get <code>ci.psm1</code> (#16399)</li>
+</ul>
+
+</details>
+
+[7.1.6]: https://github.com/PowerShell/PowerShell/compare/v7.1.5...v7.1.6
+
 ## [7.1.5] - 2021-10-14
 
 ### Engine Updates and Fixes
diff --git a/CHANGELOG/7.2.md b/CHANGELOG/7.2.md
index 8eb70874ef5..0d8466765d5 100644
--- a/CHANGELOG/7.2.md
+++ b/CHANGELOG/7.2.md
@@ -1,5 +1,78 @@
 # 7.2 Changelog
 
+## [7.2.3] - 2022-04-26
+
+### Engine Updates and Fixes
+
+- Fix for partial PowerShell module search paths, that can be resolved to CWD locations (Internal 20126)
+- Do not include node names when sending telemetry. (#16981) to v7.2.3 (Internal 20188)
+
+### Tests
+
+- Re-enable `PowerShellGet` tests targeting PowerShell gallery (#17062)
+- Skip failing scriptblock tests (#17093)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET SDK to 6.0.202</p>
+
+</summary>
+
+<ul>
+<li>Making NameObscurerTelemetryInitializer internal - v7.2.3 (Internal 20239)</li>
+<li>Updated files.wxs for 7.2.3 (Internal 20211)</li>
+<li>Updated ThirdPartyNotices for 7.2.3 (Internal 20199)</li>
+<li>Work around issue with notice generation</li>
+<li>Replace <code>.</code> in notices container name</li>
+<li>Updated cgmanifest.json by findMissingNotices.ps1 in v7.2.3 (Internal 20190)</li>
+<li>v7.2.3 - Updated packages using dotnet-outdated global tool (Internal 20170)</li>
+<li>Updated to .NET 6.0.4 / SDK 6.0.202 (Internal 20128)</li>
+<li>Update dotnet-install script download link (Internal 19951)</li>
+<li>Create checksum file for global tools (#17056) (Internal 19935)</li>
+<li>Make sure global tool packages are published in stable build (Internal 19625)</li>
+<li>Fix release pipeline (Internal 19617)</li>
+</ul>
+
+</details>
+
+[7.2.3]: https://github.com/PowerShell/PowerShell/compare/v7.2.2...v7.2.3
+
+## [7.2.2] - 2022-03-16
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET SDK to 6.0.201</p>
+
+</summary>
+
+<ul>
+<li>Update WiX file (Internal 19460)</li>
+<li>Update .NET SDK version to 6.0.201 (Internal 19457)</li>
+<li>Update experimental feature JSON files (#16838)</li>
+<li>Ensure Alpine and ARM SKUs have <code>powershell.config.json</code> file with experimental features enabled (#16823)</li>
+<li>Update the <code>vmImage</code> and PowerShell root directory for macOS builds (#16611)</li>
+<li>Update macOS build image and root folder for build (#16609)</li>
+<li>Remove WiX install (#16834)</li>
+<li>Opt-in to build security monitoring (#16911)</li>
+<li>Add SBOM manifest for release packages (#16641, #16711)</li>
+<li>Add Linux package dependencies for packaging (#16807)</li>
+<li>Switch to our custom images for build and release (#16801, #16580)</li>
+<li>Remove all references to <code>cmake</code> for the builds in this repo (#16578)</li>
+<li>Register NuGet source when generating <code>CGManifest</code> (#16570)</li>
+</ul>
+
+</details>
+
+[7.2.2]: https://github.com/PowerShell/PowerShell/compare/v7.2.1...v7.2.2
+
 ## [7.2.1] - 2021-12-14
 
 ### General Cmdlet Updates and Fixes

From 42ad8b97e2a612340e555244dbd5495014bf4e99 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 28 Apr 2022 15:37:38 -0700
Subject: [PATCH 320/645] Add backport action (#17212)

---
 .github/workflows/backport.yml    |  61 ++++++++++++
 tools/actions/backport/action.yml |  20 ++++
 tools/actions/backport/index.js   | 157 ++++++++++++++++++++++++++++++
 3 files changed, 238 insertions(+)
 create mode 100644 .github/workflows/backport.yml
 create mode 100644 tools/actions/backport/action.yml
 create mode 100644 tools/actions/backport/index.js

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
new file mode 100644
index 00000000000..2a32b62d1d5
--- /dev/null
+++ b/.github/workflows/backport.yml
@@ -0,0 +1,61 @@
+name: Backport PR to branch
+on:
+  issue_comment:
+    types: [created]
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  backport:
+    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/backport to')
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Extract backport target branch
+      uses: actions/github-script@v3
+      id: target-branch-extractor
+      with:
+        result-encoding: string
+        script: |
+          if (context.eventName !== "issue_comment") throw "Error: This action only works on issue_comment events.";
+
+          // extract the target branch name from the trigger phrase containing these characters: a-z, A-Z, digits, forward slash, dot, hyphen, underscore
+          const regex = /^\/backport to ([a-zA-Z\d\/\.\-\_]+)/;
+          target_branch = regex.exec(context.payload.comment.body);
+          if (target_branch == null) throw "Error: No backport branch found in the trigger phrase.";
+
+          return target_branch[1];
+    - name: Post backport started comment to pull request
+      uses: actions/github-script@v3
+      with:
+        script: |
+          const backport_start_body = `Started backporting to ${{ steps.target-branch-extractor.outputs.result }}: https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${process.env.GITHUB_RUN_ID}`;
+          await github.issues.createComment({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: backport_start_body
+          });
+    - name: Checkout repo
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Run backport
+      uses: ./tools/actions/backport
+      with:
+        target_branch: ${{ steps.target-branch-extractor.outputs.result }}
+        auth_token: ${{ secrets.GITHUB_TOKEN }}
+        pr_description_template: |
+          Backport of #%source_pr_number% to %target_branch%
+
+          /cc %cc_users%
+
+          ## Customer Impact
+
+          ## Testing
+
+          - [ ] For any change that affects the release process, please work with a maintainer to come up with a plan to test this.
+
+          ## Risk
diff --git a/tools/actions/backport/action.yml b/tools/actions/backport/action.yml
new file mode 100644
index 00000000000..e596f1dd586
--- /dev/null
+++ b/tools/actions/backport/action.yml
@@ -0,0 +1,20 @@
+name: 'PR Backporter'
+description: 'Backports a pull request to a branch using the "/backport to <branch>" comment'
+inputs:
+  target_branch:
+    description: 'Backport target branch.'
+  auth_token:
+    description: 'The token used to authenticate to GitHub.'
+  pr_title_template:
+      description: 'The template used for the PR title. Special placeholder tokens that will be replaced with a value: %target_branch%, %source_pr_title%, %source_pr_number%, %cc_users%.'
+      default: '[%target_branch%] %source_pr_title%'
+  pr_description_template:
+    description: 'The template used for the PR description. Special placeholder tokens that will be replaced with a value: %target_branch%, %source_pr_title%, %source_pr_number%, %cc_users%.'
+    default: |
+      Backport of #%source_pr_number% to %target_branch%
+
+      /cc %cc_users%
+
+runs:
+  using: 'node12'
+  main: 'index.js'
diff --git a/tools/actions/backport/index.js b/tools/actions/backport/index.js
new file mode 100644
index 00000000000..88d348f167d
--- /dev/null
+++ b/tools/actions/backport/index.js
@@ -0,0 +1,157 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// from https://github.com/dotnet/runtime/blob/main/eng/actions/backport/index.js
+
+function BackportException(message, postToGitHub = true) {
+    this.message = message;
+    this.postToGitHub = postToGitHub;
+  }
+
+  async function run() {
+    const util = require("util");
+    const jsExec = util.promisify(require("child_process").exec);
+
+    console.log("Installing npm dependencies");
+    const { stdout, stderr } = await jsExec("npm install @actions/core @actions/github @actions/exec");
+    console.log("npm-install stderr:\n\n" + stderr);
+    console.log("npm-install stdout:\n\n" + stdout);
+    console.log("Finished installing npm dependencies");
+
+    const core = require("@actions/core");
+    const github = require("@actions/github");
+    const exec = require("@actions/exec");
+
+    const repo_owner = github.context.payload.repository.owner.login;
+    const repo_name = github.context.payload.repository.name;
+    const pr_number = github.context.payload.issue.number;
+    const comment_user = github.context.payload.comment.user.login;
+
+    let octokit = github.getOctokit(core.getInput("auth_token", { required: true }));
+    let target_branch = core.getInput("target_branch", { required: true });
+
+    try {
+      // verify the comment user is a repo collaborator
+      try {
+        await octokit.rest.repos.checkCollaborator({
+          owner: repo_owner,
+          repo: repo_name,
+          username: comment_user
+        });
+        console.log(`Verified ${comment_user} is a repo collaborator.`);
+      } catch (error) {
+        console.log(error);
+        throw new BackportException(`Error: @${comment_user} is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your Microsoft team membership visibility is set to Public on https://github.com/orgs/microsoft/people?query=${comment_user}`);
+      }
+
+      try { await exec.exec(`git ls-remote --exit-code --heads origin ${target_branch}`) } catch { throw new BackportException(`Error: The specified backport target branch ${target_branch} wasn't found in the repo.`); }
+      console.log(`Backport target branch: ${target_branch}`);
+
+      console.log("Applying backport patch");
+
+      await exec.exec(`git checkout ${target_branch}`);
+      await exec.exec(`git clean -xdff`);
+
+      // configure git
+      await exec.exec(`git config user.name "github-actions"`);
+      await exec.exec(`git config user.email "github-actions@github.com"`);
+
+      // create temporary backport branch
+      const temp_branch = `backport/pr-${pr_number}-to-${target_branch}`;
+      await exec.exec(`git checkout -b ${temp_branch}`);
+
+      // skip opening PR if the branch already exists on the origin remote since that means it was opened
+      // by an earlier backport and force pushing to the branch updates the existing PR
+      let should_open_pull_request = true;
+      try {
+        await exec.exec(`git ls-remote --exit-code --heads origin ${temp_branch}`);
+        should_open_pull_request = false;
+      } catch { }
+
+      // download and apply patch
+      await exec.exec(`curl -sSL "${github.context.payload.issue.pull_request.patch_url}" --output changes.patch`);
+
+      const git_am_command = "git am --3way --ignore-whitespace --keep-non-patch changes.patch";
+      let git_am_output = `$ ${git_am_command}\n\n`;
+      let git_am_failed = false;
+      try {
+        await exec.exec(git_am_command, [], {
+          listeners: {
+            stdout: function stdout(data) { git_am_output += data; },
+            stderr: function stderr(data) { git_am_output += data; }
+          }
+        });
+      } catch (error) {
+        git_am_output += error;
+        git_am_failed = true;
+      }
+
+      if (git_am_failed) {
+        const git_am_failed_body = `@${github.context.payload.comment.user.login} backporting to ${target_branch} failed, the patch most likely resulted in conflicts:\n\n\`\`\`shell\n${git_am_output}\n\`\`\`\n\nPlease backport manually!`;
+        await octokit.rest.issues.createComment({
+          owner: repo_owner,
+          repo: repo_name,
+          issue_number: pr_number,
+          body: git_am_failed_body
+        });
+        throw new BackportException("Error: git am failed, most likely due to a merge conflict.", false);
+      }
+      else {
+        // push the temp branch to the repository
+        await exec.exec(`git push --force --set-upstream origin HEAD:${temp_branch}`);
+      }
+
+      if (!should_open_pull_request) {
+        console.log("Backport temp branch already exists, skipping opening a PR.");
+        return;
+      }
+
+      // prepate the GitHub PR details
+      let backport_pr_title = core.getInput("pr_title_template");
+      let backport_pr_description = core.getInput("pr_description_template");
+
+      // get users to cc (append PR author if different from user who issued the backport command)
+      let cc_users = `@${comment_user}`;
+      if (comment_user != github.context.payload.issue.user.login) cc_users += ` @${github.context.payload.issue.user.login}`;
+
+      // replace the special placeholder tokens with values
+      backport_pr_title = backport_pr_title
+        .replace(/%target_branch%/g, target_branch)
+        .replace(/%source_pr_title%/g, github.context.payload.issue.title)
+        .replace(/%source_pr_number%/g, github.context.payload.issue.number)
+        .replace(/%cc_users%/g, cc_users);
+
+      backport_pr_description = backport_pr_description
+        .replace(/%target_branch%/g, target_branch)
+        .replace(/%source_pr_title%/g, github.context.payload.issue.title)
+        .replace(/%source_pr_number%/g, github.context.payload.issue.number)
+        .replace(/%cc_users%/g, cc_users);
+
+      // open the GitHub PR
+      await octokit.rest.pulls.create({
+        owner: repo_owner,
+        repo: repo_name,
+        title: backport_pr_title,
+        body: backport_pr_description,
+        head: temp_branch,
+        base: target_branch
+      });
+
+      console.log("Successfully opened the GitHub PR.");
+    } catch (error) {
+
+      core.setFailed(error);
+
+      if (error.postToGitHub === undefined || error.postToGitHub == true) {
+        // post failure to GitHub comment
+        const unknown_error_body = `@${comment_user} an error occurred while backporting to ${target_branch}, please check the run log for details!\n\n${error.message}`;
+        await octokit.rest.issues.createComment({
+          owner: repo_owner,
+          repo: repo_name,
+          issue_number: pr_number,
+          body: unknown_error_body
+        });
+      }
+    }
+  }
+
+  run();

From f22e475f53db3a68c50e41e447dd8619c49a3a74 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Thu, 28 Apr 2022 17:02:57 -0700
Subject: [PATCH 321/645] Change logic in the testing helper module for
 determining whether `PSHOME` is writable (#17218)

---
 test/tools/Modules/HelpersCommon/HelpersCommon.psm1 | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1 b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
index 894a85ff14d..c971e786765 100644
--- a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
+++ b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
@@ -326,19 +326,16 @@ function Test-CanWriteToPsHome
         return $script:CanWriteToPsHome
     }
 
-    $script:CanWriteToPsHome = $true
+    $script:CanWriteToPsHome = $false
 
     try {
         $testFileName = Join-Path $PSHOME (New-Guid).Guid
         $null = New-Item -ItemType File -Path $testFileName -ErrorAction Stop
+        $script:CanWriteToPsHome = $true
+        Remove-Item -Path $testFileName -ErrorAction SilentlyContinue
     }
-    catch [System.UnauthorizedAccessException] {
-        $script:CanWriteToPsHome = $false
-    }
-    finally {
-        if ($script:CanWriteToPsHome) {
-            Remove-Item -Path $testFileName -ErrorAction SilentlyContinue
-        }
+    catch {
+        ; # do nothing
     }
 
     $script:CanWriteToPsHome

From 83edc101ed818230a0c4909c011add80675885f7 Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Thu, 28 Apr 2022 17:07:25 -0700
Subject: [PATCH 322/645] Make`NameObscurerTelemetryInitializer` internal
 (#17214)

Making NameObscurerTelemetryInitializer internal

From 669d15b95cdb20a6f2e78155118def94ff7db47f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Apr 2022 17:25:49 -0700
Subject: [PATCH 323/645] Bump Microsoft.CodeAnalysis.CSharp from 4.2.0-1.final
 to 4.2.0-4.final (#17210)

Bumps [Microsoft.CodeAnalysis.CSharp](https://github.com/dotnet/roslyn) from 4.2.0-1.final to 4.2.0-4.final.
- [Release notes](https://github.com/dotnet/roslyn/releases)
- [Changelog](https://github.com/dotnet/roslyn/blob/main/docs/Breaking%20API%20Changes.md)
- [Commits](https://github.com/dotnet/roslyn/commits)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.CSharp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../Microsoft.PowerShell.Commands.Utility.csproj                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index f6059f756e9..d52d29ebf1c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0-1.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0-4.final" />
     <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.2.22152.2" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.2.22152.2" />
     <PackageReference Include="NJsonSchema" Version="10.6.9" />

From 5d7b8b95ece101d986ef28c14c006c3dbe0ebe23 Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Thu, 28 Apr 2022 17:30:08 -0700
Subject: [PATCH 324/645] Fixed package names verification to support
 multi-digit versions (#17220)

Fixed package names verification to support multi-digit versions.

Currently "Validate RPM package names" release step is failing because of version "7.0.10" in these examples:
WARNING: powershell-7.0.10-1.centos.8.x86_64.rpm is not a valid package name
WARNING: powershell-7.0.10-1.rhel.7.x86_64.rpm is not a valid package name
WARNING: powershell-lts-7.0.10-1.centos.8.x86_64.rpm is not a valid package name
WARNING: powershell-lts-7.0.10-1.rhel.7.x86_64.rpm is not a valid package name
---
 .../templates/release-ValidatePackageNames.yml         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
index d50c94bcba1..fbaf6c3a0f8 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
@@ -30,7 +30,7 @@ steps:
 - pwsh: |
     $message = @()
     Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.rpm | ForEach-Object {
-        if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d\.\d\.\d(_[a-z]*\.\d+)?-1.(rh|cm1).x86_64\.rpm')
+        if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d+\.\d+\.\d+(_[a-z]*\.\d+)?-1.(rh|cm1).x86_64\.rpm')
         {
             $messageInstance = "$($_.Name) is not a valid package name"
             $message += $messageInstance
@@ -43,7 +43,7 @@ steps:
 - pwsh: |
     $message = @()
     Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.tar.gz | ForEach-Object {
-        if($_.Name -notmatch 'powershell-(lts-)?\d\.\d\.\d\-([a-z]*.\d+\-)?(linux|osx|linux-alpine)+\-(x64\-fxdependent|x64|arm32|arm64)\.(tar\.gz)')
+        if($_.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?(linux|osx|linux-alpine)+\-(x64\-fxdependent|x64|arm32|arm64)\.(tar\.gz)')
         {
             $messageInstance = "$($_.Name) is not a valid package name"
             $message += $messageInstance
@@ -56,7 +56,7 @@ steps:
 - pwsh: |
     $message = @()
     Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.pkg | ForEach-Object {
-        if($_.Name -notmatch 'powershell-(lts-)?\d\.\d\.\d\-([a-z]*.\d+\-)?osx(\.10\.12)?\-(x64|arm64)\.pkg')
+        if($_.Name -notmatch 'powershell-(lts-)?\d+\.\d+\.\d+\-([a-z]*.\d+\-)?osx(\.10\.12)?\-(x64|arm64)\.pkg')
         {
             $messageInstance = "$($_.Name) is not a valid package name"
             $message += $messageInstance
@@ -69,7 +69,7 @@ steps:
 - pwsh: |
     $message = @()
     Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -include *.zip, *.msi | ForEach-Object {
-        if($_.Name -notmatch 'PowerShell-\d\.\d\.\d\-([a-z]*.\d+\-)?win\-(fxdependent|x64|arm32|arm64|x86|fxdependentWinDesktop)\.(msi|zip){1}')
+        if($_.Name -notmatch 'PowerShell-\d+\.\d+\.\d+\-([a-z]*.\d+\-)?win\-(fxdependent|x64|arm32|arm64|x86|fxdependentWinDesktop)\.(msi|zip){1}')
         {
             $messageInstance = "$($_.Name) is not a valid package name"
             $message += $messageInstance
@@ -83,7 +83,7 @@ steps:
 - pwsh: |
     $message = @()
     Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.deb | ForEach-Object {
-        if($_.Name -notmatch 'powershell(-preview|-lts)?_\d\.\d\.\d([\-~][a-z]*.\d+)?-\d\.deb_amd64\.deb')
+        if($_.Name -notmatch 'powershell(-preview|-lts)?_\d+\.\d+\.\d+([\-~][a-z]*.\d+)?-\d\.deb_amd64\.deb')
         {
             $messageInstance = "$($_.Name) is not a valid package name"
             $message += $messageInstance

From edc489a79080e7f85543be9475b0629089e22f81 Mon Sep 17 00:00:00 2001
From: Staffan Gustafsson <staffangu@outlook.com>
Date: Fri, 29 Apr 2022 19:07:57 +0200
Subject: [PATCH 325/645] Fixing dotnet SDK version parsing in `build.psm1`
 (#17198)

---
 build.psm1 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index 2834b22a22d..3648e0f0d01 100644
--- a/build.psm1
+++ b/build.psm1
@@ -2196,7 +2196,19 @@ function Start-PSBootstrap {
 
 function Get-LatestInstalledSDK {
     Start-NativeExecution -sb {
-        dotnet --list-sdks | Select-String -Pattern '\d*.\d*.\d*(-\w*\.\d*.\d*.\d*)?' | ForEach-Object { [System.Management.Automation.SemanticVersion]::new($_.matches.value) } | Sort-Object -Descending | Select-Object -First 1
+        dotnet --list-sdks | ForEach-Object {
+            # this splits strings like
+            # '6.0.202 [C:\Program Files\dotnet\sdk]'
+            # '7.0.100-preview.2.22153.17 [C:\Users\johndoe\AppData\Local\Microsoft\dotnet\sdk]'
+            # into version and path parts.
+            $version, $null = $_ -split '\s',2
+            try {
+                [System.Management.Automation.SemanticVersion]::new($version)
+            }
+            catch {
+                Write-Warning -Message "Unable to parse dotnet version semantically: $version"
+            }
+        } | Sort-Object -Descending | Select-Object -First 1
     } -IgnoreExitcode 2> $null
 }
 

From 956c2efc3e3cf30f36ae95764b976dab49703e18 Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Fri, 29 Apr 2022 11:40:59 -0700
Subject: [PATCH 326/645] Mark
 `Microsoft.Management.Infrastructure.Runtime.Win` as a developer dependency
 to hide in notice file (#17230)

Co-authored-by: travis plunk <github@ez13.net>
---
 tools/cgmanifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 8a3f50c7713..e3042adc9e9 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -128,7 +128,7 @@
           "Version": "2.0.0"
         }
       },
-      "DevelopmentDependency": false
+      "DevelopmentDependency": true
     },
     {
       "Component": {

From c3b7e10fd001831fe1fbce40fc1be9b52829318b Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Sun, 1 May 2022 01:04:58 -0700
Subject: [PATCH 327/645] Merged PR 20126: Fix for partial PowerShell module
 search paths, that can be resolved to CWD locations (#17231)

The problem is .NET will return empty strings for special folders that don't exist in some accounts (like System account), and the module path code appends path locations without first checking if the root path is non-empty.  This results in partial paths in the PSModulePath list, which are then interpreted by .NET file APIs as rooted in the current working directory.  And this in turn can allow low privilege users to drop modules in locations that higher privilege accounts will load from, thus gaining escalated privilege code execution.

These changes detect this non-rooted condition and prevents partial paths from being included in search lists.

Cherry picked from !17201

Co-authored-by: Travis Plunk <tplunk@microsoft.com>
---
 .../engine/Modules/ModuleIntrinsics.cs        | 38 +++++++++++++++----
 .../resources/PathUtilsStrings.resx           |  3 ++
 .../utils/PathUtils.cs                        | 10 +++++
 3 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
index d845a1d2fb0..c489610a9b1 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
@@ -970,7 +970,8 @@ internal static string GetPersonalModulePath()
 #if UNIX
             return Platform.SelectProductNameForDirectory(Platform.XDG_Type.USER_MODULES);
 #else
-            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), Utils.ModuleDirectory);
+            string myDocumentsPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+            return string.IsNullOrEmpty(myDocumentsPath) ? null : Path.Combine(myDocumentsPath, Utils.ModuleDirectory);
 #endif
         }
 
@@ -1189,7 +1190,18 @@ public static string GetModulePath(string currentProcessModulePath, string hklmM
                     currentProcessModulePath = hkcuUserModulePath; // = EVT.User
                 }
 
-                currentProcessModulePath += Path.PathSeparator;
+                if (string.IsNullOrEmpty(currentProcessModulePath))
+                {
+                    if (currentProcessModulePath is null)
+                    {
+                        currentProcessModulePath = string.Empty;
+                    }
+                }
+                else
+                {
+                    currentProcessModulePath += Path.PathSeparator;
+                }
+
                 if (string.IsNullOrEmpty(hklmMachineModulePath)) // EVT.Machine does Not exist
                 {
                     currentProcessModulePath += CombineSystemModulePaths(); // += (SharedModulePath + $PSHome\Modules)
@@ -1210,11 +1222,23 @@ public static string GetModulePath(string currentProcessModulePath, string hklmM
                 // personalModulePath
                 // sharedModulePath
                 // systemModulePath
-                currentProcessModulePath = AddToPath(currentProcessModulePath, personalModulePathToUse, 0);
-                int insertIndex = PathContainsSubstring(currentProcessModulePath, personalModulePathToUse) + personalModulePathToUse.Length + 1;
-                currentProcessModulePath = AddToPath(currentProcessModulePath, sharedModulePath, insertIndex);
-                insertIndex = PathContainsSubstring(currentProcessModulePath, sharedModulePath) + sharedModulePath.Length + 1;
-                currentProcessModulePath = AddToPath(currentProcessModulePath, systemModulePathToUse, insertIndex);
+                int insertIndex = 0;
+                if (!string.IsNullOrEmpty(personalModulePathToUse))
+                {
+                    currentProcessModulePath = AddToPath(currentProcessModulePath, personalModulePathToUse, insertIndex);
+                    insertIndex = PathContainsSubstring(currentProcessModulePath, personalModulePathToUse) + personalModulePathToUse.Length + 1;
+                }
+
+                if (!string.IsNullOrEmpty(sharedModulePath))
+                {
+                    currentProcessModulePath = AddToPath(currentProcessModulePath, sharedModulePath, insertIndex);
+                    insertIndex = PathContainsSubstring(currentProcessModulePath, sharedModulePath) + sharedModulePath.Length + 1;
+                }
+
+                if (!string.IsNullOrEmpty(systemModulePathToUse))
+                {
+                    currentProcessModulePath = AddToPath(currentProcessModulePath, systemModulePathToUse, insertIndex);
+                }
             }
 
             return currentProcessModulePath;
diff --git a/src/System.Management.Automation/resources/PathUtilsStrings.resx b/src/System.Management.Automation/resources/PathUtilsStrings.resx
index 217f2522ac8..b7675e53268 100644
--- a/src/System.Management.Automation/resources/PathUtilsStrings.resx
+++ b/src/System.Management.Automation/resources/PathUtilsStrings.resx
@@ -138,6 +138,9 @@
   <data name="ExportPSSession_ErrorDirectoryExists" xml:space="preserve">
     <value>The directory '{0}' already exists.  Use the -Force parameter if you want to overwrite the directory and files within the directory.</value>
   </data>
+  <data name="ExportPSSession_ErrorModuleNameOrPath" xml:space="preserve">
+    <value>The -OutputModule parameter does not resolve to a path, and a user module path cannot be found for the provided name.</value>
+  </data>
   <data name="ExportPSSession_CannotCreateOutputDirectory" xml:space="preserve">
     <value>Cannot create the module {0} due to the following: {1}. Use a different argument for the -OutputModule parameter and retry.</value>
     <comment>{StrContains="OutputModule"}
diff --git a/src/System.Management.Automation/utils/PathUtils.cs b/src/System.Management.Automation/utils/PathUtils.cs
index 0034681e126..848fcbd6bfc 100644
--- a/src/System.Management.Automation/utils/PathUtils.cs
+++ b/src/System.Management.Automation/utils/PathUtils.cs
@@ -367,6 +367,16 @@ internal static DirectoryInfo CreateModuleDirectory(PSCmdlet cmdlet, string modu
                 if (string.IsNullOrEmpty(rootedPath))
                 {
                     string personalModuleRoot = ModuleIntrinsics.GetPersonalModulePath();
+                    if (string.IsNullOrEmpty(personalModuleRoot))
+                    {
+                        cmdlet.ThrowTerminatingError(
+                            new ErrorRecord(
+                                new ArgumentException(PathUtilsStrings.ExportPSSession_ErrorModuleNameOrPath),
+                                "ExportPSSession_ErrorModuleNameOrPath",
+                                ErrorCategory.InvalidArgument,
+                                cmdlet));
+                    }
+
                     rootedPath = Path.Combine(personalModuleRoot, moduleNameOrPath);
                 }
 

From 36fcec3bddc2e6bab20afced9fe2451bda6c503e Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 2 May 2022 10:07:12 -0700
Subject: [PATCH 328/645] Fix `ForEach` method to set property on a scalar
 object (#17213)

---
 .../engine/runtime/Binding/Binders.cs             | 15 ++++++++++++++-
 .../Scripting/Scripting.Followup.Tests.ps1        |  6 ++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
index 8025b116f19..c714520b81e 100644
--- a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
+++ b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
@@ -7454,7 +7454,20 @@ internal static object InvokeAdaptedMember(object obj, string methodName, object
             if (string.Equals(methodName, "Foreach", StringComparison.OrdinalIgnoreCase))
             {
                 var enumerator = (new object[] { obj }).GetEnumerator();
-                return EnumerableOps.ForEach(enumerator, args[0], Array.Empty<object>());
+                object[] argsToPass;
+
+                if (args.Length > 1)
+                {
+                    int length = args.Length - 1;
+                    argsToPass = new object[length];
+                    Array.Copy(args, sourceIndex: 1, argsToPass, destinationIndex: 0, length: length);
+                }
+                else
+                {
+                    argsToPass = Array.Empty<object>();
+                }
+
+                return EnumerableOps.ForEach(enumerator, args[0], argsToPass);
             }
 
             throw InterpreterError.NewInterpreterException(methodName, typeof(RuntimeException), null,
diff --git a/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1 b/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1
index 1cff5295027..9a691fa20d8 100644
--- a/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1
+++ b/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1
@@ -35,4 +35,10 @@ Describe "Scripting.Followup.Tests" -Tags "CI" {
         ([bool]$var = 42).GetType().FullName | Should -Be "System.Boolean"
         . { ([bool]$var = 42).GetType().FullName } | Should -Be "System.Boolean"
     }
+
+    It "Setting property using 'ForEach' method should work on a scalar object" {
+        $obj = [pscustomobject] @{ p = 1 }
+        $obj.ForEach('p', 32) | Should -BeNullOrEmpty
+        $obj.p | Should -Be 32
+    }
 }

From 156757c93d332afbcbf0ad9c00750353f34fcc86 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 2 May 2022 15:59:23 -0700
Subject: [PATCH 329/645] Add container to Linux CI (#17233)

---
 .vsts-ci/linux.yml                            | 101 +++++++++++++-----
 .vsts-ci/misc-analysis.yml                    |   2 -
 .vsts-ci/templates/nix-test.yml               |  62 +----------
 .../templates/test/nix-container-test.yml     |  28 +++++
 .vsts-ci/templates/test/nix-test-steps.yml    |  59 ++++++++++
 .../Test-Connection.Tests.ps1                 |  11 +-
 .../engine/Remoting/PSSession.Tests.ps1       |  10 +-
 .../Remoting/RemoteSession.Basic.Tests.ps1    |  33 ++----
 .../Modules/HelpersCommon/HelpersCommon.psd1  |   1 +
 .../Modules/HelpersCommon/HelpersCommon.psm1  |  16 +++
 tools/ci.psm1                                 |  28 +++--
 11 files changed, 213 insertions(+), 138 deletions(-)
 create mode 100644 .vsts-ci/templates/test/nix-container-test.yml
 create mode 100644 .vsts-ci/templates/test/nix-test-steps.yml

diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
index 9faa155f74d..f5623ccb2a1 100644
--- a/.vsts-ci/linux.yml
+++ b/.vsts-ci/linux.yml
@@ -47,11 +47,15 @@ variables:
   __SuppressAnsiEscapeSequences: 1
 
 resources:
-- repo: self
-  clean: true
+  repositories:
+    - repository: Docker
+      type: github
+      endpoint: PowerShell
+      name: PowerShell/PowerShell-Docker
+      ref: master
 
 stages:
-- stage: BuildLinux
+- stage: BuildLinuxStage
   displayName: Build for Linux
   jobs:
   - template: templates/ci-build.yml
@@ -60,33 +64,34 @@ stages:
       jobName: linux_build
       displayName: linux Build
 
-- stage: TestLinux
-  displayName: Test for Linux
+- stage: TestUbuntu
+  displayName: Test for Ubuntu
+  dependsOn: [BuildLinuxStage]
   jobs:
   - template: templates/nix-test.yml
     parameters:
-      name: Linux
+      name: Ubuntu
       pool: ubuntu-20.04
       purpose: UnelevatedPesterTests
       tagSet: CI
 
   - template: templates/nix-test.yml
     parameters:
-      name: Linux
+      name: Ubuntu
       pool: ubuntu-20.04
       purpose: ElevatedPesterTests
       tagSet: CI
 
   - template: templates/nix-test.yml
     parameters:
-      name: Linux
+      name: Ubuntu
       pool: ubuntu-20.04
       purpose: UnelevatedPesterTests
       tagSet: Others
 
   - template: templates/nix-test.yml
     parameters:
-      name: Linux
+      name: Ubuntu
       pool: ubuntu-20.04
       purpose: ElevatedPesterTests
       tagSet: Others
@@ -95,24 +100,72 @@ stages:
     parameters:
       pool: ubuntu-20.04
 
+- stage: TestContainer
+  displayName: Test in a container
+  dependsOn: [BuildLinuxStage]
+  jobs:
+  - job: getContainerJob
+    displayName: Choose a container
+    pool:
+      vmImage: ubuntu-20.04
+    steps:
+    - checkout: self
+      clean: true
+
+    - checkout: Docker
+      clean: true
+
+    - pwsh: |
+        $matrix = ./PowerShell-Docker/build.ps1 -GenerateMatrixJson -FullJson -Channel preview | ConvertFrom-Json
+        # Filter out containers that won't run on AzDevOps Linux host as an agent
+        # Windows, nano server, alpine, and any ARM image
+        $linuxImages = $matrix.preview |
+          Where-Object {$_.osversion -notmatch 'windows|nano|alpine|arm'} |
+          Select-Object JobName, Taglist |
+          Sort-Object -property JobName
+        # Force mariner for now, later we will add automated rotation by the month.
+        $marinerImage = $linuxImages | where-object {$_.JobName -like 'mariner*'}
+        Import-Module ./PowerShell/tools/ci.psm1
+        $tag = $marinerImage.Taglist -split ';' | select-object -first 1
+        $containerName = "mcr.microsoft.com/powershell/test-deps:$tag"
+        Set-BuildVariable -Name containerName -Value $containerName -IsOutput
+        Set-BuildVariable -Name containerBuildName -Value $marinerImage.JobName -IsOutput
+      name: getContainerTask
+      displayName: Get Container
+      continueOnError: true
+
+  - template: templates/test/nix-container-test.yml
+    parameters:
+      name: container
+      pool: ubuntu-20.04
+      purpose: UnelevatedPesterTests
+      tagSet: CI
+
+  - template: templates/test/nix-container-test.yml
+    parameters:
+      name: container
+      pool: ubuntu-20.04
+      purpose: ElevatedPesterTests
+      tagSet: CI
+
+  - template: templates/test/nix-container-test.yml
+    parameters:
+      name: container
+      pool: ubuntu-20.04
+      purpose: UnelevatedPesterTests
+      tagSet: Others
+
+  - template: templates/test/nix-container-test.yml
+    parameters:
+      name: container
+      pool: ubuntu-20.04
+      purpose: ElevatedPesterTests
+      tagSet: Others
+
 - stage: PackageLinux
   displayName: Package Linux
-  dependsOn: ["BuildLinux"]
+  dependsOn: ["BuildLinuxStage"]
   jobs:
   - template: linux/templates/packaging.yml
     parameters:
       pool: ubuntu-20.04
-
-- stage: CodeCovTestPackage
-  displayName: CodeCoverage and Test Packages
-  dependsOn: [] # by specifying an empty array, this stage doesn't depend on the stage before it
-  jobs:
-  - job: CodeCovTestPackage
-    displayName: CodeCoverage and Test Packages
-    pool:
-      vmImage: ubuntu-20.04
-    steps:
-    - pwsh: |
-        Import-Module .\tools\ci.psm1
-        New-CodeCoverageAndTestPackage
-      displayName: CodeCoverage and Test Package
diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index e1f2d8ebfc6..b7d451ea199 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -5,14 +5,12 @@ trigger:
   branches:
     include:
     - master
-    - release*
     - feature*
 
 pr:
   branches:
     include:
     - master
-    - release*
     - feature*
 
 resources:
diff --git a/.vsts-ci/templates/nix-test.yml b/.vsts-ci/templates/nix-test.yml
index f2f04d9dd5c..ab3985dacd6 100644
--- a/.vsts-ci/templates/nix-test.yml
+++ b/.vsts-ci/templates/nix-test.yml
@@ -1,71 +1,19 @@
 parameters:
   pool: 'macOS-latest'
-  parentJobs: []
   purpose: ''
   tagSet: 'CI'
   name: 'mac'
 
 jobs:
 - job: ${{ parameters.name }}_test_${{ parameters.purpose }}_${{ parameters.tagSet }}
-  dependsOn:
-    ${{ parameters.parentJobs }}
+
   pool:
     vmImage: ${{ parameters.pool }}
 
   displayName: ${{ parameters.name }} Test - ${{ parameters.purpose }} - ${{ parameters.tagSet }}
 
   steps:
-  - pwsh: |
-      Get-ChildItem -Path env:
-    displayName: Capture Environment
-    condition: succeededOrFailed()
-
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download build artifacts'
-    inputs:
-      downloadType: specific
-      itemPattern: |
-        build/**/*
-      downloadPath: '$(System.ArtifactsDirectory)'
-
-  - pwsh: |
-      Get-ChildItem "$(System.ArtifactsDirectory)\*" -Recurse
-    displayName: 'Capture Artifacts Directory'
-    continueOnError: true
-
-  - pwsh: |
-      Import-Module .\tools\ci.psm1
-      Invoke-CIInstall -SkipUser
-    displayName: Bootstrap
-
-  - task: ExtractFiles@1
-    displayName: 'Extract Build ZIP'
-    inputs:
-      archiveFilePatterns: '$(System.ArtifactsDirectory)/build/build.zip'
-      destinationFolder: '$(System.ArtifactsDirectory)/bins'
-
-  - bash: |
-      find "$(System.ArtifactsDirectory)/bins" -type d -exec chmod +rwx {} \;
-      find "$(System.ArtifactsDirectory)/bins" -type f -exec chmod +rw {} \;
-    displayName: 'Fix permissions'
-    continueOnError: true
-
-  - pwsh: |
-      Get-ChildItem "$(System.ArtifactsDirectory)\bins\*" -Recurse -ErrorAction SilentlyContinue
-    displayName: 'Capture Extracted Build ZIP'
-    continueOnError: true
-
-  - pwsh: |
-      Import-Module .\tools\ci.psm1
-      Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
-      $options = (Get-PSOptions)
-      $rootPath = '$(System.ArtifactsDirectory)\bins'
-      $originalRootPath = Split-Path -path $options.Output
-      $path = Join-Path -path $rootPath -ChildPath (split-path -leaf -path $originalRootPath)
-      $pwshPath = Join-Path -path $path -ChildPath 'pwsh'
-      chmod a+x $pwshPath
-      $options.Output = $pwshPath
-      Set-PSOptions $options
-      Invoke-CITest -Purpose '${{ parameters.purpose }}' -TagSet '${{ parameters.tagSet }}'
-    displayName: Test
-    condition: succeeded()
+    - template: ./test/nix-test-steps.yml
+      parameters:
+        purpose: ${{ parameters.purpose }}
+        tagSet: ${{ parameters.tagSet }}
diff --git a/.vsts-ci/templates/test/nix-container-test.yml b/.vsts-ci/templates/test/nix-container-test.yml
new file mode 100644
index 00000000000..87827ac2508
--- /dev/null
+++ b/.vsts-ci/templates/test/nix-container-test.yml
@@ -0,0 +1,28 @@
+parameters:
+  pool: 'macOS-latest'
+  purpose: ''
+  tagSet: 'CI'
+  name: 'mac'
+
+jobs:
+- job: ${{ parameters.name }}_test_${{ parameters.purpose }}_${{ parameters.tagSet }}
+
+  dependsOn:
+    - getContainerJob
+
+  variables:
+    getContainerJob: $[ dependencies.getContainerJob.outputs['getContainerTask.containerName'] ]
+    __INCONTAINER: 1
+
+  container: $[ variables.getContainerJob ]
+
+  pool:
+    vmImage: ${{ parameters.pool }}
+
+  displayName: ${{ parameters.name }} Test - ${{ parameters.purpose }} - ${{ parameters.tagSet }}
+
+  steps:
+    - template: ./nix-test-steps.yml
+      parameters:
+        purpose: ${{ parameters.purpose }}
+        tagSet: ${{ parameters.tagSet }}
diff --git a/.vsts-ci/templates/test/nix-test-steps.yml b/.vsts-ci/templates/test/nix-test-steps.yml
new file mode 100644
index 00000000000..c0329888006
--- /dev/null
+++ b/.vsts-ci/templates/test/nix-test-steps.yml
@@ -0,0 +1,59 @@
+parameters:
+  purpose: ''
+  tagSet: 'CI'
+
+steps:
+  - pwsh: |
+      Get-ChildItem -Path env:
+    displayName: Capture Environment
+    condition: succeededOrFailed()
+
+  - task: DownloadBuildArtifacts@0
+    displayName: 'Download build artifacts'
+    inputs:
+      downloadType: specific
+      itemPattern: |
+        build/**/*
+      downloadPath: '$(System.ArtifactsDirectory)'
+
+  - pwsh: |
+      Get-ChildItem "$(System.ArtifactsDirectory)\*" -Recurse
+    displayName: 'Capture Artifacts Directory'
+    continueOnError: true
+
+  - pwsh: |
+      Import-Module .\tools\ci.psm1
+      Invoke-CIInstall -SkipUser
+    displayName: Bootstrap
+
+  - task: ExtractFiles@1
+    displayName: 'Extract Build ZIP'
+    inputs:
+      archiveFilePatterns: '$(System.ArtifactsDirectory)/build/build.zip'
+      destinationFolder: '$(System.ArtifactsDirectory)/bins'
+
+  - bash: |
+      find "$(System.ArtifactsDirectory)/bins" -type d -exec chmod +rwx {} \;
+      find "$(System.ArtifactsDirectory)/bins" -type f -exec chmod +rw {} \;
+    displayName: 'Fix permissions'
+    continueOnError: true
+
+  - pwsh: |
+      Get-ChildItem "$(System.ArtifactsDirectory)\bins\*" -Recurse -ErrorAction SilentlyContinue
+    displayName: 'Capture Extracted Build ZIP'
+    continueOnError: true
+
+  - pwsh: |
+      Import-Module .\tools\ci.psm1
+      Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
+      $options = (Get-PSOptions)
+      $rootPath = '$(System.ArtifactsDirectory)\bins'
+      $originalRootPath = Split-Path -path $options.Output
+      $path = Join-Path -path $rootPath -ChildPath (split-path -leaf -path $originalRootPath)
+      $pwshPath = Join-Path -path $path -ChildPath 'pwsh'
+      chmod a+x $pwshPath
+      $options.Output = $pwshPath
+      Set-PSOptions $options
+      Invoke-CITest -Purpose '${{ parameters.purpose }}' -TagSet '${{ parameters.tagSet }}'
+    displayName: Test
+    condition: succeeded()
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
index dbe91e86574..b8c9d14a1be 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
@@ -97,15 +97,8 @@ Describe "Test-Connection" -tags "CI", "RequireSudoOnUnix" {
             { Test-Connection "fakeHost" -Count 1 -ErrorAction Stop } |
                 Should -Throw -ErrorId "TestConnectionException,Microsoft.PowerShell.Commands.TestConnectionCommand"
             # Error code = 11001 - Host not found.
-            $platform = Get-PlatformInfo
-            if ($platform.Platform -match "raspbian" -or ( $platform.Platform -match 'ubuntu' -and $platform.Version -eq '20.04')) {
-                $code = 11
-            } elseif (!$IsWindows) {
-                $code = -131073
-            } else {
-                $code = 11001
-            }
-            $error[0].Exception.InnerException.ErrorCode | Should -Be $code
+            # Error code = -131073 - Invalid address
+            $error[0].Exception.InnerException.ErrorCode | Should -BeIn 11, -131073, 11001
         }
 
         It "Force IPv4 with implicit PingOptions" {
diff --git a/test/powershell/engine/Remoting/PSSession.Tests.ps1 b/test/powershell/engine/Remoting/PSSession.Tests.ps1
index 25c7ab9c582..cbf7313eed0 100644
--- a/test/powershell/engine/Remoting/PSSession.Tests.ps1
+++ b/test/powershell/engine/Remoting/PSSession.Tests.ps1
@@ -79,14 +79,8 @@ Describe "SkipCACheck and SkipCNCheck PSSession options are required for New-PSS
     It "<Name>" -TestCases $testCases {
         param ($scriptBlock, $expectedErrorCode)
 
-        $platformInfo = Get-PlatformInfo
-        if (
-            ($platformInfo.Platform -match "alpine|raspbian") -or
-            ($platformInfo.Platform -eq "debian" -and ($platformInfo.Version -eq '10' -or $platformInfo.Version -eq '')) -or # debian 11 has empty Version ID
-            ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -eq '8') -or
-            ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -eq '20.04')
-        ) {
-            Set-ItResult -Skipped -Because "MI library not available for Alpine, Raspberry Pi, Debian 10 and 11, and CentOS 8"
+        if ( -not (Get-WsManSupport)) {
+            Set-ItResult -Skipped -Because "MI library not available for this platform"
             return
         }
 
diff --git a/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1 b/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1
index d56ed1999ac..84e25a276ec 100644
--- a/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1
+++ b/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1
@@ -10,15 +10,8 @@ function GetRandomString()
 
 Describe "New-PSSession basic test" -Tag @("CI") {
     It "New-PSSession should not crash powershell" {
-        $platformInfo = Get-PlatformInfo
-        if (
-            ($platformInfo.Platform -match "alpine|raspbian") -or
-            ($platformInfo.Platform -eq "debian" -and ($platformInfo.Version -eq '10' -or $platformInfo.Version -eq '')) -or # debian 11 has empty Version ID
-            ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -eq '8') -or
-            ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -eq '20.04') -or
-            ($IsMacOS)
-        ) {
-            Set-ItResult -Skipped -Because "MI library not available for Alpine, Raspberry Pi, Debian 10 and 11, CentOS 8, and not compatible with macOS"
+        if ( -not (Get-WsManSupport)) {
+            Set-ItResult -Skipped -Because "MI library not available for this platform"
             return
         }
 
@@ -29,15 +22,8 @@ Describe "New-PSSession basic test" -Tag @("CI") {
 
 Describe "Basic Auth over HTTP not allowed on Unix" -Tag @("CI") {
     It "New-PSSession should throw when specifying Basic Auth over HTTP on Unix" -Skip:($IsWindows) {
-        $platformInfo = Get-PlatformInfo
-        if (
-            ($platformInfo.Platform -match "alpine|raspbian") -or
-            ($platformInfo.Platform -eq "debian" -and ($platformInfo.Version -eq '10' -or $platformInfo.Version -eq '')) -or # debian 11 has empty Version ID
-            ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -eq '8') -or
-            ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -eq '20.04') -or
-            ($IsMacOS)
-        ) {
-            Set-ItResult -Skipped -Because "MI library not available for Alpine, Raspberry Pi, Debian 10 and 11, CentOS 8, and not compatible with macOS"
+        if ( -not (Get-WsManSupport)) {
+            Set-ItResult -Skipped -Because "MI library not available for this platform"
             return
         }
 
@@ -53,15 +39,8 @@ Describe "Basic Auth over HTTP not allowed on Unix" -Tag @("CI") {
 
     # Skip this test for macOS because the latest OS release is incompatible with our shipped libmi for WinRM/OMI.
     It "New-PSSession should NOT throw a ConnectFailed exception when specifying Basic Auth over HTTPS on Unix" -Skip:($IsWindows) {
-        $platformInfo = Get-PlatformInfo
-        if (
-            ($platformInfo.Platform -match "alpine|raspbian") -or
-            ($platformInfo.Platform -eq "debian" -and ($platformInfo.Version -eq '10' -or $platformInfo.Version -eq '')) -or # debian 11 has empty Version ID
-            ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -eq '8') -or
-            ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -eq '20.04') -or
-            ($IsMacOS)
-        ) {
-            Set-ItResult -Skipped -Because "MI library not available for Alpine, Raspberry Pi, Debian 10 and 11, CentOS 8, and not compatible with macOS"
+        if ( -not (Get-WsManSupport)) {
+            Set-ItResult -Skipped -Because "MI library not available for this platform"
             return
         }
 
diff --git a/test/tools/Modules/HelpersCommon/HelpersCommon.psd1 b/test/tools/Modules/HelpersCommon/HelpersCommon.psd1
index 3d501983806..43d2ada88cc 100644
--- a/test/tools/Modules/HelpersCommon/HelpersCommon.psd1
+++ b/test/tools/Modules/HelpersCommon/HelpersCommon.psd1
@@ -35,6 +35,7 @@ FunctionsToExport = @(
         'Wait-FileToBePresent'
         'Wait-UntilTrue'
         'Get-PlatformInfo'
+        'Get-WSManSupport'
     )
 
 CmdletsToExport= @()
diff --git a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1 b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
index c971e786765..dbd77186d2f 100644
--- a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
+++ b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
@@ -385,3 +385,19 @@ function Get-PlatformInfo {
         return "unknown"
     }
 }
+
+# return true if WsMan is supported on the current platform
+function Get-WsManSupport {
+    $platformInfo = Get-PlatformInfo
+    if (
+        ($platformInfo.Platform -match "alpine|raspbian") -or
+        ($platformInfo.Platform -eq "debian" -and $platformInfo.Version -ne '9') -or 
+        ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -eq '8') -or
+        ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -eq '20.04') -or
+        ($platformInfo.Platform -eq 'mariner') -or
+        ($IsMacOS)
+    ) {
+        return $false
+    }
+    return $true
+}
diff --git a/tools/ci.psm1 b/tools/ci.psm1
index f4ed3c78945..c06137a438d 100644
--- a/tools/ci.psm1
+++ b/tools/ci.psm1
@@ -16,7 +16,8 @@ if(Test-Path $dotNetPath)
 }
 
 # import build into the global scope so it can be used by packaging
-Import-Module (Join-Path $repoRoot 'build.psm1') -Verbose -Scope Global
+# argumentList $true says ignore tha we may not be able to build
+Import-Module (Join-Path $repoRoot 'build.psm1') -Verbose -Scope Global -ArgumentList $true
 Import-Module (Join-Path $repoRoot 'tools\packaging') -Verbose -Scope Global
 
 # import the windows specific functcion only in Windows PowerShell or on Windows
@@ -48,21 +49,26 @@ Function Set-BuildVariable
 
         [Parameter(Mandatory=$true)]
         [string]
-        $Value
+        $Value,
+
+        [switch]
+        $IsOutput
     )
 
-    if($env:TF_BUILD)
-    {
+    $IsOutputString = if ($IsOutput) { 'true' } else { 'false' }
+    $command = "vso[task.setvariable variable=$Name;isOutput=$IsOutputString]$Value"
+
+    # always log command to make local debugging easier
+    Write-Verbose -Message "sending command: $command" -Verbose
+
+    if ($env:TF_BUILD) {
         # In VSTS
-        Write-Host "##vso[task.setvariable variable=$Name;]$Value"
+        Write-Host "##$command"
         # The variable will not show up until the next task.
-        # Setting in the current session for the same behavior as the CI
-        Set-Item env:/$name -Value $Value
-    }
-    else
-    {
-        Set-Item env:/$name -Value $Value
     }
+
+    # Setting in the current session for the same behavior as the CI and to make it show up in the same task
+    Set-Item env:/$name -Value $Value
 }
 
 # Emulates running all of CI but locally

From b9c24db73032e159625b9530b09e95213cef9053 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 3 May 2022 11:57:13 -0700
Subject: [PATCH 330/645] Update to the latest notice file (#17238)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 ThirdPartyNotices.txt | 65 -------------------------------------------
 1 file changed, 65 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index b19d3b42069..cff5f36bccd 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -4148,71 +4148,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
----------------------------------------------------------
-
----------------------------------------------------------
-
-Microsoft.Management.Infrastructure.Runtime.Win 2.0.0
-
-
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) Microsoft Corporation.
-9Copyright (c) Microsoft Corporation.
-
-MICROSOFT SOFTWARE LICENSE TERMS
-Microsoft.Management.Infrastructure.dll 
-Microsoft.Management.Infrastructure.Native.dll
-Microsoft.Management.Infrastructure.Unmanaged.dll 
-Mi.dll 
-Miutils.dll
-________________________________________
-IF YOU LIVE IN (OR ARE A BUSINESS WITH A PRINCIPAL PLACE OF BUSINESS IN) THE UNITED STATES, PLEASE READ THE “BINDING ARBITRATION AND CLASS ACTION WAIVER” SECTION BELOW. IT AFFECTS HOW DISPUTES ARE RESOLVED.
-________________________________________
-
-These license terms are an agreement between you and Microsoft Corporation (or one of its affiliates). They apply to the software named above and any Microsoft services or software updates (except to the extent such services or updates are accompanied by new or additional terms, in which case those different terms apply prospectively and do not alter your or Microsoft’s rights relating to pre-updated software or services). IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE RIGHTS BELOW. BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS.
-1.	INSTALLATION AND USE RIGHTS.
-a)	General. You may install and use any number of copies of the software solely for use with Microsoft PowerShell.
-b)	Third Party Software. The software may include third party applications that Microsoft, not the third party, licenses to you under this agreement. Any included notices for third party applications are for your information only.
-2.	DATA COLLECTION. The software may collect information about you and your use of the software and send that to Microsoft. Microsoft may use this information to provide services and improve Microsoft’s products and services. Your opt-out rights, if any, are described in the product documentation. Some features in the software may enable collection of data from users of your applications that access or use the software. If you use these features to enable data collection in your applications, you must comply with applicable law, including getting any required user consent, and maintain a prominent privacy policy that accurately informs users about how you use, collect, and share their data. You can learn more about Microsoft’s data collection and use in the product documentation and the Microsoft Privacy Statement at aka.ms/privacy. You agree to comply with all applicable provisions of the Microsoft Privacy Statement.   
-a.	Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection Regulation Terms of the Online Services Terms to all customers effective May 25, 2018, at http://go.microsoft.com/?linkid=9840733.
-3.	SCOPE OF LICENSE. The software is licensed, not sold. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you will not (and have no right to):
-a)	work around any technical limitations in the software that only allow you to use it in certain ways;
-b)	reverse engineer, decompile or disassemble the software;
-c)	remove, minimize, block, or modify any notices of Microsoft or its suppliers in the software;
-d)	use the software in any way that is against the law or to create or propagate malware; or
-e)	share, publish, distribute, or lend the software, provide the software as a stand-alone hosted solution for others to use, or transfer the software or this agreement to any third party.
-4.	EXPORT RESTRICTIONS. You must comply with all domestic and international export laws and regulations that apply to the software, which include restrictions on destinations, end users, and end use. For further information on export restrictions, visit http://aka.ms/exporting.
-5.	SUPPORT SERVICES. Microsoft is not obligated under this agreement to provide any support services for the software. Any support provided is “as is”, “with all faults”, and without warranty of any kind.
-6.	UPDATES. The software may periodically check for updates, and download and install them for you. You may obtain updates only from Microsoft or authorized sources. Microsoft may need to update your system to provide you with updates. You agree to receive these automatic updates without any additional notice. Updates may not include or support all existing software features, services, or peripheral devices.
-7.	BINDING ARBITRATION AND CLASS ACTION WAIVER. This Section applies if you live in (or, if a business, your principal place of business is in) the United States.  If you and Microsoft have a dispute, you and Microsoft agree to try for 60 days to resolve it informally. If you and Microsoft can’t, you and Microsoft agree to binding individual arbitration before the American Arbitration Association under the Federal Arbitration Act (“FAA”), and not to sue in court in front of a judge or jury. Instead, a neutral arbitrator will decide. Class action lawsuits, class-wide arbitrations, private attorney-general actions, and any other proceeding where someone acts in a representative capacity are not allowed; nor is combining individual proceedings without the consent of all parties. The complete Arbitration Agreement contains more terms and is at http://aka.ms/arb-agreement-1. You and Microsoft agree to these terms.
-8.	TERMINATION. Without prejudice to any other rights, Microsoft may terminate this agreement if you fail to comply with any of its terms or conditions. In such event, you must destroy all copies of the software and all of its component parts.
-9.	ENTIRE AGREEMENT. This agreement, and any other terms Microsoft may provide for supplements, updates, or third-party applications, is the entire agreement for the software.
-10.	APPLICABLE LAW AND PLACE TO RESOLVE DISPUTES. If you acquired the software in the United States or Canada, the laws of the state or province where you live (or, if a business, where your principal place of business is located) govern the interpretation of this agreement, claims for its breach, and all other claims (including consumer protection, unfair competition, and tort claims), regardless of conflict of laws principles, except that the FAA governs everything related to arbitration. If you acquired the software in any other country, its laws apply, except that the FAA governs everything related to arbitration. If U.S. federal jurisdiction exists, you and Microsoft consent to exclusive jurisdiction and venue in the federal court in King County, Washington for all disputes heard in court (excluding arbitration). If not, you and Microsoft consent to exclusive jurisdiction and venue in the Superior Court of King County, Washington for all disputes heard in court (excluding arbitration).
-11.	CONSUMER RIGHTS; REGIONAL VARIATIONS. This agreement describes certain legal rights. You may have other rights, including consumer rights, under the laws of your state, province, or country. Separate and apart from your relationship with Microsoft, you may also have rights with respect to the party from which you acquired the software. This agreement does not change those other rights if the laws of your state, province, or country do not permit it to do so. For example, if you acquired the software in one of the below regions, or mandatory country law applies, then the following provisions apply to you:
-a)	Australia. You have statutory guarantees under the Australian Consumer Law and nothing in this agreement is intended to affect those rights.
-b)	Canada. If you acquired this software in Canada, you may stop receiving updates by turning off the automatic update feature, disconnecting your device from the Internet (if and when you re-connect to the Internet, however, the software will resume checking for and installing updates), or uninstalling the software. The product documentation, if any, may also specify how to turn off updates for your specific device or software.
-c)	Germany and Austria.
-i.	Warranty. The properly licensed software will perform substantially as described in any Microsoft materials that accompany the software. However, Microsoft gives no contractual guarantee in relation to the licensed software.
-ii.	Limitation of Liability. In case of intentional conduct, gross negligence, claims based on the Product Liability Act, as well as, in case of death or personal or physical injury, Microsoft is liable according to the statutory law.
-Subject to the foregoing clause ii., Microsoft will only be liable for slight negligence if Microsoft is in breach of such material contractual obligations, the fulfillment of which facilitate the due performance of this agreement, the breach of which would endanger the purpose of this agreement and the compliance with which a party may constantly trust in (so-called "cardinal obligations"). In other cases of slight negligence, Microsoft will not be liable for slight negligence.
-12.	DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED “AS IS.” YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES, OR CONDITIONS. TO THE EXTENT PERMITTED UNDER APPLICABLE LAWS, MICROSOFT EXCLUDES ALL IMPLIED WARRANTIES, INCLUDING MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-13.	LIMITATION ON AND EXCLUSION OF DAMAGES. IF YOU HAVE ANY BASIS FOR RECOVERING DAMAGES DESPITE THE PRECEDING DISCLAIMER OF WARRANTY, YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.
-This limitation applies to (a) anything related to the software, services, content (including code) on third party Internet sites, or third party applications; and (b) claims for breach of contract, warranty, guarantee, or condition; strict liability, negligence, or other tort; or any other claim; in each case to the extent permitted by applicable law.
-It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your state, province, or country may not allow the exclusion or limitation of incidental, consequential, or other damages.
-
-Please note: As this software is distributed in Canada, some of the clauses in this agreement are provided below in French.
-Remarque: Ce logiciel étant distribué au Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en français.
-EXONÉRATION DE GARANTIE. Le logiciel visé par une licence est offert « tel quel ». Toute utilisation de ce logiciel est à votre seule risque et péril. Microsoft n’accorde aucune autre garantie expresse. Vous pouvez bénéficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualité marchande, d’adéquation à un usage particulier et d’absence de contrefaçon sont exclues.
-LIMITATION DES DOMMAGES-INTÉRÊTS ET EXCLUSION DE RESPONSABILITÉ POUR LES DOMMAGES. Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement à hauteur de 5,00 $ US. Vous ne pouvez prétendre à aucune indemnisation pour les autres dommages, y compris les dommages spéciaux, indirects ou accessoires et pertes de bénéfices.
-Cette limitation concerne:
-•	tout ce qui est relié au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers; et
-•	les réclamations au titre de violation de contrat ou de garantie, ou au titre de responsabilité stricte, de négligence ou d’une autre faute dans la limite autorisée par la loi en vigueur.
-Elle s’applique également, même si Microsoft connaissait ou devrait connaître l’éventualité d’un tel dommage. Si votre pays n’autorise pas l’exclusion ou la limitation de responsabilité pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l’exclusion ci-dessus ne s’appliquera pas à votre égard.
-EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous pourriez avoir d’autres droits prévus par les lois de votre pays. Le présent contrat ne modifie pas les droits que vous confèrent les lois de votre pays si celles-ci ne le permettent pas.
-
-
-
 ---------------------------------------------------------
 
 

From de04e8dd2b0bc01c19df62e1f95fe9a7df6950f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 May 2022 12:06:42 -0700
Subject: [PATCH 331/645] Bump Microsoft.CodeAnalysis.NetAnalyzers (#17245)

Bumps [Microsoft.CodeAnalysis.NetAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 7.0.0-preview1.22202.1 to 7.0.0-preview1.22252.2.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/main/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/commits)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.NetAnalyzers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index d0dc67350f9..9c16cc7f9e2 100644
--- a/Analyzers.props
+++ b/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="7.0.0-preview1.22202.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22252.2" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From 2550a3a23acbe1b9864bd4c4de7c3645df7f0438 Mon Sep 17 00:00:00 2001
From: Ryne Andal <ryne.andal+github@gmail.com>
Date: Wed, 4 May 2022 12:51:45 -0500
Subject: [PATCH 332/645] Add check for `ScriptBlock` wrapped in `PSObject` to
 `$using` used in `ForEach-Object -Parallel` (#17234)

---
 src/System.Management.Automation/engine/InternalCommands.cs | 2 +-
 .../Foreach-Object-Parallel.Tests.ps1                       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/InternalCommands.cs b/src/System.Management.Automation/engine/InternalCommands.cs
index c642e30e885..58a37444a89 100644
--- a/src/System.Management.Automation/engine/InternalCommands.cs
+++ b/src/System.Management.Automation/engine/InternalCommands.cs
@@ -419,7 +419,7 @@ private void InitParallelParameterSet()
             // in which they were created.
             foreach (object item in _usingValuesMap.Values)
             {
-                if (item is ScriptBlock)
+                if (item is ScriptBlock or PSObject { BaseObject: ScriptBlock })
                 {
                     ThrowTerminatingError(
                         new ErrorRecord(
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Foreach-Object-Parallel.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Foreach-Object-Parallel.Tests.ps1
index fb7438608d1..de384c6ad78 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Foreach-Object-Parallel.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Foreach-Object-Parallel.Tests.ps1
@@ -5,6 +5,7 @@ Describe 'ForEach-Object -Parallel Basic Tests' -Tags 'CI' {
 
     BeforeAll {
         $sb = { "Hello!" }
+        $psosb = [psobject]{ "Hello!" }
     }
 
     It "Verifies dollar underbar variable" {
@@ -341,6 +342,11 @@ Describe 'ForEach-Object -Parallel Basic Tests' -Tags 'CI' {
         { 1..1 | ForEach-Object -Parallel { $using:sb } } | Should -Throw -ErrorId 'ParallelUsingVariableCannotBeScriptBlock,Microsoft.PowerShell.Commands.ForEachObjectCommand'
     }
 
+    It 'Verifies error for using script block variable in PSObject' {
+
+        { 1..1 | ForEach-Object -Parallel { $using:psosb } } | Should -Throw -ErrorId 'ParallelUsingVariableCannotBeScriptBlock,Microsoft.PowerShell.Commands.ForEachObjectCommand'
+    }
+
     It 'Verifies error for script block piped variable' {
 
         $actualError = $sb | ForEach-Object -Parallel { "Hello" } 2>&1

From 99f3bb7a6abc3143c832efe22fbfc79c2222b874 Mon Sep 17 00:00:00 2001
From: Patrick Meinecke <SeeminglyScience@users.noreply.github.com>
Date: Wed, 4 May 2022 10:56:55 -0700
Subject: [PATCH 333/645] Fix line breakpoints for `return` statements without
 a value (#17179)

---
 .../engine/parser/Compiler.cs                 |  6 ++-
 .../Scripting/Debugging/Debugging.Tests.ps1   | 44 +++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index 7550a81d459..6d325aa3e8c 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -642,7 +642,7 @@ internal static class CachedReflectionInfo
 
         internal static readonly MethodInfo ArgumentTransformationAttribute_Transform =
             typeof(ArgumentTransformationAttribute).GetMethod(nameof(ArgumentTransformationAttribute.Transform), InstancePublicFlags);
-        
+
         internal static readonly MethodInfo MemberInvocationLoggingOps_LogMemberInvocation =
             typeof(MemberInvocationLoggingOps).GetMethod(nameof(MemberInvocationLoggingOps.LogMemberInvocation), StaticFlags);
     }
@@ -5617,7 +5617,9 @@ public object VisitReturnStatement(ReturnStatementAst returnStatementAst)
                 return Expression.Block(returnValue, returnExpr);
             }
 
-            return returnExpr;
+            return Expression.Block(
+                UpdatePosition(returnStatementAst),
+                returnExpr);
         }
 
         public object VisitExitStatement(ExitStatementAst exitStatementAst)
diff --git a/test/powershell/Language/Scripting/Debugging/Debugging.Tests.ps1 b/test/powershell/Language/Scripting/Debugging/Debugging.Tests.ps1
index c7c1b6a1105..29e279a199a 100644
--- a/test/powershell/Language/Scripting/Debugging/Debugging.Tests.ps1
+++ b/test/powershell/Language/Scripting/Debugging/Debugging.Tests.ps1
@@ -331,6 +331,50 @@ elseif (Test-Path $PSCommandPath)
             $Breakpoint.HitCount | Should -Be $HitCount
         }
     }
+
+    Context "Break point on return should hit" {
+        BeforeAll {
+            $return_script_1 = @'
+return
+'@
+            $return_script_2 = @'
+return 10
+'@
+            $return_script_3 = @'
+trap {
+    'statement to ignore trap registration sequence point'
+    return
+}
+
+throw
+'@
+
+            $ReturnScript_1 = Setup -PassThru -File ReturnScript_1.ps1 -Content $return_script_1
+            $bp_1 = Set-PSBreakpoint -Script $ReturnScript_1 -Line 1 -Action { continue }
+
+            $ReturnScript_2 = Setup -PassThru -File ReturnScript_2.ps1 -Content $return_script_2
+            $bp_2 = Set-PSBreakpoint -Script $ReturnScript_2 -Line 1 -Action { continue }
+
+            $ReturnScript_3 = Setup -PassThru -File ReturnScript_3.ps1 -Content $return_script_3
+            $bp_3 = Set-PSBreakpoint -Script $ReturnScript_3 -Line 3 -Action { continue }
+
+            $testCases = @(
+                @{ Name = "return without pipeline should be hit once"; Path = $ReturnScript_1; Breakpoint = $bp_1; HitCount = 1 }
+                @{ Name = "return with pipeline should be hit once";    Path = $ReturnScript_2; Breakpoint = $bp_2; HitCount = 1 }
+                @{ Name = "return from trap should be hit once";        Path = $ReturnScript_3; Breakpoint = $bp_3; HitCount = 1 }
+            )
+        }
+
+        AfterAll {
+            Get-PSBreakpoint -Script $ReturnScript_1, $ReturnScript_2, $ReturnScript_3 | Remove-PSBreakpoint
+        }
+
+        It "Return statement <Name>" -TestCases $testCases {
+            param($Path, $Breakpoint, $HitCount)
+            $null = & $Path
+            $Breakpoint.HitCount | Should -Be $HitCount
+        }
+    }
 }
 
 Describe "It should be possible to reset runspace debugging" -Tag "Feature" {

From 41062a588b18f20b50d75b48084df4bae52aa536 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 4 May 2022 14:57:19 -0700
Subject: [PATCH 334/645] Move `cgmanifest` generation to daily (#17258)

* Move cgmanifest generation to daily

* fix PR title
---
 .github/workflows/daily.yml             | 48 ++++++++++++++++++++-
 .github/workflows/update-cgmanifest.yml | 57 -------------------------
 2 files changed, 46 insertions(+), 59 deletions(-)
 delete mode 100644 .github/workflows/update-cgmanifest.yml

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index a324f52be59..10187a50097 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -88,10 +88,54 @@ jobs:
         id: cprtpn
         if: env.CREATE_PR == 'true'
         with:
-          commit-message: "Update to the latest notice file"
+          commit-message: "Update to the latest NOTICES file"
           committer: GitHub <noreply@github.com>
           author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          title: "Update to the latest notice file"
+          title: "Update to the latest NOTICES file"
+          reviewers: travisez13
+          base: master
+          draft: false
+          branch: update-cgmanifest
+  update-cgmanifest:
+    name: Update cgmanifest
+    timeout-minutes: 15
+    runs-on: windows-latest
+    if: github.repository == 'PowerShell/PowerShell'
+    env:
+      CGMANIFEST_PATH: ''
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - 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 -Fix
+      - name: Upload cgmanifest
+        uses: actions/upload-artifact@v2
+        if: always() && env.CGMANIFEST_PATH != ''
+        with:
+          name: cgmanifest
+          path: ${{ env.CGMANIFEST_PATH }}
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        id: cprcgmanifest
+        if: env.CGMANIFEST_PATH != ''
+        with:
+          commit-message: "Update the cgmanifest"
+          committer: GitHub <noreply@github.com>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          title: "Update the cgmanifest"
           reviewers: travisez13
           base: master
           draft: false
diff --git a/.github/workflows/update-cgmanifest.yml b/.github/workflows/update-cgmanifest.yml
deleted file mode 100644
index 13c3bada243..00000000000
--- a/.github/workflows/update-cgmanifest.yml
+++ /dev/null
@@ -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 }}

From e8c85a175b620a9ea7c8331bcf3e2f27da017529 Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Wed, 4 May 2022 15:33:31 -0700
Subject: [PATCH 335/645] Merged PR 20274: Fix Generate checksum file for
 packages build failure - v7.1.7 (#17219)

Fix Generate checksum file for packages build failure
---
 tools/releaseBuild/azureDevOps/templates/nuget.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index 677e2b7c9b5..f514ca7741b 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -205,7 +205,7 @@ jobs:
       $packagePathList = Get-ChildItem $packagePath -Recurse | Select-Object -ExpandProperty FullName | Out-String
       Write-Verbose -Verbose $packagePathList
 
-      $checksums = Get-ChildItem -Path $packagePath |
+      $checksums = Get-ChildItem -Path $packagePath -Exclude "SHA512SUMS" |
           ForEach-Object {
               Write-Verbose -Verbose "Generating checksum file for $($_.FullName)"
               $packageName = $_.Name
@@ -234,7 +234,7 @@ jobs:
       $packagePathList = Get-ChildItem $packagePath -Recurse | Select-Object -ExpandProperty FullName | Out-String
       Write-Verbose -Verbose $packagePathList
 
-      $checksums = Get-ChildItem -Path $packagePath |
+      $checksums = Get-ChildItem -Path $packagePath -Exclude "SHA512SUMS" |
           ForEach-Object {
               Write-Verbose -Verbose "Generating checksum file for $($_.FullName)"
               $packageName = $_.Name

From bb72e4990def90a297a58dc76598233b694e9e10 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 4 May 2022 22:38:19 +0000
Subject: [PATCH 336/645] Update the `cgmanifest` (#17260)

Co-authored-by: TravisEz13 <TravisEz13@users.noreply.github.com>
---
 tools/cgmanifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index e3042adc9e9..a8d9a620e16 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -695,7 +695,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "StyleCop.Analyzers.Unstable",
-          "Version": "1.2.0.406"
+          "Version": "1.2.0.435"
         }
       },
       "DevelopmentDependency": true

From 855b3ea5694866a92d004e52be74539b809d21f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 May 2022 15:41:51 -0700
Subject: [PATCH 337/645] Bump NJsonSchema from 10.6.9 to 10.6.10 (#16902)

Bumps [NJsonSchema](https://github.com/RicoSuter/NJsonSchema) from 10.6.9 to 10.6.10.
- [Release notes](https://github.com/RicoSuter/NJsonSchema/releases)
- [Commits](https://github.com/RicoSuter/NJsonSchema/compare/v10.6.9...v10.6.10)

---
updated-dependencies:
- dependency-name: NJsonSchema
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../Microsoft.PowerShell.Commands.Utility.csproj                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index d52d29ebf1c..620cb7e718a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -34,7 +34,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0-4.final" />
     <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.2.22152.2" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.2.22152.2" />
-    <PackageReference Include="NJsonSchema" Version="10.6.9" />
+    <PackageReference Include="NJsonSchema" Version="10.6.10" />
   </ItemGroup>
 
 </Project>

From d092aa96b3c903dda8492e1d7921bc9c2ca0b034 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 5 May 2022 10:11:02 -0700
Subject: [PATCH 338/645] Update timeout for daily (#17263)

* Update timeout for daily

* put timeout on job
---
 .vsts-ci/linux-daily.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/.vsts-ci/linux-daily.yml b/.vsts-ci/linux-daily.yml
index e6a5375b0c9..82705e8b5ce 100644
--- a/.vsts-ci/linux-daily.yml
+++ b/.vsts-ci/linux-daily.yml
@@ -18,17 +18,9 @@ pr:
   branches:
     include:
     - master
-    - release*
-    - feature*
   paths:
     include:
-    - '*'
-    exclude:
-    - tools/releaseBuild/*
-    - tools/releaseBuild/azureDevOps/templates/*
-    - /.vsts-ci/misc-analysis.yml
-    - /.github/ISSUE_TEMPLATE/*
-    - /.dependabot/config.yml
+    - .vsts-ci/linux-daily.yml
 
 variables:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -55,6 +47,7 @@ stages:
   displayName: Test for Linux
   jobs:
   - job: linux_test
+    timeoutInMinutes: 90
     pool:
       vmImage: ubuntu-20.04
     displayName: Linux Test

From 0ea03f560dea015e49b749edc06f6c9f09b906e7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 5 May 2022 17:29:12 +0000
Subject: [PATCH 339/645] Update the cgmanifest (#17268)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 tools/cgmanifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index a8d9a620e16..504b6198504 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -265,7 +265,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "NJsonSchema",
-          "Version": "10.6.9"
+          "Version": "10.6.10"
         }
       },
       "DevelopmentDependency": false

From 0ff843da99a5beec07e74ff631f75de94eb0de08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 May 2022 10:31:42 -0700
Subject: [PATCH 340/645] Bump PSReadLine from 2.2.2 to 2.2.5 in /src/Modules
 (#17252)

* Bump PSReadLine from 2.2.2 to 2.2.5 in /src/Modules

Bumps PSReadLine from 2.2.2 to 2.2.5.

---
updated-dependencies:
- dependency-name: PSReadLine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update files.wxs

* Cleanup

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
---
 assets/wix/files.wxs                | 12 ++++++------
 src/Modules/PSGalleryModules.csproj |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 0e4db18cd28..49baf7615b1 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1843,11 +1843,6 @@
               <File Id="fil07E2CE764A83431CAFEF1132FEDBE039" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PSReadLine\net6plus\Microsoft.PowerShell.PSReadLine.Polyfiller.dll" />
             </Component>
           </Directory>
-          <Directory Name="net461" Id="dir0BE8A79265FB414097A6FEEC3FD1A9DA">
-            <Component Id="cmpFDAD012AF60E4E3A9281239CB2D1814A">
-              <File Id="fil73F9E4ADB9644EA298A91C82BF1AE025" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PSReadLine\net461\Microsoft.PowerShell.PSReadLine.Polyfiller.dll" />
-            </Component>
-          </Directory>
           <Directory Name="_manifest" Id="dirAB7C5C1B9B094AFDB92B0579CB436378">
             <Directory Name="spdx_2.2" Id="dirC34C47323EC444F9ABBAD517851610A8">
               <Component Id="cmp6BFA61E2CB7C40E2A92575EBFC772B96">
@@ -1858,6 +1853,11 @@
               </Component>
             </Directory>
           </Directory>
+          <Directory Name="net462" Id="dirE8193E9A93A04D29BC5ECCFAB1DB4704">
+            <Component Id="cmpF735DF855B6A444E8874E7FD15796C37">
+              <File Id="fil7C020FDFFB144CA4890E8288E91F6926" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PSReadLine\net462\Microsoft.PowerShell.PSReadLine.Polyfiller.dll" />
+            </Component>
+          </Directory>
         </Directory>
         <Directory Name="PowerShellGet" Id="dir49159A33EB06456C9C2C971815311A6A">
           <Directory Name="en-US" Id="dirF5EBE6CBD04149359D3582351CB4438D">
@@ -3777,7 +3777,6 @@
       <ComponentRef Id="cmp9207ABECCDB7479392AFC35A6133994E" />
       <ComponentRef Id="cmp6BFA61E2CB7C40E2A92575EBFC772B96" />
       <ComponentRef Id="cmp0F6EADB772B844B48C250D8F0469A19B" />
-      <ComponentRef Id="cmpFDAD012AF60E4E3A9281239CB2D1814A" />
       <ComponentRef Id="cmp3F48AB8F48674965B721E9D5DE5AC19F" />
       <ComponentRef Id="cmpB9EF9DAB25064D92A757E7D390CC8922" />
       <ComponentRef Id="cmp092D1859608844F78D3211718ED31171" />
@@ -4214,6 +4213,7 @@
       <ComponentRef Id="cmp05AA3332D604464298B922F34672061F" />
       <ComponentRef Id="cmpFE56825F03274064A69AA43CA4B597C7" />
       <ComponentRef Id="cmp0AB1EF494922410AB17DC61097295172" />
+      <ComponentRef Id="cmpF735DF855B6A444E8874E7FD15796C37" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj
index 1bbb056765f..c831d438942 100644
--- a/src/Modules/PSGalleryModules.csproj
+++ b/src/Modules/PSGalleryModules.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="PowerShellGet" Version="2.2.5" />
     <PackageReference Include="PackageManagement" Version="1.4.7" />
     <PackageReference Include="Microsoft.PowerShell.Archive" Version="1.2.5" />
-    <PackageReference Include="PSReadLine" Version="2.2.2" />
+    <PackageReference Include="PSReadLine" Version="2.2.5" />
     <PackageReference Include="ThreadJob" Version="2.0.3" />
   </ItemGroup>
 

From 8cfb727a0c408233a3b883e5a39340d5a58e643d Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 5 May 2022 14:58:47 -0700
Subject: [PATCH 341/645] Update engine working group members (#17271)

---
 docs/community/working-group-definitions.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/community/working-group-definitions.md b/docs/community/working-group-definitions.md
index 2a64a5ac6b2..26f94d8c03e 100644
--- a/docs/community/working-group-definitions.md
+++ b/docs/community/working-group-definitions.md
@@ -66,6 +66,7 @@ However, it's expected that many issues will require input from both WGs.
 * @rkeithhill
 * @vexx32
 * @SeeminglyScience
+* @IISResetMe
 
 ## Interactive UX
 

From e08edcb82d947c6a125c7c62577417200d92746d Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 5 May 2022 15:27:59 -0700
Subject: [PATCH 342/645] Update to use `mcr.microsoft.com` (#17272)

---
 test/docker/networktest/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/docker/networktest/Dockerfile b/test/docker/networktest/Dockerfile
index 1e4f3d65ebb..cac78654c86 100644
--- a/test/docker/networktest/Dockerfile
+++ b/test/docker/networktest/Dockerfile
@@ -1,5 +1,5 @@
 # escape=`
-FROM microsoft/windowsservercore
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
 
 SHELL ["pwsh.exe","-command"]
 

From c000fc54304352cd25202ad1d7670a1edc4d31e1 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 6 May 2022 11:24:24 -0700
Subject: [PATCH 343/645] Add rotation between the two mariner images (#17277)

* Add rotation between the two mariner images

* Add comments and fix issues

* select the tag that works with test-deps
---
 .vsts-ci/linux.yml | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
index f5623ccb2a1..e553689652c 100644
--- a/.vsts-ci/linux.yml
+++ b/.vsts-ci/linux.yml
@@ -116,20 +116,41 @@ stages:
       clean: true
 
     - pwsh: |
+        # For PRs set the seed to the PR number so that the image is always the same
+        $seed = $env:SYSTEM_PULLREQUEST_PULLREQUESTID
+        if(!$seed) {
+          # for non-PRs use the integer identifier of the build as the seed.
+          $seed = $env:SYSTEM_BUILD_BUILDID
+        }
+        Write-Verbose "Seed: $seed" -Verbose
+
+        # Get the latest image matrix JSON for preview
         $matrix = ./PowerShell-Docker/build.ps1 -GenerateMatrixJson -FullJson -Channel preview | ConvertFrom-Json
+
         # Filter out containers that won't run on AzDevOps Linux host as an agent
         # Windows, nano server, alpine, and any ARM image
         $linuxImages = $matrix.preview |
           Where-Object {$_.osversion -notmatch 'windows|nano|alpine|arm'} |
           Select-Object JobName, Taglist |
           Sort-Object -property JobName
-        # Force mariner for now, later we will add automated rotation by the month.
+
+        # Force mariner for now
         $marinerImage = $linuxImages | where-object {$_.JobName -like 'mariner*'}
-        Import-Module ./PowerShell/tools/ci.psm1
-        $tag = $marinerImage.Taglist -split ';' | select-object -first 1
+
+        # Use the selected seed to pick a container
+        $index = Get-Random -Minimum 0 -Maximum $marinerImage.Count -SetSeed $seed
+        $selectedImage = $marinerImage[$index]
+
+        # Filter to the first test-deps compatible tag
+        $tag = $selectedImage.Taglist -split ';' | Where-Object {$_ -match 'preview-\D+'} | Select-Object -First 1
+
+        # Calculate the container name
         $containerName = "mcr.microsoft.com/powershell/test-deps:$tag"
+
+        # Set variables for later jobs to use
+        Import-Module ./PowerShell/tools/ci.psm1
         Set-BuildVariable -Name containerName -Value $containerName -IsOutput
-        Set-BuildVariable -Name containerBuildName -Value $marinerImage.JobName -IsOutput
+        Set-BuildVariable -Name containerBuildName -Value $selectedImage.JobName -IsOutput
       name: getContainerTask
       displayName: Get Container
       continueOnError: true

From 4c6c4f30afebd08dfb4f02cbaec6ed282bb9f8b1 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 6 May 2022 11:40:34 -0700
Subject: [PATCH 344/645] Fix formatting truncation to handle strings with VT
 sequences (#17251)

---
 .../FormatAndOutput/common/ComplexWriter.cs   |   8 +-
 .../FormatAndOutput/common/ILineOutput.cs     | 126 ++++++++----
 .../FormatAndOutput/common/ListWriter.cs      |   7 +-
 .../FormatAndOutput/common/TableWriter.cs     |  50 ++---
 .../common/Utilities/MshObjectUtil.cs         |   1 +
 .../out-console/ConsoleLineOutput.cs          | 160 ++++-----------
 .../FormatAndOutput/out-console/OutConsole.cs |   6 +-
 .../utils/StringUtil.cs                       | 182 ++++++++++++++++++
 .../engine/Formatting/PSStyle.Tests.ps1       | 105 ++++++++++
 9 files changed, 445 insertions(+), 200 deletions(-)

diff --git a/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
index 187775d3072..3adb5a799c2 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
@@ -451,7 +451,7 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa
                     {
                         // we are not at the end of the string, select a sub string
                         // that would fit in the remaining display length
-                        int charactersToAdd = displayCells.GetHeadSplitLength(currentLine, offset, currentDisplayLen);
+                        int charactersToAdd = displayCells.TruncateTail(currentLine, offset, currentDisplayLen);
 
                         if (charactersToAdd <= 0)
                         {
@@ -465,7 +465,7 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa
                         else
                         {
                             // of the given length, add it to the accumulator
-                            accumulator.AddLine(currentLine.Substring(offset, charactersToAdd));
+                            accumulator.AddLine(currentLine.VtSubstring(offset, charactersToAdd));
                         }
 
                         // increase the offset by the # of characters added
@@ -474,7 +474,7 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa
                     else
                     {
                         // we reached the last (partial) line, we add it all
-                        accumulator.AddLine(currentLine.Substring(offset));
+                        accumulator.AddLine(currentLine.VtSubstring(offset));
                         break;
                     }
                 }
@@ -553,7 +553,7 @@ private static StringCollection GenerateLinesWithWordWrap(DisplayCells displayCe
                     // Handle soft hyphen
                     if (word.Delim == s_softHyphen.ToString())
                     {
-                        int wordWidthWithHyphen = displayCells.Length(wordToAdd) + displayCells.Length(s_softHyphen.ToString());
+                        int wordWidthWithHyphen = displayCells.Length(wordToAdd) + displayCells.Length(s_softHyphen);
 
                         // Add hyphen only if necessary
                         if (wordWidthWithHyphen == spacesLeft)
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs b/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
index 8c672b62063..ddd69ae0ee9 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
@@ -14,60 +14,112 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
 {
     /// <summary>
     /// Base class providing support for string manipulation.
-    /// This class is a tear off class provided by the LineOutput class
-    ///
-    /// Assumptions (in addition to the assumptions made for LineOutput):
-    /// - characters map to one or more character cells
-    ///
-    /// NOTE: we provide a base class that is valid for devices that have a
-    /// 1:1 mapping between a UNICODE character and a display cell.
+    /// This class is a tear off class provided by the LineOutput class.
     /// </summary>
     internal class DisplayCells
     {
-        internal virtual int Length(string str)
+        /// <summary>
+        /// Calculate the buffer cell length of the given string.
+        /// </summary>
+        /// <param name="str">String that may contain VT escape sequences.</param>
+        /// <returns>Number of buffer cells the string needs to take.</returns>
+        internal int Length(string str)
         {
             return Length(str, 0);
         }
 
+        /// <summary>
+        /// Calculate the buffer cell length of the given string.
+        /// </summary>
+        /// <param name="str">String that may contain VT escape sequences.</param>
+        /// <param name="offset">
+        /// When the string doesn't contain VT sequences, it's the starting index.
+        /// When the string contains VT sequences, it means starting from the 'n-th' char that doesn't belong to a escape sequence.</param>
+        /// <returns>Number of buffer cells the string needs to take.</returns>
         internal virtual int Length(string str, int offset)
         {
-            int length = 0;
+            if (string.IsNullOrEmpty(str))
+            {
+                return 0;
+            }
 
-            foreach (char c in str)
+            var valueStrDec = new ValueStringDecorated(str);
+            if (valueStrDec.IsDecorated)
             {
-                length += LengthInBufferCells(c);
+                str = valueStrDec.ToString(OutputRendering.PlainText);
             }
 
-            return length - offset;
-        }
+            int length = 0;
+            for (; offset < str.Length; offset++)
+            {
+                length += CharLengthInBufferCells(str[offset]);
+            }
 
-        internal virtual int Length(char character) { return 1; }
+            return length;
+        }
 
-        internal virtual int GetHeadSplitLength(string str, int displayCells)
+        /// <summary>
+        /// Calculate the buffer cell length of the given character.
+        /// </summary>
+        /// <param name="character"></param>
+        /// <returns>Number of buffer cells the character needs to take.</returns>
+        internal virtual int Length(char character)
         {
-            return GetHeadSplitLength(str, 0, displayCells);
+            return CharLengthInBufferCells(character);
         }
 
-        internal virtual int GetHeadSplitLength(string str, int offset, int displayCells)
+        /// <summary>
+        /// Truncate from the tail of the string.
+        /// </summary>
+        /// <param name="str">String that may contain VT escape sequences.</param>
+        /// <param name="displayCells">Number of buffer cells to fit in.</param>
+        /// <returns>Number of non-escape-sequence characters from head of the string that can fit in the space.</returns>
+        internal int TruncateTail(string str, int displayCells)
         {
-            int len = str.Length - offset;
-            return (len < displayCells) ? len : displayCells;
+            return TruncateTail(str, offset: 0, displayCells);
         }
 
-        internal virtual int GetTailSplitLength(string str, int displayCells)
+        /// <summary>
+        /// Truncate from the tail of the string.
+        /// </summary>
+        /// <param name="str">String that may contain VT escape sequences.</param>
+        /// <param name="offset">
+        /// When the string doesn't contain VT sequences, it's the starting index.
+        /// When the string contains VT sequences, it means starting from the 'n-th' char that doesn't belong to a escape sequence.</param>
+        /// <param name="displayCells">Number of buffer cells to fit in.</param>
+        /// <returns>Number of non-escape-sequence characters from head of the string that can fit in the space.</returns>
+        internal int TruncateTail(string str, int offset, int displayCells)
         {
-            return GetTailSplitLength(str, 0, displayCells);
+            var valueStrDec = new ValueStringDecorated(str);
+            if (valueStrDec.IsDecorated)
+            {
+                str = valueStrDec.ToString(OutputRendering.PlainText);
+            }
+
+            return GetFitLength(str, offset, displayCells, startFromHead: true);
         }
 
-        internal virtual int GetTailSplitLength(string str, int offset, int displayCells)
+        /// <summary>
+        /// Truncate from the head of the string.
+        /// </summary>
+        /// <param name="str">String that may contain VT escape sequences.</param>
+        /// <param name="displayCells">Number of buffer cells to fit in.</param>
+        /// <returns>Number of non-escape-sequence characters from head of the string that should be skipped.</returns>
+        internal int TruncateHead(string str, int displayCells)
         {
-            int len = str.Length - offset;
-            return (len < displayCells) ? len : displayCells;
+            var valueStrDec = new ValueStringDecorated(str);
+            if (valueStrDec.IsDecorated)
+            {
+                str = valueStrDec.ToString(OutputRendering.PlainText);
+            }
+
+            int tailCount = GetFitLength(str, offset: 0, displayCells, startFromHead: false);
+            return str.Length - tailCount;
         }
 
         #region Helpers
 
-        protected static int LengthInBufferCells(char c)
+        protected static int CharLengthInBufferCells(char c)
         {
             // The following is based on http://www.cl.cam.ac.uk/~mgk25/c/wcwidth.c
             // which is derived from https://www.unicode.org/Public/UCD/latest/ucd/EastAsianWidth.txt
@@ -94,25 +146,26 @@ protected static int LengthInBufferCells(char c)
         /// Given a string and a number of display cells, it computes how many
         /// characters would fit starting from the beginning or end of the string.
         /// </summary>
-        /// <param name="str">String to be displayed.</param>
+        /// <param name="str">String to be displayed, which doesn't contain any VT sequences.</param>
         /// <param name="offset">Offset inside the string.</param>
         /// <param name="displayCells">Number of display cells.</param>
-        /// <param name="head">If true compute from the head (i.e. k++) else from the tail (i.e. k--).</param>
+        /// <param name="startFromHead">If true compute from the head (i.e. k++) else from the tail (i.e. k--).</param>
         /// <returns>Number of characters that would fit.</returns>
-        protected int GetSplitLengthInternalHelper(string str, int offset, int displayCells, bool head)
+        protected int GetFitLength(string str, int offset, int displayCells, bool startFromHead)
         {
             int filledDisplayCellsCount = 0; // number of cells that are filled in
             int charactersAdded = 0; // number of characters that fit
             int currCharDisplayLen; // scratch variable
 
-            int k = (head) ? offset : str.Length - 1;
-            int kFinal = (head) ? str.Length - 1 : offset;
+            int k = startFromHead ? offset : str.Length - 1;
+            int kFinal = startFromHead ? str.Length - 1 : offset;
             while (true)
             {
-                if ((head && (k > kFinal)) || ((!head) && (k < kFinal)))
+                if ((startFromHead && k > kFinal) || (!startFromHead && k < kFinal))
                 {
                     break;
                 }
+
                 // compute the cell number for the current character
                 currCharDisplayLen = this.Length(str[k]);
 
@@ -121,6 +174,7 @@ protected int GetSplitLengthInternalHelper(string str, int offset, int displayCe
                     // if we added this character it would not fit, we cannot continue
                     break;
                 }
+
                 // keep adding, we fit
                 filledDisplayCellsCount += currCharDisplayLen;
                 charactersAdded++;
@@ -132,13 +186,13 @@ protected int GetSplitLengthInternalHelper(string str, int offset, int displayCe
                     break;
                 }
 
-                k = (head) ? (k + 1) : (k - 1);
+                k = startFromHead ? (k + 1) : (k - 1);
             }
 
             return charactersAdded;
         }
-        #endregion
 
+        #endregion
     }
 
     /// <summary>
@@ -354,11 +408,11 @@ private void WriteLineInternal(string val, int cols)
                 {
                     // the string is still too long to fit, write the first cols characters
                     // and go back for more wraparound
-                    int splitLen = _displayCells.GetHeadSplitLength(s, cols);
-                    WriteLineInternal(s.Substring(0, splitLen), cols);
+                    int headCount = _displayCells.TruncateTail(s, cols);
+                    WriteLineInternal(s.VtSubstring(0, headCount), cols);
 
                     // chop off the first fieldWidth characters, already printed
-                    s = s.Substring(splitLen);
+                    s = s.VtSubstring(headCount);
                     if (_displayCells.Length(s) <= cols)
                     {
                         // if we fit, print the tail of the string and we are done
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
index b5c97c3d85d..6031eacd216 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
@@ -88,19 +88,20 @@ internal void Initialize(string[] propertyNames, int screenColumnWidth, DisplayC
 
             for (int k = 0; k < propertyNames.Length; k++)
             {
+                string propertyName = propertyNames[k];
                 if (propertyNameCellCounts[k] < _propertyLabelsDisplayLength)
                 {
                     // shorter than the max, add padding
-                    _propertyLabels[k] = propertyNames[k] + StringUtil.Padding(_propertyLabelsDisplayLength - propertyNameCellCounts[k]);
+                    _propertyLabels[k] = propertyName + StringUtil.Padding(_propertyLabelsDisplayLength - propertyNameCellCounts[k]);
                 }
                 else if (propertyNameCellCounts[k] > _propertyLabelsDisplayLength)
                 {
                     // longer than the max, clip
-                    _propertyLabels[k] = propertyNames[k].Substring(0, dc.GetHeadSplitLength(propertyNames[k], _propertyLabelsDisplayLength));
+                    _propertyLabels[k] = propertyName.VtSubstring(0, dc.TruncateTail(propertyName, _propertyLabelsDisplayLength));
                 }
                 else
                 {
-                    _propertyLabels[k] = propertyNames[k];
+                    _propertyLabels[k] = propertyName;
                 }
 
                 _propertyLabels[k] += Separator;
diff --git a/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs
index fb5ef0bf930..eae65766bb9 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs
@@ -42,8 +42,6 @@ private sealed class ScreenInfo
 
         private ScreenInfo _si;
 
-        private const char ESC = '\u001b';
-
         private List<string> _header;
 
         internal static int ComputeWideViewBestItemsPerRowFit(int stringLen, int screenColumns)
@@ -457,8 +455,10 @@ private string GenerateRow(string[] values, ReadOnlySpan<int> alignment, Display
                     }
                 }
 
-                sb.Append(GenerateRowField(values[k], _si.columnInfo[k].width, alignment[k], dc, addPadding));
-                if (values[k] is not null && values[k].Contains(ESC))
+                string rowField = GenerateRowField(values[k], _si.columnInfo[k].width, alignment[k], dc, addPadding);
+                sb.Append(rowField);
+
+                if (rowField is not null && rowField.Contains(ValueStringDecorated.ESC) && !rowField.AsSpan().TrimEnd().EndsWith(PSStyle.Instance.Reset))
                 {
                     // Reset the console output if the content of this column contains ESC
                     sb.Append(PSStyle.Instance.Reset);
@@ -472,9 +472,7 @@ private static string GenerateRowField(string val, int width, int alignment, Dis
         {
             // make sure the string does not have any embedded <CR> in it
             string s = StringManipulationHelper.TruncateAtNewLine(val);
-
-            string currentValue = s;
-            int currentValueDisplayLength = dc.Length(currentValue);
+            int currentValueDisplayLength = dc.Length(s);
 
             if (currentValueDisplayLength < width)
             {
@@ -531,18 +529,10 @@ private static string GenerateRowField(string val, int width, int alignment, Dis
                         case TextAlignment.Right:
                             {
                                 // get from "abcdef" to "...f"
-                                int tailCount = dc.GetTailSplitLength(s, truncationDisplayLength);
-                                s = s.Substring(s.Length - tailCount);
-                                s = PSObjectHelper.Ellipsis + s;
-                            }
-
-                            break;
-
-                        case TextAlignment.Center:
-                            {
-                                // get from "abcdef" to "a..."
-                                s = s.Substring(0, dc.GetHeadSplitLength(s, truncationDisplayLength));
-                                s += PSObjectHelper.Ellipsis;
+                                s = s.VtSubstring(
+                                    startOffset: dc.TruncateHead(s, truncationDisplayLength),
+                                    prependStr: PSObjectHelper.EllipsisStr,
+                                    appendStr: null);
                             }
 
                             break;
@@ -551,8 +541,11 @@ private static string GenerateRowField(string val, int width, int alignment, Dis
                             {
                                 // left align is the default
                                 // get from "abcdef" to "a..."
-                                s = s.Substring(0, dc.GetHeadSplitLength(s, truncationDisplayLength));
-                                s += PSObjectHelper.Ellipsis;
+                                s = s.VtSubstring(
+                                    startOffset: 0,
+                                    length: dc.TruncateTail(s, truncationDisplayLength),
+                                    prependStr: null,
+                                    appendStr: PSObjectHelper.EllipsisStr);
                             }
 
                             break;
@@ -561,23 +554,12 @@ private static string GenerateRowField(string val, int width, int alignment, Dis
                 else
                 {
                     // not enough space for the ellipsis, just truncate at the width
-                    int len = width;
-
                     switch (alignment)
                     {
                         case TextAlignment.Right:
                             {
                                 // get from "abcdef" to "f"
-                                int tailCount = dc.GetTailSplitLength(s, len);
-                                s = s.Substring(s.Length - tailCount, tailCount);
-                            }
-
-                            break;
-
-                        case TextAlignment.Center:
-                            {
-                                // get from "abcdef" to "a"
-                                s = s.Substring(0, dc.GetHeadSplitLength(s, len));
+                                s = s.VtSubstring(startOffset: dc.TruncateHead(s, width));
                             }
 
                             break;
@@ -586,7 +568,7 @@ private static string GenerateRowField(string val, int width, int alignment, Dis
                             {
                                 // left align is the default
                                 // get from "abcdef" to "a"
-                                s = s.Substring(0, dc.GetHeadSplitLength(s, len));
+                                s = s.VtSubstring(startOffset: 0, length: dc.TruncateTail(s, width));
                             }
 
                             break;
diff --git a/src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs b/src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs
index 7760e86b13d..8d95f8fd9a1 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs
@@ -26,6 +26,7 @@ internal static class PSObjectHelper
         #endregion tracer
 
         internal const char Ellipsis = '\u2026';
+        internal const string EllipsisStr = "\u2026";
 
         internal static string PSObjectIsOfExactType(Collection<string> typeNames)
         {
diff --git a/src/System.Management.Automation/FormatAndOutput/out-console/ConsoleLineOutput.cs b/src/System.Management.Automation/FormatAndOutput/out-console/ConsoleLineOutput.cs
index f3ed3ba6189..e8379d3f321 100644
--- a/src/System.Management.Automation/FormatAndOutput/out-console/ConsoleLineOutput.cs
+++ b/src/System.Management.Automation/FormatAndOutput/out-console/ConsoleLineOutput.cs
@@ -1,11 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-// NOTE: define this if you want to test the output on US machine and ASCII
-// characters
-//#define TEST_MULTICELL_ON_SINGLE_CELL_LOCALE
-
 using System;
+using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
@@ -17,70 +14,12 @@
 
 namespace Microsoft.PowerShell.Commands.Internal.Format
 {
-#if TEST_MULTICELL_ON_SINGLE_CELL_LOCALE
-
-    /// <summary>
-    /// Test class to provide easily overridable behavior for testing on US machines
-    /// using US data.
-    /// NOTE: the class just forces any uppercase letter [A-Z] to be prepended
-    /// with an underscore (e.g. "A" becomes "_A", but "a" stays the same)
-    /// </summary>
-    internal class DisplayCellsTest : DisplayCells
-    {
-        internal override int Length(string str, int offset)
-        {
-            int len = 0;
-            for (int k = offset; k < str.Length; k++)
-            {
-                len += this.Length(str[k]);
-            }
-
-            return len;
-        }
-
-        internal override int Length(char character)
-        {
-            if (character >= 'A' && character <= 'Z')
-                return 2;
-            return 1;
-        }
-
-        internal override int GetHeadSplitLength(string str, int offset, int displayCells)
-        {
-            return GetSplitLengthInternalHelper(str, offset, displayCells, true);
-        }
-
-        internal override int GetTailSplitLength(string str, int offset, int displayCells)
-        {
-            return GetSplitLengthInternalHelper(str, offset, displayCells, false);
-        }
-
-        internal string GenerateTestString(string str)
-        {
-            StringBuilder sb = new StringBuilder();
-            for (int k = 0; k < str.Length; k++)
-            {
-                char ch = str[k];
-                if (this.Length(ch) == 2)
-                {
-                    sb.Append('_');
-                }
-
-                sb.Append(ch);
-            }
-
-            return sb.ToString();
-        }
-
-    }
-#endif
-
     /// <summary>
     /// Tear off class.
     /// </summary>
-    internal class DisplayCellsPSHost : DisplayCells
+    internal class DisplayCellsHost : DisplayCells
     {
-        internal DisplayCellsPSHost(PSHostRawUserInterface rawUserInterface)
+        internal DisplayCellsHost(PSHostRawUserInterface rawUserInterface)
         {
             _rawUserInterface = rawUserInterface;
         }
@@ -99,30 +38,26 @@ internal override int Length(string str, int offset)
 
             try
             {
-                return _rawUserInterface.LengthInBufferCells(str, offset);
-            }
-            catch
-            {
-                // thrown when external host rawui is not implemented, in which case
-                // we will fallback to the default value.
-            }
+                var valueStrDec = new ValueStringDecorated(str);
+                if (valueStrDec.IsDecorated)
+                {
+                    str = valueStrDec.ToString(OutputRendering.PlainText);
+                }
 
-            return str.Length - offset;
-        }
+                int length = 0;
+                for (; offset < str.Length; offset++)
+                {
+                    length += _rawUserInterface.LengthInBufferCells(str[offset]);
+                }
 
-        internal override int Length(string str)
-        {
-            try
-            {
-                return _rawUserInterface.LengthInBufferCells(str);
+                return length;
             }
             catch
             {
                 // thrown when external host rawui is not implemented, in which case
                 // we will fallback to the default value.
+                return base.Length(str, offset);
             }
-
-            return string.IsNullOrEmpty(str) ? 0 : str.Length;
         }
 
         internal override int Length(char character)
@@ -135,19 +70,8 @@ internal override int Length(char character)
             {
                 // thrown when external host rawui is not implemented, in which case
                 // we will fallback to the default value.
+                return base.Length(character);
             }
-
-            return 1;
-        }
-
-        internal override int GetHeadSplitLength(string str, int offset, int displayCells)
-        {
-            return GetSplitLengthInternalHelper(str, offset, displayCells, true);
-        }
-
-        internal override int GetTailSplitLength(string str, int offset, int displayCells)
-        {
-            return GetSplitLengthInternalHelper(str, offset, displayCells, false);
         }
 
         private readonly PSHostRawUserInterface _rawUserInterface;
@@ -163,6 +87,11 @@ internal sealed class ConsoleLineOutput : LineOutput
         internal static readonly PSTraceSource tracer = PSTraceSource.GetTracer("ConsoleLineOutput", "ConsoleLineOutput");
         #endregion tracer
 
+        /// <summary>
+        /// The default buffer cell calculation already works for the PowerShell console host and Visual studio code host.
+        /// </summary>
+        private static readonly HashSet<string> s_psHost = new(StringComparer.Ordinal) { "ConsoleHost", "Visual Studio Code Host" };
+
         #region LineOutput implementation
         /// <summary>
         /// The # of columns is just the width of the screen buffer (not the
@@ -241,12 +170,13 @@ internal override DisplayCells DisplayCells
             get
             {
                 CheckStopProcessing();
-                if (_displayCellsPSHost != null)
+                if (_displayCellsHost != null)
                 {
-                    return _displayCellsPSHost;
+                    return _displayCellsHost;
                 }
+
                 // fall back if we do not have a Msh host specific instance
-                return _displayCellsPSHost;
+                return _displayCellsDefault;
             }
         }
         #endregion
@@ -254,39 +184,38 @@ internal override DisplayCells DisplayCells
         /// <summary>
         /// Constructor for the ConsoleLineOutput.
         /// </summary>
-        /// <param name="hostConsole">PSHostUserInterface to wrap.</param>
+        /// <param name="host">PSHostUserInterface to wrap.</param>
         /// <param name="paging">True if we require prompting for page breaks.</param>
         /// <param name="errorContext">Error context to throw exceptions.</param>
-        internal ConsoleLineOutput(PSHostUserInterface hostConsole, bool paging, TerminatingErrorContext errorContext)
+        internal ConsoleLineOutput(PSHost host, bool paging, TerminatingErrorContext errorContext)
         {
-            if (hostConsole == null)
-                throw PSTraceSource.NewArgumentNullException(nameof(hostConsole));
+            if (host == null)
+            {
+                throw PSTraceSource.NewArgumentNullException(nameof(host));
+            }
+
             if (errorContext == null)
+            {
                 throw PSTraceSource.NewArgumentNullException(nameof(errorContext));
+            }
 
-            _console = hostConsole;
+            _console = host.UI;
             _errorContext = errorContext;
 
             if (paging)
             {
                 tracer.WriteLine("paging is needed");
-                // if we need to do paging, instantiate a prompt handler
-                // that will take care of the screen interaction
+
+                // If we need to do paging, instantiate a prompt handler that will take care of the screen interaction
                 string promptString = StringUtil.Format(FormatAndOut_out_xxx.ConsoleLineOutput_PagingPrompt);
                 _prompt = new PromptHandler(promptString, this);
             }
 
-            PSHostRawUserInterface raw = _console.RawUI;
-            if (raw != null)
+            if (!s_psHost.Contains(host.Name) && _console.RawUI is not null)
             {
-                tracer.WriteLine("there is a valid raw interface");
-#if TEST_MULTICELL_ON_SINGLE_CELL_LOCALE
-                // create a test instance with fake behavior
-                this._displayCellsPSHost = new DisplayCellsTest();
-#else
                 // set only if we have a valid raw interface
-                _displayCellsPSHost = new DisplayCellsPSHost(raw);
-#endif
+                tracer.WriteLine("there is a valid raw interface");
+                _displayCellsHost = new DisplayCellsHost(_console.RawUI);
             }
 
             // instantiate the helper to do the line processing when ILineOutput.WriteXXX() is called
@@ -309,9 +238,6 @@ internal ConsoleLineOutput(PSHostUserInterface hostConsole, bool paging, Termina
         /// <param name="s">String to write.</param>
         private void OnWriteLine(string s)
         {
-#if TEST_MULTICELL_ON_SINGLE_CELL_LOCALE
-            s = ((DisplayCellsTest)this._displayCellsPSHost).GenerateTestString(s);
-#endif
             // Do any default transcription.
             _console.TranscribeResult(s);
 
@@ -356,10 +282,6 @@ private void OnWriteLine(string s)
         /// <param name="s">String to write.</param>
         private void OnWrite(string s)
         {
-#if TEST_MULTICELL_ON_SINGLE_CELL_LOCALE
-            s = ((DisplayCellsTest)this._displayCellsPSHost).GenerateTestString(s);
-#endif
-
             switch (this.WriteStream)
             {
                 case WriteStreamType.Error:
@@ -615,7 +537,7 @@ internal PromptResponse PromptUser(PSHostUserInterface console)
         /// <summary>
         /// Msh host specific string manipulation helper.
         /// </summary>
-        private readonly DisplayCells _displayCellsPSHost;
+        private readonly DisplayCells _displayCellsHost;
 
         /// <summary>
         /// Reference to error context to throw Msh exceptions.
diff --git a/src/System.Management.Automation/FormatAndOutput/out-console/OutConsole.cs b/src/System.Management.Automation/FormatAndOutput/out-console/OutConsole.cs
index 2582a1e68db..8d51f42de8c 100644
--- a/src/System.Management.Automation/FormatAndOutput/out-console/OutConsole.cs
+++ b/src/System.Management.Automation/FormatAndOutput/out-console/OutConsole.cs
@@ -65,8 +65,7 @@ public OutDefaultCommand()
         /// </summary>
         protected override void BeginProcessing()
         {
-            PSHostUserInterface console = this.Host.UI;
-            ConsoleLineOutput lineOutput = new ConsoleLineOutput(console, false, new TerminatingErrorContext(this));
+            var lineOutput = new ConsoleLineOutput(Host, false, new TerminatingErrorContext(this));
 
             ((OutputManagerInner)this.implementation).LineOutput = lineOutput;
 
@@ -206,8 +205,7 @@ public SwitchParameter Paging
         /// </summary>
         protected override void BeginProcessing()
         {
-            PSHostUserInterface console = this.Host.UI;
-            ConsoleLineOutput lineOutput = new ConsoleLineOutput(console, _paging, new TerminatingErrorContext(this));
+            var lineOutput = new ConsoleLineOutput(Host, _paging, new TerminatingErrorContext(this));
 
             ((OutputManagerInner)this.implementation).LineOutput = lineOutput;
             base.BeginProcessing();
diff --git a/src/System.Management.Automation/utils/StringUtil.cs b/src/System.Management.Automation/utils/StringUtil.cs
index c84b3f5e9fe..ed08f425eac 100644
--- a/src/System.Management.Automation/utils/StringUtil.cs
+++ b/src/System.Management.Automation/utils/StringUtil.cs
@@ -1,8 +1,11 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Collections.Generic;
 using System.Globalization;
 using System.Management.Automation.Host;
+using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 
 using Dbg = System.Management.Automation.Diagnostics;
@@ -93,5 +96,184 @@ internal static string DashPadding(int count)
 
             return result;
         }
+
+        /// <summary>
+        /// Substring implementation that takes into account the VT escape sequences.
+        /// </summary>
+        /// <param name="str">String that may contain VT escape sequences.</param>
+        /// <param name="startOffset">
+        /// When the string doesn't contain VT sequences, it's the starting index.
+        /// When the string contains VT sequences, it means starting from the 'n-th' char that doesn't belong to a escape sequence.
+        /// </param>
+        /// <returns>The requested substring.</returns>
+        internal static string VtSubstring(this string str, int startOffset)
+        {
+            return VtSubstring(str, startOffset, int.MaxValue, prependStr: null, appendStr: null);
+        }
+
+        /// <summary>
+        /// Substring implementation that takes into account the VT escape sequences.
+        /// </summary>
+        /// <param name="str">String that may contain VT escape sequences.</param>
+        /// <param name="startOffset">
+        /// When the string doesn't contain VT sequences, it's the starting index.
+        /// When the string contains VT sequences, it means starting from the 'n-th' char that doesn't belong to a escape sequence.</param>
+        /// <param name="length">Number of non-escape-sequence characters to be included in the substring.</param>
+        /// <returns>The requested substring.</returns>
+        internal static string VtSubstring(this string str, int startOffset, int length)
+        {
+            return VtSubstring(str, startOffset, length, prependStr: null, appendStr: null);
+        }
+
+        /// <summary>
+        /// Substring implementation that takes into account the VT escape sequences.
+        /// </summary>
+        /// <param name="str">String that may contain VT escape sequences.</param>
+        /// <param name="startOffset">
+        /// When the string doesn't contain VT sequences, it's the starting index.
+        /// When the string contains VT sequences, it means starting from the 'n-th' char that doesn't belong to a escape sequence.</param>
+        /// <param name="prependStr">The string to be prepended to the substring.</param>
+        /// <param name="appendStr">The string to be appended to the substring.</param>
+        /// <returns>The requested substring.</returns>
+        internal static string VtSubstring(this string str, int startOffset, string prependStr, string appendStr)
+        {
+            return VtSubstring(str, startOffset, int.MaxValue, prependStr, appendStr);
+        }
+
+        /// <summary>
+        /// Substring implementation that takes into account the VT escape sequences.
+        /// </summary>
+        /// <param name="str">String that may contain VT escape sequences.</param>
+        /// <param name="startOffset">
+        /// When the string doesn't contain VT sequences, it's the starting index.
+        /// When the string contains VT sequences, it means starting from the 'n-th' char that doesn't belong to a escape sequence.</param>
+        /// <param name="length">Number of non-escape-sequence characters to be included in the substring.</param>
+        /// <param name="prependStr">The string to be prepended to the substring.</param>
+        /// <param name="appendStr">The string to be appended to the substring.</param>
+        /// <returns>The requested substring.</returns>
+        internal static string VtSubstring(this string str, int startOffset, int length, string prependStr, string appendStr)
+        {
+            var valueStrDec = new ValueStringDecorated(str);
+            if (valueStrDec.IsDecorated)
+            {
+                // Handle strings with VT sequences.
+                var sb = new StringBuilder(capacity: str.Length);
+                bool copyStarted = startOffset == 0;
+                bool hasEscSeqs = false;
+                bool firstNonEscChar = true;
+
+                // Find all escape sequences in the string, and keep track of their starting indexes and length.
+                var ansiRanges = new Dictionary<int, int>();
+                foreach (Match match in ValueStringDecorated.AnsiRegex.Matches(str))
+                {
+                    ansiRanges.Add(match.Index, match.Length);
+                }
+
+                for (int i = 0, offset = 0; i < str.Length; i++)
+                {
+                    // Keep all leading ANSI escape sequences.
+                    if (ansiRanges.TryGetValue(i, out int len))
+                    {
+                        hasEscSeqs = true;
+                        sb.Append(str.AsSpan(i, len));
+
+                        i += len - 1;
+                        continue;
+                    }
+
+                    // OK, now we get a non-escape-sequence character.
+                    if (copyStarted)
+                    {
+                        if (firstNonEscChar)
+                        {
+                            // Prepend the string before we copy the first non-escape-sequence character.
+                            sb.Append(prependStr);
+                            firstNonEscChar = false;
+                        }
+
+                        // Copy this character if we've started the copy.
+                        sb.Append(str[i]);
+
+                        // Increment 'offset' to keep track of number of non-escape-sequence characters we've copied.
+                        offset++;
+                    }
+                    else if (++offset == startOffset)
+                    {
+                        // We've skipped enough non-escape-sequence characters, and will be copying the next one.
+                        copyStarted = true;
+
+                        // Reset 'offset' and from now on use it to track the number of copied non-escape-sequence characters.
+                        offset = 0;
+                        continue;
+                    }
+
+                    // If the number of copied non-escape-sequence characters has reached the specified length, done copying.
+                    if (offset == length)
+                    {
+                        break;
+                    }
+                }
+
+                if (hasEscSeqs)
+                {
+                    string resetStr = PSStyle.Instance.Reset;
+                    bool endsWithReset = sb.EndsWith(resetStr);
+                    if (endsWithReset)
+                    {
+                        // Append the given string before the reset VT sequence.
+                        sb.Insert(sb.Length - resetStr.Length, appendStr);
+                    }
+                    else
+                    {
+                        // Append the given string and add the reset VT sequence.
+                        sb.Append(appendStr).Append(resetStr);
+                    }
+                }
+                else
+                {
+                    sb.Append(appendStr);
+                }
+
+                return sb.ToString();
+            }
+
+            // Handle strings without VT sequences.
+            if (length == int.MaxValue)
+            {
+                length = str.Length - startOffset;
+            }
+
+            if (prependStr is null && appendStr is null)
+            {
+                return str.Substring(startOffset, length);
+            }
+            else
+            {
+                int capacity = length + prependStr?.Length ?? 0 + appendStr?.Length ?? 0;
+                return new StringBuilder(prependStr, capacity)
+                    .Append(str, startOffset, length)
+                    .Append(appendStr)
+                    .ToString();
+            }
+        }
+
+        internal static bool EndsWith(this StringBuilder sb, string value)
+        {
+            if (sb.Length < value.Length)
+            {
+                return false;
+            }
+
+            int offset = sb.Length - value.Length;
+            for (int i = 0; i < value.Length; i++)
+            {
+                if (sb[offset + i] != value[i])
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
     }
 }
diff --git a/test/powershell/engine/Formatting/PSStyle.Tests.ps1 b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
index 04c13c5e04e..24343537e82 100644
--- a/test/powershell/engine/Formatting/PSStyle.Tests.ps1
+++ b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
@@ -238,3 +238,108 @@ Describe 'Tests for $PSStyle automatic variable' {
         }
     }
 }
+
+Describe 'Handle strings with escape sequences in formatting' {
+
+    BeforeAll {
+        function Get-DemoObjects {
+            [PSCustomObject]@{PSTypeName = "User"; Name = "Bob Saggat"; Tenure = 2; Role = "Developer" }
+            [PSCustomObject]@{PSTypeName = "User"; Name = "John Seymour"; Tenure = 6; Role = "Sw Engineer" }
+            [PSCustomObject]@{PSTypeName = "User"; Name = "Billy Bob Thorton"; Tenure = 13; Role = "Senior DevOps Engineer" }
+        }
+
+        $oldOutputRendering = $PSStyle.OutputRendering
+        $PSStyle.OutputRendering = [System.Management.Automation.OutputRendering]::Ansi
+        $colors = @("`e[32m", "`e[34m", "`e[33m", "`e[31m", "`e[33m", "`e[34m", "`e[32m")
+        $outFile = "$TestDrive\outFile.txt"
+    }
+
+    AfterAll {
+        $PSStyle.OutputRendering = $oldOutputRendering
+    }
+
+    It 'Truncation for strings with no escape sequences' {
+        $expected = @"
+`e[32;1mName       Role            YIR`e[0m
+`e[32;1m----       ----            ---`e[0m
+Bob Saggat Developer         2
+John Seym… Sw Engineer       6
+Billy Bob… Senior DevOps …  13
+"@
+        Get-DemoObjects |
+            Format-Table @{Width = 10; Name = "Name"; E = { $_.Name }},
+                         @{Width = 15; Name = "Role";  E = { $_.Role }},
+                         @{Width = 3; Name = "YIR";  E = { $_.Tenure }} |
+            Out-File $outFile
+
+        $text = Get-Content $outFile -Raw
+        $text.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
+    }
+
+    It "Truncation for strings with escape sequences - TableView-1" {
+        $expected = @"
+`e[32;1mName       Role            YIR`e[0m
+`e[32;1m----       ----            ---`e[0m
+`e[32mBob Saggat`e[39m`e[0m Developer         2
+`e[33mJohn Seym…`e[0m Sw Engineer       6
+`e[31mBilly Bob…`e[0m Senior DevOps …  13
+"@
+        Get-DemoObjects |
+            Format-Table @{Width = 10; Name = "Name"; E = {
+                                $index = [array]::BinarySearch(@(3, 5, 8), $_.Tenure)
+                                $color = $colors[$index]
+                                $color + $_.Name + "`e[39m"}
+                          },
+                         @{Width = 15; Name = "Role";  E = { $_.Role }},
+                         @{Width = 3; Name = "YIR";  E = { $_.Tenure }} |
+            Out-File $outFile
+
+        $text = Get-Content $outFile -Raw
+        $text.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
+    }
+
+    It "Truncation for strings with escape sequences - TableView-2" {
+        $expected = @"
+`e[32;1mName       Role            YIR`e[0m
+`e[32;1m----       ----            ---`e[0m
+`e[32mBob Saggat`e[39m`e[0m Developer`e[0m         2
+`e[33mJohn Seym…`e[0m `e[1;33mSw Engineer`e[0m       6
+`e[31mBilly Bob…`e[0m `e[42m`e[1;33mSenior DevOps …`e[0m  13
+"@
+        Get-DemoObjects |
+            Format-Table @{Width = 10; Name = "Name"; E = {
+                                $index = [array]::BinarySearch(@(3, 5, 8), $_.Tenure)
+                                $color = $colors[$index]
+                                $color + $_.Name + "`e[39m"}
+                          },
+                         @{Width = 15; Name = "Role"; E = {
+                            $color = -join $(switch -regex ($_.Role){
+                                "Senior" { "`e[42m" }
+                                "Engineer" { "`e[1;33m" }
+                            })
+                            $color + $_.Role  + "`e[0m"}},
+                         @{Width = 3; Name = "YIR";  E = { $_.Tenure }} |
+            Out-File $outFile
+
+        $text = Get-Content $outFile -Raw
+        $text.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
+    }
+
+    It "Truncation for strings with escape sequences - WideView" {
+        $expected = @"
+`e[32mBob Saggat`e[39m             `e[0m `e[33mJohn Seymour`e[39m`e[0m
+`e[31mBilly Bob Thorton`e[39m      `e[0m `e[32mBob Saggat`e[39m`e[0m
+`e[33mJohn Seymour`e[39m           `e[0m `e[31mBilly Bob Thorton`e[39m`e[0m
+"@
+        (Get-DemoObjects) + (Get-DemoObjects) |
+            Format-Wide @{E = {
+                            $index = [array]::BinarySearch(@(3, 5, 8), $_.Tenure)
+                            $color = $colors[$index]
+                            $color + $_.Name + "`e[39m" }
+                        } -Column 2 |
+            Out-String -Width 47 | Out-File $outFile
+
+        $text = Get-Content $outFile -Raw
+        $text.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
+    }
+}

From 3bff8c0e69e910300d888bd6020394d29feb4c20 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 6 May 2022 11:47:42 -0700
Subject: [PATCH 345/645] Fix build id variable name when selecting CI
 container (#17279)

---
 .vsts-ci/linux.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
index e553689652c..14907611f71 100644
--- a/.vsts-ci/linux.yml
+++ b/.vsts-ci/linux.yml
@@ -116,11 +116,13 @@ stages:
       clean: true
 
     - pwsh: |
+        $buildId = $env:BUILD_BUILDID
+        Write-Verbose "Fall back seed: $buildId" -Verbose
         # For PRs set the seed to the PR number so that the image is always the same
         $seed = $env:SYSTEM_PULLREQUEST_PULLREQUESTID
         if(!$seed) {
           # for non-PRs use the integer identifier of the build as the seed.
-          $seed = $env:SYSTEM_BUILD_BUILDID
+          $seed = $buildId
         }
         Write-Verbose "Seed: $seed" -Verbose
 

From a33b5d32b0e93c97adba1befad277f91716770a9 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 6 May 2022 11:54:04 -0700
Subject: [PATCH 346/645] Put Secure supply chain analysis at correct place
 (#17273)

* Update releaseBuild.yml

* Add nuget security analysis to where it should be

* Add a display name

* Update tools/releaseBuild/azureDevOps/releaseBuild.yml

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
---
 tools/releaseBuild/azureDevOps/releaseBuild.yml               | 3 +++
 .../azureDevOps/templates/insert-nuget-config-azfeed.yml      | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index 59fb0498a57..916f90c7a5b 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -34,6 +34,9 @@ variables:
     value: 1
   - name: NugetSecurityAnalysisWarningLevel
     value: none
+  # Prevents auto-injection of nuget-security-analysis@0
+  - name: skipNugetSecurityAnalysis
+    value: true
   - name: branchCounterKey
     value: $[format('{0:yyyyMMdd}-{1}', pipeline.startTime,variables['Build.SourceBranch'])]
   - name: branchCounter
diff --git a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
index 9cf3d8dbc8d..affecad20dd 100644
--- a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+++ b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
@@ -23,3 +23,7 @@ steps:
       }
   displayName: 'Add nuget.config for Azure DevOps feed for packages'
   condition: and(succeededOrFailed(), ne(variables['PSInternalNugetFeed'], ''))
+
+- task: nuget-security-analysis@0
+  displayName: 'Run Secure Supply Chain analysis'
+

From 4af204f574c92d21034cd86e49ab31be73ba6011 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 9 May 2022 11:42:15 -0700
Subject: [PATCH 347/645] Switch to using GitHub action to verify markdown
 links for PRs (#17281)

---
 .github/workflows/markdown-link/config.json |  3 +++
 .github/workflows/markdownLink.yml          | 20 ++++++++++++++++++++
 .vsts-ci/misc-analysis.yml                  | 12 ------------
 README.md                                   |  2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 .github/workflows/markdown-link/config.json
 create mode 100644 .github/workflows/markdownLink.yml

diff --git a/.github/workflows/markdown-link/config.json b/.github/workflows/markdown-link/config.json
new file mode 100644
index 00000000000..ff00be38b45
--- /dev/null
+++ b/.github/workflows/markdown-link/config.json
@@ -0,0 +1,3 @@
+{
+  "aliveStatusCodes": [504, 503, 403, 200]
+}
diff --git a/.github/workflows/markdownLink.yml b/.github/workflows/markdownLink.yml
new file mode 100644
index 00000000000..732ab5d4159
--- /dev/null
+++ b/.github/workflows/markdownLink.yml
@@ -0,0 +1,20 @@
+on:
+  pull_request:
+    branches:
+      - master
+      - 'release/**'
+    paths:
+      - '**.md'
+
+name: Check links for modified files
+jobs:
+  markdown-link-check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - uses: gaurav-nelson/github-action-markdown-link-check@v1
+      with:
+        use-quiet-mode: 'yes'
+        use-verbose-mode: 'yes'
+        check-modified-files-only: 'yes'
+        config-file: .github/workflows/markdown-link/config.json
diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
index b7d451ea199..b9e19a2a505 100644
--- a/.vsts-ci/misc-analysis.yml
+++ b/.vsts-ci/misc-analysis.yml
@@ -51,15 +51,3 @@ stages:
   dependsOn: []
   jobs:
   - template: ./misc-analysis/mdSpell.yml
-- stage: markdown_link
-  displayName: Markdown Link
-  dependsOn: []
-  jobs:
-  - template: ./misc-analysis/generateMarkdownMatrix.yml
-    parameters:
-      jobName: generateMatrix
-      taskName: matrixTask
-  - template: ./misc-analysis/markdown.yml
-    parameters:
-      matrix: $[ dependencies.generateMatrix.outputs['matrixTask.matrix'] ]
-      dependsOn: generateMatrix
diff --git a/README.md b/README.md
index fecde3d1e5c..1fb9ac898e5 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@ For more information on how and why we built this dashboard, check out this [blo
 
 ## Discussions
 
-[GitHub Discussions](https://docs.github.com/en/free-pro-team@latest/discussions/quickstart) is a feature to enable fluid and open discussions within the community
+[GitHub Discussions](https://docs.github.com/discussions/quickstart) is a feature to enable fluid and open discussions within the community
 for topics that are not related to code, unlike issues.
 
 This is an experiment we are trying in our repositories to see if it helps move discussions out of issues so that issues remain actionable by the team or members of the community.

From 6c33ebd51f9c9034ff45588aec6fee7065f2e365 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 9 May 2022 21:41:51 +0000
Subject: [PATCH 348/645] Update to the latest NOTICES file (#17275)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 ThirdPartyNotices.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index cff5f36bccd..5490a136b06 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -658,7 +658,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-NJsonSchema 10.6.9 - MIT
+NJsonSchema 10.6.10 - MIT
 
 
 (c) 2008 VeriSign, Inc.

From ea0ab84eb2e0e17f9ac28708737cf9ae8744dcae Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 9 May 2022 17:51:07 -0700
Subject: [PATCH 349/645] Reduce unneeded verbose message from `build.psm1`
 (#17291)

---
 build.psm1 | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 3648e0f0d01..92f398ea1d4 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1949,7 +1949,7 @@ function Install-Dotnet {
 
             $psArgs += @('-SkipNonVersionedFiles')
 
-            $psArgs | Out-String | Write-Verbose -Verbose
+            $psArgs -join ' ' | Write-Verbose -Verbose
 
             Start-NativeExecution {
                 & $fullPSPath @psArgs
@@ -2195,21 +2195,21 @@ function Start-PSBootstrap {
 }
 
 function Get-LatestInstalledSDK {
-    Start-NativeExecution -sb {
-        dotnet --list-sdks | ForEach-Object {
-            # this splits strings like
-            # '6.0.202 [C:\Program Files\dotnet\sdk]'
-            # '7.0.100-preview.2.22153.17 [C:\Users\johndoe\AppData\Local\Microsoft\dotnet\sdk]'
-            # into version and path parts.
-            $version, $null = $_ -split '\s',2
-            try {
-                [System.Management.Automation.SemanticVersion]::new($version)
-            }
-            catch {
-                Write-Warning -Message "Unable to parse dotnet version semantically: $version"
-            }
-        } | Sort-Object -Descending | Select-Object -First 1
-    } -IgnoreExitcode 2> $null
+    $output = Start-NativeExecution -sb { dotnet --list-sdks } -IgnoreExitcode 2> $null
+
+    $output | ForEach-Object {
+        # this splits strings like
+        # '6.0.202 [C:\Program Files\dotnet\sdk]'
+        # '7.0.100-preview.2.22153.17 [C:\Users\johndoe\AppData\Local\Microsoft\dotnet\sdk]'
+        # into version and path parts.
+        $version, $null = $_ -split '\s',2
+        try {
+            [System.Management.Automation.SemanticVersion]::new($version)
+        }
+        catch {
+            Write-Warning -Message "Unable to parse dotnet version semantically: $version"
+        }
+    } | Sort-Object -Descending | Select-Object -First 1
 }
 
 function Start-DevPowerShell {

From ee97dfe412f790ca6587f1efecd163933942da66 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 10 May 2022 10:06:09 -0700
Subject: [PATCH 350/645] Only inject NuGet security analysis if we are using
 secure `nuget.config` (#17293)

---
 .../azureDevOps/templates/insert-nuget-config-azfeed.yml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
index affecad20dd..3ba642407ce 100644
--- a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+++ b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
@@ -26,4 +26,4 @@ steps:
 
 - task: nuget-security-analysis@0
   displayName: 'Run Secure Supply Chain analysis'
-
+  condition: and(succeededOrFailed(), ne(variables['PSInternalNugetFeed'], ''), ne(variables['AzDevOpsFeed'], ''))

From 34f316db1a38450a77685479f927d29f0e938b2e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 10 May 2022 10:09:51 -0700
Subject: [PATCH 351/645] Improve how Linux container CI builds are identified
 (#17295)

* Add buildName preview to Jobs and tests

* try other syntax

* give up on task name

* try naming the job again

* use other syntax for variable

* rename and tag build

* Revert "try naming the job again"

This reverts commit b900e1231b10ab6d7ebe4cd864b843b82e0bd2a3.

* conditionally set build name and add tag

* Pass title prefix

* don't add tag when the build is a PR

* use correct variable name
---
 .vsts-ci/linux.yml                            |  9 +++
 .../templates/test/nix-container-test.yml     |  4 +-
 .vsts-ci/templates/test/nix-test-steps.yml    |  3 +-
 tools/ci.psm1                                 | 62 +++++++++++++++----
 4 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
index 14907611f71..7fd3d6b2a1d 100644
--- a/.vsts-ci/linux.yml
+++ b/.vsts-ci/linux.yml
@@ -153,6 +153,15 @@ stages:
         Import-Module ./PowerShell/tools/ci.psm1
         Set-BuildVariable -Name containerName -Value $containerName -IsOutput
         Set-BuildVariable -Name containerBuildName -Value $selectedImage.JobName -IsOutput
+
+        if($env:BUILD_REASON -eq 'PullRequest') {
+          Write-Host "##vso[build.updatebuildnumber]PR-$(System.PullRequest.PullRequestNumber)-$($selectedImage.JobName)-$((get-date).ToString("yyyyMMddhhmmss"))"
+        } else {
+          Write-Host "##vso[build.updatebuildnumber]${env:BUILD_SOURCEBRANCHNAME}-${env:BUILD_SOURCEVERSION}-$($selectedImage.JobName)-$((get-date).ToString("yyyyMMddhhmmss"))"
+
+          # Cannot do this for a PR
+          Write-Host "##vso[build.addbuildtag]$($selectedImage.JobName)"
+        }
       name: getContainerTask
       displayName: Get Container
       continueOnError: true
diff --git a/.vsts-ci/templates/test/nix-container-test.yml b/.vsts-ci/templates/test/nix-container-test.yml
index 87827ac2508..931af6fc675 100644
--- a/.vsts-ci/templates/test/nix-container-test.yml
+++ b/.vsts-ci/templates/test/nix-container-test.yml
@@ -11,8 +11,9 @@ jobs:
     - getContainerJob
 
   variables:
-    getContainerJob: $[ dependencies.getContainerJob.outputs['getContainerTask.containerName'] ]
     __INCONTAINER: 1
+    getContainerJob: $[ dependencies.getContainerJob.outputs['getContainerTask.containerName'] ]
+    containerBuildName: $[ dependencies.getContainerJob.outputs['getContainerTask.containerBuildName'] ]
 
   container: $[ variables.getContainerJob ]
 
@@ -26,3 +27,4 @@ jobs:
       parameters:
         purpose: ${{ parameters.purpose }}
         tagSet: ${{ parameters.tagSet }}
+        buildName: $(containerBuildName)
diff --git a/.vsts-ci/templates/test/nix-test-steps.yml b/.vsts-ci/templates/test/nix-test-steps.yml
index c0329888006..84d7a37b848 100644
--- a/.vsts-ci/templates/test/nix-test-steps.yml
+++ b/.vsts-ci/templates/test/nix-test-steps.yml
@@ -1,6 +1,7 @@
 parameters:
   purpose: ''
   tagSet: 'CI'
+  buildName: 'Ubuntu'
 
 steps:
   - pwsh: |
@@ -54,6 +55,6 @@ steps:
       chmod a+x $pwshPath
       $options.Output = $pwshPath
       Set-PSOptions $options
-      Invoke-CITest -Purpose '${{ parameters.purpose }}' -TagSet '${{ parameters.tagSet }}'
+      Invoke-CITest -Purpose '${{ parameters.purpose }}' -TagSet '${{ parameters.tagSet }}' -TitlePrefix '${{ parameters.buildName }}'
     displayName: Test
     condition: succeeded()
diff --git a/tools/ci.psm1 b/tools/ci.psm1
index c06137a438d..bc87db9db5e 100644
--- a/tools/ci.psm1
+++ b/tools/ci.psm1
@@ -219,7 +219,8 @@ function Invoke-CITest
         [ValidateSet('UnelevatedPesterTests', 'ElevatedPesterTests')]
         [string] $Purpose,
         [ValidateSet('CI', 'Others')]
-        [string] $TagSet
+        [string] $TagSet,
+        [string] $TitlePrefix
     )
 
     # Set locale correctly for Linux CIs
@@ -244,7 +245,7 @@ function Invoke-CITest
 
     if($IsLinux -or $IsMacOS)
     {
-        return Invoke-LinuxTestsCore -Purpose $Purpose -ExcludeTag $ExcludeTag -TagSet $TagSet
+        return Invoke-LinuxTestsCore -Purpose $Purpose -ExcludeTag $ExcludeTag -TagSet $TagSet -TitlePrefix $TitlePrefix
     }
 
     # CoreCLR
@@ -271,7 +272,12 @@ function Invoke-CITest
             ExcludeTag = $ExcludeTag + 'RequireAdminOnWindows'
         }
 
-        Start-PSPester @arguments -Title "Pester Unelevated - $TagSet"
+        $title = "Pester Unelevated - $TagSet"
+        if ($TitlePrefix) {
+            $title = "$TitlePrefix - $title"
+        }
+        Start-PSPester @arguments -Title $title
+
         # Fail the build, if tests failed
         Test-PSPesterResults -TestResultsFile $testResultsNonAdminFile
 
@@ -293,7 +299,11 @@ function Invoke-CITest
                 $arguments['Path'] = $testFiles
             }
 
-            Start-PSPester @arguments -Title "Pester Experimental Unelevated - $featureName"
+            $title = "Pester Experimental Unelevated - $featureName"
+            if ($TitlePrefix) {
+                $title = "$TitlePrefix - $title"
+            }
+            Start-PSPester @arguments -Title $title
 
             # Fail the build, if tests failed
             Test-PSPesterResults -TestResultsFile $expFeatureTestResultFile
@@ -309,7 +319,11 @@ function Invoke-CITest
             ExcludeTag = $ExcludeTag
         }
 
-        Start-PSPester @arguments -Title "Pester Elevated - $TagSet"
+        $title = "Pester Elevated - $TagSet"
+        if ($TitlePrefix) {
+            $title = "$TitlePrefix - $title"
+        }
+        Start-PSPester @arguments -Title $title
 
         # Fail the build, if tests failed
         Test-PSPesterResults -TestResultsFile $testResultsAdminFile
@@ -334,7 +348,12 @@ function Invoke-CITest
                 # If a non-empty string or array is specified for the feature name, we only run those test files.
                 $arguments['Path'] = $testFiles
             }
-            Start-PSPester @arguments -Title "Pester Experimental Elevated - $featureName"
+
+            $title = "Pester Experimental >levated - $featureName"
+            if ($TitlePrefix) {
+                $title = "$TitlePrefix - $title"
+            }
+            Start-PSPester @arguments -Title $title
 
             # Fail the build, if tests failed
             Test-PSPesterResults -TestResultsFile $expFeatureTestResultFile
@@ -612,7 +631,8 @@ function Invoke-LinuxTestsCore
         [ValidateSet('UnelevatedPesterTests', 'ElevatedPesterTests', 'All')]
         [string] $Purpose = 'All',
         [string[]] $ExcludeTag = @('Slow', 'Feature', 'Scenario'),
-        [string] $TagSet = 'CI'
+        [string] $TagSet = 'CI',
+        [string] $TitlePrefix
     )
 
     $output = Split-Path -Parent (Get-PSOutput -Options (Get-PSOptions))
@@ -639,7 +659,11 @@ function Invoke-LinuxTestsCore
     # Running tests which do not require sudo.
     if($Purpose -eq 'UnelevatedPesterTests' -or $Purpose -eq 'All')
     {
-        $pesterPassThruNoSudoObject = Start-PSPester @noSudoPesterParam -Title "Pester No Sudo - $TagSet"
+        $title = "Pester No Sudo - $TagSet"
+        if ($TitlePrefix) {
+            $title = "$TitlePrefix - $title"
+        }
+        $pesterPassThruNoSudoObject = Start-PSPester @noSudoPesterParam -Title $title
 
         # Running tests that do not require sudo, with specified experimental features enabled
         $noSudoResultsWithExpFeatures = @()
@@ -660,7 +684,12 @@ function Invoke-LinuxTestsCore
                 # If a non-empty string or array is specified for the feature name, we only run those test files.
                 $noSudoPesterParam['Path'] = $testFiles
             }
-            $passThruResult = Start-PSPester @noSudoPesterParam -Title "Pester Experimental No Sudo - $featureName - $TagSet"
+            $title = "Pester Experimental No Sudo - $featureName - $TagSet"
+            if ($TitlePrefix) {
+                $title = "$TitlePrefix - $title"
+            }
+            $passThruResult = Start-PSPester @noSudoPesterParam -Title $title
+
             $noSudoResultsWithExpFeatures += $passThruResult
         }
     }
@@ -674,7 +703,12 @@ function Invoke-LinuxTestsCore
         $sudoPesterParam['ExcludeTag'] = $ExcludeTag
         $sudoPesterParam['Sudo'] = $true
         $sudoPesterParam['OutputFile'] = $testResultsSudo
-        $pesterPassThruSudoObject = Start-PSPester @sudoPesterParam -Title "Pester Sudo - $TagSet"
+
+        $title = "Pester Sudo - $TagSet"
+        if ($TitlePrefix) {
+            $title = "$TitlePrefix - $title"
+        }
+        $pesterPassThruSudoObject = Start-PSPester @sudoPesterParam -Title $title
 
         # Running tests that require sudo, with specified experimental features enabled
         $sudoResultsWithExpFeatures = @()
@@ -696,7 +730,13 @@ function Invoke-LinuxTestsCore
                 # If a non-empty string or array is specified for the feature name, we only run those test files.
                 $sudoPesterParam['Path'] = $testFiles
             }
-            $passThruResult = Start-PSPester @sudoPesterParam -Title "Pester Experimental Sudo - $featureName - $TagSet"
+
+            $title = "Pester Experimental Sudo - $featureName - $TagSet"
+            if ($TitlePrefix) {
+                $title = "$TitlePrefix - $title"
+            }
+            $passThruResult = Start-PSPester @sudoPesterParam -Title $title
+
             $sudoResultsWithExpFeatures += $passThruResult
         }
     }

From 6ffc24b4dc2b674b2047c3b0f4268dd0660be98e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 May 2022 10:31:39 -0700
Subject: [PATCH 352/645] Update the cgmanifest (#17302)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 tools/cgmanifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 504b6198504..1bf4f5b0a7b 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -1215,7 +1215,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Cryptography.Pkcs",
-          "Version": "6.0.0"
+          "Version": "6.0.1"
         }
       },
       "DevelopmentDependency": false

From 18846935c7ceb500a7ec1b8ae0cdd9b14401d5f8 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Wed, 11 May 2022 02:34:52 +0900
Subject: [PATCH 353/645] Correct spelling of `pseudo` in `Compiler.cs`
 (#17285)

psuedo -> pseudo
psuedo-code -> pseudo-code
---
 .../engine/parser/Compiler.cs                             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index 6d325aa3e8c..68bb523427b 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -1064,7 +1064,7 @@ internal static Expression CallSetVariable(Expression variablePath, Expression r
 
         internal Expression GetAutomaticVariable(VariableExpressionAst varAst)
         {
-            // Generate, in psuedo code:
+            // Generate, in pseudo code:
             //
             //     return (localsTuple.IsValueSet(tupleIndex)
             //          ? localsTuple.ItemXXX
@@ -1074,7 +1074,7 @@ internal Expression GetAutomaticVariable(VariableExpressionAst varAst)
             //
             //     * $PSCmdlet - always set if the script uses cmdletbinding.
             //     * $_ - always set in process and end block, otherwise need dynamic checks.
-            //     * $this - can never know if it's set, always need above psuedo code.
+            //     * $this - can never know if it's set, always need above pseudo code.
             //     * $input - also can never know - it's always set from a command process, but not necessarily set from ScriptBlock.Invoke.
             //
             // These optimizations are not yet performed.
@@ -3907,7 +3907,7 @@ private Expression GetRedirectedExpression(CommandExpressionAst commandExpr, boo
             //       funcContext.OutputPipe = oldPipe;
             //   }
             //
-            // In the above psuedo-code, any of {outputFileRedirection, nonOutputFileRedirection, mergingRedirection} may
+            // In the above pseudo-code, any of {outputFileRedirection, nonOutputFileRedirection, mergingRedirection} may
             // not exist, but the order is preserved, so that file redirections go before merging redirections (so that
             // funcContext.OutputPipe has the correct value when setting up merging.)
             //
@@ -5178,7 +5178,7 @@ public object VisitCatchClause(CatchClauseAst catchClauseAst)
         // If the automatic var has no value in the current frame, then we set the variable's value to $null
         // after leaving the stmt.
         //
-        // The psuedo-code:
+        // The pseudo-code:
         //
         //    try {
         //        oldValue = (localSet.Get(automaticVar)) ? locals.ItemNNN : null;

From 44098e771a059c06f1619eac8f97deeb118d127e Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 10 May 2022 16:05:14 -0700
Subject: [PATCH 354/645] Fix the list view to not leak VT decorations (#17262)

---
 .../FormatAndOutput/common/ListWriter.cs      | 28 +++++++++++++++++--
 .../Format-List.Tests.ps1                     | 13 +++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
index 6031eacd216..16df0c57287 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
@@ -6,6 +6,7 @@
 using System.Diagnostics;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
+using System.Text;
 
 namespace Microsoft.PowerShell.Commands.Internal.Format
 {
@@ -30,6 +31,11 @@ internal class ListWriter
         /// </summary>
         private int _columnWidth = 0;
 
+        /// <summary>
+        /// A cached string builder used within this type to reduce creation of temporary strings.
+        /// </summary>
+        private readonly StringBuilder _cachedBuilder = new();
+
         /// <summary>
         /// </summary>
         /// <param name="propertyNames">Names of the properties to display.</param>
@@ -207,7 +213,9 @@ private void WriteProperty(int k, string propertyValue, LineOutput lo)
         private void WriteSingleLineHelper(string prependString, string line, LineOutput lo)
         {
             if (line == null)
+            {
                 line = string.Empty;
+            }
 
             // compute the width of the field for the value string (in screen cells)
             int fieldCellCount = _columnWidth - _propertyLabelsDisplayLength;
@@ -221,14 +229,30 @@ private void WriteSingleLineHelper(string prependString, string line, LineOutput
             // display the string collection
             for (int k = 0; k < sc.Count; k++)
             {
+                string str = sc[k];
+                _cachedBuilder.Clear();
+
                 if (k == 0)
                 {
-                    lo.WriteLine(PSStyle.Instance.Formatting.FormatAccent + prependString + PSStyle.Instance.Reset + sc[k]);
+                    _cachedBuilder
+                        .Append(PSStyle.Instance.Formatting.FormatAccent)
+                        .Append(prependString)
+                        .Append(PSStyle.Instance.Reset)
+                        .Append(str);
                 }
                 else
                 {
-                    lo.WriteLine(padding + PSStyle.Instance.Formatting.FormatAccent + PSStyle.Instance.Reset + sc[k]);
+                    _cachedBuilder
+                        .Append(padding)
+                        .Append(str);
                 }
+
+                if (str.Contains(ValueStringDecorated.ESC) && !str.EndsWith(PSStyle.Instance.Reset))
+                {
+                    _cachedBuilder.Append(PSStyle.Instance.Reset);
+                }
+
+                lo.WriteLine(_cachedBuilder.ToString());
             }
         }
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
index 715503c3577..cd8d0d037b9 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
@@ -229,4 +229,17 @@ Describe 'Format-List color tests' {
         $out[0] | Should -BeExactly "$($PSStyle.Formatting.FormatAccent)Short      : $($PSStyle.Reset)1" -Because ($out[0] | Format-Hex)
         $out[1] | Should -BeExactly "$($PSStyle.Formatting.FormatAccent)LongLabelN : $($PSStyle.Reset)2"
     }
+
+    It 'VT decorations in a property value should not be leaked in list view' {
+        $expected = @"
+`e[32;1ma : `e[0mHello
+`e[32;1mb : `e[0m`e[36mworld`e[0m
+"@
+        ## Format-List should append the 'reset' escape sequence to the value of 'b' property.
+        $obj = [pscustomobject]@{ a = "Hello"; b = $PSStyle.Foreground.Cyan + "world"; }
+        $obj | Format-List | Out-File "$TestDrive/outfile.txt"
+
+        $output = Get-Content "$TestDrive/outfile.txt" -Raw
+        $output.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
+    }
 }

From 514d6f62e0ff1a1157d4c1f97dbf08f8b2db206e Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 11 May 2022 09:49:43 -0700
Subject: [PATCH 355/645] Fix `build.psm1` to find the required .NET SDK
 version when a higher version is installed (#17299)

---
 build.psm1 | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 92f398ea1d4..0d1096d673c 100644
--- a/build.psm1
+++ b/build.psm1
@@ -393,7 +393,7 @@ function Start-PSBuild {
     }
 
     # Verify if the dotnet in-use is the required version
-    $dotnetCLIInstalledVersion = Get-LatestInstalledSDK
+    $dotnetCLIInstalledVersion = Find-RequiredSDK $dotnetCLIRequiredVersion
 
     If ($dotnetCLIInstalledVersion -ne $dotnetCLIRequiredVersion) {
         Write-Warning @"
@@ -2152,7 +2152,7 @@ function Start-PSBootstrap {
         $dotNetExists = precheck 'dotnet' $null
         $dotNetVersion = [string]::Empty
         if($dotNetExists) {
-            $dotNetVersion = Get-LatestInstalledSDK
+            $dotNetVersion = Find-RequiredSDK $dotnetCLIRequiredVersion
         }
 
         if(!$dotNetExists -or $dotNetVersion -ne $dotnetCLIRequiredVersion -or $Force.IsPresent) {
@@ -2194,22 +2194,30 @@ function Start-PSBootstrap {
     }
 }
 
-function Get-LatestInstalledSDK {
+## If the required SDK version is found, return it.
+## Otherwise, return the latest installed SDK version that can be found.
+function Find-RequiredSDK {
+    param(
+        [Parameter(Mandatory, Position = 0)]
+        [string] $requiredSdkVersion
+    )
+
     $output = Start-NativeExecution -sb { dotnet --list-sdks } -IgnoreExitcode 2> $null
 
-    $output | ForEach-Object {
+    $installedSdkVersions = $output | ForEach-Object {
         # this splits strings like
         # '6.0.202 [C:\Program Files\dotnet\sdk]'
         # '7.0.100-preview.2.22153.17 [C:\Users\johndoe\AppData\Local\Microsoft\dotnet\sdk]'
         # into version and path parts.
-        $version, $null = $_ -split '\s',2
-        try {
-            [System.Management.Automation.SemanticVersion]::new($version)
-        }
-        catch {
-            Write-Warning -Message "Unable to parse dotnet version semantically: $version"
-        }
-    } | Sort-Object -Descending | Select-Object -First 1
+        ($_ -split '\s',2)[0]
+    }
+
+    if ($installedSdkVersions -contains $requiredSdkVersion) {
+        $requiredSdkVersion
+    }
+    else {
+        $installedSdkVersions | Sort-Object -Descending | Select-Object -First 1
+    }
 }
 
 function Start-DevPowerShell {
@@ -2361,7 +2369,7 @@ function Find-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 = Find-RequiredSDK $chosenDotNetVersion
         Pop-Location
 
         Write-Verbose -Message "Find-DotNet: dotnetCLIInstalledVersion = $dotnetCLIInstalledVersion; chosenDotNetVersion = $chosenDotNetVersion"

From 1a24540e31b27433eaa19e460d4b90b656a85256 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Wed, 11 May 2022 12:30:22 -0700
Subject: [PATCH 356/645] Enable more tests to be run in a container. (#17294)

---
 .../commands/utility/SetDateCommand.cs        | 35 +++++++++++----
 .../engine/Utils.cs                           |  2 +
 .../NativeCommandProcessor.Tests.ps1          |  2 +
 .../Test-Connection.Tests.ps1                 |  8 +---
 .../Set-Date.Tests.ps1                        | 22 +++++++---
 .../Help/HelpSystem.OnlineHelp.Tests.ps1      | 43 +------------------
 .../engine/Help/HelpSystem.Tests.ps1          |  2 +-
 7 files changed, 50 insertions(+), 64 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs
index 8128c1a84ca..3ace3ea0e3f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs
@@ -71,7 +71,13 @@ protected override void ProcessRecord()
             if (ShouldProcess(dateToUse.ToString()))
             {
 #if UNIX
-                if (!Platform.NonWindowsSetDate(dateToUse))
+                // We are not validating the native call here.
+                // We just want to be sure that we're using the value the user provided us.
+                if (Dbg.Internal.InternalTestHooks.SetDate)
+                {
+                    WriteObject(dateToUse);
+                }
+                else if (!Platform.NonWindowsSetDate(dateToUse))
                 {
                     throw new Win32Exception(Marshal.GetLastWin32Error());
                 }
@@ -86,16 +92,23 @@ protected override void ProcessRecord()
                 systemTime.Second = (ushort)dateToUse.Second;
                 systemTime.Milliseconds = (ushort)dateToUse.Millisecond;
 #pragma warning disable 56523
-                if (!NativeMethods.SetLocalTime(ref systemTime))
+                if (Dbg.Internal.InternalTestHooks.SetDate)
                 {
-                    throw new Win32Exception(Marshal.GetLastWin32Error());
+                    WriteObject(systemTime);
                 }
-
-                // MSDN says to call this twice to account for changes
-                // between DST
-                if (!NativeMethods.SetLocalTime(ref systemTime))
+                else
                 {
-                    throw new Win32Exception(Marshal.GetLastWin32Error());
+                    if (!NativeMethods.SetLocalTime(ref systemTime))
+                    {
+                        throw new Win32Exception(Marshal.GetLastWin32Error());
+                    }
+
+                    // MSDN says to call this twice to account for changes
+                    // between DST
+                    if (!NativeMethods.SetLocalTime(ref systemTime))
+                    {
+                        throw new Win32Exception(Marshal.GetLastWin32Error());
+                    }
                 }
 #pragma warning restore 56523
 #endif
@@ -106,7 +119,11 @@ protected override void ProcessRecord()
             PSNoteProperty note = new("DisplayHint", DisplayHint);
             outputObj.Properties.Add(note);
 
-            WriteObject(outputObj);
+            // If we've turned on the SetDate test hook, don't emit the output object here because we emitted it earlier.
+            if (!Dbg.Internal.InternalTestHooks.SetDate)
+            {
+                WriteObject(outputObj);
+            }
         }
 
         #endregion
diff --git a/src/System.Management.Automation/engine/Utils.cs b/src/System.Management.Automation/engine/Utils.cs
index 879f43944a5..16ac72bfb12 100644
--- a/src/System.Management.Automation/engine/Utils.cs
+++ b/src/System.Management.Automation/engine/Utils.cs
@@ -1592,6 +1592,8 @@ public static class InternalTestHooks
         internal static bool SetConsoleWidthToZero;
         internal static bool SetConsoleHeightToZero;
 
+        internal static bool SetDate;
+
         // A location to test PSEdition compatibility functionality for Windows PowerShell modules with
         // since we can't manipulate the System32 directory in a test
         internal static string TestWindowsPowerShellPSHomeLocation;
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
index b76cf67bfec..8175c4b07ce 100644
--- a/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
+++ b/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
@@ -47,6 +47,8 @@ Describe 'native commands with pipeline' -tags 'Feature' {
     It 'native command should be killed when pipeline is disposed' -Skip:($IsWindows) {
         $yes = (Get-Process 'yes' -ErrorAction Ignore).Count
         yes | Select-Object -First 2
+        # wait a little to be sure that the process is ended
+        Start-Sleep -Milliseconds 500
         (Get-Process 'yes' -ErrorAction Ignore).Count | Should -Be $yes
     }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
index b8c9d14a1be..1d639fe5f2d 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
@@ -254,10 +254,7 @@ Describe "Test-Connection" -tags "CI", "RequireSudoOnUnix" {
     }
 
     Context "MTUSizeDetect" {
-        # We skip the MtuSize detection tests when in containers, as the environments throw raw exceptions
-        # instead of returning a PacketTooBig response cleanly.
-        # Test disabled due to .NET runtime issue: https://github.com/dotnet/runtime/issues/55961
-        It "MTUSizeDetect works" -Pending:(($env:__INCONTAINER -eq 1) -or $IsMacOS) {
+        It "MTUSizeDetect works" {
             $result = Test-Connection $testAddress -MtuSize
 
             $result | Should -BeOfType Microsoft.PowerShell.Commands.TestConnectionCommand+PingMtuStatus
@@ -266,8 +263,7 @@ Describe "Test-Connection" -tags "CI", "RequireSudoOnUnix" {
             $result.MtuSize | Should -BeGreaterThan 0
         }
 
-        # Test disabled due to .NET runtime issue: https://github.com/dotnet/runtime/issues/55961
-        It "Quiet works" -Pending:(($env:__INCONTAINER -eq 1) -or $IsMacOS) {
+        It "Quiet works" {
             $result = Test-Connection $gatewayAddress -MtuSize -Quiet
 
             $result | Should -BeOfType Int32
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-Date.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-Date.Tests.ps1
index f8b974c457f..f382c6fa214 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-Date.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-Date.Tests.ps1
@@ -5,18 +5,28 @@ Import-Module HelpersCommon
 
 Describe "Set-Date for admin" -Tag @('CI', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
     BeforeAll {
-        $skipTest = (Test-IsVstsLinux) -or ($env:__INCONTAINER -eq 1)
+        [System.Management.Automation.Internal.InternalTestHooks]::SetTestHook("SetDate", $true)
     }
-    # Fails in VSTS Linux with Operation not permitted
-    It "Set-Date should be able to set the date in an elevated context" -Skip:$skipTest {
+    AfterAll {
+        [System.Management.Automation.Internal.InternalTestHooks]::SetTestHook("SetDate", $false)
+    }
+
+    It "Set-Date should be able to set the date in an elevated context" {
         { Get-Date | Set-Date } | Should -Not -Throw
     }
 
-    # Fails in VSTS Linux with Operation not permitted
-    It "Set-Date should be able to set the date with -Date parameter" -Skip:$skipTest {
+    # Check the individual properties as the types may be different
+    It "Set-Date should be able to set the date with -Date parameter" {
         $target = Get-Date
         $expected = $target
-        Set-Date -Date $target | Should -Be $expected
+        $observed = Set-Date -Date $target
+        # do not test dayofweek because the number of the day is different between native and managed
+        $observed.Day | Should -Be $expected.Day
+        $observed.Hour | Should -Be $expected.Hour
+        $observed.Minutes | Should -Be $expected.Minutes
+        $observed.Month | Should -Be $expected.Month
+        $observed.Second | Should -Be $expected.Second
+        $observed.Year | Should -Be $expected.Year
     }
 }
 
diff --git a/test/powershell/engine/Help/HelpSystem.OnlineHelp.Tests.ps1 b/test/powershell/engine/Help/HelpSystem.OnlineHelp.Tests.ps1
index 69922140347..b56effc8626 100644
--- a/test/powershell/engine/Help/HelpSystem.OnlineHelp.Tests.ps1
+++ b/test/powershell/engine/Help/HelpSystem.OnlineHelp.Tests.ps1
@@ -42,6 +42,7 @@ Describe 'Online help tests for PowerShell Cmdlets' -Tags "Feature" {
 
             # TopicTitle - is the cmdlet name in the csv file
             # HelpURI - is the expected help URI in the csv file
+            # If this is correct, then launching the cmdlet should open the expected help URI.
 
             It "Validate 'get-help $($cmdlet.TopicTitle) -Online'" -Skip:$skipTest {
                 $actualURI = Get-Help $cmdlet.TopicTitle -Online
@@ -52,48 +53,6 @@ Describe 'Online help tests for PowerShell Cmdlets' -Tags "Feature" {
     }
 }
 
-Describe 'Get-Help -Online opens the default web browser and navigates to the cmdlet help content' -Tags "Feature" {
-
-    $skipTest = [System.Management.Automation.Platform]::IsIoT -or
-                [System.Management.Automation.Platform]::IsNanoServer -or
-                $env:__INCONTAINER -eq 1
-
-    # this code is a workaround for issue: https://github.com/PowerShell/PowerShell/issues/3079
-    if((-not ($skipTest)) -and $IsWindows)
-    {
-        $skipTest = $true
-        $regKey = "HKCU:\Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice"
-
-        try
-        {
-            $progId = (Get-ItemProperty $regKey).ProgId
-            if($progId)
-            {
-                if (-not (Test-Path 'HKCR:\'))
-                {
-                    New-PSDrive -PSProvider registry -Root HKEY_CLASSES_ROOT -Name HKCR | Should -Not -BeNullOrEmpty
-                }
-                $browserExe = ((Get-ItemProperty "HKCR:\$progId\shell\open\command")."(default)" -replace '"', '') -split " "
-                if ($browserExe.count -ge 1)
-                {
-                    if($browserExe[0] -match '.exe')
-                    {
-                        $skipTest = $false
-                    }
-                }
-            }
-        }
-        catch
-        {
-            # We are not able to access Registry, skipping test.
-        }
-    }
-
-    It "Get-Help get-process -online" -Skip:$skipTest {
-        { Get-Help get-process -Online } | Should -Not -Throw
-    }
-}
-
 Describe 'Get-Help -Online is not supported on Nano Server and IoT' -Tags "CI" {
 
     $skipTest = -not ([System.Management.Automation.Platform]::IsIoT -or [System.Management.Automation.Platform]::IsNanoServer)
diff --git a/test/powershell/engine/Help/HelpSystem.Tests.ps1 b/test/powershell/engine/Help/HelpSystem.Tests.ps1
index 207053b058b..bd523b1033e 100644
--- a/test/powershell/engine/Help/HelpSystem.Tests.ps1
+++ b/test/powershell/engine/Help/HelpSystem.Tests.ps1
@@ -578,7 +578,7 @@ Describe "Help failure cases" -Tags Feature {
 
         # under some conditions this does not throw, so include what we actually got
         $helpTopic = [guid]::NewGuid().ToString("N")
-        { & $command $helpTopic -ErrorAction Stop } | Should -Throw -ErrorId "HelpNotFound,Microsoft.PowerShell.Commands.GetHelpCommand" -Because "$(& $command $helpTopic -ea Ignore)"
+        { & $command $helpTopic -ErrorAction Stop } | Should -Throw -ErrorId "HelpNotFound,Microsoft.PowerShell.Commands.GetHelpCommand" -Because "A help topic was unexpectantly found for $helpTopic"
     }
 }
 

From 765c7badd98e2d2d53af79ad622dc9eb8d88e321 Mon Sep 17 00:00:00 2001
From: Anam Navied <anam.naviyou@gmail.com>
Date: Wed, 11 May 2022 15:39:23 -0400
Subject: [PATCH 357/645] Add mapping for ubuntu22.04 jammy (#17317)

---
 tools/packages.microsoft.com/mapping.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/packages.microsoft.com/mapping.json b/tools/packages.microsoft.com/mapping.json
index ba0b2def317..46ea9f7dbf4 100644
--- a/tools/packages.microsoft.com/mapping.json
+++ b/tools/packages.microsoft.com/mapping.json
@@ -37,6 +37,10 @@
           "distribution" : ["bionic"],
           "PackageFormat" : "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
       },
+      {
+          "distribution" : ["jammy"],
+          "PackageFormat" : "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"
+      },
       {
           "distribution": ["focal"],
           "PackageFormat": "PACKAGE_NAME_POWERSHELL_RELEASE-1.deb_amd64.deb"

From e4fb4a81120b235575a74235d15b976fb3f63766 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 11 May 2022 15:22:22 -0700
Subject: [PATCH 358/645] Update to the latest NOTICES file (#17311)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 ThirdPartyNotices.txt | 40 +---------------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 5490a136b06..54f6f61f836 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -3031,47 +3031,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.Pkcs 6.0.0 - MIT
+System.Security.Cryptography.Pkcs 6.0.1 - MIT
 
 
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation.
-Copyright (c) Andrew Arnott
-Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2017 Yoshifumi Kawai
-Copyright (c) Microsoft Corporation
-Copyright (c) 2007 James Newton-King
-Copyright (c) 2012-2014, Yann Collet
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Copyright (c) 2018 Alexander Chermyanin
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2013-2017, Milosz Krajewski
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2019 Microsoft Corporation, Daan Leijen
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
-Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 

From 2fe5f0037ded57d0a22aa2de7d140be8120d79ef Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 11 May 2022 15:23:58 -0700
Subject: [PATCH 359/645] Add a finalize template which causes jobs with issues
 to fail (#17314)

* Add a finalize template

* add finalize to prep

* update display name

* Add condition

* revert me: add fake issue

* fix display name

* Revert "revert me: add fake issue"

This reverts commit 5b10f299ce8f2c0f5cc11a8484b7b3b396d4a473.
---
 tools/releaseBuild/azureDevOps/releaseBuild.yml              | 2 ++
 .../azureDevOps/templates/checkAzureContainer.yml            | 3 ++-
 .../azureDevOps/templates/compliance/compliance.yml          | 2 ++
 tools/releaseBuild/azureDevOps/templates/json.yml            | 2 ++
 tools/releaseBuild/azureDevOps/templates/linux.yml           | 4 ++++
 .../releaseBuild/azureDevOps/templates/mac-file-signing.yml  | 2 ++
 .../releaseBuild/azureDevOps/templates/mac-package-build.yml | 2 ++
 .../azureDevOps/templates/mac-package-signing.yml            | 2 ++
 tools/releaseBuild/azureDevOps/templates/mac.yml             | 2 ++
 tools/releaseBuild/azureDevOps/templates/step/finalize.yml   | 5 +++++
 tools/releaseBuild/azureDevOps/templates/testartifacts.yml   | 2 ++
 .../azureDevOps/templates/windows-hosted-build.yml           | 2 ++
 .../azureDevOps/templates/windows-package-signing.yml        | 2 ++
 .../releaseBuild/azureDevOps/templates/windows-packaging.yml | 2 ++
 14 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 tools/releaseBuild/azureDevOps/templates/step/finalize.yml

diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index 916f90c7a5b..4ae32ad430f 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -227,3 +227,5 @@ stages:
             Get-Content "$(Build.StagingDirectory)\release.json"
             Write-Host "##vso[artifact.upload containerfolder=metadata;artifactname=metadata]$(Build.StagingDirectory)\release.json"
           displayName: Create and upload release.json file to build artifact
+
+        - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
index 49082849e9b..af6451004e4 100644
--- a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
+++ b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
@@ -22,6 +22,7 @@ jobs:
       UseJson: no
 
   - task: AzurePowerShell@4
+    displayName: Check if blob exists and delete if specified
     inputs:
       azureSubscription: '$(AzureFileCopySubscription)'
       scriptType: inlineScript
@@ -47,4 +48,4 @@ jobs:
             }
         }
 
-
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
index e81bdcf3709..eb0400bc3fe 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
@@ -88,3 +88,5 @@ jobs:
     inputs:
       sourceScanPath: '$(Build.SourcesDirectory)\tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/json.yml b/tools/releaseBuild/azureDevOps/templates/json.yml
index 714978022a5..1d6c10b8f3e 100644
--- a/tools/releaseBuild/azureDevOps/templates/json.yml
+++ b/tools/releaseBuild/azureDevOps/templates/json.yml
@@ -53,3 +53,5 @@ jobs:
     inputs:
       sourceScanPath: '$(Build.SourcesDirectory)\tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index 6dd44eb219c..92224a74d04 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -153,6 +153,8 @@ jobs:
     condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
     workingDirectory: $(PowerShellRoot)
 
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
+
 - job: upload_${{ parameters.buildName }}
   displayName: ${{ parameters.uploadDisplayName }} ${{ parameters.buildName }}
   dependsOn: build_${{ parameters.buildName }}
@@ -335,3 +337,5 @@ jobs:
     parameters:
       artifactPath: '$(Build.StagingDirectory)\signedPackages\release'
       condition: and(and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
index a5c5a0811ec..5af4295994e 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
@@ -118,3 +118,5 @@ jobs:
       inputs:
         sourceScanPath: '$(repoRoot)\tools'
         snapshotForceEnabled: true
+
+    - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
index 69c683156d8..e61ea99004f 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
@@ -133,3 +133,5 @@ jobs:
     inputs:
       sourceScanPath: '$(PowerShellRoot)/tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
index e41d0609d4c..c0fea010973 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
@@ -130,3 +130,5 @@ jobs:
     inputs:
       sourceScanPath: '$(repoRoot)/tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/mac.yml b/tools/releaseBuild/azureDevOps/templates/mac.yml
index 9634c3bdb57..776382c952d 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac.yml
@@ -59,3 +59,5 @@ jobs:
     inputs:
       sourceScanPath: '$(Build.SourcesDirectory)/tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/step/finalize.yml b/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
new file mode 100644
index 00000000000..72a677fec9a
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/step/finalize.yml
@@ -0,0 +1,5 @@
+steps:
+  - pwsh: |
+      throw "Jobs with an Issue will not work for release. Please fix the issue and try again."
+    displayName: Check for SucceededWithIssues
+    condition: eq(variables['Agent.JobStatus'],'SucceededWithIssues')
diff --git a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
index 38d9ee0d158..99122b59de6 100644
--- a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
+++ b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
@@ -57,3 +57,5 @@ jobs:
       BuildTestPackage -runtime linux-musl-x64
 
     displayName: Build test package and upload
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
index 16554ae7d41..1201edf98b7 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -78,3 +78,5 @@ jobs:
     inputs:
       sourceScanPath: '$(PowerShellRoot)\tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
index 66bf7af7b3d..c2e3f4d1c1c 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -134,3 +134,5 @@ jobs:
     inputs:
       sourceScanPath: '$(repoRoot)\tools'
       snapshotForceEnabled: true
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index 956eb19d855..7cd0f5e33a4 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -353,3 +353,5 @@ jobs:
       }
     displayName: Clean up local Clone
     condition: always()
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml

From 57965f22f6c11edef5a2c63045fcffa0abbd84a3 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 11 May 2022 15:24:40 -0700
Subject: [PATCH 360/645] Disable release security analysis for SSH CI (#17303)

---
 .vsts-ci/sshremoting-tests.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.vsts-ci/sshremoting-tests.yml b/.vsts-ci/sshremoting-tests.yml
index 46af221f8eb..e7b7003c3b7 100644
--- a/.vsts-ci/sshremoting-tests.yml
+++ b/.vsts-ci/sshremoting-tests.yml
@@ -23,11 +23,21 @@ pr:
     - '/test/SSHRemoting/*'
 
 variables:
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-  POWERSHELL_TELEMETRY_OPTOUT: 1
+  - name: DOTNET_CLI_TELEMETRY_OPTOUT
+    value: 1
+  - name: POWERSHELL_TELEMETRY_OPTOUT
+    value: 1
   # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-  __SuppressAnsiEscapeSequences: 1
+  - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
+    value: 1
+  - name:  __SuppressAnsiEscapeSequences
+    value: 1
+  - name: NugetSecurityAnalysisWarningLevel
+    value: none
+# Prevents auto-injection of nuget-security-analysis@0
+  - name: skipNugetSecurityAnalysis
+    value: true
+
 
 resources:
 - repo: self

From 38909f7ee5c14931b8de6a462c5870734d2e78a4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 11 May 2022 18:27:51 -0700
Subject: [PATCH 361/645] Update .NET SDK version from
 `7.0.100-preview.2.22153.17` to `7.0.100-preview.4.22252.9` (#17061)

---
 assets/wix/files.wxs                          | 88 +++----------------
 global.json                                   |  2 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  6 +-
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           |  8 +-
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 .../System.Management.Automation.csproj       | 14 +--
 .../engine/MshMemberInfo.cs                   |  2 +-
 .../WebCmdlets.Tests.ps1                      | 28 ------
 ...soft.PowerShell.NamedPipeConnection.csproj |  2 +-
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/Program.cs             | 10 ++-
 test/tools/WebListener/WebListener.csproj     |  4 +-
 14 files changed, 43 insertions(+), 129 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 49baf7615b1..020d9c09fd3 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -71,9 +71,6 @@
       <Component Id="cmp0068EDEA68F0D5BF766CE0305A9082BA">
         <File Id="filA48A655199585DFA5D785038D3C734C8" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.Contracts.dll" />
       </Component>
-      <Component Id="cmpC998327F5549F21F104E42B906FD60C4">
-        <File Id="fil2AB41B473A72FD55578EECEEFF2533DB" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-time-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp36DE82D9AD5932124FEC1B067B0D011D">
         <File Id="filDED6864E01EE07C9FB9CA2749C56C94F" KeyPath="yes" Source="$(var.ProductSourcePath)\System.ServiceModel.Web.dll" />
       </Component>
@@ -86,9 +83,6 @@
       <Component Id="cmp02D5012CE68A72B4EB57A85BF4E40843">
         <File Id="filD5DB09D96F86A527D7CEAB0EAFF51B86" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.Security.dll" />
       </Component>
-      <Component Id="cmpF0032BD367B4868B9D0B806AFE081A3D">
-        <File Id="filDA24B4648C7D71A519B6936C515B657D" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-filesystem-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp0AC970BEC366F9ADB96BD5FA34459C23">
         <File Id="fil3F2F86E92BC30154B4AFAD3F8F43CD83" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Xml.XPath.XDocument.dll" />
       </Component>
@@ -149,9 +143,6 @@
       <Component Id="cmpE76D27D7B5D2ABAF88E777361EB91660">
         <File Id="fil47B903568DF7E9B8A73851F7E4A2FEAB" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Eventing-Legacy-L1-1-0.dll" />
       </Component>
-      <Component Id="cmp3BBD9887A33167372318718FF8D1AEDB">
-        <File Id="fil3A265404B89A7B66638CD6249A872235" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-utility-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp3233756873AD35E45D8AFF0DECB12A10">
         <File Id="fil8FA95BFDD5FD05813DE64D663DAEF2C7" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.Cng.dll" />
       </Component>
@@ -269,9 +260,6 @@
       <Component Id="cmp4CB166B799668590C946561BBF2EFDE1">
         <File Id="fil0190F42D9CCACA0269421EFE6529CC5B" KeyPath="yes" Source="$(var.ProductSourcePath)\mi.dll" />
       </Component>
-      <Component Id="cmp07CBFC92249F39E209D5A16F80B9B54B">
-        <File Id="filCDE53CA156BB4F7FECF572E36EDD5814" KeyPath="yes" Source="$(var.ProductSourcePath)\ucrtbase.dll" />
-      </Component>
       <Component Id="cmpB9AA376C913A011DB4FCF8058BBA8243">
         <File Id="filCF52386189A53C286BDEF8C9B52CA4F2" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-errorhandling-l1-1-1.dll" />
       </Component>
@@ -368,9 +356,6 @@
       <Component Id="cmp46562550D9D7CE53CAB162E828DE0283">
         <File Id="filF9CC0FF66E3FDFE703063A59EA0FC7E8" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Linq.Expressions.dll" />
       </Component>
-      <Component Id="cmp0DD31480ADEA8E2FE03F202EAC7410DA">
-        <File Id="filCA5AF6E212D338ED8190A2CF8C30A64B" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-process-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp8D3944B62C435DB200C2997753F11B4C">
         <File Id="filC38FA53191DC840B249A5E70B7111474" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Threading.Timer.dll" />
       </Component>
@@ -422,9 +407,6 @@
       <Component Id="cmp4C42AE293DE5ECC32068657DD0E1E109">
         <File Id="fil7F290AA9461B201CC430D62AB361BB5C" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.Compression.dll" />
       </Component>
-      <Component Id="cmpB33F1D8B38414D02BC417B7221BB2C92">
-        <File Id="fil67677DBEFAD32470E776301630C99956" KeyPath="yes" Source="$(var.ProductSourcePath)\dbgshim.dll" />
-      </Component>
       <Component Id="cmpD53ED8782D7CC7C913ECB3436A2FD7D7">
         <File Id="fil2F2D79333159F787952C64D7D01486A7" KeyPath="yes" Source="$(var.ProductSourcePath)\pwrshplugin.dll" />
       </Component>
@@ -491,18 +473,12 @@
       <Component Id="cmp5EFA00ED72CAE35E2305583E29C7C0E7">
         <File Id="fil7B391D35320BDE264190F5B0E15027A3" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-comm-l1-1-0.dll" />
       </Component>
-      <Component Id="cmp40742AC331A13D877BE3085F0E2E5017">
-        <File Id="fil3BED8CDA46F8260F0D9D103D1DE598EC" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-convert-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp5E5EC336758293C396FB70037EAECB51">
         <File Id="fil822A044DA3EDC8B87F6455195D0EA67D" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Private.CoreLib.dll" />
       </Component>
       <Component Id="cmp283684B3318BCD5A91BF7209D7334305">
         <File Id="fil784BD86176B1BFD7016FD9FC7DA3EEA1" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.WebHeaderCollection.dll" />
       </Component>
-      <Component Id="cmpA49D505499A05C526F7BB28E03781BAD">
-        <File Id="fil3A149DC49629023F9881E06A3A232A56" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-private-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp0A0A39DD78246C9E3C90FA18EC033480">
         <File Id="filCE4963B76A7BA5A844237E14E9F61ABD" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-xstate-l2-1-0.dll" />
       </Component>
@@ -542,9 +518,6 @@
       <Component Id="cmp8C0438E44E39800EA412C6D1DF647015">
         <File Id="filAD9895244BE9130C2D45E8E9926AC9F6" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Xml.XDocument.dll" />
       </Component>
-      <Component Id="cmp2460170ED7A1590E536AC4DFA2A090C4">
-        <File Id="fil4E3587A7E196B2C031760DA9F753FFB6" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-stdio-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpDA3111DDBA4FDD64BF4EFCD32783E9D7">
         <File Id="fil2F3F18223A914D352BB0E9063DB48132" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-file-l2-1-1.dll" />
       </Component>
@@ -611,9 +584,6 @@
       <Component Id="cmp79B0C6718C0A7BFE6B6810F6DAD41E81">
         <File Id="filF60A905BFBF12DDCE7C1AA276A2F050F" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Resources.Reader.dll" />
       </Component>
-      <Component Id="cmp7A2455D41F5640E0038318F3C93E6183">
-        <File Id="fil965530F52B393BAA6F9F5DAC76DF62D5" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-math-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp017F1FE334055D7A9ED621D69CE55DD4">
         <File Id="fil7108E4467B9B1B6950FDA3885B294F4B" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Collections.dll" />
       </Component>
@@ -974,21 +944,12 @@
       <Component Id="cmpF780CC7E5C204F6E10B5B47620F46811">
         <File Id="fil5A34C0D4D001F3E1B087252ECF88EB20" KeyPath="yes" Source="$(var.ProductSourcePath)\System.ServiceProcess.dll" />
       </Component>
-      <Component Id="cmpF42179572F192988F9C4D8E216D01887">
-        <File Id="fil5AD9188C7AC3EAC0FF3CF91A667D17B1" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-conio-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmp95717E1DE28928903EF839289814A639">
-        <File Id="fil83271044F4FA903831D1660B2C26E908" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-runtime-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpBFA0597694F7DEC5642F4DDFBB45F896">
         <File Id="fil4044E303D81BB2A62CF5AAD12A0C7DE6" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-shutdown-l1-1-0.dll" />
       </Component>
       <Component Id="cmp18535DF89416A031A513808AB8CE4B56">
         <File Id="fil52AE8E8AD62EEA8CBD86A1D9C7DA54FE" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Management.Automation.dll" />
       </Component>
-      <Component Id="cmpEA952E7A6079391C2EB0EFF5245DCDBC">
-        <File Id="filB9F3BB8ECB2441EFD813D0178EB5F884" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-string-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpF47CAA3A846D0FD72C81B4A04768665C">
         <File Id="fil77F3F4CFCFCA39C1B1B083A36C2E5BC5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Linq.dll" />
       </Component>
@@ -1013,9 +974,6 @@
       <Component Id="cmp97AD5D1CAADB8D87FAEFC54F0C4B1589">
         <File Id="fil767FF6EB7B7A5812137BC8FEC3EEA1E6" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Collections.Immutable.dll" />
       </Component>
-      <Component Id="cmp2BDEF32CC13DBA589FB48B87BFCCFD88">
-        <File Id="fil33B7DF26FF9BB42AB22D9ED46814204F" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-multibyte-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp7B96661EFE30D6FCD749BFA049D70D35">
         <File Id="fil7DABC93B7AB8B576F1F17928631C50E8" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-synch-l1-2-0.dll" />
       </Component>
@@ -1025,9 +983,6 @@
       <Component Id="cmp5729F92BFE2487ED81F16B9F76F5A0D8">
         <File Id="fil1D814BE2F3A0D26425F9BD2DC3AC69E6" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-profile-l1-1-0.dll" />
       </Component>
-      <Component Id="cmpE0B9175AA901E035434C262FA5BFDE24">
-        <File Id="fil030614BC7CA05C9D87D0D0D46E290265" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-locale-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp8930D9CAAE48EEA1DDF7B05ECA4C1E8D">
         <File Id="fil788EA3360C765EEDAC59EB3311975703" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-EventLog-Legacy-L1-1-0.dll" />
       </Component>
@@ -1049,9 +1004,6 @@
       <Component Id="cmpF0C4435AA0B6F2F56D0D000A43EE1277">
         <File Id="fil0521BA12454B6AAC63D5931273EE9785" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-fibers-l1-1-0.dll" />
       </Component>
-      <Component Id="cmp541CF763DAFF56DCA1D812BD1465C83D">
-        <File Id="fil349B3C482CDAA7C903AEC8CB6CFD582F" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-heap-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp155A485C71B7DE54A5EF8B9B663B01CC">
         <File Id="filCD4FBC2BA645383317FA103756778D25" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Runtime.Serialization.Primitives.dll" />
       </Component>
@@ -1121,9 +1073,6 @@
       <Component Id="cmp99B544AF658E943EE6140147819FCBC1">
         <File Id="fil59E629256DD2B13293508775BE21887A" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.WebClient.dll" />
       </Component>
-      <Component Id="cmp81D64ED83BF0404F92003FCE096996C1">
-        <File Id="fil91FBD24EE9047B501078E138C0A5CC02" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-crt-environment-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpBA27F493BA63114999D9C645A559ACBE">
         <File Id="fil45F1A936427A7AA64349B26335C8BA54" KeyPath="yes" Source="$(var.ProductSourcePath)\System.ComponentModel.DataAnnotations.dll" />
       </Component>
@@ -1641,6 +1590,9 @@
         <Component Id="cmpE5993DB9118640FD8C180A2D61C89C01">
           <File Id="fil7381E5F4FBC64B60A8B7D7841B89F4C6" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Security.Cryptography.dll" />
         </Component>
+        <Component Id="cmp044F67223E6D490D8533691BF50B2B86">
+          <File Id="fil461F92924EE64C589D486A178AAD1342" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Tar.dll" />
+        </Component>
       </Directory>
       <Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
         <Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
@@ -3137,9 +3089,6 @@
       <Component Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D">
         <File Id="fil8FEEEB3B27DF40148EB85CE6AE1A420B" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.DiaSymReader.Native.$(var.FileArchitecture).dll" />
       </Component>
-      <Component Id="cmp1EBDE676D79B4B0DB859B3F601D78513">
-        <File Id="fil589A10D0D26C4D7F8479F40D11824D63" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
-      </Component>
       <Component Id="cmpB92B70CEFC2F438386F97264FB436CDD">
         <File Id="fil824D1A506096432888ABC2FDFAFABEE5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.EventLog.Messages.dll" />
       </Component>
@@ -3180,15 +3129,18 @@
       <Component Id="cmpE0DEAA289B2D4594A0C4791B2808C97C">
         <File Id="fil530EAD567BDB402FA6F02AFAA696D721" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.dll" />
       </Component>
-      <Component Id="cmp05AA3332D604464298B922F34672061F">
-        <File Id="fil45EB1A6088AA4475B1B9B0413BC0FE02" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.15202.dll" />
-      </Component>
       <Component Id="cmpFE56825F03274064A69AA43CA4B597C7">
         <File Id="filAAE3E9B665914FF7A0164F83BD421829" KeyPath="yes" Source="$(var.ProductSourcePath)\getfilesiginforedist.dll" />
       </Component>
       <Component Id="cmp0AB1EF494922410AB17DC61097295172">
         <File Id="fil70AB7246AA664FFCADD71E79322934EA" KeyPath="yes" Source="$(var.ProductSourcePath)\getfilesiginforedistwrapper.dll" />
       </Component>
+      <Component Id="cmp8A466581FE0540CEB2210C64DA5F970B">
+        <File Id="filE75D9761159B495A8DF7A1035E36EF05" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Formats.Tar.dll" />
+      </Component>
+      <Component Id="cmp1BCC0D0458494D89B527324A8E131D18">
+        <File Id="fil81CF1F7D16E34E6BAD003EF106FE384A" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.22904.dll" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -3216,12 +3168,10 @@
       <ComponentRef Id="cmp02ABBE4A3EDBEBFD05DC17A009A2B79D" />
       <ComponentRef Id="cmpAA10498DF244C013CB5043C62E3AA83A" />
       <ComponentRef Id="cmp0068EDEA68F0D5BF766CE0305A9082BA" />
-      <ComponentRef Id="cmpC998327F5549F21F104E42B906FD60C4" />
       <ComponentRef Id="cmp36DE82D9AD5932124FEC1B067B0D011D" />
       <ComponentRef Id="cmp8D31C0EED6D178C8313F057D6EE90970" />
       <ComponentRef Id="cmpEC0174D67CBA8D49D44387CCDC8E7986" />
       <ComponentRef Id="cmp02D5012CE68A72B4EB57A85BF4E40843" />
-      <ComponentRef Id="cmpF0032BD367B4868B9D0B806AFE081A3D" />
       <ComponentRef Id="cmp0AC970BEC366F9ADB96BD5FA34459C23" />
       <ComponentRef Id="cmp268C3104F2C2E1772E901BF932388BA0" />
       <ComponentRef Id="cmp5C3D90690414B641947FDA684E9BE9A9" />
@@ -3242,7 +3192,6 @@
       <ComponentRef Id="cmp52FBB26F92105AD3AD35C220A657AD2A" />
       <ComponentRef Id="cmp717F2424B3CF81CE7C4CF659DB544785" />
       <ComponentRef Id="cmpE76D27D7B5D2ABAF88E777361EB91660" />
-      <ComponentRef Id="cmp3BBD9887A33167372318718FF8D1AEDB" />
       <ComponentRef Id="cmp3233756873AD35E45D8AFF0DECB12A10" />
       <ComponentRef Id="cmpC34CACA6E967ECA4F9CCF56570BD8185" />
       <ComponentRef Id="cmpFD7E03A554A320F567F49F8211D93A59" />
@@ -3282,7 +3231,6 @@
       <ComponentRef Id="cmpD8208C4E8508687BF4672F2A0EB64E67" />
       <ComponentRef Id="cmp16E86C327EA784631EE474C8518A5FA5" />
       <ComponentRef Id="cmp4CB166B799668590C946561BBF2EFDE1" />
-      <ComponentRef Id="cmp07CBFC92249F39E209D5A16F80B9B54B" />
       <ComponentRef Id="cmpB9AA376C913A011DB4FCF8058BBA8243" />
       <ComponentRef Id="cmp91FC3112769800144B79BEECAD84D60A" />
       <ComponentRef Id="cmpC3FFE4945C208FFF74B59235DE2524CF" />
@@ -3315,7 +3263,6 @@
       <ComponentRef Id="cmp1000361436DD46A7A215CE64CCB3070F" />
       <ComponentRef Id="cmp3C4A26443C1FF5DCF10620805BA1810E" />
       <ComponentRef Id="cmp46562550D9D7CE53CAB162E828DE0283" />
-      <ComponentRef Id="cmp0DD31480ADEA8E2FE03F202EAC7410DA" />
       <ComponentRef Id="cmp8D3944B62C435DB200C2997753F11B4C" />
       <ComponentRef Id="cmpCA53F2E8DB1BC17C1D52DF65193093F5" />
       <ComponentRef Id="cmpA2AE100BE9A48176C32A44F8EAFED87F" />
@@ -3333,7 +3280,6 @@
       <ComponentRef Id="cmp61361B29279CEB7B0434A889BB3C3B71" />
       <ComponentRef Id="cmpFCCFD9A69F8311B86AF6ECFD358911D6" />
       <ComponentRef Id="cmp4C42AE293DE5ECC32068657DD0E1E109" />
-      <ComponentRef Id="cmpB33F1D8B38414D02BC417B7221BB2C92" />
       <ComponentRef Id="cmpD53ED8782D7CC7C913ECB3436A2FD7D7" />
       <ComponentRef Id="cmpEA2A37C87C5D278D1C97725C0BE5E814" />
       <ComponentRef Id="cmp1A9CC77C3CEB765A85E2A5D41237626C" />
@@ -3356,10 +3302,8 @@
       <ComponentRef Id="cmpD195B2A584856051C325572DBB7E0FA9" />
       <ComponentRef Id="cmp1043F63E626C53139A6B800DE19F1D31" />
       <ComponentRef Id="cmp5EFA00ED72CAE35E2305583E29C7C0E7" />
-      <ComponentRef Id="cmp40742AC331A13D877BE3085F0E2E5017" />
       <ComponentRef Id="cmp5E5EC336758293C396FB70037EAECB51" />
       <ComponentRef Id="cmp283684B3318BCD5A91BF7209D7334305" />
-      <ComponentRef Id="cmpA49D505499A05C526F7BB28E03781BAD" />
       <ComponentRef Id="cmp0A0A39DD78246C9E3C90FA18EC033480" />
       <ComponentRef Id="cmp3C23CFE2F3E20CB67AB209A01D404991" />
       <ComponentRef Id="cmpD34C8CD8BF5F802DCE6D79BD031400F6" />
@@ -3373,7 +3317,6 @@
       <ComponentRef Id="cmp6E73647D495A1EA3BE6C1A2F86D804FC" />
       <ComponentRef Id="cmp1E51AA1C97285F18C1F3502915AC2142" />
       <ComponentRef Id="cmp8C0438E44E39800EA412C6D1DF647015" />
-      <ComponentRef Id="cmp2460170ED7A1590E536AC4DFA2A090C4" />
       <ComponentRef Id="cmpDA3111DDBA4FDD64BF4EFCD32783E9D7" />
       <ComponentRef Id="cmpDDAD601E3283C9A170131D9676843483" />
       <ComponentRef Id="cmp4AF23AD5CF83E8C3CA23CE6DBF09DAB7" />
@@ -3396,7 +3339,6 @@
       <ComponentRef Id="cmp5084DA048CE4466B2B33CC19E8E160C0" />
       <ComponentRef Id="cmpA1069497315F9B59DAC010E401DDE5F8" />
       <ComponentRef Id="cmp79B0C6718C0A7BFE6B6810F6DAD41E81" />
-      <ComponentRef Id="cmp7A2455D41F5640E0038318F3C93E6183" />
       <ComponentRef Id="cmp017F1FE334055D7A9ED621D69CE55DD4" />
       <ComponentRef Id="cmpC962D0075A7DCFD1C87041AF911A97C4" />
       <ComponentRef Id="cmpAF7B98CB7B1CC0D4106B4C84AA309583" />
@@ -3517,11 +3459,8 @@
       <ComponentRef Id="cmp796D96057D21272C6888BA16E71621A6" />
       <ComponentRef Id="cmp09FC5AE7AC1DEE9FA331E11474827936" />
       <ComponentRef Id="cmpF780CC7E5C204F6E10B5B47620F46811" />
-      <ComponentRef Id="cmpF42179572F192988F9C4D8E216D01887" />
-      <ComponentRef Id="cmp95717E1DE28928903EF839289814A639" />
       <ComponentRef Id="cmpBFA0597694F7DEC5642F4DDFBB45F896" />
       <ComponentRef Id="cmp18535DF89416A031A513808AB8CE4B56" />
-      <ComponentRef Id="cmpEA952E7A6079391C2EB0EFF5245DCDBC" />
       <ComponentRef Id="cmpF47CAA3A846D0FD72C81B4A04768665C" />
       <ComponentRef Id="cmpBE223BF60ADD50DD211D379C90DFF2F5" />
       <ComponentRef Id="cmp52B77FCAF50F9D0DDA11553DDFE24918" />
@@ -3530,11 +3469,9 @@
       <ComponentRef Id="cmp0F07FB10C2781EF64985C0231E9D1880" />
       <ComponentRef Id="cmp6CC2AE24D70256108843A35BBE543ABD" />
       <ComponentRef Id="cmp97AD5D1CAADB8D87FAEFC54F0C4B1589" />
-      <ComponentRef Id="cmp2BDEF32CC13DBA589FB48B87BFCCFD88" />
       <ComponentRef Id="cmp7B96661EFE30D6FCD749BFA049D70D35" />
       <ComponentRef Id="cmp983EFF7B0E21D7CBA5007E969992B47D" />
       <ComponentRef Id="cmp5729F92BFE2487ED81F16B9F76F5A0D8" />
-      <ComponentRef Id="cmpE0B9175AA901E035434C262FA5BFDE24" />
       <ComponentRef Id="cmp8930D9CAAE48EEA1DDF7B05ECA4C1E8D" />
       <ComponentRef Id="cmp8BB683B8EFA12D81B0093983B9A86989" />
       <ComponentRef Id="cmp8C02558B25F6B22C6A6E900C20C10FF9" />
@@ -3542,7 +3479,6 @@
       <ComponentRef Id="cmp88A6FB261DFD24D9E25F2AF63C232B4F" />
       <ComponentRef Id="cmpFC754EAE0337C1473B750A7AEBA4062C" />
       <ComponentRef Id="cmpF0C4435AA0B6F2F56D0D000A43EE1277" />
-      <ComponentRef Id="cmp541CF763DAFF56DCA1D812BD1465C83D" />
       <ComponentRef Id="cmp155A485C71B7DE54A5EF8B9B663B01CC" />
       <ComponentRef Id="cmp0112845AD6F6887B3A1094D1202C3188" />
       <ComponentRef Id="cmp0336F0CDFF2D0715CD342BF0D0EAF38E" />
@@ -3566,7 +3502,6 @@
       <ComponentRef Id="cmp6D952234CE10B4FEBDF02EBBC1C03E1E" />
       <ComponentRef Id="cmp7C73A78033C737A6EA4AAC81D6943407" />
       <ComponentRef Id="cmp99B544AF658E943EE6140147819FCBC1" />
-      <ComponentRef Id="cmp81D64ED83BF0404F92003FCE096996C1" />
       <ComponentRef Id="cmpBA27F493BA63114999D9C645A559ACBE" />
       <ComponentRef Id="cmp405FE4AEFE314F91B7F8089861BBB353" />
       <ComponentRef Id="cmpA0853678FFF217EE041189B7EA010175" />
@@ -4160,7 +4095,6 @@
       <ComponentRef Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" />
       <ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
       <ComponentRef Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D" />
-      <ComponentRef Id="cmp1EBDE676D79B4B0DB859B3F601D78513" />
       <ComponentRef Id="cmpB92B70CEFC2F438386F97264FB436CDD" />
       <ComponentRef Id="cmpEE26930D65E346FDAE1B3E07F5DBEF77" />
       <ComponentRef Id="cmp8635213A03B04AAE8E1BFB7EA85E0DB2" />
@@ -4210,10 +4144,12 @@
       <ComponentRef Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9" />
       <ComponentRef Id="cmpE5993DB9118640FD8C180A2D61C89C01" />
       <ComponentRef Id="cmpE0DEAA289B2D4594A0C4791B2808C97C" />
-      <ComponentRef Id="cmp05AA3332D604464298B922F34672061F" />
       <ComponentRef Id="cmpFE56825F03274064A69AA43CA4B597C7" />
       <ComponentRef Id="cmp0AB1EF494922410AB17DC61097295172" />
       <ComponentRef Id="cmpF735DF855B6A444E8874E7FD15796C37" />
+      <ComponentRef Id="cmp8A466581FE0540CEB2210C64DA5F970B" />
+      <ComponentRef Id="cmp1BCC0D0458494D89B527324A8E131D18" />
+      <ComponentRef Id="cmp044F67223E6D490D8533691BF50B2B86" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 463c146c54b..e097be7392b 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100-preview.2.22153.17"
+    "version": "7.0.100-preview.4.22252.9"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 50cb39f3206..b0e6f222c49 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.4.22229.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 620cb7e718a..b04e27161cd 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0-4.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.2.22152.2" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-1.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.4.22229.4" />
     <PackageReference Include="NJsonSchema" Version="10.6.10" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 3afc5691568..76028af5a3d 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.4.22229.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index a7f86581f9a..b4f715464c1 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.2.22152.2" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.2.22152.2" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.4.22229.4" />
     <!-- 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" />
@@ -30,7 +30,7 @@
     <PackageReference Include="System.Private.ServiceModel" Version="4.9.0" />
     <!-- 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="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.4.22229.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index a0d5f1f3c34..073b47d1587 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.4.22229.4" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 56a1e8adeb3..76a93854def 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.2.22152.2" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.2.22152.2" />
-    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.4.22229.4" />
     <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
-    <PackageReference Include="System.Management" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.Management" Version="7.0.0-preview.4.22229.4" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.2.22152.2" />
-    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.2.22152.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.4.22229.4" />
     <!-- 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.3.0-preview.1" />
diff --git a/src/System.Management.Automation/engine/MshMemberInfo.cs b/src/System.Management.Automation/engine/MshMemberInfo.cs
index 4856b08fb75..ce495f13423 100644
--- a/src/System.Management.Automation/engine/MshMemberInfo.cs
+++ b/src/System.Management.Automation/engine/MshMemberInfo.cs
@@ -2691,7 +2691,7 @@ private static Type GetMethodGroupType(MethodInfo methodInfo)
 
                 return DelegateHelpers.MakeDelegate(methodTypes);
             }
-            catch (TypeLoadException)
+            catch (Exception)
             {
                 return typeof(Func<PSNonBindableType>);
             }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
index 181cbbcf879..7a5ad26d545 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
@@ -1757,24 +1757,11 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
 
             $testCases2 = @(
                 @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls13'}; Pending = $true }
-                # Removed this as Tls now default to Tls12
-                # @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls12'}; Pending = $false }
-                @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls11'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
-                # Removed this as Tls now default to Tls12
-                # @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
-                @{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
-                @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls'}; Pending = $false }
-                @{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
-                # Removed this as Tls now default to Tls12
-                # @{ Test = @{IntendedProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls11, Tls12, Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
                 @{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls13'}; Pending = $true }
                 @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
-                @{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
-                # Removed this as Tls now default to Tls12
-                # @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
             )
         }
 
@@ -3358,24 +3345,9 @@ Describe "Invoke-RestMethod tests" -Tags "Feature", "RequireAdminOnWindows" {
 
             $testCases2 = @(
                 @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls13'}; Pending = $true }
-                # Removed this as Tls now default to Tls12
-                # @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls12'}; Pending = $false }
-                @{ Test = @{IntendedProtocol = 'Tls'; ActualProtocol = 'Tls11'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
-                # Removed this as Tls now default to Tls12
-                # @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
-                @{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
-                @{ Test = @{IntendedProtocol = 'Tls11'; ActualProtocol = 'Tls'}; Pending = $false }
-                @{ Test = @{IntendedProtocol = 'Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls13'; ActualProtocol = 'Tls'}; Pending = $true }
-                # Removed this as Tls now default to Tls12
-                # @{ Test = @{IntendedProtocol = 'Tls11, Tls12'; ActualProtocol = 'Tls'}; Pending = $false }
-                @{ Test = @{IntendedProtocol = 'Tls11, Tls12, Tls13'; ActualProtocol = 'Tls'}; Pending = $false }
                 @{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls13'}; Pending = $true }
-                @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls13'}; Pending = $true }
-                @{ Test = @{IntendedProtocol = 'Tls, Tls12'; ActualProtocol = 'Tls11'}; Pending = $false }
-                # Removed this as Tls now default to Tls12
-                # @{ Test = @{IntendedProtocol = 'Tls, Tls11'; ActualProtocol = 'Tls12'}; Pending = $false }
             )
         }
 
diff --git a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
index 07d33c9a11d..b1e7f09fa6b 100644
--- a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
+++ b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" version="4.5.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <Reference Include="System.Management.Automation">
       <HintPath>.\Ref\System.Management.Automation.dll</HintPath>
     </Reference>
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 50338b19df3..ce9637897b2 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.4.22229.4" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/Program.cs b/test/tools/WebListener/Program.cs
index 37a62a58268..a2d49a45fc5 100644
--- a/test/tools/WebListener/Program.cs
+++ b/test/tools/WebListener/Program.cs
@@ -62,7 +62,10 @@ public static IWebHost BuildWebHost(string[] args) =>
                         {
                             var certificate = new X509Certificate2(args[0], args[1]);
                             HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
-                            httpsOption.SslProtocols = SslProtocols.Tls11;
+
+                            // TLS 1.1 is obsolete. Using this value now defaults to TLS 1.2.
+                            httpsOption.SslProtocols = SslProtocols.Tls12;
+
                             httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
                             httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
                             httpsOption.CheckCertificateRevocation = false;
@@ -78,7 +81,10 @@ public static IWebHost BuildWebHost(string[] args) =>
                         {
                             var certificate = new X509Certificate2(args[0], args[1]);
                             HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
-                            httpsOption.SslProtocols = SslProtocols.Tls;
+
+                            // TLS is obsolete. Using this value now defaults to TLS 1.2.
+                            httpsOption.SslProtocols = SslProtocols.Tls12;
+
                             httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
                             httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
                             httpsOption.CheckCertificateRevocation = false;
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 878d2547786..242e5f76242 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.2.22153.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.4.22251.1" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.4.22229.4" />
   </ItemGroup>
 
   <ItemGroup>

From e8a5db2d74a12afd07137b246b8f6e05b4ef17e5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 12 May 2022 09:58:22 -0700
Subject: [PATCH 362/645] Update the cgmanifest (#17324)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 tools/cgmanifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 1bf4f5b0a7b..f2e9b3507bf 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -1415,7 +1415,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Web.Services.Description",
-          "Version": "4.9.0-rc2.21473.1"
+          "Version": "4.9.0"
         }
       },
       "DevelopmentDependency": false

From ba6fbe9f2a4d23887fc1a03021cfc04ab3147c01 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 12 May 2022 10:03:40 -0700
Subject: [PATCH 363/645] Start rotating through all images (#17315)

* Use day of week for fallback seed

* Use new properties to select CI image

* move container selection code into

* use parameter

* fix azDO variable refernce

* move container name left in non-PR build name

* Use get-command to detect package manager

* update dependencies in build.psm1

* Add RHEL to WSMan support function

* Update build.psm1

* Update tools/ci.psm1

Co-authored-by: James Truher [MSFT] <jimtru@microsoft.com>

Co-authored-by: James Truher [MSFT] <jimtru@microsoft.com>
---
 .vsts-ci/linux.yml                            | 58 ++++---------------
 build.psm1                                    |  7 +--
 .../Modules/HelpersCommon/HelpersCommon.psm1  |  3 +-
 tools/ci.psm1                                 | 52 +++++++++++++++++
 4 files changed, 69 insertions(+), 51 deletions(-)

diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
index 7fd3d6b2a1d..6a3f0280d0c 100644
--- a/.vsts-ci/linux.yml
+++ b/.vsts-ci/linux.yml
@@ -1,3 +1,12 @@
+parameters:
+  - name: ContainerPattern
+    displayName: |
+      Pattern to match JobName of the container.
+      Update this to force a container.
+      `.` will match everything
+    type: string
+    default: .
+
 name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
 trigger:
   # Batch merge builds together while a merge build is running
@@ -116,54 +125,11 @@ stages:
       clean: true
 
     - pwsh: |
-        $buildId = $env:BUILD_BUILDID
-        Write-Verbose "Fall back seed: $buildId" -Verbose
-        # For PRs set the seed to the PR number so that the image is always the same
-        $seed = $env:SYSTEM_PULLREQUEST_PULLREQUESTID
-        if(!$seed) {
-          # for non-PRs use the integer identifier of the build as the seed.
-          $seed = $buildId
-        }
-        Write-Verbose "Seed: $seed" -Verbose
-
-        # Get the latest image matrix JSON for preview
-        $matrix = ./PowerShell-Docker/build.ps1 -GenerateMatrixJson -FullJson -Channel preview | ConvertFrom-Json
-
-        # Filter out containers that won't run on AzDevOps Linux host as an agent
-        # Windows, nano server, alpine, and any ARM image
-        $linuxImages = $matrix.preview |
-          Where-Object {$_.osversion -notmatch 'windows|nano|alpine|arm'} |
-          Select-Object JobName, Taglist |
-          Sort-Object -property JobName
-
-        # Force mariner for now
-        $marinerImage = $linuxImages | where-object {$_.JobName -like 'mariner*'}
-
-        # Use the selected seed to pick a container
-        $index = Get-Random -Minimum 0 -Maximum $marinerImage.Count -SetSeed $seed
-        $selectedImage = $marinerImage[$index]
-
-        # Filter to the first test-deps compatible tag
-        $tag = $selectedImage.Taglist -split ';' | Where-Object {$_ -match 'preview-\D+'} | Select-Object -First 1
-
-        # Calculate the container name
-        $containerName = "mcr.microsoft.com/powershell/test-deps:$tag"
-
-        # Set variables for later jobs to use
+        # Initialize container test stage
         Import-Module ./PowerShell/tools/ci.psm1
-        Set-BuildVariable -Name containerName -Value $containerName -IsOutput
-        Set-BuildVariable -Name containerBuildName -Value $selectedImage.JobName -IsOutput
-
-        if($env:BUILD_REASON -eq 'PullRequest') {
-          Write-Host "##vso[build.updatebuildnumber]PR-$(System.PullRequest.PullRequestNumber)-$($selectedImage.JobName)-$((get-date).ToString("yyyyMMddhhmmss"))"
-        } else {
-          Write-Host "##vso[build.updatebuildnumber]${env:BUILD_SOURCEBRANCHNAME}-${env:BUILD_SOURCEVERSION}-$($selectedImage.JobName)-$((get-date).ToString("yyyyMMddhhmmss"))"
-
-          # Cannot do this for a PR
-          Write-Host "##vso[build.addbuildtag]$($selectedImage.JobName)"
-        }
+        Invoke-InitializeContainerStage -ContainerPattern '${{ parameters.ContainerPattern }}'
       name: getContainerTask
-      displayName: Get Container
+      displayName: Initialize Container Stage
       continueOnError: true
 
   - template: templates/test/nix-container-test.yml
diff --git a/build.psm1 b/build.psm1
index 0d1096d673c..d8796b78e1b 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1959,9 +1959,9 @@ function Install-Dotnet {
 }
 
 function Get-RedHatPackageManager {
-    if ($environment.IsCentOS) {
+    if ($environment.IsCentOS -or (Get-Command -Name yum -CommandType Application -ErrorAction SilentlyContinue)) {
         "yum install -y -q"
-    } elseif ($environment.IsFedora) {
+    } elseif ($environment.IsFedora -or (Get-Command -Name dnf -CommandType Application -ErrorAction SilentlyContinue)) {
         "dnf install -y -q"
     } else {
         throw "Error determining package manager for this distribution."
@@ -2044,7 +2044,6 @@ function Start-PSBootstrap {
                 $Deps += "curl", "wget"
 
                 # .NET Core required runtime libraries
-                $Deps += "libunwind8"
                 if ($environment.IsUbuntu16) { $Deps += "libicu55" }
                 elseif ($environment.IsUbuntu18) { $Deps += "libicu60"}
 
@@ -2070,7 +2069,7 @@ function Start-PSBootstrap {
                 $Deps += "which", "curl", "wget"
 
                 # .NET Core required runtime libraries
-                $Deps += "libicu", "libunwind"
+                $Deps += "libicu", "openssl-libs"
 
                 # Packaging tools
                 if ($Package) { $Deps += "ruby-devel", "rpm-build", "groff", 'libffi-devel', "gcc-c++" }
diff --git a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1 b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
index dbd77186d2f..e0b2c8c2e6c 100644
--- a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
+++ b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
@@ -391,10 +391,11 @@ function Get-WsManSupport {
     $platformInfo = Get-PlatformInfo
     if (
         ($platformInfo.Platform -match "alpine|raspbian") -or
-        ($platformInfo.Platform -eq "debian" -and $platformInfo.Version -ne '9') -or 
+        ($platformInfo.Platform -eq "debian" -and $platformInfo.Version -ne '9') -or
         ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -eq '8') -or
         ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -eq '20.04') -or
         ($platformInfo.Platform -eq 'mariner') -or
+        ($platformInfo.Platform -eq 'rhel') -or
         ($IsMacOS)
     ) {
         return $false
diff --git a/tools/ci.psm1 b/tools/ci.psm1
index bc87db9db5e..7991a03fba6 100644
--- a/tools/ci.psm1
+++ b/tools/ci.psm1
@@ -811,3 +811,55 @@ function New-LinuxPackage
         Copy-Item $armPackage -Destination "${env:BUILD_ARTIFACTSTAGINGDIRECTORY}" -Force
     }
 }
+
+function Invoke-InitializeContainerStage {
+    param(
+        [string]
+        $ContainerPattern = '.'
+    )
+
+    Write-Verbose "Invoking InitializeContainerStage with ContainerPattern: ${ContainerPattern}" -Verbose
+
+    $fallbackSeed = (get-date).DayOfYear
+    Write-Verbose "Fall back seed: $fallbackSeed" -Verbose
+
+    # For PRs set the seed to the PR number so that the image is always the same
+    $seed = $env:SYSTEM_PULLREQUEST_PULLREQUESTID
+    if(!$seed) {
+      # for non-PRs use the integer identifier of the build as the seed.
+      $seed = $fallbackSeed
+    }
+
+    Write-Verbose "Seed: $seed" -Verbose
+
+    # Get the latest image matrix JSON for preview
+    $matrix = ./PowerShell-Docker/build.ps1 -GenerateMatrixJson -FullJson -Channel preview | ConvertFrom-Json
+
+    # Chose images that are validated or validating, Linux and can be used in CI.
+    $linuxImages = $matrix.preview |
+      Where-Object {$_.IsLinux -and $_.UseInCi -and $_.DistributionState -match 'Validat.*' -and $_.JobName -match $ContainerPattern} |
+      Select-Object JobName, Taglist |
+      Sort-Object -property JobName
+
+    # Use the selected seed to pick a container
+    $index = Get-Random -Minimum 0 -Maximum $linuxImages.Count -SetSeed $seed
+    $selectedImage = $linuxImages[$index]
+
+    # Filter to the first test-deps compatible tag
+    $tag = $selectedImage.Taglist -split ';' | Where-Object {$_ -match 'preview-\D+'} | Select-Object -First 1
+
+    # Calculate the container name
+    $containerName = "mcr.microsoft.com/powershell/test-deps:$tag"
+
+    Set-BuildVariable -Name containerName -Value $containerName -IsOutput
+    Set-BuildVariable -Name containerBuildName -Value $selectedImage.JobName -IsOutput
+
+    if($env:BUILD_REASON -eq 'PullRequest') {
+      Write-Host "##vso[build.updatebuildnumber]PR-${env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}-$($selectedImage.JobName)-$((get-date).ToString("yyyyMMddhhmmss"))"
+    } else {
+      Write-Host "##vso[build.updatebuildnumber]${env:BUILD_SOURCEBRANCHNAME}-$($selectedImage.JobName)-${env:BUILD_SOURCEVERSION}-$((get-date).ToString("yyyyMMddhhmmss"))"
+
+      # Cannot do this for a PR
+      Write-Host "##vso[build.addbuildtag]$($selectedImage.JobName)"
+    }
+}

From 30f4b82b8a48218ffe5ad8ce15e6ee0892a451db Mon Sep 17 00:00:00 2001
From: yogeshbirla <birlayogesh@gmail.com>
Date: Thu, 12 May 2022 10:46:47 -0700
Subject: [PATCH 364/645] Add sles15 support to `install-powershell.sh`
 (#16984)

Co-authored-by: Yogesh Birla <yogeshbirla@microsoft.com>
---
 tools/install-powershell.sh | 9 +++++----
 tools/installpsh-suse.sh    | 6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tools/install-powershell.sh b/tools/install-powershell.sh
index ce4711d142b..f13e76665bf 100755
--- a/tools/install-powershell.sh
+++ b/tools/install-powershell.sh
@@ -95,10 +95,6 @@ install(){
                 else
                     DistroBasedOn='redhat'
                 fi
-            elif [ -f /etc/SuSE-release ] ; then
-                DistroBasedOn='suse'
-                PSUEDONAME=$( (tr "\n" ' '| sed s/VERSION.*//) < /etc/SuSE-release )
-                REV=$( (grep 'VERSION' | sed s/.*=\ //) < /etc/SuSE-release )
             elif [ -f /etc/mandrake-release ] ; then
                 DistroBasedOn='mandrake'
                 PSUEDONAME=$( (sed s/.*\(// | sed s/\)//) < /etc/mandrake-release )
@@ -117,6 +113,11 @@ install(){
             if [ -f /etc/UnitedLinux-release ] ; then
                 DIST="${DIST}[$( (tr "\n" ' ' | sed s/VERSION.*//) < /etc/UnitedLinux-release )]"
             fi
+			osname=$(source /etc/os-release; echo $PRETTY_NAME)
+			if [[ $osname = *SUSE* ]]; then
+				DistroBasedOn='suse'
+				REV=$(source /etc/os-release; echo $VERSION_ID)
+			fi			
             OS=$(lowercase $OS)
             DistroBasedOn=$(lowercase $DistroBasedOn)
         fi
diff --git a/tools/installpsh-suse.sh b/tools/installpsh-suse.sh
index 4e2c5cd0242..5c1dd857b9d 100755
--- a/tools/installpsh-suse.sh
+++ b/tools/installpsh-suse.sh
@@ -71,8 +71,6 @@ else
             else
                 DistroBasedOn='redhat'
             fi
-        elif [ -f /etc/SuSE-release ] ; then
-            DistroBasedOn='suse'
         elif [ -f /etc/mandrake-release ] ; then
             DistroBasedOn='mandrake'
         elif [ -f /etc/debian_version ] ; then
@@ -82,6 +80,10 @@ else
             DIST="${DIST}[$( (tr "\n" ' ' | sed s/VERSION.*//) < /etc/UnitedLinux-release )]"
             DistroBasedOn=unitedlinux
         fi
+		osname=$(source /etc/os-release; echo $PRETTY_NAME)
+        if [[ $osname = *SUSE* ]]; then
+            DistroBasedOn='suse'
+        fi		
         OS=$(lowercase "$OS")
         DistroBasedOn=$(lowercase "$DistroBasedOn")
     fi

From 87f621eb1fa94f1d114b0cc4a5fb7aab5d3133c9 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 12 May 2022 11:25:14 -0700
Subject: [PATCH 365/645] Add fedora to the OS's that can't run WSMan (#17325)

---
 test/tools/Modules/HelpersCommon/HelpersCommon.psm1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1 b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
index e0b2c8c2e6c..cb4c6c4ea4d 100644
--- a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
+++ b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
@@ -396,6 +396,7 @@ function Get-WsManSupport {
         ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -eq '20.04') -or
         ($platformInfo.Platform -eq 'mariner') -or
         ($platformInfo.Platform -eq 'rhel') -or
+        ($platformInfo.Platform -eq 'fedora') -or
         ($IsMacOS)
     ) {
         return $false

From 950ff45625dfce5d652e9faf3012273736750a74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 May 2022 11:35:13 -0700
Subject: [PATCH 366/645] Bump Microsoft.NET.Test.Sdk from 17.1.0 to 17.2.0
 (#17320)

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.1.0 to 17.2.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v17.1.0...v17.2.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/xUnit/xUnit.tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index d5ab90cddee..56fd4afaadb 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="XunitXml.TestLogger" Version="3.0.70" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
   </ItemGroup>
 
   <ItemGroup>

From 00d165ee711243d78f5571ee7c16bdf738bfc93b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 12 May 2022 12:53:04 -0700
Subject: [PATCH 367/645] Make sure we execute tests on LTS package for older
 LTS releases (#17326)

---
 tools/releaseBuild/azureDevOps/releaseBuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index 4ae32ad430f..9eb2d62bbdc 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -222,7 +222,7 @@ stages:
 
         - powershell: |
             $metadata = Get-Content '$(Build.SourcesDirectory)/tools/metadata.json' -Raw | ConvertFrom-Json
-            $LTS = $metadata.LTSRelease.Latest
+            $LTS = $metadata.LTSRelease.Package
             @{ ReleaseVersion = "$(Version)"; LTSRelease = $LTS } | ConvertTo-Json | Out-File "$(Build.StagingDirectory)\release.json"
             Get-Content "$(Build.StagingDirectory)\release.json"
             Write-Host "##vso[artifact.upload containerfolder=metadata;artifactname=metadata]$(Build.StagingDirectory)\release.json"

From fea4484986d46069462045c713e04473f67b76a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 May 2022 20:57:33 +0000
Subject: [PATCH 368/645] Bump xunit.runner.visualstudio from 2.4.3 to 2.4.5
 (#17274)

Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.4.3 to 2.4.5.
- [Release notes](https://github.com/xunit/visualstudio.xunit/releases)
- [Commits](https://github.com/xunit/visualstudio.xunit/commits)

---
updated-dependencies:
- dependency-name: xunit.runner.visualstudio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/xUnit/xUnit.tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index 56fd4afaadb..94e45ffdd95 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -25,7 +25,7 @@
   <ItemGroup>
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageReference Include="XunitXml.TestLogger" Version="3.0.70" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
   </ItemGroup>

From 975e5f8871d7fd36fc49c29488549e2d29d9d1b3 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 13 May 2022 10:33:55 -0700
Subject: [PATCH 369/645] Update Ubuntu 22 to be detected as not supported
 WSMan (#17338)

---
 test/tools/Modules/HelpersCommon/HelpersCommon.psm1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1 b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
index cb4c6c4ea4d..8bdc144cac8 100644
--- a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
+++ b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
@@ -392,8 +392,8 @@ function Get-WsManSupport {
     if (
         ($platformInfo.Platform -match "alpine|raspbian") -or
         ($platformInfo.Platform -eq "debian" -and $platformInfo.Version -ne '9') -or
-        ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -eq '8') -or
-        ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -eq '20.04') -or
+        ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -ne '7') -or
+        ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -notin '18.04', '16.04') -or
         ($platformInfo.Platform -eq 'mariner') -or
         ($platformInfo.Platform -eq 'rhel') -or
         ($platformInfo.Platform -eq 'fedora') -or

From f4cc838e22f1c7ea8cc334760fa503b4172c676b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 13 May 2022 20:22:19 +0000
Subject: [PATCH 370/645] Update to the latest NOTICES file (#17332)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 ThirdPartyNotices.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 54f6f61f836..fee4bdafbdc 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -4006,7 +4006,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Web.Services.Description 4.9.0-rc2.21473.1 - MIT
+System.Web.Services.Description 4.9.0 - MIT
 
 
 (c) 2008 VeriSign, Inc.

From c4555da0edd012a63a5655d32b033dfe0b827c8c Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 13 May 2022 13:35:22 -0700
Subject: [PATCH 371/645] Update `DotnetRuntimeMetadata.json` for .NET 7
 Preview 4 (#17336)

---
 DotnetRuntimeMetadata.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index c11e7455ff7..34f1b8f8db2 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "channel": "7.0.1xx-preview3",
+    "channel": "7.0.1xx-preview4",
     "quality": "signed",
     "qualityFallback": "daily",
-    "packageVersionPattern": "7.0.0-preview.3",
+    "packageVersionPattern": "7.0.0-preview.4",
     "sdkImageVersion": "7.0.100",
-    "nextChannel": "7.0.1xx-preview3",
+    "nextChannel": "7.0.1xx-preview4",
     "azureFeed": "",
     "sdkImageOverride": ""
   },

From 4e2f72ea7d644a6460f26a14bdd201296ab40789 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Fri, 13 May 2022 15:21:18 -0700
Subject: [PATCH 372/645] On Windows, reset cursor visibility back to previous
 state when rendering progress (#16782)

* On Windows, reset cursor visibility back to previous state when rendering progress

* Update src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs

Co-authored-by: Ilya <darpa@yandex.ru>

Co-authored-by: Ilya <darpa@yandex.ru>
---
 .../host/msh/ProgressPane.cs                       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs
index a3be724b7c4..404477fa6a3 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs
@@ -301,7 +301,17 @@ private void WriteContent()
         {
             if (_content is not null)
             {
+                // On Windows, we can check if the cursor is currently visible and not change it to visible
+                // if it is intentionally hidden.  On Unix, it is not currently supported to read the cursor visibility.
+#if UNIX
                 Console.CursorVisible = false;
+#else
+                bool currentCursorVisible = Console.CursorVisible;
+                if (currentCursorVisible)
+                {
+                    Console.CursorVisible = false;
+                }
+#endif
 
                 var currentPosition = _rawui.CursorPosition;
                 _rawui.CursorPosition = _location;
@@ -319,7 +329,11 @@ private void WriteContent()
                 }
 
                 _rawui.CursorPosition = currentPosition;
+#if UNIX
                 Console.CursorVisible = true;
+#else
+                Console.CursorVisible = currentCursorVisible;
+#endif
             }
         }
 

From b0c16cb4c1dbfb55a62dbc0b97794896b59d72ec Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 16 May 2022 10:23:18 -0700
Subject: [PATCH 373/645] Update the cgmanifest (#17344)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 tools/cgmanifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index f2e9b3507bf..e2eb71bc2fd 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -65,7 +65,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Common",
-          "Version": "4.1.0"
+          "Version": "4.2.0"
         }
       },
       "DevelopmentDependency": false
@@ -75,7 +75,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.CSharp",
-          "Version": "4.1.0"
+          "Version": "4.2.0"
         }
       },
       "DevelopmentDependency": false

From f2b7b296b5fcce960a3f60a824439e8258b23e11 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 16 May 2022 10:25:32 -0700
Subject: [PATCH 374/645] Have rebase workflow Post a message when it starts
 (#17341)

---
 .github/workflows/rebase.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index f0c61ca2636..f610e1b53df 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -1,7 +1,7 @@
 # This cannot rebase workflow changes into a PR
 # It also only works if the GITHUB_TOKEN has permission to push to the branch
 # see: https://github.com/cirrus-actions/rebase/issues/12#issuecomment-632594995
-on: 
+on:
   issue_comment:
     types: [created]
 name: Automatic Rebase
@@ -15,6 +15,17 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
+    - name: Post rebase started comment to pull request
+      uses: actions/github-script@v3
+      with:
+        script: |
+          const backport_start_body = `Started rebase: https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${process.env.GITHUB_RUN_ID}`;
+          await github.issues.createComment({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: backport_start_body
+          });
     - name: Automatic Rebase
       uses: cirrus-actions/rebase@1.6
       env:

From cc3b6fb9daf5092ea0ebf613ff745754ef217295 Mon Sep 17 00:00:00 2001
From: Andrew <anmenaga@microsoft.com>
Date: Mon, 16 May 2022 10:27:18 -0700
Subject: [PATCH 375/645] Disable broken macOS CI job, which is unused (#17221)

---
 .vsts-ci/mac.yml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/.vsts-ci/mac.yml b/.vsts-ci/mac.yml
index c4623c9fef0..24646a0da4b 100644
--- a/.vsts-ci/mac.yml
+++ b/.vsts-ci/mac.yml
@@ -91,16 +91,3 @@ stages:
     parameters:
       pool: macOS-latest
 
-- stage: CodeCovTestPackage
-  displayName: CodeCoverage and Test Packages
-  dependsOn: [] # by specifying an empty array, this stage doesn't depend on the stage before it
-  jobs:
-  - job: CodeCovTestPackage
-    displayName: CodeCoverage and Test Packages
-    pool:
-      vmImage: macOS-latest
-    steps:
-    - pwsh: |
-        Import-Module .\tools\ci.psm1
-        New-CodeCoverageAndTestPackage
-      displayName: CodeCoverage and Test Package

From 56e08dc76dbaf88c7202778bc46ad0fd2759a46e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 May 2022 19:25:51 +0000
Subject: [PATCH 376/645] Bump `NJsonSchema` from `10.6.10` to `10.7.0`
 (#17350)

Bumps [NJsonSchema](https://github.com/RicoSuter/NJsonSchema) from 10.6.10 to 10.7.0.
- [Release notes](https://github.com/RicoSuter/NJsonSchema/releases)
- [Commits](https://github.com/RicoSuter/NJsonSchema/compare/v10.6.10...v10.7.0)

---
updated-dependencies:
- dependency-name: NJsonSchema
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../Microsoft.PowerShell.Commands.Utility.csproj                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index b04e27161cd..17a4b290311 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -34,7 +34,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-1.final" />
     <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.4.22229.4" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.4.22229.4" />
-    <PackageReference Include="NJsonSchema" Version="10.6.10" />
+    <PackageReference Include="NJsonSchema" Version="10.7.0" />
   </ItemGroup>
 
 </Project>

From f6ac9bb6048022eee7b5c778c01a01194227e4cd Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Mon, 16 May 2022 14:18:30 -0700
Subject: [PATCH 377/645] Add support for new WDAC API (#17247)

* Add support for new WDAC API

* Fix non-Windows platform error

* Fix code factor errors

* Update cgmanifest json file

* Fix test failure

* Update src/System.Management.Automation/resources/SecuritySupportStrings.resx

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
---
 .../CoreCLR/CorePsStub.cs                     |  40 +++++
 .../engine/ExternalScriptInfo.cs              |  51 ++++--
 .../resources/SecuritySupportStrings.resx     |   6 +
 .../security/wldpNativeMethods.cs             | 166 +++++++++++++++++-
 4 files changed, 242 insertions(+), 21 deletions(-)

diff --git a/src/System.Management.Automation/CoreCLR/CorePsStub.cs b/src/System.Management.Automation/CoreCLR/CorePsStub.cs
index d99bcbb398b..67775cde747 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsStub.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsStub.cs
@@ -457,6 +457,20 @@ internal static bool IsClassInApprovedList(Guid clsid)
         {
             throw new NotImplementedException("SystemPolicy.IsClassInApprovedList not implemented");
         }
+
+        /// <summary>
+        /// Gets the system wide script file policy enforcement for an open file.
+        /// Based on system WDAC (Windows Defender Application Control) or AppLocker policies.
+        /// </summary>
+        /// <param name="filePath">Script file path for policy check.</param>
+        /// <param name="fileStream">FileStream object to script file path.</param>
+        /// <retruns>Policy check result for script file.</returns>
+        public static SystemScriptFileEnforcement GetFilePolicyEnforcement(
+            string filePath,
+            System.IO.FileStream fileStream)
+        {
+            return SystemScriptFileEnforcement.None;
+        }
     }
 
     /// <summary>
@@ -473,6 +487,32 @@ internal enum SystemEnforcementMode
         /// Enabled, enforce restrictions
         Enforce = 2
     }
+
+    /// <summary>
+    /// System wide policy enforcement for a specific script file.
+    /// </summary>
+    public enum SystemScriptFileEnforcement
+    {
+        /// <summary>
+        /// No policy enforcement.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Script file is blocked from running.
+        /// </summary>
+        Block = 1,
+
+        /// <summary>
+        /// Script file is allowed to run without restrictions (FullLanguage mode).
+        /// </summary>
+        Allow = 2,
+
+        /// <summary>
+        /// Script file is allowed to run in ConstrainedLanguage mode only.
+        /// </summary>
+        AllowConstrained = 3
+    }
 }
 
 // Porting note: Tracing is absolutely not available on Linux
diff --git a/src/System.Management.Automation/engine/ExternalScriptInfo.cs b/src/System.Management.Automation/engine/ExternalScriptInfo.cs
index bbd49c76d36..642eb4d8fe9 100644
--- a/src/System.Management.Automation/engine/ExternalScriptInfo.cs
+++ b/src/System.Management.Automation/engine/ExternalScriptInfo.cs
@@ -516,32 +516,45 @@ private void ReadScriptContents()
                     using (FileStream readerStream = new FileStream(_path, FileMode.Open, FileAccess.Read))
                     {
                         Encoding defaultEncoding = ClrFacade.GetDefaultEncoding();
-                        Microsoft.Win32.SafeHandles.SafeFileHandle safeFileHandle = readerStream.SafeFileHandle;
 
                         using (StreamReader scriptReader = new StreamReader(readerStream, defaultEncoding))
                         {
                             _scriptContents = scriptReader.ReadToEnd();
                             _originalEncoding = scriptReader.CurrentEncoding;
 
-                            // Check if this came from a trusted path. If so, set its language mode to FullLanguage.
-                            if (SystemPolicy.GetSystemLockdownPolicy() != SystemEnforcementMode.None)
+                            // Check this file against any system wide enforcement policies.
+                            SystemScriptFileEnforcement filePolicyEnforcement = SystemPolicy.GetFilePolicyEnforcement(_path, readerStream);
+                            switch (filePolicyEnforcement)
                             {
-                                SystemEnforcementMode scriptSpecificPolicy = SystemPolicy.GetLockdownPolicy(_path, safeFileHandle);
-                                if (scriptSpecificPolicy != SystemEnforcementMode.Enforce)
-                                {
-                                    this.DefiningLanguageMode = PSLanguageMode.FullLanguage;
-                                }
-                                else
-                                {
-                                    this.DefiningLanguageMode = PSLanguageMode.ConstrainedLanguage;
-                                }
-                            }
-                            else
-                            {
-                                if (this.Context != null)
-                                {
-                                    this.DefiningLanguageMode = this.Context.LanguageMode;
-                                }
+                                case SystemScriptFileEnforcement.None:
+                                    if (Context != null)
+                                    {
+                                        DefiningLanguageMode = Context.LanguageMode;
+                                    }
+
+                                    break;
+
+                                case SystemScriptFileEnforcement.Allow:
+                                    DefiningLanguageMode = PSLanguageMode.FullLanguage;
+                                    break;
+
+                                case SystemScriptFileEnforcement.AllowConstrained:
+                                    DefiningLanguageMode = PSLanguageMode.ConstrainedLanguage;
+                                    break;
+
+                                case SystemScriptFileEnforcement.Block:
+                                    throw new PSSecurityException(
+                                        string.Format(
+                                            Globalization.CultureInfo.CurrentUICulture,
+                                            SecuritySupportStrings.ScriptFileBlockedBySystemPolicy,
+                                            _path));
+
+                                default:
+                                    throw new PSSecurityException(
+                                        string.Format(
+                                            Globalization.CultureInfo.CurrentUICulture,
+                                            SecuritySupportStrings.UnknownSystemScriptFileEnforcement,
+                                            filePolicyEnforcement));
                             }
                         }
                     }
diff --git a/src/System.Management.Automation/resources/SecuritySupportStrings.resx b/src/System.Management.Automation/resources/SecuritySupportStrings.resx
index cd8a65a5c90..cf1ca357cc4 100644
--- a/src/System.Management.Automation/resources/SecuritySupportStrings.resx
+++ b/src/System.Management.Automation/resources/SecuritySupportStrings.resx
@@ -153,4 +153,10 @@
   <data name="InvalidSessionKey" xml:space="preserve">
     <value>Invalid session key data.</value>
   </data>
+  <data name="ScriptFileBlockedBySystemPolicy" xml:space="preserve">
+    <value>Script file, '{0}', is blocked from running by system policy.</value>
+  </data>
+  <data name="UnknownSystemScriptFileEnforcement" xml:space="preserve">
+    <value>An unknown script file policy enforcement value was returned: {0}.</value>
+  </data>
 </root>
diff --git a/src/System.Management.Automation/security/wldpNativeMethods.cs b/src/System.Management.Automation/security/wldpNativeMethods.cs
index 02cbf8f1815..8f8257f51cb 100644
--- a/src/System.Management.Automation/security/wldpNativeMethods.cs
+++ b/src/System.Management.Automation/security/wldpNativeMethods.cs
@@ -12,6 +12,32 @@
 
 namespace System.Management.Automation.Security
 {
+    /// <summary>
+    /// System wide policy enforcement for a specific script file.
+    /// </summary>
+    public enum SystemScriptFileEnforcement
+    {
+        /// <summary>
+        /// No policy enforcement.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Script file is blocked from running.
+        /// </summary>
+        Block = 1,
+
+        /// <summary>
+        /// Script file is allowed to run without restrictions (FullLanguage mode).
+        /// </summary>
+        Allow = 2,
+
+        /// <summary>
+        /// Script file is allowed to run in ConstrainedLanguage mode only.
+        /// </summary>
+        AllowConstrained = 3
+    }
+
     /// <summary>
     /// How the policy is being enforced.
     /// </summary>
@@ -71,6 +97,90 @@ public static SystemEnforcementMode GetSystemLockdownPolicy()
         private static readonly object s_systemLockdownPolicyLock = new object();
         private static SystemEnforcementMode? s_systemLockdownPolicy = null;
         private static bool s_allowDebugOverridePolicy = false;
+        private static bool s_wldpCanExecuteAvailable = true;
+
+        /// <summary>
+        /// Gets the system wide script file policy enforcement for an open file.
+        /// Based on system WDAC (Windows Defender Application Control) or AppLocker policies.
+        /// </summary>
+        /// <param name="filePath">Script file path for policy check.</param>
+        /// <param name="fileStream">FileStream object to script file path.</param>
+        /// <returns>Policy check result for script file.</returns>
+        public static SystemScriptFileEnforcement GetFilePolicyEnforcement(
+            string filePath,
+            System.IO.FileStream fileStream)
+        {
+            SafeHandle fileHandle = fileStream.SafeFileHandle;
+
+            // First check latest WDAC APIs if available.
+            if (s_wldpCanExecuteAvailable)
+            {
+                try
+                {
+                    string fileName = System.IO.Path.GetFileNameWithoutExtension(filePath);
+                    string auditMsg = $"PowerShell ExternalScriptInfo reading file: {fileName}";
+
+                    int hr = WldpNativeMethods.WldpCanExecuteFile(
+                        host: PowerShellHost,
+                        options: WLDP_EXECUTION_EVALUATION_OPTIONS.WLDP_EXECUTION_EVALUATION_OPTION_NONE,
+                        fileHandle: fileHandle.DangerousGetHandle(),
+                        auditInfo: auditMsg,
+                        result: out WLDP_EXECUTION_POLICY canExecuteResult);
+
+                    if (hr >= 0)
+                    {
+                        switch (canExecuteResult)
+                        {
+                            case WLDP_EXECUTION_POLICY.WLDP_CAN_EXECUTE_ALLOWED:
+                                return SystemScriptFileEnforcement.Allow;
+
+                            case WLDP_EXECUTION_POLICY.WLDP_CAN_EXECUTE_BLOCKED:
+                                return SystemScriptFileEnforcement.Block;
+
+                            case WLDP_EXECUTION_POLICY.WLDP_CAN_EXECUTE_REQUIRE_SANDBOX:
+                                return SystemScriptFileEnforcement.AllowConstrained;
+
+                            default:
+                                // Fall through to legacy system policy checks.
+                                System.Diagnostics.Debug.Assert(false, $"Unknown execution policy returned from WldCanExecute: {canExecuteResult}");
+                                break;
+                        }
+                    }
+
+                    // If HResult is unsuccessful (such as E_NOTIMPL (0x80004001)), fall through to legacy system checks.
+                }
+                catch (DllNotFoundException)
+                {
+                    // Fall back to legacy system policy checks.
+                    s_wldpCanExecuteAvailable = false;
+                }
+                catch (EntryPointNotFoundException)
+                {
+                    // Fall back to legacy system policy checks.
+                    s_wldpCanExecuteAvailable = false;
+                }
+            }
+
+            // Original (legacy) WDAC and AppLocker system checks.
+            if (SystemPolicy.GetSystemLockdownPolicy() != SystemEnforcementMode.None)
+            {
+                switch (SystemPolicy.GetLockdownPolicy(filePath, fileHandle))
+                {
+                    case SystemEnforcementMode.Enforce:
+                        return SystemScriptFileEnforcement.AllowConstrained;
+
+                    case SystemEnforcementMode.None:
+                    case SystemEnforcementMode.Audit:
+                        return SystemScriptFileEnforcement.Allow;
+
+                    default:
+                        System.Diagnostics.Debug.Assert(false, "GetFilePolicyEnforcement: Unknown SystemEnforcementMode.");
+                        return SystemScriptFileEnforcement.Block;
+                }
+            }
+
+            return SystemScriptFileEnforcement.None;
+        }
 
         /// <summary>
         /// Gets lockdown policy as applied to a file.
@@ -546,18 +656,66 @@ internal struct WLDP_HOST_INFORMATION
             internal IntPtr hSource;
         }
 
+        /// <summary>
+        /// Options for WldpCanExecuteFile method.
+        /// </summary>
+        [Flags]
+        internal enum WLDP_EXECUTION_EVALUATION_OPTIONS
+        {
+            WLDP_EXECUTION_EVALUATION_OPTION_NONE = 0x0,
+            WLDP_EXECUTION_EVALUATION_OPTION_EXECUTE_IN_INTERACTIVE_SESSION = 0x1
+        }
+
+        /// <summary>
+        /// Results from WldpCanExecuteFile method.
+        /// </summary>
+        internal enum WLDP_EXECUTION_POLICY
+        {
+            WLDP_CAN_EXECUTE_BLOCKED = 0,
+            WLDP_CAN_EXECUTE_ALLOWED = 1,
+            WLDP_CAN_EXECUTE_REQUIRE_SANDBOX = 2
+        }
+
+        /// <summary>
+        /// Powershell Script Host.
+        /// </summary>
+        internal static readonly Guid PowerShellHost = new Guid("8E9AAA7C-198B-4879-AE41-A50D47AD6458");
+
         /// <summary>
         /// Native methods for dealing with the lockdown policy.
         /// </summary>
         internal static class WldpNativeMethods
         {
+            /// <summary>
+            /// Returns a WLDP_EXECUTION_POLICY enum value indicating if and how a script file
+            /// should be executed.
+            /// </summary>
+            /// <param name="host">Host guid.</param>
+            /// <param name="options">Evaluation options.</param>
+            /// <param name="fileHandle">Evaluated file handle.</param>
+            /// <param name="auditInfo">Auditing information string.</param>
+            /// <param name="result">Evaluation result.</param>
+            /// <returns>HResult value.</returns>
+            [DefaultDllImportSearchPathsAttribute(DllImportSearchPath.System32)]
+            [DllImportAttribute("wldp.dll", EntryPoint = "WldpCanExecuteFile")]
+            internal static extern int WldpCanExecuteFile(
+                Guid host,
+                WLDP_EXECUTION_EVALUATION_OPTIONS options,
+                IntPtr fileHandle,
+                [MarshalAs(UnmanagedType.LPWStr)]
+                string auditInfo,
+                out WLDP_EXECUTION_POLICY result);
+
             /// Return Type: HRESULT->LONG->int
             /// pHostInformation: PWLDP_HOST_INFORMATION->_WLDP_HOST_INFORMATION*
             /// pdwLockdownState: PDWORD->DWORD*
             /// dwFlags: DWORD->unsigned int
             [DefaultDllImportSearchPathsAttribute(DllImportSearchPath.System32)]
             [DllImportAttribute("wldp.dll", EntryPoint = "WldpGetLockdownPolicy")]
-            internal static extern int WldpGetLockdownPolicy(ref WLDP_HOST_INFORMATION pHostInformation, ref uint pdwLockdownState, uint dwFlags);
+            internal static extern int WldpGetLockdownPolicy(
+                ref WLDP_HOST_INFORMATION pHostInformation,
+                ref uint pdwLockdownState,
+                uint dwFlags);
 
             /// Return Type: HRESULT->LONG->int
             /// rclsid: IID*
@@ -566,7 +724,11 @@ internal static class WldpNativeMethods
             /// dwFlags: DWORD->unsigned int
             [DefaultDllImportSearchPathsAttribute(DllImportSearchPath.System32)]
             [DllImportAttribute("wldp.dll", EntryPoint = "WldpIsClassInApprovedList")]
-            internal static extern int WldpIsClassInApprovedList(ref Guid rclsid, ref WLDP_HOST_INFORMATION pHostInformation, ref int ptIsApproved, uint dwFlags);
+            internal static extern int WldpIsClassInApprovedList(
+                ref Guid rclsid,
+                ref WLDP_HOST_INFORMATION pHostInformation,
+                ref int ptIsApproved,
+                uint dwFlags);
 
             [DllImport("shell32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
             internal static extern int SHGetKnownFolderPath(

From 41c7cd79da65a3e0c481bdb268fc47c11a46c2fd Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 16 May 2022 14:55:00 -0700
Subject: [PATCH 378/645] Fix the error message in Hashtable-to-object
 conversion (#17329)

---
 .../engine/LanguagePrimitives.cs              | 19 ++++++---
 .../resources/ExtendedTypeSystem.resx         |  5 ++-
 ...htableToPSCustomObjectConversion.Tests.ps1 | 41 +++++++++++++++++++
 3 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/src/System.Management.Automation/engine/LanguagePrimitives.cs b/src/System.Management.Automation/engine/LanguagePrimitives.cs
index 3176fbbead1..b697e8e750f 100644
--- a/src/System.Management.Automation/engine/LanguagePrimitives.cs
+++ b/src/System.Management.Automation/engine/LanguagePrimitives.cs
@@ -310,9 +310,11 @@ public static class LanguagePrimitives
 
         internal static void CreateMemberNotFoundError(PSObject pso, DictionaryEntry property, Type resultType)
         {
-            string availableProperties = GetAvailableProperties(pso);
+            string settableProperties = GetSettableProperties(pso);
 
-            string message = StringUtil.Format(ExtendedTypeSystem.PropertyNotFound, property.Key.ToString(), resultType.FullName, availableProperties);
+            string message = settableProperties == string.Empty
+                ? StringUtil.Format(ExtendedTypeSystem.NoSettableProperty, property.Key.ToString(), resultType.FullName)
+                : StringUtil.Format(ExtendedTypeSystem.PropertyNotFound, property.Key.ToString(), resultType.FullName, settableProperties);
 
             typeConversion.WriteLine("Issuing an error message about not being able to create an object from hashtable.");
             throw new InvalidOperationException(message);
@@ -4735,18 +4737,23 @@ internal static PSObject SetObjectProperties(object o, IDictionary properties, T
             return pso;
         }
 
-        private static string GetAvailableProperties(PSObject pso)
+        private static string GetSettableProperties(PSObject pso)
         {
+            if (pso is null || pso.Properties is null)
+            {
+                return string.Empty;
+            }
+
             StringBuilder availableProperties = new StringBuilder();
             bool first = true;
 
-            if (pso != null && pso.Properties != null)
+            foreach (PSPropertyInfo p in pso.Properties)
             {
-                foreach (PSPropertyInfo p in pso.Properties)
+                if (p.IsSettable)
                 {
                     if (!first)
                     {
-                        availableProperties.Append(" , ");
+                        availableProperties.Append(", ");
                     }
 
                     availableProperties.Append("[" + p.Name + " <" + p.TypeNameOfValue + ">]");
diff --git a/src/System.Management.Automation/resources/ExtendedTypeSystem.resx b/src/System.Management.Automation/resources/ExtendedTypeSystem.resx
index 86b3f826324..3a84b103102 100644
--- a/src/System.Management.Automation/resources/ExtendedTypeSystem.resx
+++ b/src/System.Management.Automation/resources/ExtendedTypeSystem.resx
@@ -352,7 +352,10 @@
     <value>"{0}" returned a null value.</value>
   </data>
   <data name="PropertyNotFound" xml:space="preserve">
-    <value>The {0} property was not found for the {1} object. The available property is: {2}</value>
+    <value>The property '{0}' was not found for the '{1}' object. The settable properties are: {2}.</value>
+  </data>
+  <data name="NoSettableProperty" xml:space="preserve">
+    <value>The property '{0}' was not found for the '{1}' object. There is no settable property available.</value>
   </data>
   <data name="ObjectCreationError" xml:space="preserve">
     <value>Cannot create object of type "{0}". {1}</value>
diff --git a/test/powershell/Language/Scripting/HashtableToPSCustomObjectConversion.Tests.ps1 b/test/powershell/Language/Scripting/HashtableToPSCustomObjectConversion.Tests.ps1
index 09570e0e1e9..8d0d1ac24fe 100644
--- a/test/powershell/Language/Scripting/HashtableToPSCustomObjectConversion.Tests.ps1
+++ b/test/powershell/Language/Scripting/HashtableToPSCustomObjectConversion.Tests.ps1
@@ -142,3 +142,44 @@ Describe "Tests for hashtable to PSCustomObject conversion" -Tags "CI" {
     }
 }
 
+Describe "Error message with settable Property information" {
+    BeforeAll {
+        Add-Type @"
+namespace HashtableConversionTest {
+    public class AType {
+        public string Name;
+        public string Path { get; set; }
+        public string Id { get; }
+    }
+}
+"@
+    }
+
+    It "Only settable properties are called out in the error message" {
+        try {
+            [HashtableConversionTest.AType]@{ key = 1 }
+        } catch {
+            $e = $_
+        }
+
+        $e.FullyQualifiedErrorId | Should -BeExactly "ObjectCreationError"
+        $e.Exception.Message.Contains("key") | Should -BeTrue
+        $e.Exception.Message.Contains("Name") | Should -BeTrue
+        $e.Exception.Message.Contains("Path") | Should -BeTrue
+        $e.Exception.Message.Contains("Id") | Should -BeFalse
+    }
+
+    It "Shows no property when there is no settable property" {
+        try {
+            [System.Collections.Specialized.OrderedDictionary]@{ key = 1 }
+        } catch {
+            $e = $_
+        }
+
+        $type = [psobject].Assembly.GetType("ExtendedTypeSystem")
+        $property = $type.GetProperty("NoSettableProperty", @("NonPublic", "Static"))
+        $resString = $property.GetValue($null) -f 'key', 'System.Collections.Specialized.OrderedDictionary'
+
+        $e.Exception.Message | Should -BeLike "*$resString"
+    }
+}

From c40066d5f204a7addc73a7182f279a4bf46302ed Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 16 May 2022 16:10:55 -0700
Subject: [PATCH 379/645] Fix the word wrapping in formatting to handle escape
 sequences properly (#17316)

---
 Settings.StyleCop                             |   1 +
 .../FormatAndOutput/common/ComplexWriter.cs   | 235 +++++++++++++-----
 .../FormatAndOutput/common/ILineOutput.cs     |   5 +-
 .../FormatAndOutput/common/ListWriter.cs      |  36 ++-
 .../FormatAndOutput/common/StringDecorated.cs |  29 ++-
 .../utils/StringUtil.cs                       |  12 +-
 stylecop.json                                 |   2 +-
 .../engine/Formatting/PSStyle.Tests.ps1       |  38 +++
 8 files changed, 266 insertions(+), 92 deletions(-)

diff --git a/Settings.StyleCop b/Settings.StyleCop
index 7fa179ee02e..e10c02bdd12 100644
--- a/Settings.StyleCop
+++ b/Settings.StyleCop
@@ -162,6 +162,7 @@
           <Value>op</Value>
           <Value>my</Value>
           <Value>sb</Value>
+          <Value>vt</Value>
         </CollectionProperty>
       </AnalyzerSettings>
     </Analyzer>
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
index 3adb5a799c2..0982a8e198e 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
@@ -6,8 +6,10 @@
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Globalization;
+using System.Management.Automation;
 using System.Management.Automation.Internal;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace Microsoft.PowerShell.Commands.Internal.Format
 {
@@ -146,7 +148,7 @@ private void WriteToScreen()
             int indentationAbsoluteValue = (firstLineIndentation > 0) ? firstLineIndentation : -firstLineIndentation;
             if (indentationAbsoluteValue >= usefulWidth)
             {
-                // valu too big, we reset it to zero
+                // value too big, we reset it to zero
                 firstLineIndentation = 0;
             }
 
@@ -353,27 +355,58 @@ static StringManipulationHelper()
         private static IEnumerable<GetWordsResult> GetWords(string s)
         {
             StringBuilder sb = new StringBuilder();
-            GetWordsResult result = new GetWordsResult();
+            StringBuilder vtSeqs = null;
+            Dictionary<int, int> vtRanges = null;
 
+            var valueStrDec = new ValueStringDecorated(s);
+            if (valueStrDec.IsDecorated)
+            {
+                vtSeqs = new StringBuilder();
+                vtRanges = valueStrDec.EscapeSequenceRanges;
+            }
+
+            bool wordHasVtSeqs = false;
             for (int i = 0; i < s.Length; i++)
             {
-                // Soft hyphen = \u00AD - Should break, and add a hyphen if needed. If not needed for a break, hyphen should be absent
-                if (s[i] == ' ' || s[i] == '\t' || s[i] == s_softHyphen)
+                if (vtRanges?.TryGetValue(i, out int len) == true)
                 {
-                    result.Word = sb.ToString();
-                    sb.Clear();
-                    result.Delim = new string(s[i], 1);
+                    var vtSpan = s.AsSpan(i, len);
+                    sb.Append(vtSpan);
+                    vtSeqs.Append(vtSpan);
 
-                    yield return result;
+                    wordHasVtSeqs = true;
+                    i += len - 1;
+                    continue;
+                }
+
+                string delimiter = null;
+                if (s[i] == ' ' || s[i] == '\t' || s[i] == s_softHyphen)
+                {
+                    // Soft hyphen = \u00AD - Should break, and add a hyphen if needed.
+                    // If not needed for a break, hyphen should be absent.
+                    delimiter = new string(s[i], 1);
                 }
-                // Non-breaking space = \u00A0 - ideally shouldn't wrap
-                // Hard hyphen = \u2011 - Should not break
                 else if (s[i] == s_hardHyphen || s[i] == s_nonBreakingSpace)
                 {
-                    result.Word = sb.ToString();
-                    sb.Clear();
-                    result.Delim = string.Empty;
+                    // Non-breaking space = \u00A0 - ideally shouldn't wrap.
+                    // Hard hyphen = \u2011 - Should not break.
+                    delimiter = string.Empty;
+                }
+
+                if (delimiter is not null)
+                {
+                    if (wordHasVtSeqs && !sb.EndsWith(PSStyle.Instance.Reset))
+                    {
+                        sb.Append(PSStyle.Instance.Reset);
+                    }
 
+                    var result = new GetWordsResult()
+                    {
+                        Word = sb.ToString(),
+                        Delim = delimiter
+                    };
+
+                    sb.Clear().Append(vtSeqs);
                     yield return result;
                 }
                 else
@@ -382,10 +415,23 @@ private static IEnumerable<GetWordsResult> GetWords(string s)
                 }
             }
 
-            result.Word = sb.ToString();
-            result.Delim = string.Empty;
+            if (wordHasVtSeqs)
+            {
+                if (sb.Length == vtSeqs.Length)
+                {
+                    // This indicates 'sb' only contains all VT sequences, which may happen when the string ends with a word delimiter.
+                    // For a word that contains VT sequence only, it's the same as an empty string to the formatting system,
+                    // because nothing will actually be rendered.
+                    // So, we use an empty string in this case to avoid unneeded string allocations.
+                    sb.Clear();
+                }
+                else if (!sb.EndsWith(PSStyle.Instance.Reset))
+                {
+                    sb.Append(PSStyle.Instance.Reset);
+                }
+            }
 
-            yield return result;
+            yield return new GetWordsResult() { Word = sb.ToString(), Delim = string.Empty };
         }
 
         internal static StringCollection GenerateLines(DisplayCells displayCells, string val, int firstLineLen, int followingLinesLen)
@@ -412,9 +458,9 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa
             }
 
             // break string on newlines and process each line separately
-            string[] lines = SplitLines(val);
+            List<string> lines = SplitLines(val);
 
-            for (int k = 0; k < lines.Length; k++)
+            for (int k = 0; k < lines.Count; k++)
             {
                 string currentLine = lines[k];
 
@@ -530,9 +576,9 @@ private static StringCollection GenerateLinesWithWordWrap(DisplayCells displayCe
             }
 
             // break string on newlines and process each line separately
-            string[] lines = SplitLines(val);
+            List<string> lines = SplitLines(val);
 
-            for (int k = 0; k < lines.Length; k++)
+            for (int k = 0; k < lines.Count; k++)
             {
                 if (lines[k] == null || displayCells.Length(lines[k]) <= firstLineLen)
                 {
@@ -545,28 +591,34 @@ private static StringCollection GenerateLinesWithWordWrap(DisplayCells displayCe
                 int lineWidth = firstLineLen;
                 bool firstLine = true;
                 StringBuilder singleLine = new StringBuilder();
+                string resetStr = PSStyle.Instance.Reset;
 
                 foreach (GetWordsResult word in GetWords(lines[k]))
                 {
                     string wordToAdd = word.Word;
+                    string suffix = null;
 
                     // Handle soft hyphen
-                    if (word.Delim == s_softHyphen.ToString())
+                    if (word.Delim.Length == 1 && word.Delim[0] == s_softHyphen)
                     {
                         int wordWidthWithHyphen = displayCells.Length(wordToAdd) + displayCells.Length(s_softHyphen);
 
                         // Add hyphen only if necessary
                         if (wordWidthWithHyphen == spacesLeft)
                         {
-                            wordToAdd += "-";
+                            suffix = "-";
                         }
                     }
-                    else
+                    else if (!string.IsNullOrEmpty(word.Delim))
                     {
-                        if (!string.IsNullOrEmpty(word.Delim))
-                        {
-                            wordToAdd += word.Delim;
-                        }
+                        suffix = word.Delim;
+                    }
+
+                    if (suffix is not null)
+                    {
+                        wordToAdd = wordToAdd.EndsWith(resetStr)
+                            ? wordToAdd.Insert(wordToAdd.Length - resetStr.Length, suffix)
+                            : wordToAdd + suffix;
                     }
 
                     int wordWidth = displayCells.Length(wordToAdd);
@@ -591,15 +643,35 @@ private static StringCollection GenerateLinesWithWordWrap(DisplayCells displayCe
                     // Word is wider than a single line
                     if (wordWidth > lineWidth)
                     {
-                        foreach (char c in wordToAdd)
+                        Dictionary<int, int> vtRanges = null;
+                        StringBuilder vtSeqs = null;
+
+                        var valueStrDec = new ValueStringDecorated(wordToAdd);
+                        if (valueStrDec.IsDecorated)
                         {
-                            char charToAdd = c;
-                            int charWidth = displayCells.Length(c);
+                            vtSeqs = new StringBuilder();
+                            vtRanges = valueStrDec.EscapeSequenceRanges;
+                        }
 
-                            // corner case: we have a two cell character and the current
-                            // display length is one.
-                            // add a single cell arbitrary character instead of the original
-                            // one and keep going
+                        bool hasEscSeqs = false;
+                        for (int i = 0; i < wordToAdd.Length; i++)
+                        {
+                            if (vtRanges?.TryGetValue(i, out int len) == true)
+                            {
+                                var vtSpan = wordToAdd.AsSpan(i, len);
+                                singleLine.Append(vtSpan);
+                                vtSeqs.Append(vtSpan);
+
+                                hasEscSeqs = true;
+                                i += len - 1;
+                                continue;
+                            }
+
+                            char charToAdd = wordToAdd[i];
+                            int charWidth = displayCells.Length(charToAdd);
+
+                            // Corner case: we have a two cell character and the current display length is one.
+                            // Add a single cell arbitrary character instead of the original one and keep going.
                             if (charWidth > lineWidth)
                             {
                                 charToAdd = '?';
@@ -608,9 +680,13 @@ private static StringCollection GenerateLinesWithWordWrap(DisplayCells displayCe
 
                             if (charWidth > spacesLeft)
                             {
+                                if (hasEscSeqs && !singleLine.EndsWith(resetStr))
+                                {
+                                    singleLine.Append(resetStr);
+                                }
+
                                 retVal.Add(singleLine.ToString());
-                                singleLine.Clear();
-                                singleLine.Append(charToAdd);
+                                singleLine.Clear().Append(vtSeqs).Append(charToAdd);
 
                                 if (firstLine)
                                 {
@@ -632,8 +708,7 @@ private static StringCollection GenerateLinesWithWordWrap(DisplayCells displayCe
                         if (wordWidth > spacesLeft)
                         {
                             retVal.Add(singleLine.ToString());
-                            singleLine.Clear();
-                            singleLine.Append(wordToAdd);
+                            singleLine.Clear().Append(wordToAdd);
 
                             if (firstLine)
                             {
@@ -663,49 +738,77 @@ private static StringCollection GenerateLinesWithWordWrap(DisplayCells displayCe
         /// </summary>
         /// <param name="s">String to split.</param>
         /// <returns>String array with the values.</returns>
-        internal static string[] SplitLines(string s)
+        internal static List<string> SplitLines(string s)
         {
-            if (string.IsNullOrEmpty(s))
-                return new string[1] { s };
+            if (string.IsNullOrEmpty(s) || !s.Contains('\n'))
+            {
+                return new List<string>(capacity: 1) { s?.Replace("\r", string.Empty) };
+            }
 
             StringBuilder sb = new StringBuilder();
+            List<string> list = new List<string>();
+
+            StringBuilder vtSeqs = null;
+            Dictionary<int, int> vtRanges = null;
 
-            foreach (char c in s)
+            var valueStrDec = new ValueStringDecorated(s);
+            if (valueStrDec.IsDecorated)
             {
-                if (c != '\r')
-                    sb.Append(c);
+                vtSeqs = new StringBuilder();
+                vtRanges = valueStrDec.EscapeSequenceRanges;
             }
 
-            return sb.ToString().Split(s_newLineChar);
-        }
-
-#if false
-        internal static string StripNewLines (string s)
-        {
-            if (string.IsNullOrEmpty (s))
-                return s;
-
-            string[] lines = SplitLines (s);
+            bool hasVtSeqs = false;
+            for (int i = 0; i < s.Length; i++)
+            {
+                if (vtRanges?.TryGetValue(i, out int len) == true)
+                {
+                    var vtSpan = s.AsSpan(i, len);
+                    sb.Append(vtSpan);
+                    vtSeqs.Append(vtSpan);
 
-            if (lines.Length == 0)
-                return null;
+                    hasVtSeqs = true;
+                    i += len - 1;
+                    continue;
+                }
 
-            if (lines.Length == 1)
-                return lines[0];
+                char c = s[i];
+                if (c == '\n')
+                {
+                    if (hasVtSeqs && !sb.EndsWith(PSStyle.Instance.Reset))
+                    {
+                        sb.Append(PSStyle.Instance.Reset);
+                    }
 
-            StringBuilder sb = new StringBuilder ();
+                    list.Add(sb.ToString());
+                    sb.Clear().Append(vtSeqs);
+                }
+                else if (c != '\r')
+                {
+                    sb.Append(c);
+                }
+            }
 
-            for (int k = 0; k < lines.Length; k++)
+            if (hasVtSeqs)
             {
-                if (k == 0)
-                    sb.Append (lines[k]);
-                else
-                    sb.Append (" " + lines[k]);
+                if (sb.Length == vtSeqs.Length)
+                {
+                    // This indicates 'sb' only contains all VT sequences, which may happen when the string ends with '\n'.
+                    // For a sub-string that contains VT sequence only, it's the same as an empty string to the formatting
+                    // system, because nothing will actually be rendered.
+                    // So, we use an empty string in this case to avoid unneeded string allocations.
+                    sb.Clear();
+                }
+                else if (!sb.EndsWith(PSStyle.Instance.Reset))
+                {
+                    sb.Append(PSStyle.Instance.Reset);
+                }
             }
 
-            return sb.ToString ();
+            list.Add(sb.ToString());
+            return list;
         }
-#endif
+
         internal static string TruncateAtNewLine(string s)
         {
             if (string.IsNullOrEmpty(s))
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs b/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
index ddd69ae0ee9..a1f373a5dd5 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Management.Automation;
@@ -379,10 +380,10 @@ private void WriteLineInternal(string val, int cols)
             }
 
             // check for line breaks
-            string[] lines = StringManipulationHelper.SplitLines(val);
+            List<string> lines = StringManipulationHelper.SplitLines(val);
 
             // process the substrings as separate lines
-            for (int k = 0; k < lines.Length; k++)
+            for (int k = 0; k < lines.Count; k++)
             {
                 // compute the display length of the string
                 int displayLength = _displayCells.Length(lines[k]);
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
index 16df0c57287..786a25c2d7b 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Management.Automation;
@@ -180,12 +181,12 @@ private void WriteProperty(int k, string propertyValue, LineOutput lo)
                 propertyValue = string.Empty;
 
             // make sure we honor embedded newlines
-            string[] lines = StringManipulationHelper.SplitLines(propertyValue);
+            List<string> lines = StringManipulationHelper.SplitLines(propertyValue);
 
             // padding to use in the lines after the first
             string padding = null;
 
-            for (int i = 0; i < lines.Length; i++)
+            for (int i = 0; i < lines.Count; i++)
             {
                 string prependString = null;
 
@@ -212,7 +213,7 @@ private void WriteProperty(int k, string propertyValue, LineOutput lo)
         /// <param name="lo">LineOuput to write to.</param>
         private void WriteSingleLineHelper(string prependString, string line, LineOutput lo)
         {
-            if (line == null)
+            if (line is null)
             {
                 line = string.Empty;
             }
@@ -223,8 +224,8 @@ private void WriteSingleLineHelper(string prependString, string line, LineOutput
             // split the lines
             StringCollection sc = StringManipulationHelper.GenerateLines(lo.DisplayCells, line, fieldCellCount, fieldCellCount);
 
-            // padding to use in the lines after the first
-            string padding = StringUtil.Padding(_propertyLabelsDisplayLength);
+            // The padding to use in the lines after the first.
+            string headPadding = null;
 
             // display the string collection
             for (int k = 0; k < sc.Count; k++)
@@ -234,17 +235,26 @@ private void WriteSingleLineHelper(string prependString, string line, LineOutput
 
                 if (k == 0)
                 {
-                    _cachedBuilder
-                        .Append(PSStyle.Instance.Formatting.FormatAccent)
-                        .Append(prependString)
-                        .Append(PSStyle.Instance.Reset)
-                        .Append(str);
+                    if (string.IsNullOrWhiteSpace(prependString))
+                    {
+                        // Sometimes 'prependString' is just padding white spaces.
+                        // We don't need to add formatting escape sequences in such a case.
+                        _cachedBuilder.Append(prependString).Append(str);
+                    }
+                    else
+                    {
+                        _cachedBuilder
+                            .Append(PSStyle.Instance.Formatting.FormatAccent)
+                            .Append(prependString)
+                            .Append(PSStyle.Instance.Reset)
+                            .Append(str);
+                    }
                 }
                 else
                 {
-                    _cachedBuilder
-                        .Append(padding)
-                        .Append(str);
+                    // Lazily calculate the padding to use for the subsequent lines as it's quite often that only the first line exists.
+                    headPadding ??= StringUtil.Padding(_propertyLabelsDisplayLength);
+                    _cachedBuilder.Append(headPadding).Append(str);
                 }
 
                 if (str.Contains(ValueStringDecorated.ESC) && !str.EndsWith(PSStyle.Instance.Reset))
diff --git a/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs b/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
index 9b82cf3d7a7..c2497bdff59 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
@@ -3,6 +3,7 @@
 
 #nullable enable
 
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
 namespace System.Management.Automation.Internal
@@ -87,6 +88,7 @@ internal struct ValueStringDecorated
         private readonly bool _isDecorated;
         private readonly string _text;
         private string? _plaintextcontent;
+        private Dictionary<int, int>? _vtRanges;
 
         private string PlainText
         {
@@ -110,6 +112,30 @@ private string PlainText
         // replace regex with .NET 6 API once available
         internal static readonly Regex AnsiRegex = new Regex($"{GraphicsRegex}|{CsiRegex}", RegexOptions.Compiled);
 
+        /// <summary>
+        /// Get the ranges of all escape sequences in the text.
+        /// </summary>
+        /// <returns>
+        /// A dictionary with the key being the starting index of an escape sequence,
+        /// and the value being the length of the escape sequence.
+        /// </returns>
+        internal Dictionary<int, int>? EscapeSequenceRanges
+        {
+            get
+            {
+                if (_isDecorated && _vtRanges is null)
+                {
+                    _vtRanges = new Dictionary<int, int>();
+                    foreach (Match match in AnsiRegex.Matches(_text))
+                    {
+                        _vtRanges.Add(match.Index, match.Length);
+                    }
+                }
+
+                return _vtRanges;
+            }
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ValueStringDecorated"/> struct.
         /// </summary>
@@ -118,7 +144,8 @@ public ValueStringDecorated(string text)
         {
             _text = text;
             _isDecorated = text.Contains(ESC);
-            _plaintextcontent = null;
+            _plaintextcontent = _isDecorated ? null : text;
+            _vtRanges = null;
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/utils/StringUtil.cs b/src/System.Management.Automation/utils/StringUtil.cs
index ed08f425eac..6bdedd03a3b 100644
--- a/src/System.Management.Automation/utils/StringUtil.cs
+++ b/src/System.Management.Automation/utils/StringUtil.cs
@@ -157,22 +157,16 @@ internal static string VtSubstring(this string str, int startOffset, int length,
             if (valueStrDec.IsDecorated)
             {
                 // Handle strings with VT sequences.
-                var sb = new StringBuilder(capacity: str.Length);
                 bool copyStarted = startOffset == 0;
                 bool hasEscSeqs = false;
                 bool firstNonEscChar = true;
-
-                // Find all escape sequences in the string, and keep track of their starting indexes and length.
-                var ansiRanges = new Dictionary<int, int>();
-                foreach (Match match in ValueStringDecorated.AnsiRegex.Matches(str))
-                {
-                    ansiRanges.Add(match.Index, match.Length);
-                }
+                StringBuilder sb = new(capacity: str.Length);
+                Dictionary<int, int> vtRanges = valueStrDec.EscapeSequenceRanges;
 
                 for (int i = 0, offset = 0; i < str.Length; i++)
                 {
                     // Keep all leading ANSI escape sequences.
-                    if (ansiRanges.TryGetValue(i, out int len))
+                    if (vtRanges.TryGetValue(i, out int len))
                     {
                         hasEscSeqs = true;
                         sb.Append(str.AsSpan(i, len));
diff --git a/stylecop.json b/stylecop.json
index 77517f2095b..9653436690c 100644
--- a/stylecop.json
+++ b/stylecop.json
@@ -25,7 +25,7 @@
         },
         "namingRules" : {
             "allowCommonHungarianPrefixes" : true,
-            "allowedHungarianPrefixes" : [ "n", "r", "l", "i", "io", "is", "fs", "lp", "dw", "h", "rs", "ps", "op", "sb", "my" ]
+            "allowedHungarianPrefixes" : [ "n", "r", "l", "i", "io", "is", "fs", "lp", "dw", "h", "rs", "ps", "op", "sb", "my", "vt" ]
         },
         "maintainabilityRules" : {
             "topLevelTypes" : [
diff --git a/test/powershell/engine/Formatting/PSStyle.Tests.ps1 b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
index 24343537e82..aa54a63dc05 100644
--- a/test/powershell/engine/Formatting/PSStyle.Tests.ps1
+++ b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
@@ -342,4 +342,42 @@ Billy Bob… Senior DevOps …  13
         $text = Get-Content $outFile -Raw
         $text.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
     }
+
+    It "Word wrapping for string with escape sequences" {
+       $expected = @"
+`e[32;1mLongDescription : `e[0m`e[33mPowerShell `e[0m
+                  `e[33mscripting `e[0m
+                  `e[33mlanguage`e[0m
+"@
+        $obj = [pscustomobject] @{ LongDescription = "`e[33mPowerShell scripting language" }
+        $obj | Format-List | Out-String -Width 35 | Out-File $outFile
+
+        $text = Get-Content $outFile -Raw
+        $text.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
+    }
+
+    It "Splitting multi-line string with escape sequences" {
+        $expected = @"
+`e[32;1mb : `e[0m`e[33mPowerShell is a task automation and configuration management program from Microsoft,`e[0m
+    `e[33mconsisting of a command-line shell and the associated scripting language`e[0m
+"@
+        $obj = [pscustomobject] @{ b = "`e[33mPowerShell is a task automation and configuration management program from Microsoft,`nconsisting of a command-line shell and the associated scripting language" }
+        $obj | Format-List | Out-File $outFile
+
+        $text = Get-Content $outFile -Raw
+        $text.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
+    }
+
+    It "Wrapping long word with escape sequences" {
+        $expected = @"
+`e[32;1mb : `e[0m`e[33mC:\repos\PowerShell\src\powershell-w`e[0m
+    `e[33min-core\bin\Debug\net7.0\win7-x64\pu`e[0m
+    `e[33mblish\pwsh.exe`e[0m
+"@
+        $obj = [pscustomobject] @{ b = "`e[33mC:\repos\PowerShell\src\powershell-win-core\bin\Debug\net7.0\win7-x64\publish\pwsh.exe" }
+        $obj | Format-List | Out-String -Width 40 | Out-File $outFile
+
+        $text = Get-Content $outFile -Raw
+        $text.Trim().Replace("`r", "") | Should -BeExactly $expected.Replace("`r", "")
+    }
 }

From 65d8f11aebbdb49b7e28af026d84bf1d38705d37 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Mon, 16 May 2022 17:10:51 -0700
Subject: [PATCH 380/645] Update telemetry collecting with a few changes
 (#17304)

---
 .../host/msh/CommandLineParameterParser.cs    | 136 +++++++++++++++++-
 .../host/msh/ConsoleHost.cs                   |  10 +-
 .../engine/Modules/ImportModuleCommand.cs     |  16 ++-
 .../engine/pipeline.cs                        |   2 -
 .../utils/Telemetry.cs                        | 121 ++++++++++------
 .../engine/Basic/Telemetry.Tests.ps1          |  24 +---
 6 files changed, 233 insertions(+), 76 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
index 795921a0c5a..aefcb58cfd8 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-
 #nullable enable
 
 using System;
@@ -195,6 +194,57 @@ internal static int MaxNameLength()
             "workingdirectory"
         };
 
+        /// <summary>
+        /// These represent the parameters that are used when starting pwsh.
+        /// We can query in our telemetry to determine how pwsh was invoked.
+        /// </summary>
+        [Flags]
+        internal enum ParameterBitmap : long
+        {
+            Command             = 0x00000001, // -Command | -c
+            ConfigurationName   = 0x00000002, // -ConfigurationName | -config
+            CustomPipeName      = 0x00000004, // -CustomPipeName
+            EncodedCommand      = 0x00000008, // -EncodedCommand | -e | -ec
+            EncodedArgument     = 0x00000010, // -EncodedArgument
+            ExecutionPolicy     = 0x00000020, // -ExecutionPolicy | -ex | -ep
+            File                = 0x00000040, // -File | -f
+            Help                = 0x00000080, // -Help, -?, /?
+            InputFormat         = 0x00000100, // -InputFormat | -inp | -if
+            Interactive         = 0x00000200, // -Interactive | -i
+            Login               = 0x00000400, // -Login | -l
+            MTA                 = 0x00000800, // -MTA
+            NoExit              = 0x00001000, // -NoExit | -noe
+            NoLogo              = 0x00002000, // -NoLogo | -nol
+            NonInteractive      = 0x00004000, // -NonInteractive | -noni
+            NoProfile           = 0x00008000, // -NoProfile | -nop
+            OutputFormat        = 0x00010000, // -OutputFormat | -o | -of
+            SettingsFile        = 0x00020000, // -SettingsFile | -settings
+            SSHServerMode       = 0x00040000, // -SSHServerMode | -sshs
+            SocketServerMode    = 0x00080000, // -SocketServerMode | -sockets
+            ServerMode          = 0x00100000, // -ServerMode | -server
+            NamedPipeServerMode = 0x00200000, // -NamedPipeServerMode | -namedpipes
+            STA                 = 0x00400000, // -STA
+            Version             = 0x00800000, // -Version | -v
+            WindowStyle         = 0x01000000, // -WindowStyle | -w
+            WorkingDirectory    = 0x02000000, // -WorkingDirectory | -wd
+            // Enum values for specified ExecutionPolicy
+            EPUnrestricted      = 0x0000000100000000, // ExecutionPolicy unrestricted
+            EPRemoteSigned      = 0x0000000200000000, // ExecutionPolicy remote signed
+            EPAllSigned         = 0x0000000400000000, // ExecutionPolicy all signed
+            EPRestricted        = 0x0000000800000000, // ExecutionPolicy restricted
+            EPDefault           = 0x0000001000000000, // ExecutionPolicy default
+            EPBypass            = 0x0000002000000000, // ExecutionPolicy bypass
+            EPUndefined         = 0x0000004000000000, // ExecutionPolicy undefined
+            EPIncorrect         = 0x0000008000000000, // ExecutionPolicy incorrect
+        }
+
+        internal ParameterBitmap ParametersUsed = 0;
+
+        internal double ParametersUsedAsDouble
+        {
+            get { return (double)ParametersUsed; }
+        }
+
         [Conditional("DEBUG")]
         private void AssertArgumentsParsed()
         {
@@ -641,6 +691,53 @@ internal static string NormalizeFilePath(string path)
             return Path.GetFullPath(path);
         }
 
+        /// <summary>
+        /// Determine the execution policy based on the supplied string.
+        /// If the string doesn't match to any known execution policy, set it to incorrect.
+        /// </summary>
+        /// <param name="_executionPolicy">The value provided on the command line.</param>
+        /// <returns>The execution policy.</returns>
+        private static ParameterBitmap GetExecutionPolicy(string? _executionPolicy)
+        {
+            if (_executionPolicy is null)
+            {
+                return ParameterBitmap.EPUndefined;
+            }
+
+            ParameterBitmap executionPolicySetting = ParameterBitmap.EPIncorrect;
+
+            if (string.Equals(_executionPolicy, "default", StringComparison.OrdinalIgnoreCase))
+            {
+                executionPolicySetting = ParameterBitmap.EPDefault;
+            }
+            else if (string.Equals(_executionPolicy, "remotesigned", StringComparison.OrdinalIgnoreCase))
+            {
+                executionPolicySetting = ParameterBitmap.EPRemoteSigned;
+            }
+            else if (string.Equals(_executionPolicy, "bypass", StringComparison.OrdinalIgnoreCase))
+            {
+                executionPolicySetting = ParameterBitmap.EPBypass;
+            }
+            else if (string.Equals(_executionPolicy, "allsigned", StringComparison.OrdinalIgnoreCase))
+            {
+                executionPolicySetting = ParameterBitmap.EPAllSigned;
+            }
+            else if (string.Equals(_executionPolicy, "restricted", StringComparison.OrdinalIgnoreCase))
+            {
+                executionPolicySetting = ParameterBitmap.EPRestricted;
+            }
+            else if (string.Equals(_executionPolicy, "unrestricted", StringComparison.OrdinalIgnoreCase))
+            {
+                executionPolicySetting = ParameterBitmap.EPUnrestricted;
+            }
+            else if (string.Equals(_executionPolicy, "undefined", StringComparison.OrdinalIgnoreCase))
+            {
+                executionPolicySetting = ParameterBitmap.EPUndefined;
+            }
+
+            return executionPolicySetting;
+        }
+
         private static bool MatchSwitch(string switchKey, string match, string smallestUnambiguousMatch)
         {
             Dbg.Assert(!string.IsNullOrEmpty(match), "need a value");
@@ -755,6 +852,7 @@ private void ParseHelper(string[] args)
                     _noInteractive = true;
                     _skipUserInit = true;
                     _noExit = false;
+                    ParametersUsed |= ParameterBitmap.Version;
                     break;
                 }
 
@@ -763,48 +861,59 @@ private void ParseHelper(string[] args)
                     _showHelp = true;
                     _showExtendedHelp = true;
                     _abortStartup = true;
+                    ParametersUsed |= ParameterBitmap.Help;
                 }
                 else if (MatchSwitch(switchKey, "login", "l"))
                 {
                     // On Windows, '-Login' does nothing.
                     // On *nix, '-Login' is already handled much earlier to improve startup performance, so we do nothing here.
+                    ParametersUsed |= ParameterBitmap.Login;
                 }
                 else if (MatchSwitch(switchKey, "noexit", "noe"))
                 {
                     _noExit = true;
                     noexitSeen = true;
+                    ParametersUsed |= ParameterBitmap.NoExit;
                 }
                 else if (MatchSwitch(switchKey, "noprofile", "nop"))
                 {
                     _skipUserInit = true;
+                    ParametersUsed |= ParameterBitmap.NoProfile;
                 }
                 else if (MatchSwitch(switchKey, "nologo", "nol"))
                 {
                     _showBanner = false;
+                    ParametersUsed |= ParameterBitmap.NoLogo;
                 }
                 else if (MatchSwitch(switchKey, "noninteractive", "noni"))
                 {
                     _noInteractive = true;
+                    ParametersUsed |= ParameterBitmap.NonInteractive;
                 }
                 else if (MatchSwitch(switchKey, "socketservermode", "so"))
                 {
                     _socketServerMode = true;
+                    ParametersUsed |= ParameterBitmap.SocketServerMode;
                 }
                 else if (MatchSwitch(switchKey, "servermode", "s"))
                 {
                     _serverMode = true;
+                    ParametersUsed |= ParameterBitmap.ServerMode;
                 }
                 else if (MatchSwitch(switchKey, "namedpipeservermode", "nam"))
                 {
                     _namedPipeServerMode = true;
+                    ParametersUsed |= ParameterBitmap.NamedPipeServerMode;
                 }
                 else if (MatchSwitch(switchKey, "sshservermode", "sshs"))
                 {
                     _sshServerMode = true;
+                    ParametersUsed |= ParameterBitmap.SSHServerMode;
                 }
                 else if (MatchSwitch(switchKey, "interactive", "i"))
                 {
                     _noInteractive = false;
+                    ParametersUsed |= ParameterBitmap.Interactive;
                 }
                 else if (MatchSwitch(switchKey, "configurationname", "config"))
                 {
@@ -817,6 +926,7 @@ private void ParseHelper(string[] args)
                     }
 
                     _configurationName = args[i];
+                    ParametersUsed |= ParameterBitmap.ConfigurationName;
                 }
                 else if (MatchSwitch(switchKey, "custompipename", "cus"))
                 {
@@ -841,7 +951,9 @@ private void ParseHelper(string[] args)
                         break;
                     }
 #endif
+
                     _customPipeName = args[i];
+                    ParametersUsed |= ParameterBitmap.CustomPipeName;
                 }
                 else if (MatchSwitch(switchKey, "command", "c"))
                 {
@@ -849,6 +961,8 @@ private void ParseHelper(string[] args)
                     {
                         break;
                     }
+
+                    ParametersUsed |= ParameterBitmap.Command;
                 }
                 else if (MatchSwitch(switchKey, "windowstyle", "w"))
                 {
@@ -875,6 +989,8 @@ private void ParseHelper(string[] args)
                             string.Format(CultureInfo.CurrentCulture, CommandLineParameterParserStrings.InvalidWindowStyleArgument, args[i], e.Message));
                         break;
                     }
+
+                    ParametersUsed |= ParameterBitmap.WindowStyle;
 #endif
                 }
                 else if (MatchSwitch(switchKey, "file", "f"))
@@ -883,6 +999,8 @@ private void ParseHelper(string[] args)
                     {
                         break;
                     }
+
+                    ParametersUsed |= ParameterBitmap.File;
                 }
 #if DEBUG
                 else if (MatchSwitch(switchKey, "isswait", "isswait"))
@@ -894,14 +1012,18 @@ private void ParseHelper(string[] args)
                 {
                     ParseFormat(args, ref i, ref _outFormat, CommandLineParameterParserStrings.MissingOutputFormatParameter);
                     _outputFormatSpecified = true;
+                    ParametersUsed |= ParameterBitmap.OutputFormat;
                 }
                 else if (MatchSwitch(switchKey, "inputformat", "inp") || MatchSwitch(switchKey, "if", "if"))
                 {
                     ParseFormat(args, ref i, ref _inFormat, CommandLineParameterParserStrings.MissingInputFormatParameter);
+                    ParametersUsed |= ParameterBitmap.InputFormat;
                 }
                 else if (MatchSwitch(switchKey, "executionpolicy", "ex") || MatchSwitch(switchKey, "ep", "ep"))
                 {
                     ParseExecutionPolicy(args, ref i, ref _executionPolicy, CommandLineParameterParserStrings.MissingExecutionPolicyParameter);
+                    ParametersUsed |= ParameterBitmap.ExecutionPolicy;
+                    ParametersUsed |= GetExecutionPolicy(_executionPolicy);
                 }
                 else if (MatchSwitch(switchKey, "encodedcommand", "e") || MatchSwitch(switchKey, "ec", "e"))
                 {
@@ -910,6 +1032,8 @@ private void ParseHelper(string[] args)
                     {
                         break;
                     }
+
+                    ParametersUsed |= ParameterBitmap.EncodedCommand;
                 }
                 else if (MatchSwitch(switchKey, "encodedarguments", "encodeda") || MatchSwitch(switchKey, "ea", "ea"))
                 {
@@ -917,6 +1041,8 @@ private void ParseHelper(string[] args)
                     {
                         break;
                     }
+
+                    ParametersUsed |= ParameterBitmap.EncodedArgument;
                 }
                 else if (MatchSwitch(switchKey, "settingsfile", "settings"))
                 {
@@ -925,6 +1051,8 @@ private void ParseHelper(string[] args)
                     {
                         break;
                     }
+
+                    ParametersUsed |= ParameterBitmap.SettingsFile;
                 }
                 else if (MatchSwitch(switchKey, "sta", "sta"))
                 {
@@ -944,6 +1072,7 @@ private void ParseHelper(string[] args)
                     }
 
                     _staMode = true;
+                    ParametersUsed |= ParameterBitmap.STA;
                 }
                 else if (MatchSwitch(switchKey, "mta", "mta"))
                 {
@@ -963,6 +1092,7 @@ private void ParseHelper(string[] args)
                     }
 
                     _staMode = false;
+                    ParametersUsed |= ParameterBitmap.MTA;
                 }
                 else if (MatchSwitch(switchKey, "workingdirectory", "wo") || MatchSwitch(switchKey, "wd", "wd"))
                 {
@@ -975,6 +1105,7 @@ private void ParseHelper(string[] args)
                     }
 
                     _workingDirectory = args[i];
+                    ParametersUsed |= ParameterBitmap.WorkingDirectory;
                 }
 #if !UNIX
                 else if (MatchSwitch(switchKey, "removeworkingdirectorytrailingcharacter", "removeworkingdirectorytrailingcharacter"))
@@ -990,6 +1121,9 @@ private void ParseHelper(string[] args)
                     {
                         break;
                     }
+
+                    // default to filename being the next argument.
+                    ParametersUsed |= ParameterBitmap.File;
                 }
             }
 
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
index 4703d54d880..6a78b4c864e 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -192,7 +192,7 @@ internal static int Start(string bannerText, string helpText)
                 // First check for and handle PowerShell running in a server mode.
                 if (s_cpp.ServerMode)
                 {
-                    ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("ServerMode");
+                    ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("ServerMode", s_cpp.ParametersUsedAsDouble);
                     ProfileOptimization.StartProfile("StartupProfileData-ServerMode");
                     StdIOProcessMediator.Run(
                         initialCommand: s_cpp.InitialCommand,
@@ -202,7 +202,7 @@ internal static int Start(string bannerText, string helpText)
                 }
                 else if (s_cpp.SSHServerMode)
                 {
-                    ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("SSHServer");
+                    ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("SSHServer", s_cpp.ParametersUsedAsDouble);
                     ProfileOptimization.StartProfile("StartupProfileData-SSHServerMode");
                     StdIOProcessMediator.Run(
                         initialCommand: s_cpp.InitialCommand,
@@ -212,7 +212,7 @@ internal static int Start(string bannerText, string helpText)
                 }
                 else if (s_cpp.NamedPipeServerMode)
                 {
-                    ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("NamedPipe");
+                    ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("NamedPipe", s_cpp.ParametersUsedAsDouble);
                     ProfileOptimization.StartProfile("StartupProfileData-NamedPipeServerMode");
                     RemoteSessionNamedPipeServer.RunServerMode(
                         configurationName: s_cpp.ConfigurationName);
@@ -220,7 +220,7 @@ internal static int Start(string bannerText, string helpText)
                 }
                 else if (s_cpp.SocketServerMode)
                 {
-                    ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("SocketServerMode");
+                    ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("SocketServerMode", s_cpp.ParametersUsedAsDouble);
                     ProfileOptimization.StartProfile("StartupProfileData-SocketServerMode");
                     HyperVSocketMediator.Run(
                         initialCommand: s_cpp.InitialCommand,
@@ -255,7 +255,7 @@ internal static int Start(string bannerText, string helpText)
                     PSHost.IsStdOutputRedirected = Console.IsOutputRedirected;
 
                     // Send startup telemetry for ConsoleHost startup
-                    ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("Normal");
+                    ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("Normal", s_cpp.ParametersUsedAsDouble);
 
                     exitCode = s_theConsoleHost.Run(s_cpp, false);
                 }
diff --git a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
index 8f503cbe464..8e178c0cb10 100644
--- a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
@@ -619,7 +619,7 @@ private PSModuleInfo ImportModule_LocallyViaName_WithTelemetry(ImportModuleOptio
                 // avoid double reporting for WinCompat modules that go through CommandDiscovery\AutoloadSpecifiedModule
                 if (!foundModule.IsWindowsPowerShellCompatModule)
                 {
-                    ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.ModuleLoad, foundModule.Name);
+                    ApplicationInsightsTelemetry.SendModuleTelemetryMetric(TelemetryType.ModuleLoad, foundModule.Name, foundModule.Version?.ToString());
 #if LEGACYTELEMETRY
                     TelemetryAPI.ReportModuleLoad(foundModule);
 #endif
@@ -896,7 +896,7 @@ private PSModuleInfo ImportModule_LocallyViaFQName(ImportModuleOptions importMod
 
             if (foundModule != null)
             {
-                ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.ModuleLoad, foundModule.Name);
+                ApplicationInsightsTelemetry.SendModuleTelemetryMetric(TelemetryType.ModuleLoad, foundModule.Name, foundModule.Version?.ToString());
                 SetModuleBaseForEngineModules(foundModule.Name, this.Context);
             }
 
@@ -938,7 +938,7 @@ private IList<PSModuleInfo> ImportModule_RemotelyViaPsrpSession(
             // Send telemetry on the imported modules
             foreach (PSModuleInfo moduleInfo in remotelyImportedModules)
             {
-                ApplicationInsightsTelemetry.SendTelemetryMetric(usingWinCompat ? TelemetryType.WinCompatModuleLoad : TelemetryType.ModuleLoad, moduleInfo.Name);
+                ApplicationInsightsTelemetry.SendModuleTelemetryMetric(usingWinCompat ? TelemetryType.WinCompatModuleLoad : TelemetryType.ModuleLoad, moduleInfo.Name, moduleInfo.Version?.ToString());
             }
 
             return remotelyImportedModules;
@@ -1369,7 +1369,8 @@ private void ImportModule_RemotelyViaCimSession(
             foreach (RemoteDiscoveryHelper.CimModule remoteCimModule in remotePsCimModules)
             {
                 ImportModule_RemotelyViaCimModuleData(importModuleOptions, remoteCimModule, cimSession);
-                ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.ModuleLoad, remoteCimModule.ModuleName);
+                // we don't know the version of the module
+                ApplicationInsightsTelemetry.SendModuleTelemetryMetric(TelemetryType.ModuleLoad, remoteCimModule.ModuleName);
             }
         }
 
@@ -1874,7 +1875,7 @@ protected override void ProcessRecord()
                 // of doing Get-Module -list
                 foreach (PSModuleInfo module in ModuleInfo)
                 {
-                    ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.ModuleLoad, module.Name);
+                    ApplicationInsightsTelemetry.SendModuleTelemetryMetric(TelemetryType.ModuleLoad, module.Name, module.Version?.ToString());
                     RemoteDiscoveryHelper.DispatchModuleInfoProcessing(
                         module,
                         localAction: () =>
@@ -1902,7 +1903,8 @@ protected override void ProcessRecord()
                 // Now load all of the supplied assemblies...
                 foreach (Assembly suppliedAssembly in Assembly)
                 {
-                    ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.ModuleLoad, suppliedAssembly.GetName().Name);
+                    // we don't know what the version of the module is.
+                    ApplicationInsightsTelemetry.SendModuleTelemetryMetric(TelemetryType.ModuleLoad, suppliedAssembly.GetName().Name);
                     ImportModule_ViaAssembly(importModuleOptions, suppliedAssembly);
                 }
             }
@@ -1933,7 +1935,7 @@ protected override void ProcessRecord()
                 ImportModule_RemotelyViaPsrpSession(importModuleOptions, null, FullyQualifiedName, this.PSSession);
                 foreach (ModuleSpecification modulespec in FullyQualifiedName)
                 {
-                    ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.ModuleLoad, modulespec.Name);
+                    ApplicationInsightsTelemetry.SendModuleTelemetryMetric(TelemetryType.ModuleLoad, modulespec.Name, modulespec.Version?.ToString());
                 }
             }
             else if (this.ParameterSetName.Equals(ParameterSet_ViaWinCompat, StringComparison.OrdinalIgnoreCase)
diff --git a/src/System.Management.Automation/engine/pipeline.cs b/src/System.Management.Automation/engine/pipeline.cs
index 185e60e072f..152b3e771ed 100644
--- a/src/System.Management.Automation/engine/pipeline.cs
+++ b/src/System.Management.Automation/engine/pipeline.cs
@@ -1077,8 +1077,6 @@ private void Start(bool incomingStream)
                     CommandState.Started,
                     commandProcessor.Command.MyInvocation);
 
-                // Send telemetry that includes the type of command.
-                ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.ApplicationType, commandProcessor.Command.CommandInfo.CommandType.ToString());
 #if LEGACYTELEMETRY
                 Microsoft.PowerShell.Telemetry.Internal.TelemetryAPI.TraceExecutedCommand(commandProcessor.Command.CommandInfo, commandProcessor.Command.CommandOrigin);
 #endif
diff --git a/src/System.Management.Automation/utils/Telemetry.cs b/src/System.Management.Automation/utils/Telemetry.cs
index 1c1f1b8d2c2..625f9571651 100644
--- a/src/System.Management.Automation/utils/Telemetry.cs
+++ b/src/System.Management.Automation/utils/Telemetry.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Management.Automation;
 using System.Runtime.InteropServices;
@@ -94,8 +95,15 @@ public static class ApplicationInsightsTelemetry
         // private const string _psCoreTelemetryKey = "ee4b2115-d347-47b0-adb6-b19c2c763808"; // Production
         private const string _psCoreTelemetryKey = "d26a5ef4-d608-452c-a6b8-a4a55935f70d"; // V7 Preview 3
 
+        // In the event there is a problem in creating the node identifier file, use the default identifier.
+        // This can happen if we are running in a system which has a read-only filesystem.
+        private static readonly Guid _defaultNodeIdentifier = new Guid("2f998828-3f4a-4741-bf50-d11c6be42f50");
+
         // Use "anonymous" as the string to return when you can't report a name
-        private const string _anonymous = "anonymous";
+        private const string Anonymous = "anonymous";
+
+        // Use '0.0' as the string for an anonymous module version
+        private const string AnonymousVersion = "0.0";
 
         // the telemetry failure string
         private const string _telemetryFailure = "TELEMETRY_FAILURE";
@@ -240,6 +248,7 @@ static ApplicationInsightsTelemetry()
                         "Az.StorageTable",
                         "Az.StreamAnalytics",
                         "Az.Subscription",
+                        "Az.Tools.Predictor",
                         "Az.TrafficManager",
                         "Az.Websites",
                         "Azs.Azurebridge.Admin",
@@ -642,6 +651,28 @@ private static bool GetEnvironmentVariableAsBool(string name, bool defaultValue)
             return defaultValue;
         }
 
+        /// <summary>
+        /// Send module load telemetry as a metric.
+        /// For modules we send the module name (if allowed), and the version.
+        /// Some modules (CIM) will continue use the string alternative method.
+        /// </summary>
+        /// <param name="telemetryType">The type of telemetry that we'll be sending.</param>
+        /// <param name="moduleName">The module name to report. If it is not allowed, then it is set to 'anonymous'.</param>
+        /// <param name="moduleVersion">The module version to report. The default value is the anonymous version '0.0.0.0'.</param>
+        internal static void SendModuleTelemetryMetric(TelemetryType telemetryType, string moduleName, string moduleVersion = AnonymousVersion)
+        {
+            try
+            {
+                string allowedModuleName = GetModuleName(moduleName);
+                string allowedModuleVersion = allowedModuleName == Anonymous ? AnonymousVersion : moduleVersion;
+                s_telemetryClient.GetMetric(telemetryType.ToString(), "uuid", "SessionId", "ModuleName", "Version").TrackValue(metricValue: 1.0, s_uniqueUserIdentifier, s_sessionId, allowedModuleName, allowedModuleVersion);
+            }
+            catch
+            {
+                // Ignore errors.
+            }
+        }
+
         /// <summary>
         /// Send telemetry as a metric.
         /// </summary>
@@ -654,7 +685,9 @@ internal static void SendTelemetryMetric(TelemetryType metricId, string data)
                 return;
             }
 
-            SendPSCoreStartupTelemetry("hosted");
+            // These should be handled by SendModuleTelemetryMetric.
+            Debug.Assert(metricId != TelemetryType.ModuleLoad, "ModuleLoad should be handled by SendModuleTelemetryMetric.");
+            Debug.Assert(metricId != TelemetryType.WinCompatModuleLoad, "WinCompatModuleLoad should be handled by SendModuleTelemetryMetric.");
 
             string metricName = metricId.ToString();
             try
@@ -671,11 +704,6 @@ internal static void SendTelemetryMetric(TelemetryType metricId, string data)
                         string experimentalFeatureName = GetExperimentalFeatureName(data);
                         s_telemetryClient.GetMetric(metricName, "uuid", "SessionId", "Detail").TrackValue(metricValue: 1.0, s_uniqueUserIdentifier, s_sessionId, experimentalFeatureName);
                         break;
-                    case TelemetryType.ModuleLoad:
-                    case TelemetryType.WinCompatModuleLoad:
-                        string moduleName = GetModuleName(data); // This will return anonymous if the modulename is not on the report list
-                        s_telemetryClient.GetMetric(metricName, "uuid", "SessionId", "Detail").TrackValue(metricValue: 1.0, s_uniqueUserIdentifier, s_sessionId, moduleName);
-                        break;
                 }
             }
             catch
@@ -697,7 +725,7 @@ private static string GetExperimentalFeatureName(string featureNameToValidate)
                 return featureNameToValidate;
             }
 
-            return _anonymous;
+            return Anonymous;
         }
 
         // Get the module name. If we can report it, we'll return the name, otherwise, we'll return "anonymous"
@@ -708,7 +736,7 @@ private static string GetModuleName(string moduleNameToValidate)
                 return moduleNameToValidate;
             }
 
-            return _anonymous;
+            return Anonymous;
         }
 
         /// <summary>
@@ -716,7 +744,8 @@ private static string GetModuleName(string moduleNameToValidate)
         /// This is done only once during for the console host.
         /// </summary>
         /// <param name="mode">The "mode" of the startup.</param>
-        internal static void SendPSCoreStartupTelemetry(string mode)
+        /// <param name="parametersUsed">The parameter bitmap used when starting.</param>
+        internal static void SendPSCoreStartupTelemetry(string mode, double parametersUsed)
         {
             // Check if we already sent startup telemetry
             if (Interlocked.CompareExchange(ref s_startupEventSent, 1, 0) == 1)
@@ -729,22 +758,30 @@ internal static void SendPSCoreStartupTelemetry(string mode)
                 return;
             }
 
+            // This is the payload which reports the startup information of OS and shell details.
             var properties = new Dictionary<string, string>();
 
-            // The variable POWERSHELL_DISTRIBUTION_CHANNEL is set in our docker images.
-            // This allows us to track the actual docker OS as OSDescription provides only "linuxkit"
-            // which has limited usefulness
+            // This is the payload for the parameter data which is sent as a metric.
+            var parameters = new Dictionary<string, double>();
+
+            // The variable POWERSHELL_DISTRIBUTION_CHANNEL is set in our docker images and 
+            // by various other environments. This allows us to track the actual docker OS as
+            // OSDescription provides only "linuxkit" which has limited usefulness.
             var channel = Environment.GetEnvironmentVariable("POWERSHELL_DISTRIBUTION_CHANNEL");
 
+            // Construct the payload for the OS and shell details.
             properties.Add("SessionId", s_sessionId);
             properties.Add("UUID", s_uniqueUserIdentifier);
             properties.Add("GitCommitID", PSVersionInfo.GitCommitId);
             properties.Add("OSDescription", RuntimeInformation.OSDescription);
             properties.Add("OSChannel", string.IsNullOrEmpty(channel) ? "unknown" : channel);
             properties.Add("StartMode", string.IsNullOrEmpty(mode) ? "unknown" : mode);
+
+            // Construct the payload for the parameters used.
+            parameters.Add("Param", parametersUsed);
             try
             {
-                s_telemetryClient.TrackEvent("ConsoleHostStartup", properties, null);
+                s_telemetryClient.TrackEvent("ConsoleHostStartup", properties, parameters);
             }
             catch
             {
@@ -798,50 +835,53 @@ private static bool TryGetIdentifier(string telemetryFilePath, out Guid id)
         /// Try to create a unique identifier and persist it to the telemetry.uuid file.
         /// </summary>
         /// <param name="telemetryFilePath">The path to the persisted telemetry.uuid file.</param>
-        /// <param name="id">The created identifier.</param>
         /// <returns>
-        /// The method returns a bool indicating success or failure of creating the id.
+        /// The method node id.
         /// </returns>
-        private static bool TryCreateUniqueIdentifierAndFile(string telemetryFilePath, out Guid id)
+        private static Guid CreateUniqueIdentifierAndFile(string telemetryFilePath)
         {
             // one last attempt to retrieve before creating incase we have a lot of simultaneous entry into the mutex.
-            id = Guid.Empty;
+            Guid id = Guid.Empty;
             if (TryGetIdentifier(telemetryFilePath, out id))
             {
-                return true;
+                return id;
             }
 
             // The directory may not exist, so attempt to create it
             // CreateDirectory will simply return the directory if exists
+            bool attemptFileCreation = true;
             try
             {
                 Directory.CreateDirectory(Path.GetDirectoryName(telemetryFilePath));
             }
             catch
             {
-                // send a telemetry indicating a problem with the cache dir
-                // it's likely something is seriously wrong so we should at least report it.
-                // We don't want to provide reasons here, that's not the point, but we
-                // would like to know if we're having a generalized problem which we can trace statistically
-                CanSendTelemetry = false;
-                s_telemetryClient.GetMetric(_telemetryFailure, "Detail").TrackValue(1, "cachedir");
-                return false;
+                // There was a problem in creating the directory for the file, do not attempt to create the file.
+                // We don't send telemetry here because there are valid reasons for the directory to not exist 
+                // and not be able to be created.
+                attemptFileCreation = false;
             }
 
-            // Create and save the new identifier, and if there's a problem, disable telemetry
-            try
+            // If we were able to create the directory, try to create the file,
+            // if this fails we will send telemetry to indicate this and then use the default identifier.
+            if (attemptFileCreation)
             {
-                id = Guid.NewGuid();
-                File.WriteAllBytes(telemetryFilePath, id.ToByteArray());
-                return true;
-            }
-            catch
-            {
-                // another bit of telemetry to notify us about a problem with saving the unique id.
-                s_telemetryClient.GetMetric(_telemetryFailure, "Detail").TrackValue(1, "saveuuid");
+                try
+                {
+                    id = Guid.NewGuid();
+                    File.WriteAllBytes(telemetryFilePath, id.ToByteArray());
+                    return id;
+                }
+                catch
+                {
+                    // another bit of telemetry to notify us about a problem with saving the unique id.
+                    s_telemetryClient.GetMetric(_telemetryFailure, "Detail").TrackValue(1, "saveuuid");
+                }
             }
 
-            return false;
+            // all attempts to create an identifier have failed, so use the default node id.
+            id = _defaultNodeIdentifier;
+            return id;
         }
 
         /// <summary>
@@ -865,15 +905,12 @@ private static Guid GetUniqueIdentifier()
             // simultaneous shell starts without the persisted file which attempt to create the file.
             try
             {
-                // TryCreateUniqueIdentifierAndFile shouldn't throw, but the mutex might
+                // CreateUniqueIdentifierAndFile shouldn't throw, but the mutex might
                 using var m = new Mutex(true, "CreateUniqueUserId");
                 m.WaitOne();
                 try
                 {
-                    if (TryCreateUniqueIdentifierAndFile(uuidPath, out id))
-                    {
-                        return id;
-                    }
+                    return CreateUniqueIdentifierAndFile(uuidPath);
                 }
                 finally
                 {
diff --git a/test/powershell/engine/Basic/Telemetry.Tests.ps1 b/test/powershell/engine/Basic/Telemetry.Tests.ps1
index 0ea3594b869..2378b9e5a66 100644
--- a/test/powershell/engine/Basic/Telemetry.Tests.ps1
+++ b/test/powershell/engine/Basic/Telemetry.Tests.ps1
@@ -129,28 +129,14 @@ Describe "Telemetry for shell startup" -Tag CI {
         $result | Should -Be $expectedValue
     }
 
-    It "Should resend startup event if the semaphore says we haven't sent telemetry" {
-
+    It "Should send startup event" {
         $resultJson = & $PWSH -NoProfile -c {
+            # this should ensure that the startup telemetry event is sent.
+            $null = Get-Date | Out-String
             $telemetryType = [Microsoft.PowerShell.Telemetry.ApplicationInsightsTelemetry]
             $bindingFlags = [System.Reflection.BindingFlags]"NonPublic,Static"
-            $initialValue = ${telemetryType}.GetMember("s_startupEventSent", $bindingFlags)[0].GetValue($null)
-            # force a resend of the startup telemetry
-            $null = ${telemetryType}.GetMember("s_startupEventSent", $bindingFlags)[0].SetValue($null,0)
-            $null = Get-Date | Out-String
-            # now check it again, it should be true now that something has executed
-            $finalValue = ${telemetryType}.GetMember("s_startupEventSent", $bindingFlags)[0].GetValue($null)
-            @{
-                initialValue = $initialValue
-                finalValue = $finalValue
-            } | ConvertTo-Json -Compress
+            $observedValue = ${telemetryType}.GetMember("s_startupEventSent", $bindingFlags)[0].GetValue($null)
+            $observedValue | Should -Be 1  -Because "Should have sent telemetry on console startup"
         }
-
-        $result = $resultJson | ConvertFrom-Json
-
-        $result.InitialValue | Should -Be 1  -Because "Should have sent telemetry on console startup"
-
-        $result.FinalValue | Should -Be 1  -Because "Should have resent telemetry"
     }
-
 }

From 3d1d0524ca7aad23d32b5fae597481e2d5e64075 Mon Sep 17 00:00:00 2001
From: Jordan Borean <jborean93@gmail.com>
Date: Wed, 18 May 2022 02:19:58 +1000
Subject: [PATCH 381/645] Remove the use of `BinaryFormatter` in PSRP
 serialization (#17133)

---
 .../common/WireDataFormat/EncodeAndDecode.cs  | 20 ------
 .../WireDataFormat/RemoteSessionCapability.cs | 61 -------------------
 .../engine/remoting/fanin/PSPrincipal.cs      | 13 +---
 .../remoting/server/serverremotesession.cs    |  7 ---
 .../engine/serialization.cs                   |  1 -
 5 files changed, 3 insertions(+), 99 deletions(-)

diff --git a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs
index aa22e45682a..2fc70413d1a 100644
--- a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs
+++ b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs
@@ -1601,8 +1601,6 @@ internal static RemoteDataObject GenerateClientSessionCapability(RemoteSessionCa
                 Guid runspacePoolId)
         {
             PSObject temp = GenerateSessionCapability(capability);
-            temp.Properties.Add(
-                new PSNoteProperty(RemoteDataNameStrings.TimeZone, RemoteSessionCapability.GetCurrentTimeZoneInByteFormat()));
             return RemoteDataObject.CreateFrom(capability.RemotingDestination,
                 RemotingDataType.SessionCapability, runspacePoolId, Guid.Empty, temp);
         }
@@ -2373,24 +2371,6 @@ internal static RemoteSessionCapability GetSessionCapability(object data)
                 RemotingDestination.InvalidDestination,
                 protocolVersion, psVersion, serializationVersion);
 
-            if (dataAsPSObject.Properties[RemoteDataNameStrings.TimeZone] != null)
-            {
-                // Binary deserialization of timezone info via BinaryFormatter is unsafe,
-                // so don't deserialize any untrusted client data using this API.
-                //
-                // In addition, the binary data being sent by the client doesn't represent
-                // the client's current TimeZone unless they somehow accessed the
-                // StandardName and DaylightName. These properties are initialized lazily
-                // by the .NET Framework, and would be populated by the server with local
-                // values anyways.
-                //
-                // So just return the CurrentTimeZone.
-
-#if !CORECLR // TimeZone Not In CoreCLR
-                result.TimeZone = TimeZone.CurrentTimeZone;
-#endif
-            }
-
             return result;
         }
 
diff --git a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteSessionCapability.cs b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteSessionCapability.cs
index d95ba65ec90..f0ccb496ebe 100644
--- a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteSessionCapability.cs
+++ b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteSessionCapability.cs
@@ -5,7 +5,6 @@
 using System.IO;
 using System.Management.Automation.Host;
 using System.Management.Automation.Internal.Host;
-using System.Runtime.Serialization.Formatters.Binary;
 
 using Dbg = System.Management.Automation.Diagnostics;
 
@@ -25,8 +24,6 @@ internal class RemoteSessionCapability
         private readonly Version _serversion;
         private Version _protocolVersion;
         private readonly RemotingDestination _remotingDestination;
-        private static byte[] _timeZoneInByteFormat;
-        private TimeZoneInfo _timeZone;
 
         #endregion
 
@@ -91,64 +88,6 @@ internal static RemoteSessionCapability CreateServerCapability()
         {
             return new RemoteSessionCapability(RemotingDestination.Client);
         }
-
-        /// <summary>
-        /// This is static property which gets Current TimeZone in byte format
-        /// by using ByteFormatter.
-        /// This is static to make client generate this only once.
-        /// </summary>
-        internal static byte[] GetCurrentTimeZoneInByteFormat()
-        {
-            if (_timeZoneInByteFormat == null)
-            {
-                Exception e = null;
-                try
-                {
-                    BinaryFormatter formatter = new BinaryFormatter();
-                    using (MemoryStream stream = new MemoryStream())
-                    {
-#pragma warning disable SYSLIB0011
-                        formatter.Serialize(stream, TimeZoneInfo.Local);
-#pragma warning restore SYSLIB0011
-                        stream.Seek(0, SeekOrigin.Begin);
-                        byte[] result = new byte[stream.Length];
-                        stream.Read(result, 0, (int)stream.Length);
-                        _timeZoneInByteFormat = result;
-                    }
-                }
-                catch (ArgumentNullException ane)
-                {
-                    e = ane;
-                }
-                catch (System.Runtime.Serialization.SerializationException sre)
-                {
-                    e = sre;
-                }
-                catch (System.Security.SecurityException se)
-                {
-                    e = se;
-                }
-
-                // if there is any exception serializing the timezone information
-                // ignore it and dont try to serialize again.
-                if (e != null)
-                {
-                    _timeZoneInByteFormat = Array.Empty<byte>();
-                }
-            }
-
-            return _timeZoneInByteFormat;
-        }
-
-        /// <summary>
-        /// Gets the TimeZone of the destination machine. This may be null.
-        /// </summary>
-        internal TimeZoneInfo TimeZone
-        {
-            get { return _timeZone; }
-
-            set { _timeZone = value; }
-        }
     }
 
     /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/fanin/PSPrincipal.cs b/src/System.Management.Automation/engine/remoting/fanin/PSPrincipal.cs
index 1341c9e0a83..67a5ff4e80d 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/PSPrincipal.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/PSPrincipal.cs
@@ -18,9 +18,8 @@ namespace System.Management.Automation.Remoting
     /// <summary>
     /// This class is used in the server side remoting scenarios. This class
     /// holds information about the incoming connection like:
-    /// (a) Client's TimeZone
-    /// (b) Connecting User information
-    /// (c) Connection String used by the user to connect to the server.
+    /// (a) Connecting User information
+    /// (b) Connection String used by the user to connect to the server.
     /// </summary>
     [Serializable]
     public sealed class PSSenderInfo : ISerializable
@@ -81,8 +80,6 @@ private PSSenderInfo(SerializationInfo info, StreamingContext context)
                 UserInfo = senderInfo.UserInfo;
                 ConnectionString = senderInfo.ConnectionString;
                 _applicationArguments = senderInfo._applicationArguments;
-
-                ClientTimeZone = senderInfo.ClientTimeZone;
             }
             catch (Exception)
             {
@@ -129,11 +126,7 @@ public PSPrincipal UserInfo
         /// <summary>
         /// Contains the TimeZone information from the client machine.
         /// </summary>
-        public TimeZoneInfo ClientTimeZone
-        {
-            get;
-            internal set;
-        }
+        public TimeZoneInfo ClientTimeZone => null;
 
         /// <summary>
         /// Connection string used by the client to connect to the server. This is
diff --git a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
index 7b08c674301..c09c75d345d 100644
--- a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
+++ b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
@@ -749,13 +749,6 @@ private void HandleCreateRunspacePool(object sender, RemoteDataEventArgs createR
             RemoteDataObject<PSObject> rcvdData = createRunspaceEventArg.ReceivedData;
             Dbg.Assert(rcvdData != null, "rcvdData must be non-null");
 
-            // set the PSSenderInfo sent in the first packets
-            // This is used by the initial session state configuration providers like Exchange.
-            if (Context != null)
-            {
-                _senderInfo.ClientTimeZone = Context.ClientCapability.TimeZone;
-            }
-
             _senderInfo.ApplicationArguments = RemotingDecoder.GetApplicationArguments(rcvdData.Data);
 
             // Get Initial Session State from custom session config suppliers
diff --git a/src/System.Management.Automation/engine/serialization.cs b/src/System.Management.Automation/engine/serialization.cs
index ce21d8258be..be72947769e 100644
--- a/src/System.Management.Automation/engine/serialization.cs
+++ b/src/System.Management.Automation/engine/serialization.cs
@@ -7212,7 +7212,6 @@ internal static PSSenderInfo RehydratePSSenderInfo(PSObject pso)
 
             PSSenderInfo senderInfo = new PSSenderInfo(psPrincipal, GetPropertyValue<string>(pso, "ConnectionString"));
 
-            senderInfo.ClientTimeZone = TimeZoneInfo.Local;
             senderInfo.ApplicationArguments = GetPropertyValue<PSPrimitiveDictionary>(pso, "ApplicationArguments");
 
             return senderInfo;

From 0b8574db77e26c2709a303c3c94b11ad45494f8e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 17 May 2022 09:50:36 -0700
Subject: [PATCH 382/645] Update the cgmanifest (#17361)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 tools/cgmanifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index e2eb71bc2fd..2a018e965df 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -265,7 +265,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "NJsonSchema",
-          "Version": "10.6.10"
+          "Version": "10.7.0"
         }
       },
       "DevelopmentDependency": false

From 391e0806ec862880aa04080764431aa3cc157852 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 17 May 2022 09:51:42 -0700
Subject: [PATCH 383/645] Redo the change that was reverted by #15853 (#17357)

---
 .../utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs       | 2 --
 .../resources/WebCmdletStrings.resx                             | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
index 7394b9f0933..517a5960cc6 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
@@ -1438,7 +1438,6 @@ internal virtual HttpResponseMessage GetResponse(HttpClient client, HttpRequestM
                             WebCmdletStrings.WebMethodInvocationVerboseMsg,
                             requestWithoutRange.Version,
                             requestWithoutRange.Method,
-                            requestWithoutRange.RequestUri,
                             requestContentLength);
                         WriteVerbose(reqVerboseMsg);
 
@@ -1534,7 +1533,6 @@ protected override void ProcessRecord()
                                     WebCmdletStrings.WebMethodInvocationVerboseMsg,
                                     request.Version,
                                     request.Method,
-                                    request.RequestUri,
                                     requestContentLength);
 
                                 WriteVerbose(reqVerboseMsg);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx
index 8ba25baff18..976ec531e25 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/WebCmdletStrings.resx
@@ -247,7 +247,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>HTTP/{0} {1} with {2}-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>

From afe99fcaea4c3df7c68cd00529890e29c88a2961 Mon Sep 17 00:00:00 2001
From: "Mathias R. Jessen" <IISResetMe@users.noreply.github.com>
Date: Tue, 17 May 2022 18:54:26 +0200
Subject: [PATCH 384/645] SemanticChecks: Avoid repeated type resolution of
 `[ordered]` (#17328)

---
 .../engine/parser/SemanticChecks.cs           |  7 +++++
 .../Scripting/Scripting.Followup.Tests.ps1    | 27 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/System.Management.Automation/engine/parser/SemanticChecks.cs b/src/System.Management.Automation/engine/parser/SemanticChecks.cs
index b792530193b..2e2dcadd645 100644
--- a/src/System.Management.Automation/engine/parser/SemanticChecks.cs
+++ b/src/System.Management.Automation/engine/parser/SemanticChecks.cs
@@ -920,6 +920,13 @@ public override AstVisitAction VisitConvertExpression(ConvertExpressionAst conve
                         ParserStrings.OrderedAttributeOnlyOnHashLiteralNode,
                         convertExpressionAst.Type.TypeName.FullName);
                 }
+
+                // Currently, the type name '[ordered]' is handled specially in PowerShell.
+                // When used in a conversion expression, it's only allowed on a hashliteral node, and it's
+                // always interpreted as an initializer for a case-insensitive
+                // 'System.Collections.Specialized.OrderedDictionary' by the compiler.
+                // So, we can return early from here.
+                return AstVisitAction.Continue;
             }
 
             if (typeof(PSReference) == convertExpressionAst.Type.TypeName.GetReflectionType())
diff --git a/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1 b/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1
index 9a691fa20d8..933c53de6de 100644
--- a/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1
+++ b/test/powershell/Language/Scripting/Scripting.Followup.Tests.ps1
@@ -41,4 +41,31 @@ Describe "Scripting.Followup.Tests" -Tags "CI" {
         $obj.ForEach('p', 32) | Should -BeNullOrEmpty
         $obj.p | Should -Be 32
     }
+
+    It "Test the special type name 'ordered'" {
+        class ordered {
+            [hashtable] $Member
+            ordered([hashtable] $hash) {
+                $this.Member = $hash
+            }
+        }
+
+        ## `<expr> -as\-is [ordered]` resolves 'ordered' as a normal type name.
+        $hash = @{ key = 2 }
+        $result = $hash -as [ordered]
+        $result.GetType().FullName | Should -BeExactly ([ordered].FullName)
+        $result -is [ordered] | Should -BeTrue
+        $result.Member['key'] | Should -Be 2
+        $result.Member.Count | Should -Be 1
+
+        ## `[ordered]$hash` causes parsing error.
+        $err = $null
+        $null = [System.Management.Automation.Language.Parser]::ParseInput('[ordered]$hash', [ref]$null, [ref]$err)
+        $err.Count | Should -Be 1
+        $err[0].ErrorId | Should -BeExactly 'OrderedAttributeOnlyOnHashLiteralNode'
+
+        ## `[ordered]@{ key = 1 }` creates 'OrderedDictionary'
+        $result = [ordered]@{ key = 1 }
+        $result | Should -BeOfType 'System.Collections.Specialized.OrderedDictionary'
+    }
 }

From e11167d54f59cc8c3d37af10d9687888622e158a Mon Sep 17 00:00:00 2001
From: Tess Gauthier <tgauth@bu.edu>
Date: Tue, 17 May 2022 14:21:19 -0400
Subject: [PATCH 385/645] Add Daily Link Check GitHub Workflow (#17351)

* add github workflow for daily link checking

* remove extra name statement

* increase indentation

* scan all files, not just modified ones

* add retries for 429 errors

* increase timeout for status 0 errors

* uncomment teams notifier task

* fix experimental features link

* add copyright header

* Update .github/workflows/markdownLinkDaily.yml

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .github/PULL_REQUEST_TEMPLATE.md            |  2 +-
 .github/workflows/markdown-link/config.json |  4 +++
 .github/workflows/markdownLinkDaily.yml     | 29 +++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/markdownLinkDaily.yml

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b64343410f7..6ad155756b5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -19,7 +19,7 @@
 - **[Breaking changes](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#making-breaking-changes)**
     - [ ] None
     - **OR**
-    - [ ] [Experimental feature(s) needed](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/staging/reference/6/Microsoft.PowerShell.Core/About/about_Experimental_Features.md)
+    - [ ] [Experimental feature(s) needed](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/main/reference/7.3/Microsoft.PowerShell.Core/About/about_Experimental_Features.md)
         - [ ] Experimental feature name(s): <!-- Experimental feature name(s) here -->
 - **User-facing changes**
     - [ ] Not Applicable
diff --git a/.github/workflows/markdown-link/config.json b/.github/workflows/markdown-link/config.json
index ff00be38b45..87d65922a91 100644
--- a/.github/workflows/markdown-link/config.json
+++ b/.github/workflows/markdown-link/config.json
@@ -1,3 +1,7 @@
 {
+  "timeout": "40s",
+  "retryOn429": true,
+  "retryCount": 5,
+  "fallbackRetryDelay": "30s",
   "aliveStatusCodes": [504, 503, 403, 200]
 }
diff --git a/.github/workflows/markdownLinkDaily.yml b/.github/workflows/markdownLinkDaily.yml
new file mode 100644
index 00000000000..70c28ace9fc
--- /dev/null
+++ b/.github/workflows/markdownLinkDaily.yml
@@ -0,0 +1,29 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+name: PowerShell Daily Markdown Link Verification
+
+on:
+  workflow_dispatch:
+  schedule:
+  # At 13:00 UTC every day.
+  - cron:  '0 13 * * *'
+
+jobs:
+  markdown-link-check:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+    - name: Check Links
+      uses: gaurav-nelson/github-action-markdown-link-check@v1
+      with:
+        use-quiet-mode: 'yes'
+        use-verbose-mode: 'yes'
+        config-file: .github/workflows/markdown-link/config.json
+    - name: Microsoft Teams Notifier
+      uses: skitionek/notify-microsoft-teams@master
+      if: failure()
+      with:
+        webhook_url: ${{ secrets.PS_BUILD_TEAMS_CHANNEL }}
+        overwrite: "{title: `Failure in .github/markdownLinkDaily.yml validating links. Look at ${workflow_link}`}"

From 7a6d06f177988eb328630da373fb76d40f3b40c1 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Tue, 17 May 2022 12:13:28 -0700
Subject: [PATCH 386/645] Update build versions (#17318)

---
 README.md           | 54 ++++++++++++++++++++++-----------------------
 tools/metadata.json |  8 +++----
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 1fb9ac898e5..bbe230f3d5d 100644
--- a/README.md
+++ b/README.md
@@ -64,33 +64,33 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 | 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.3/PowerShell-7.2.3-win-x86.msi
-[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x64.msi
-[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-lts_7.2.3-1.deb_amd64.deb
-[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-lts-7.2.3-1.rh.x86_64.rpm
-[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-lts-7.2.3-osx-x64.pkg
-[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-lts-7.2.3-osx-arm64.pkg
-
-[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x64.msi
-[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x86.msi
-[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell_7.2.3-1.deb_amd64.deb
-[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell_7.2.3-1.deb_amd64.deb
-[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell_7.2.3-1.deb_amd64.deb
-[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell_7.2.3-1.deb_amd64.deb
-[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell_7.2.3-1.deb_amd64.deb
-[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell_7.2.3-1.deb_amd64.deb
-[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-1.rh.x86_64.rpm
-[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-1.rh.x86_64.rpm
-[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-osx-x64.pkg
-[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-osx-arm64.pkg
-[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-arm64.zip
-[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x86.zip
-[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x64.zip
-[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-osx-x64.tar.gz
-[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-osx-arm64.tar.gz
-[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-linux-x64.tar.gz
-[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-linux-arm32.tar.gz
-[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/powershell-7.2.3-linux-arm64.tar.gz
+[lts-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x86.msi
+[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x64.msi
+[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-lts_7.2.4-1.deb_amd64.deb
+[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-lts-7.2.4-1.rh.x86_64.rpm
+[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-lts-7.2.4-osx-x64.pkg
+[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-lts-7.2.4-osx-arm64.pkg
+
+[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x64.msi
+[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x86.msi
+[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell_7.2.4-1.deb_amd64.deb
+[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell_7.2.4-1.deb_amd64.deb
+[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell_7.2.4-1.deb_amd64.deb
+[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell_7.2.4-1.deb_amd64.deb
+[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell_7.2.4-1.deb_amd64.deb
+[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell_7.2.4-1.deb_amd64.deb
+[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-1.rh.x86_64.rpm
+[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-1.rh.x86_64.rpm
+[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-osx-x64.pkg
+[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-osx-arm64.pkg
+[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-arm64.zip
+[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x86.zip
+[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x64.zip
+[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-osx-x64.tar.gz
+[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-osx-arm64.tar.gz
+[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-linux-x64.tar.gz
+[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-linux-arm32.tar.gz
+[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-linux-arm64.tar.gz
 [rl-snap]: https://snapcraft.io/powershell
 
 [pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/PowerShell-7.3.0-preview.3-win-x64.msi
diff --git a/tools/metadata.json b/tools/metadata.json
index ae1d2549f0a..9e00201329e 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,9 +1,9 @@
 {
-  "StableReleaseTag": "v7.2.3",
+  "StableReleaseTag": "v7.2.4",
   "PreviewReleaseTag": "v7.3.0-preview.3",
-  "ServicingReleaseTag": "v7.0.10",
-  "ReleaseTag": "v7.2.3",
-  "LTSReleaseTag" : ["v7.2.3", "v7.0.10"],
+  "ServicingReleaseTag": "v7.0.11",
+  "ReleaseTag": "v7.2.4",
+  "LTSReleaseTag" : ["v7.2.4", "v7.0.11"],
   "NextReleaseTag": "v7.3.0-preview.4",
   "LTSRelease": { "Latest": false, "Package": false },
   "StableRelease":  { "Latest": false, "Package": false }

From e248694eb516cdd76f1d5bc907aa3aca77e0fc9d Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Tue, 17 May 2022 12:53:41 -0700
Subject: [PATCH 387/645] Release changelogs (#17364)

* Update change log for releases

* Fix breaking change

* Remove white space
---
 CHANGELOG/7.0.md | 40 +++++++++++++++++++++++++++++++++++++++-
 CHANGELOG/7.2.md | 28 ++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG/7.0.md b/CHANGELOG/7.0.md
index 194b4b3d748..13468c71bc8 100644
--- a/CHANGELOG/7.0.md
+++ b/CHANGELOG/7.0.md
@@ -1,5 +1,42 @@
 # 7.0 Changelog
 
+## [7.0.11] - 2022-05-17
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 3.1.419</p>
+
+</summary>
+
+<ul>
+<li>Add explicit job name for approval tasks in Snap stage (#16579)</li>
+<li>Update to use <code>mcr.microsoft.com</code> (#17272)</li>
+<li>Update global.json and wix</li>
+<li>Put Secure supply chain analysis at correct place (#17273)</li>
+<li>Partial back-port of: Update a few tests to make them more stable in CI (#16944) (Internal 20648)</li>
+<li>Replace <code>.</code> in notices container name (#17292)</li>
+<li>Add an approval for releasing build-info json (#16351)</li>
+<li>Release build info json when it is preview (#16335)</li>
+<li>Add a major-minor build info JSON file (#16301)</li>
+<li>Update release instructions with link to new build (#17256)</li>
+<li>Add condition to generate release file in local dev build only (#17255)</li>
+<li>Removed old not-used-anymore docker-based tests for PS release packages (#16224)</li>
+<li>Publish global tool package for stable releases (#15961)</li>
+<li>Update to use <code>windows-latest</code> as the build agent image (#16831)</li>
+<li>Don't upload <code>dep</code> or <code>tar.gz</code> for <code>RPM</code> build because there are none. (#17224)</li>
+<li>Update to <code>vPack</code> task version 12 (#17225)</li>
+<li>Make RPM license recognized (#17223)</li>
+<li>Ensure <code>psoptions.json</code> and <code>manifest.spdx.json</code> files always exist in packages (#17226)</li>
+</ul>
+
+</details>
+
+[7.0.11]: https://github.com/PowerShell/PowerShell/compare/v7.0.10...v7.0.11
+
 ## [7.0.10] - 2022-04-26
 
 ### Engine Updates and Fixes
@@ -267,6 +304,8 @@ Bump .NET SDK to version <code>3.1.405</code>
 
 </details>
 
+[7.0.3]: https://github.com/PowerShell/PowerShell/compare/v7.0.2...v7.0.3
+
 ## [7.0.2] - 2020-06-11
 
 ### Engine Updates and Fixes
@@ -1305,7 +1344,6 @@ Move to .NET Core 3.1.202 SDK and update packages.
 - Update docs for `6.2.0-rc.1` release (#9022)
 - Update release template (#8996)
 
-
 [7.0.3]: https://github.com/PowerShell/PowerShell/compare/v7.0.2...v7.0.3
 [7.0.2]: https://github.com/PowerShell/PowerShell/compare/v7.0.1...v7.0.2
 [7.0.1]: https://github.com/PowerShell/PowerShell/compare/v7.0.0...v7.0.1
diff --git a/CHANGELOG/7.2.md b/CHANGELOG/7.2.md
index 0d8466765d5..f74dec0b180 100644
--- a/CHANGELOG/7.2.md
+++ b/CHANGELOG/7.2.md
@@ -1,5 +1,33 @@
 # 7.2 Changelog
 
+## [7.2.4] - 2022-05-17
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET SDK to 6.0.203</p>
+
+</summary>
+
+<ul>
+<li>Add mapping for Ubuntu22.04 Jammy (#17317)</li>
+<li>Update to use <code>mcr.microsoft.com</code> (#17272)</li>
+<li>Update third party notices</li>
+<li>Update global.json and wix</li>
+<li>Put Secure supply chain analysis at correct place (#17273)</li>
+<li>Fix web cmdlets so that an empty <code>Get</code> does not include a <code>content-length</code> header (#16587)</li>
+<li>Update package fallback list for Ubuntu (from those updated for Ubuntu <code>22.04</code>) (<code>deb</code>) (#17217)</li>
+<li>Add <code>sha256</code> digests to RPM packages (#17215)</li>
+<li>Allow multiple installations of dotnet. (#17216)</li>
+</ul>
+
+</details>
+
+[7.2.4]: https://github.com/PowerShell/PowerShell/compare/v7.2.3...v7.2.4
+
 ## [7.2.3] - 2022-04-26
 
 ### Engine Updates and Fixes

From f9008245f53fd85aa3534814bd5559f8e7c9d3d1 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 17 May 2022 13:43:35 -0700
Subject: [PATCH 388/645] Make sure verbose message is not null (#17363)

---
 tools/UpdateDotnetRuntime.ps1 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index cf31c695936..520e2398457 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -227,9 +227,7 @@ function Get-DotnetUpdate {
         } else {
             $shouldUpdate = $false
             $newVersion = $latestSDKVersionString
-            if ($null -eq $currentVersion.PreReleaseLabel) {
-                $Message = "$latestSDKversion is not preview, update manually."
-            }
+            $Message = $null -eq $currentVersion.PreReleaseLabel ? "$latestSDKversion is not preview, update manually." : "No update needed."
         }
     } catch {
         Write-Verbose -Verbose "Error occured: $_.message"

From 3f35800a89005339dcb0fec1c3dd741859490aac Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 17 May 2022 14:19:28 -0700
Subject: [PATCH 389/645] Run on every PR and let the action skip (#17366)

* Run on every PR and let the action skip

* Fix spelling

* fix 7.2 spelling
---
 .github/workflows/markdownLink.yml |  2 --
 .spelling                          | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/markdownLink.yml b/.github/workflows/markdownLink.yml
index 732ab5d4159..88c46b64b77 100644
--- a/.github/workflows/markdownLink.yml
+++ b/.github/workflows/markdownLink.yml
@@ -3,8 +3,6 @@ on:
     branches:
       - master
       - 'release/**'
-    paths:
-      - '**.md'
 
 name: Check links for modified files
 jobs:
diff --git a/.spelling b/.spelling
index b0dc84c87da..39eacb8cbac 100644
--- a/.spelling
+++ b/.spelling
@@ -1157,6 +1157,14 @@ SergeyZalyadeev
 KiwiThePoodle
 Thomas-Yu
 cgmanifest.json
+mcr.microsoft.com
+global.json
+tar.gz
+psoptions.json
+manifest.spdx.json
+buildinfo
+SKUs
+vmImage
  - CHANGELOG.md
 aavdberg
 asrosent
@@ -1300,6 +1308,7 @@ package.json
 jcotton42
 RPMs
 PSDesiredStateConfiguration
+dotnet5
  - CHANGELOG/7.2.md
 Gimly
 jborean93
@@ -1434,6 +1443,7 @@ ThirdPartyNotices.txt
 rtm.21527.11
 SKUs
 vmImage
+Ubuntu22.04
  - CHANGELOG/7.0.md
 codesign
 release-BuildJson

From e35f4a967bfc4ab0426df8c7cc20f987940a6a49 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 18 May 2022 09:32:08 -0700
Subject: [PATCH 390/645] Update to the latest NOTICES file (#17372)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 ThirdPartyNotices.txt | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index fee4bdafbdc..ed77de6d3ca 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -232,12 +232,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.CodeAnalysis.Common 4.1.0 - MIT
+Microsoft.CodeAnalysis.Common 4.2.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation
-Copyright (c) .NET Foundation and Contributors
 
 MIT License
 
@@ -253,14 +250,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Microsoft.CodeAnalysis.CSharp 4.1.0 - MIT
+Microsoft.CodeAnalysis.CSharp 4.2.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
-(c) Microsoft Corporation
-Copyright (c) Microsoft Corporation
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) Microsoft Corporation. Alle Rechte
 
 MIT License
 
@@ -658,13 +650,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-NJsonSchema 10.6.10 - MIT
+NJsonSchema 10.7.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
-Copyright Rico Suter, 2021
-Copyright (c) Rico Suter, 2021
-Copyright Rico Suter, 2021 4JSON Schema
 
 MIT License
 

From e7a4b7ddaa4634ea61e8acce8e2d491090aa965f Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Wed, 18 May 2022 09:34:43 -0700
Subject: [PATCH 391/645] Simplify `Get-WSManSupport` based on current .NET
 Distro Support (#17356)

* Simplify Get-WSManSupport based on current .NET Distro Support

* Update test/tools/Modules/HelpersCommon/HelpersCommon.psm1
---
 test/tools/Modules/HelpersCommon/HelpersCommon.psm1 | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1 b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
index 8bdc144cac8..f0706650bb9 100644
--- a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
+++ b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
@@ -390,16 +390,9 @@ function Get-PlatformInfo {
 function Get-WsManSupport {
     $platformInfo = Get-PlatformInfo
     if (
-        ($platformInfo.Platform -match "alpine|raspbian") -or
-        ($platformInfo.Platform -eq "debian" -and $platformInfo.Version -ne '9') -or
-        ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -ne '7') -or
-        ($platformInfo.Platform -eq 'ubuntu' -and $platformInfo.Version -notin '18.04', '16.04') -or
-        ($platformInfo.Platform -eq 'mariner') -or
-        ($platformInfo.Platform -eq 'rhel') -or
-        ($platformInfo.Platform -eq 'fedora') -or
-        ($IsMacOS)
+        ($platformInfo.Platform -eq 'centos' -and $platformInfo.Version -eq '7')
     ) {
-        return $false
+        return $true
     }
-    return $true
+    return $false
 }

From 031aee96e2861922a7774ccfa14ced0e0f404549 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 May 2022 10:06:56 -0700
Subject: [PATCH 392/645] Bump NJsonSchema from 10.7.0 to 10.7.1 (#17381)

Bumps [NJsonSchema](https://github.com/RicoSuter/NJsonSchema) from 10.7.0 to 10.7.1.
- [Release notes](https://github.com/RicoSuter/NJsonSchema/releases)
- [Commits](https://github.com/RicoSuter/NJsonSchema/compare/v10.7.0...v10.7.1)

---
updated-dependencies:
- dependency-name: NJsonSchema
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../Microsoft.PowerShell.Commands.Utility.csproj                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 17a4b290311..4da9862aec4 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -34,7 +34,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-1.final" />
     <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.4.22229.4" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.4.22229.4" />
-    <PackageReference Include="NJsonSchema" Version="10.7.0" />
+    <PackageReference Include="NJsonSchema" Version="10.7.1" />
   </ItemGroup>
 
 </Project>

From 9be70a50c0af13109c13d9f09fd7b2ed783aa7fc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 20 May 2022 11:44:24 -0700
Subject: [PATCH 393/645] Update the cgmanifest (#17393)

---
 tools/cgmanifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 2a018e965df..0c61a6002a4 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -265,7 +265,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "NJsonSchema",
-          "Version": "10.7.0"
+          "Version": "10.7.1"
         }
       },
       "DevelopmentDependency": false

From f47159ba6d015ea46067530fb1183348cc4115d3 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 20 May 2022 11:48:37 -0700
Subject: [PATCH 394/645] Update script to automatically take new preview
 pre-release builds (#17375)

---
 DotnetRuntimeMetadata.json    |  6 +++---
 tools/UpdateDotnetRuntime.ps1 | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 34f1b8f8db2..308c57cf662 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,11 +1,11 @@
 {
   "sdk": {
     "channel": "7.0.1xx-preview4",
-    "quality": "signed",
-    "qualityFallback": "daily",
+    "quality": "daily",
+    "qualityFallback": "preview",
     "packageVersionPattern": "7.0.0-preview.4",
     "sdkImageVersion": "7.0.100",
-    "nextChannel": "7.0.1xx-preview4",
+    "nextChannel": "7.0.1xx",
     "azureFeed": "",
     "sdkImageOverride": ""
   },
diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index 520e2398457..39bfa1ff014 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -254,6 +254,27 @@ function Update-DevContainer {
     $devContainerDocker | Out-File -FilePath $dockerFilePath -Force
 }
 
+<#
+ .DESCRIPTION Update the DotnetMetadata.json file with the latest version of the SDK
+ #>
+function Update-DotnetRuntimeMetadataChannel {
+    param (
+        [string] $newSdk
+    )
+
+    # -replace uses regex so in order to split on `.`, we need to use `\.` to escape the dot character.
+    $sdkParts = $newSdk -split '\.'
+
+    # Transform SDK Version '7.0.100-preview.5.22263.22' -> '7.0.1xx-preview5'
+    $newChannel = $sdkParts[0] + "." + $sdkParts[1] + "." + ($sdkParts[2] -replace '0','x') + $sdkParts[3]
+
+    Write-Verbose -Verbose -Message "Updating DotnetRuntimeMetadata.json with channel $newChannel"
+
+    $metadata = Get-Content -Raw "$PSScriptRoot/../DotnetRuntimeMetadata.json" | ConvertFrom-Json
+    $metadata.sdk.channel = $newChannel
+    $metadata | ConvertTo-Json | Out-File -FilePath "$PSScriptRoot/../DotnetRuntimeMetadata.json" -Force
+}
+
 $dotnetMetadataPath = "$PSScriptRoot/../DotnetRuntimeMetadata.json"
 $dotnetMetadataJson = Get-Content $dotnetMetadataPath -Raw | ConvertFrom-Json
 $channel = $dotnetMetadataJson.sdk.channel
@@ -364,6 +385,8 @@ if ($dotnetUpdate.ShouldUpdate) {
     }
 
     Update-DevContainer
+
+    Update-DotnetRuntimeMetadataChannel -newSdk $latestSdkVersion
 }
 else {
     Write-Verbose -Verbose -Message $dotnetUpdate.Message

From f23c056c4275047bf7c71d859268226120a4b130 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Sun, 22 May 2022 00:57:05 +0900
Subject: [PATCH 395/645] Fix typo in AsyncResult.cs (#17396)

occured -> occurred
---
 .../engine/hostifaces/AsyncResult.cs                        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs b/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs
index f1e57e6fe39..09b042868f3 100644
--- a/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs
+++ b/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs
@@ -16,7 +16,7 @@ internal class AsyncResult : IAsyncResult
         #region Private Data
 
         private ManualResetEvent _completedWaitHandle;
-        // exception occured in the async thread.
+        // exception occurred in the async thread.
         // user supplied state object
 
         // Invoke on thread (remote debugging support).
@@ -125,7 +125,7 @@ public WaitHandle AsyncWaitHandle
         /// Marks the async operation as completed.
         /// </summary>
         /// <param name="exception">
-        /// Exception occured. null if no exception occured
+        /// Exception occurred. null if no exception occurred
         /// </param>
         internal void SetAsCompleted(Exception exception)
         {
@@ -222,7 +222,7 @@ internal void EndInvoke()
             _invokeOnThreadEvent.Dispose();
             _invokeOnThreadEvent = null;  // Allow early GC
 
-            // Operation is done: if an exception occured, throw it
+            // Operation is done: if an exception occurred, throw it
             if (Exception != null)
             {
                 throw Exception;

From 9b9dbc0cd160b2ec404f22d2f2a7bede7fd4c20a Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Mon, 23 May 2022 09:49:06 -0700
Subject: [PATCH 396/645] Update readme and metadata for 7.3.0-preview.4
 release (#17378)

---
 README.md           | 28 ++++++++++++++--------------
 tools/metadata.json |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index bbe230f3d5d..8a55acb803f 100644
--- a/README.md
+++ b/README.md
@@ -93,20 +93,20 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 [rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-linux-arm64.tar.gz
 [rl-snap]: https://snapcraft.io/powershell
 
-[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/PowerShell-7.3.0-preview.3-win-x64.msi
-[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/PowerShell-7.3.0-preview.3-win-x86.msi
-[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-preview_7.3.0-preview.3-1.deb_amd64.deb
-[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-preview-7.3.0_preview.3-1.rh.x86_64.rpm
-[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-osx-x64.pkg
-[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-osx-arm64.pkg
-[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/PowerShell-7.3.0-preview.3-win-arm64.zip
-[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/PowerShell-7.3.0-preview.3-win-x86.zip
-[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/PowerShell-7.3.0-preview.3-win-x64.zip
-[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-osx-x64.tar.gz
-[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-osx-arm64.tar.gz
-[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-linux-x64.tar.gz
-[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-linux-arm32.tar.gz
-[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.3/powershell-7.3.0-preview.3-linux-arm64.tar.gz
+[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/PowerShell-7.3.0-preview.4-win-x64.msi
+[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/PowerShell-7.3.0-preview.4-win-x86.msi
+[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-preview_7.3.0-preview.4-1.deb_amd64.deb
+[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-preview-7.3.0_preview.4-1.rh.x86_64.rpm
+[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-osx-x64.pkg
+[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-osx-arm64.pkg
+[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/PowerShell-7.3.0-preview.4-win-arm64.zip
+[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/PowerShell-7.3.0-preview.4-win-x86.zip
+[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/PowerShell-7.3.0-preview.4-win-x64.zip
+[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-osx-x64.tar.gz
+[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-osx-arm64.tar.gz
+[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-linux-x64.tar.gz
+[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-linux-arm32.tar.gz
+[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-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
diff --git a/tools/metadata.json b/tools/metadata.json
index 9e00201329e..e652db44a4b 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,10 +1,10 @@
 {
   "StableReleaseTag": "v7.2.4",
-  "PreviewReleaseTag": "v7.3.0-preview.3",
+  "PreviewReleaseTag": "v7.3.0-preview.4",
   "ServicingReleaseTag": "v7.0.11",
   "ReleaseTag": "v7.2.4",
   "LTSReleaseTag" : ["v7.2.4", "v7.0.11"],
-  "NextReleaseTag": "v7.3.0-preview.4",
+  "NextReleaseTag": "v7.3.0-preview.5",
   "LTSRelease": { "Latest": false, "Package": false },
   "StableRelease":  { "Latest": false, "Package": false }
 }

From dc2d03e86da0cb7c5b741270b6abd6330d93f908 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Mon, 23 May 2022 09:56:03 -0700
Subject: [PATCH 397/645] Update change log for v7.3.0-preview.4 release
 (#17412)

---
 CHANGELOG/preview.md | 146 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)

diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index 0d11d0af62c..aa09386b226 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,5 +1,151 @@
 # Current preview release
 
+## [7.3.0-preview.4] - 2022-05-23
+
+### Engine Updates and Fixes
+
+<ul>
+<li>Remove the use of <code>BinaryFormatter</code> in PSRP serialization (#17133) (Thanks @jborean93!)</li>
+<li>Update telemetry collection removing unused data and adding some new data (#17304)</li>
+<li>Fix the word wrapping in formatting to handle escape sequences properly (#17316)</li>
+<li>Fix the error message in Hashtable-to-object conversion (#17329)</li>
+<li>Add support for new WDAC API (#17247)</li>
+<li>On Windows, reset cursor visibility back to previous state when rendering progress (#16782)</li>
+<li>Fix the list view to not leak VT decorations (#17262)</li>
+<li>Fix formatting truncation to handle strings with VT sequences (#17251)</li>
+<li>Fix line breakpoints for <code>return</code> statements without a value (#17179)</li>
+<li>Fix for partial PowerShell module search paths, that can be resolved to CWD locations (#17231) (Internal 20126)</li>
+<li>Change logic in the testing helper module for determining whether <code>PSHOME</code> is writable (#17218)</li>
+<li>Make a variable assignment in a <code>ParenExpression</code> to return the variable value (#17174)</li>
+<li>Use new Windows signature APIs from <code>Microsoft.Security.Extensions</code> package (#17159)</li>
+<li>Do not include node names when sending telemetry. (#16981)</li>
+<li>Support forward slashes in network share (UNC path) completion (#17111) (#17117) (Thanks @sba923!)</li>
+<li>Do not generate clean block in proxy function when the feature is disabled (#17112)</li>
+<li>Ignore failure attempting to set console window title (#16948)</li>
+<li>Update regex used to remove ANSI escape sequences to be more specific to decoration and CSI sequences (#16811)</li>
+<li>Improve member auto completion (#16504) (Thanks @MartinGC94!)</li>
+<li>Prioritize <code>ValidateSet</code> completions over Enums for parameters (#15257) (Thanks @MartinGC94!)</li>
+<li>Add Custom Remote Connections Feature (#17011)</li>
+</ul>
+
+### General Cmdlet Updates and Fixes
+
+<ul>
+<li>Add check for <code>ScriptBlock</code> wrapped in <code>PSObject</code> to <code>$using</code> used in <code>ForEach-Object -Parallel</code> (#17234) (Thanks @ryneandal!)</li>
+<li>Fix <code>ForEach</code> method to set property on a scalar object (#17213)</li>
+<li>Fix <code>Sort-Object -Stable -Unique</code> to actually do stable sorting (#17189) (Thanks @m1k0net!)</li>
+<li>Add <code>OutputType</code> attribute to various commands (#16962) (Thanks @MartinGC94!)</li>
+<li>Make <code>Stop-Service</code> only request needed privileges when not setting SDDL. (#16663) (Thanks @kvprasoon!)</li>
+</ul>
+
+### Code Cleanup
+
+<ul>
+<li>Remove <code>EventLogLogProvider</code> and its related legacy code (#17027)</li>
+<li>Fix typos in names of method (#17003) (Thanks @al-cheb!)</li>
+<li>SemanticChecks: Avoid repeated type resolution of <code>[ordered]</code> (#17328) (Thanks IISResetMe!)</li>
+<li>Redo the change that was reverted by #15853 (#17357)</li>
+<li>Correct spelling of <code>pseudo</code> in <code>Compiler.cs</code> (#17285) (Thanks @eltociear!)</li>
+<li>Make<code>NameObscurerTelemetryInitializer</code> internal (#17214)</li>
+<li>Make <code>NameObscurerTelemetryInitializer</code> internal (#17167)</li>
+<li>Correct Typo in the resource string <code>PathResolvedToMultiple</code> (#17098) (Thanks @charltonstanley!)</li>
+<li>Fix typo in <code>ComRuntimeHelpers.cs</code> (#17104) (Thanks @eltociear!)</li>
+</ul>
+
+### Documentation and Help Content
+
+<ul>
+<li>Update link to PowerShell remoting in depth video (#17166)</li>
+</ul>
+
+### Tests
+
+<ul>
+<li>Add <code>-because</code> to the failing test to aid in debugging (#17030)</li>
+<li>Simplify Enum generator for the <code>-bnot</code> operator test (#17014)</li>
+<li>Improve unique naming for tests (#17043)</li>
+<li>Use a random string for the missing help topic to improve the chances that the help topic really won't be found. (#17042)</li>
+</ul>
+
+### Build and Packaging Improvements
+
+<ul>
+<li>Update <code>README.md</code> and <code>metadata.json</code> for v7.3.0-preview.3 release (#17029)</li>
+<li>Do not pull dotnet updates from internal feed (#17007)</li>
+<li>Simplify <code>Get-WSManSupport</code> based on current .NET Distro Support (#17356)</li>
+<li>Update to the latest NOTICES file (#17372, #17332, #17311, #17275)</li>
+<li>Run on every PR and let the action skip (#17366)</li>
+<li>Make sure verbose message is not null (#17363)</li>
+<li>Release changelogs (#17364)</li>
+<li>Update build versions (#17318)</li>
+<li>Add Daily Link Check GitHub Workflow (#17351)</li>
+<li>Update the cgmanifest (#17361, #17344, #17324, #17302, #17268)</li>
+<li>Bump <code>NJsonSchema</code> from <code>10.6.10</code> to <code>10.7.0</code> (#17350)</li>
+<li>Disable broken macOS CI job, which is unused (#17221)</li>
+<li>Have rebase workflow Post a message when it starts (#17341)</li>
+<li>Update <code>DotnetRuntimeMetadata.json</code> for .NET 7 Preview 4 (#17336)</li>
+<li>Update Ubuntu 22 to be detected as not supported WSMan (#17338)</li>
+<li>Bump xunit.runner.visualstudio from 2.4.3 to 2.4.5 (#17274)</li>
+<li>Make sure we execute tests on LTS package for older LTS releases (#17326)</li>
+<li>Bump Microsoft.NET.Test.Sdk from 17.1.0 to 17.2.0 (#17320)</li>
+<li>Add fedora to the OS's that can't run WSMan (#17325)</li>
+<li>Add sles15 support to <code>install-powershell.sh</code> (#16984)</li>
+<li>Start rotating through all images (#17315)</li>
+<li>Update .NET SDK version from <code>7.0.100-preview.2.22153.17</code> to <code>7.0.100-preview.4.22252.9</code> (#17061)</li>
+<li>Disable release security analysis for SSH CI (#17303)</li>
+<li>Add a finalize template which causes jobs with issues to fail (#17314)</li>
+<li>Add mapping for ubuntu22.04 jammy (#17317)</li>
+<li>Enable more tests to be run in a container. (#17294)</li>
+<li>Fix <code>build.psm1</code> to find the required .NET SDK version when a higher version is installed (#17299)</li>
+<li>Improve how Linux container CI builds are identified (#17295)</li>
+<li>Only inject NuGet security analysis if we are using secure <code>nuget.config</code> (#17293)</li>
+<li>Reduce unneeded verbose message from <code>build.psm1</code> (#17291)</li>
+<li>Switch to using GitHub action to verify markdown links for PRs (#17281)</li>
+<li>Put Secure supply chain analysis at correct place (#17273)</li>
+<li>Fix build id variable name when selecting CI container (#17279)</li>
+<li>Add rotation between the two mariner images (#17277)</li>
+<li>Update to use <code>mcr.microsoft.com</code> (#17272)</li>
+<li>Update engine working group members (#17271)</li>
+<li>Bump PSReadLine from 2.2.2 to 2.2.5 in /src/Modules (#17252)</li>
+<li>Update timeout for daily (#17263)</li>
+<li>Bump NJsonSchema from 10.6.9 to 10.6.10 (#16902)</li>
+<li>Update the <code>cgmanifest</code> (#17260)</li>
+<li>Fix Generate checksum file for packages build failure - v7.1.7 (#17219) (Internal 20274)</li>
+<li>Move <code>cgmanifest</code> generation to daily (#17258)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#17245)</li>
+<li>Update to the latest notice file (#17238)</li>
+<li>Add container to Linux CI (#17233)</li>
+<li>Mark <code>Microsoft.Management.Infrastructure.Runtime.Win</code> as a developer dependency to hide in notice file (#17230)</li>
+<li>Fixing dotnet SDK version parsing in <code>build.psm1</code> (#17198) (Thanks @powercode!)</li>
+<li>Fixed package names verification to support multi-digit versions (#17220)</li>
+<li>Bump Microsoft.CodeAnalysis.CSharp from 4.2.0-1.final to 4.2.0-4.final (#17210)</li>
+<li>Add backport action (#17212)</li>
+<li>Updated change logs for v7.0.9 / v7.0.10 / v7.1.6 / v7.1.7 / v7.2.2 / v7.2.3  (#17207)</li>
+<li>Updated metadata.json and README.md for v7.2.3 and v7.0.10 (#17158)</li>
+<li>Update package fallback list for ubuntu (from those updated for ubuntu 22.04) (deb) (#17180)</li>
+<li>Update <code>wix</code> to include security extensions package (#17171)</li>
+<li>Update rebase.yml (#17170)</li>
+<li>Adds sha256 digests to RPM packages (#16896) (Thanks @ngharo!)</li>
+<li>Make mariner packages Framework dependent (#17151)</li>
+<li>Update to the latest notice file (#17169)</li>
+<li>Update to the latest notice file (#17146)</li>
+<li>Replace <code>.</code> in notices container name (#17154)</li>
+<li>Allow multiple installations of dotnet. (#17141)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#17105)</li>
+<li>Update to the latest notice file (#16437)</li>
+<li>Skip failing scriptblock tests (#17093)</li>
+<li>Update dotnet-install script download link (#17086)</li>
+<li>Fix the version of the <code>Microsoft.CodeAnalysis.NetAnalyzers</code> package (#17075)</li>
+<li>Update <code>dotnetmetadata.json</code> to accept .NET 7 preview 3 builds (#17063)</li>
+<li>Re-enable <code>PowerShellGet</code> tests targeting PowerShell gallery (#17062)</li>
+<li>Add mariner 1.0 amd64 package (#17057)</li>
+<li>Create checksum file for global tools (#17056)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#17065)</li>
+<li>Use new cask format (#17064)</li>
+</ul>
+
+[7.3.0-preview.4]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.3...v7.3.0-preview.4
+
 ## [7.3.0-preview.3] - 2022-03-21
 
 ### Engine Updates and Fixes

From 90703cb3d8cd17d1f328bbe65e493cb8e6ec6002 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 23 May 2022 10:42:32 -0700
Subject: [PATCH 398/645] Fix mariner mappings (#17413)

---
 tools/packages.microsoft.com/mapping.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/packages.microsoft.com/mapping.json b/tools/packages.microsoft.com/mapping.json
index 46ea9f7dbf4..854285fb56a 100644
--- a/tools/packages.microsoft.com/mapping.json
+++ b/tools/packages.microsoft.com/mapping.json
@@ -17,11 +17,11 @@
       },
       {
           "url": "cbl-mariner-1.0-prod-Microsoft-x86_64-rpms",
-          "distribution" : ["bionic"],
+          "distribution" : ["mariner"],
           "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm"
       },
       {
-          "url": "cbl-mariner-2.0-prod-Microsoft-x86_64-rpms",
+          "url": "cbl-mariner-2.0-prod-Microsoft-x86_64",
           "distribution" : ["bionic"],
           "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm"
       },

From a3c11579e9fda94933ffbb4c162c58b756088225 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 23 May 2022 11:36:03 -0700
Subject: [PATCH 399/645] Fix spelling errors introduced in changelog (#17414)

---
 .spelling | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/.spelling b/.spelling
index 39eacb8cbac..1d5ecdb1480 100644
--- a/.spelling
+++ b/.spelling
@@ -8,9 +8,11 @@
 0xfeeddeadbeef
 100ms
 1redone
+1.final
 2.x
 2ae5d07
 32-bit
+4.final
 64-bit
 about_
 about_debuggers
@@ -28,6 +30,7 @@ adityapatwardhan
 ADOPTERS.md
 aetos382
 aiello
+al-cheb
 alepauly
 alexandair
 alexjordan6
@@ -71,6 +74,7 @@ azurerm.profile.netcore.preview
 azurerm.resources.netcore.preview
 backgrounded
 backgrounding
+backport
 beatcracker
 bergmeister
 beta.1
@@ -85,7 +89,9 @@ beta.9
 beta2
 bgelens
 Bhaal22
+BinaryFormatter
 bjh7242
+bnot
 bool
 bpayette
 brcrista
@@ -111,6 +117,7 @@ changelogs
 changeset
 changesets
 channel9
+charltonstanley
 charset
 checkbox
 checksum
@@ -141,7 +148,9 @@ CommandInvocationIntrinsics
 commandsearch
 CommandSearcher
 comobject
+Compiler.cs
 composability
+ComRuntimeHelpers.cs
 config
 connect-pssession
 consolehost
@@ -234,7 +243,9 @@ dongbo
 dotcover
 dotnet
 dotnetcore
+dotnetmetadata.json
 DotnetRutimeMetadata.json
+DotnetRuntimeMetadata.json
 dottedscopes
 downlevel
 dropdown
@@ -262,6 +273,7 @@ ergo3114
 errorrecord
 etl
 eugenesmlv
+EventLogLogProvider
 excludeversion
 exe
 executables
@@ -344,6 +356,7 @@ get-typedata
 get-uiculture
 get-winevent
 get-wsmaninstance
+Get-WSManSupport
 GetExceptionForHR
 getparentprocess
 gettype
@@ -478,6 +491,7 @@ lukexjeremy
 lupino3
 lynda.com
 lzybkr
+m1k0net
 M1kep
 mababio
 macos
@@ -507,6 +521,7 @@ Microsoft.CodeAnalysis.NetAnalyzers
 microsoft.com
 microsoft.management.infrastructure.cimcmdlets
 microsoft.management.infrastructure.native
+Microsoft.Management.Infrastructure.Runtime.Win
 microsoft.net.test.sdk
 microsoft.powershell.archive
 microsoft.powershell.commands.diagnostics
@@ -523,6 +538,7 @@ microsoft.powershell.markdownrender
 microsoft.powershell.psreadline
 microsoft.powershell.security
 microsoft.powershell.utility
+Microsoft.Security.Extensions
 microsoft.wsman.management
 microsoft.wsman.runtime
 mikeTWC1984
@@ -577,6 +593,7 @@ new-winevent
 new-wsmaninstance
 new-wsmansessionoption
 NextTurn
+ngharo
 NJsonSchema
 NoMoreFood
 non-22
@@ -609,6 +626,7 @@ openssh
 openssl
 opensuse
 oss
+OutputType
 p1
 packagemanagement
 PackageVersion
@@ -616,8 +634,10 @@ parameshbabu
 parameterbinderbase
 parameterbindercontroller
 parameterbinding
+ParenExpression
 ParseError.ToString
 pathresolution
+PathResolvedToMultiple
 patochun
 patwardhan
 paulhigin
@@ -661,6 +681,7 @@ prepend
 preprocessor
 preview.1
 preview.2
+preview.2.22153.17
 preview.3
 preview.4
 preview.5
@@ -680,6 +701,7 @@ preview.7.20366.2
 preview.7.20366.15
 preview.4.20258.7
 preview.4.20229.10
+preview.4.22252.9
 preview.8
 preview1-24530-04
 preview7
@@ -734,6 +756,7 @@ readme.md
 readonly
 ReadyToRun
 rebase
+rebase.yml
 rebasing
 receive-pssession
 recurse
@@ -808,6 +831,7 @@ scriptblock
 securestring
 seemethere
 select-xml
+SemanticChecks
 semver
 serverless
 sessionid
@@ -839,6 +863,7 @@ Shriram0908
 silijon
 simonwahlin
 singleline
+sles15
 smes
 snapcraft
 snapin
@@ -937,6 +962,7 @@ typegen
 typematch
 t_
 ubuntu
+ubuntu22.04
 uint
 un-versioned
 unicode
@@ -990,9 +1016,14 @@ v6.2.4
 v7.0.0
 v7.0.3
 v7.0.4
+v7.0.9
 v7.1.0
+v7.1.6
 v7.1.7
+v7.2.2
+v7.3.0
 validatenotnullorempty
+ValidateSet
 versioned
 versioning
 vexx32
@@ -1046,6 +1077,7 @@ youtube
 Youssef1313
 zackjknight
 ComInterop
+ryneandal
 runtime#33060
 vexx32
 perf

From 830b5e7bd510fc0c1a13277d3333f6d61321e163 Mon Sep 17 00:00:00 2001
From: "Mikey Lombardi (He/Him)" <michael.t.lombardi@gmail.com>
Date: Mon, 23 May 2022 14:28:42 -0500
Subject: [PATCH 400/645] Update Documentation Issue Template URL (#17410)

Prior to this commit, the URL for the **Documentation Issue** entry in the issue template
configuration pointed to the base URL for the docs repository.

This commit updates the URL to take a user directly to the choosing-page for issues in the
docs repository to reduce the clicking and re-orienting required by users when submitting
a docs issue.
---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 8471badfb0e..973921cb24a 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -7,5 +7,5 @@ contact_links:
     url: https://github.com/PowerShell/PowerShell/blob/master/.github/SUPPORT.md
     about: PowerShell Support Questions/Help
   - name: Documentation Issue
-    url: https://github.com/MicrosoftDocs/PowerShell-Docs
+    url: https://github.com/MicrosoftDocs/PowerShell-Docs/issues/new/choose
     about: Please open issues on documentation for PowerShell here.

From 45aa45aec5ba98a45a0a31fc78549e7a5267123e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 23 May 2022 14:02:02 -0700
Subject: [PATCH 401/645] Move to configuring the fabric bot via JSON (#17411)

---
 .github/fabricbot.json | 2096 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2096 insertions(+)
 create mode 100644 .github/fabricbot.json

diff --git a/.github/fabricbot.json b/.github/fabricbot.json
new file mode 100644
index 00000000000..6cff68d8c2b
--- /dev/null
+++ b/.github/fabricbot.json
@@ -0,0 +1,2096 @@
+[
+  {
+    "taskType": "trigger",
+    "capabilityId": "AutoMerge",
+    "subCapability": "AutoMerge",
+    "version": "1.0",
+    "config": {
+      "taskName": "AutoMerge",
+      "minMinutesOpen": "1440",
+      "mergeType": "squash",
+      "deleteBranches": true,
+      "label": "AutoMerge",
+      "minimumNumberOfStatuses": 6,
+      "requireAllStatuses": false,
+      "removeLabelOnPush": true,
+      "requireSpecificCheckRuns": false,
+      "requireAllStatuses_exemptList": [
+        "CodeFactor",
+        "Codacy/PR Quality Review"
+      ],
+      "requireSpecificCheckRunsList": [
+        "PowerShell-CI-linux",
+        "PowerShell-CI-macos",
+        "PowerShell-CI-static-analysis",
+        "PowerShell-CI-windows",
+        "WIP"
+      ],
+      "usePrDescriptionAsCommitMessage": true
+    },
+    "disabled": false
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "ReleaseAnnouncement",
+    "subCapability": "ReleaseAnnouncement",
+    "version": "1.0",
+    "config": {
+      "taskName": "Announce a fix has been released",
+      "prReply": ":tada:`${version}` has been released which incorporates this pull request.:tada:\n\nHandy links:\n* [Release Notes](https://github.com/${owner}/${repo}/releases/tag/${version})\n",
+      "issueReply": ":tada:This issue was addressed in #${prNumber}, which has now been successfully released as `${version}`.:tada:\n\nHandy links:\n* [Release Notes](https://github.com/${owner}/${repo}/releases/tag/${version})\n",
+      "packageRegex": "(v\\d+\\.\\d+\\.\\d+(-\\w+(\\.\\d+)?)?)",
+      "referencedPrsRegex": "\\(#(\\d+)\\)",
+      "packageVersionGroup": 0,
+      "packageNameGroup": 1
+    }
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "PullRequestReviewResponder",
+    "version": "1.0",
+    "config": {
+      "taskName": "Add needs author feedback label to pull requests when changes are requested",
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "name": "isAction",
+            "parameters": {
+              "action": "submitted"
+            }
+          },
+          {
+            "name": "isReviewState",
+            "parameters": {
+              "state": "changes_requested"
+            }
+          }
+        ]
+      },
+      "actions": [
+        {
+          "name": "addLabel",
+          "parameters": {
+            "label": "Waiting on Author"
+          }
+        },
+        {
+          "name": "removeMilestone",
+          "parameters": {}
+        },
+        {
+          "name": "removeLabel",
+          "parameters": {
+            "label": "Review - Needed"
+          }
+        }
+      ],
+      "eventType": "pull_request",
+      "eventNames": [
+        "pull_request_review"
+      ]
+    }
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "PullRequestResponder",
+    "version": "1.0",
+    "config": {
+      "taskName": "Remove needs author feedback label when the author responds to a pull request",
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "name": "isActivitySender",
+            "parameters": {
+              "user": {
+                "type": "author"
+              }
+            }
+          },
+          {
+            "operator": "not",
+            "operands": [
+              {
+                "name": "isAction",
+                "parameters": {
+                  "action": "closed"
+                }
+              }
+            ]
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Waiting on Author"
+            }
+          },
+          {
+            "operator": "not",
+            "operands": [
+              {
+                "name": "titleContains",
+                "parameters": {
+                  "isRegex": true,
+                  "titlePattern": "(WIP|Work in progress|🚧)"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "actions": [
+        {
+          "name": "removeLabel",
+          "parameters": {
+            "label": "Waiting on Author"
+          }
+        }
+      ],
+      "eventType": "pull_request",
+      "eventNames": [
+        "pull_request",
+        "issues",
+        "project_card"
+      ]
+    }
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "PullRequestCommentResponder",
+    "version": "1.0",
+    "config": {
+      "taskName": "Remove needs author feedback label when the author comments on a pull request",
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "name": "isActivitySender",
+            "parameters": {
+              "user": {
+                "type": "author"
+              }
+            }
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Waiting on Author"
+            }
+          }
+        ]
+      },
+      "actions": [
+        {
+          "name": "removeLabel",
+          "parameters": {
+            "label": "Waiting on Author"
+          }
+        }
+      ],
+      "eventType": "pull_request",
+      "eventNames": [
+        "issue_comment"
+      ]
+    }
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "PullRequestReviewResponder",
+    "version": "1.0",
+    "config": {
+      "taskName": "Remove needs author feedback label when the author responds to a pull request review comment",
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "name": "isActivitySender",
+            "parameters": {
+              "user": {
+                "type": "author"
+              }
+            }
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Waiting on Author"
+            }
+          }
+        ]
+      },
+      "actions": [
+        {
+          "name": "removeLabel",
+          "parameters": {
+            "label": "Waiting on Author"
+          }
+        }
+      ],
+      "eventType": "pull_request",
+      "eventNames": [
+        "pull_request_review"
+      ]
+    }
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "PullRequestResponder",
+    "version": "1.0",
+    "config": {
+      "taskName": "Remove no recent activity label from pull requests",
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "operator": "not",
+            "operands": [
+              {
+                "name": "isAction",
+                "parameters": {
+                  "action": "closed"
+                }
+              }
+            ]
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          },
+          {
+            "name": "isActivitySender",
+            "parameters": {
+              "user": {
+                "type": "author"
+              }
+            }
+          }
+        ]
+      },
+      "actions": [
+        {
+          "name": "removeLabel",
+          "parameters": {
+            "label": "Stale"
+          }
+        }
+      ],
+      "eventType": "pull_request",
+      "eventNames": [
+        "pull_request",
+        "issues",
+        "project_card"
+      ]
+    }
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "PullRequestCommentResponder",
+    "version": "1.0",
+    "config": {
+      "taskName": "Remove no recent activity label when a pull request is commented on",
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          }
+        ]
+      },
+      "actions": [
+        {
+          "name": "removeLabel",
+          "parameters": {
+            "label": "Stale"
+          }
+        }
+      ],
+      "eventType": "pull_request",
+      "eventNames": [
+        "issue_comment"
+      ]
+    }
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "PullRequestReviewResponder",
+    "version": "1.0",
+    "config": {
+      "taskName": "Remove no recent activity label when a pull request is reviewed",
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Stale"
+            }
+          }
+        ]
+      },
+      "actions": [
+        {
+          "name": "removeLabel",
+          "parameters": {
+            "label": "Stale"
+          }
+        }
+      ],
+      "eventType": "pull_request",
+      "eventNames": [
+        "pull_request_review"
+      ]
+    }
+  },
+  {
+    "taskType": "scheduled",
+    "capabilityId": "ScheduledSearch",
+    "subCapability": "ScheduledSearch",
+    "version": "1.1",
+    "config": {
+      "taskName": "Close stale pull requests",
+      "frequency": [
+        {
+          "weekDay": 0,
+          "hours": [
+            10,
+            22
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 1,
+          "hours": [
+            10,
+            22
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 2,
+          "hours": [
+            10,
+            22
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 3,
+          "hours": [
+            10,
+            22
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 4,
+          "hours": [
+            10,
+            22
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 5,
+          "hours": [
+            10,
+            22
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 6,
+          "hours": [
+            10,
+            22
+          ],
+          "timezoneOffset": -8
+        }
+      ],
+      "searchTerms": [
+        {
+          "name": "isPr",
+          "parameters": {}
+        },
+        {
+          "name": "isOpen",
+          "parameters": {}
+        },
+        {
+          "name": "hasLabel",
+          "parameters": {
+            "label": "Waiting on Author"
+          }
+        },
+        {
+          "name": "hasLabel",
+          "parameters": {
+            "label": "Stale"
+          }
+        },
+        {
+          "name": "noActivitySince",
+          "parameters": {
+            "days": 10
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "closeIssue",
+          "parameters": {}
+        }
+      ]
+    }
+  },
+  {
+    "taskType": "scheduled",
+    "capabilityId": "ScheduledSearch",
+    "subCapability": "ScheduledSearch",
+    "version": "1.1",
+    "config": {
+      "taskName": "Add no recent activity label to pull requests",
+      "frequency": [
+        {
+          "weekDay": 0,
+          "hours": [
+            1,
+            4,
+            7,
+            10,
+            13,
+            16,
+            19,
+            22
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 1,
+          "hours": [
+            1,
+            4,
+            7,
+            10,
+            13,
+            16,
+            19,
+            22
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 2,
+          "hours": [
+            1,
+            4,
+            7,
+            10,
+            13,
+            16,
+            19,
+            22
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 3,
+          "hours": [
+            1,
+            4,
+            7,
+            10,
+            13,
+            16,
+            19,
+            22
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 4,
+          "hours": [
+            1,
+            4,
+            7,
+            10,
+            13,
+            16,
+            19,
+            22
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 5,
+          "hours": [
+            1,
+            4,
+            7,
+            10,
+            13,
+            16,
+            19,
+            22
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 6,
+          "hours": [
+            1,
+            4,
+            7,
+            10,
+            13,
+            16,
+            19,
+            22
+          ],
+          "timezoneOffset": -7
+        }
+      ],
+      "searchTerms": [
+        {
+          "name": "isPr",
+          "parameters": {}
+        },
+        {
+          "name": "isOpen",
+          "parameters": {}
+        },
+        {
+          "name": "hasLabel",
+          "parameters": {
+            "label": "Waiting on Author"
+          }
+        },
+        {
+          "name": "noActivitySince",
+          "parameters": {
+            "days": 15
+          }
+        },
+        {
+          "name": "noLabel",
+          "parameters": {
+            "label": "Stale"
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "addLabel",
+          "parameters": {
+            "label": "Stale"
+          }
+        },
+        {
+          "name": "addReply",
+          "parameters": {
+            "comment": "This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **15 days**. It will be closed if no further activity occurs **within 10 days of this comment**."
+          }
+        },
+        {
+          "name": "removeMilestone",
+          "parameters": {}
+        }
+      ]
+    }
+  },
+  {
+    "taskType": "scheduled",
+    "capabilityId": "ScheduledSearch",
+    "subCapability": "ScheduledSearch",
+    "version": "1.1",
+    "config": {
+      "taskName": "Close duplicate issues",
+      "frequency": [
+        {
+          "weekDay": 0,
+          "hours": [
+            0,
+            3,
+            6,
+            9,
+            12,
+            15,
+            18,
+            21
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 1,
+          "hours": [
+            0,
+            3,
+            6,
+            9,
+            12,
+            15,
+            18,
+            21
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 2,
+          "hours": [
+            0,
+            3,
+            6,
+            9,
+            12,
+            15,
+            18,
+            21
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 3,
+          "hours": [
+            0,
+            3,
+            6,
+            9,
+            12,
+            15,
+            18,
+            21
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 4,
+          "hours": [
+            0,
+            3,
+            6,
+            9,
+            12,
+            15,
+            18,
+            21
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 5,
+          "hours": [
+            0,
+            3,
+            6,
+            9,
+            12,
+            15,
+            18,
+            21
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 6,
+          "hours": [
+            0,
+            3,
+            6,
+            9,
+            12,
+            15,
+            18,
+            21
+          ],
+          "timezoneOffset": -8
+        }
+      ],
+      "searchTerms": [
+        {
+          "name": "isIssue",
+          "parameters": {}
+        },
+        {
+          "name": "isOpen",
+          "parameters": {}
+        },
+        {
+          "name": "hasLabel",
+          "parameters": {
+            "label": "Resolution-Duplicate"
+          }
+        },
+        {
+          "name": "noActivitySince",
+          "parameters": {
+            "days": 1
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "addReply",
+          "parameters": {
+            "comment": "This issue has been marked as duplicate and has not had any activity for **1 day**. It has been closed for housekeeping purposes."
+          }
+        },
+        {
+          "name": "closeIssue",
+          "parameters": {}
+        }
+      ]
+    },
+    "disabled": false
+  },
+  {
+    "taskType": "scheduled",
+    "capabilityId": "ScheduledSearch",
+    "subCapability": "ScheduledSearch",
+    "version": "1.1",
+    "config": {
+      "taskName": "Close external issues",
+      "frequency": [
+        {
+          "weekDay": 0,
+          "hours": [
+            2,
+            5,
+            8,
+            11,
+            14,
+            17,
+            20,
+            23
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 1,
+          "hours": [
+            2,
+            5,
+            8,
+            11,
+            14,
+            17,
+            20,
+            23
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 2,
+          "hours": [
+            2,
+            5,
+            8,
+            11,
+            14,
+            17,
+            20,
+            23
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 3,
+          "hours": [
+            2,
+            5,
+            8,
+            11,
+            14,
+            17,
+            20,
+            23
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 4,
+          "hours": [
+            2,
+            5,
+            8,
+            11,
+            14,
+            17,
+            20,
+            23
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 5,
+          "hours": [
+            2,
+            5,
+            8,
+            11,
+            14,
+            17,
+            20,
+            23
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 6,
+          "hours": [
+            2,
+            5,
+            8,
+            11,
+            14,
+            17,
+            20,
+            23
+          ],
+          "timezoneOffset": -8
+        }
+      ],
+      "searchTerms": [
+        {
+          "name": "isIssue",
+          "parameters": {}
+        },
+        {
+          "name": "isOpen",
+          "parameters": {}
+        },
+        {
+          "name": "hasLabel",
+          "parameters": {
+            "label": "Resolution-External"
+          }
+        },
+        {
+          "name": "noActivitySince",
+          "parameters": {
+            "days": 1
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "addReply",
+          "parameters": {
+            "comment": "This issue has been marked as external and has not had any activity for **1 day**. It has been be closed for housekeeping purposes."
+          }
+        },
+        {
+          "name": "closeIssue",
+          "parameters": {}
+        }
+      ]
+    }
+  },
+  {
+    "taskType": "scheduled",
+    "capabilityId": "ScheduledSearch",
+    "subCapability": "ScheduledSearch",
+    "version": "1.1",
+    "config": {
+      "taskName": "Close answered issues",
+      "frequency": [
+        {
+          "weekDay": 0,
+          "hours": [
+            0,
+            12
+          ]
+        },
+        {
+          "weekDay": 1,
+          "hours": [
+            0,
+            12
+          ]
+        },
+        {
+          "weekDay": 2,
+          "hours": [
+            0,
+            12
+          ]
+        },
+        {
+          "weekDay": 3,
+          "hours": [
+            0,
+            12
+          ]
+        },
+        {
+          "weekDay": 4,
+          "hours": [
+            0,
+            12
+          ]
+        },
+        {
+          "weekDay": 5,
+          "hours": [
+            0,
+            12
+          ]
+        },
+        {
+          "weekDay": 6,
+          "hours": [
+            0,
+            12
+          ]
+        }
+      ],
+      "searchTerms": [
+        {
+          "name": "isIssue",
+          "parameters": {}
+        },
+        {
+          "name": "isOpen",
+          "parameters": {}
+        },
+        {
+          "name": "hasLabel",
+          "parameters": {
+            "label": "Resolution-Answered"
+          }
+        },
+        {
+          "name": "noActivitySince",
+          "parameters": {
+            "days": 1
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "addReply",
+          "parameters": {
+            "comment": "This issue has been marked as answered and has not had any activity for **1 day**. It has been closed for housekeeping purposes."
+          }
+        },
+        {
+          "name": "closeIssue",
+          "parameters": {}
+        }
+      ]
+    }
+  },
+  {
+    "taskType": "scheduled",
+    "capabilityId": "ScheduledSearch",
+    "subCapability": "ScheduledSearch",
+    "version": "1.1",
+    "config": {
+      "taskName": "Close fixed issues",
+      "frequency": [
+        {
+          "weekDay": 0,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 1,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 2,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 3,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 4,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 5,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 6,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        }
+      ],
+      "searchTerms": [
+        {
+          "name": "isIssue",
+          "parameters": {}
+        },
+        {
+          "name": "isOpen",
+          "parameters": {}
+        },
+        {
+          "name": "hasLabel",
+          "parameters": {
+            "label": "Resolution-Fixed"
+          }
+        },
+        {
+          "name": "noActivitySince",
+          "parameters": {
+            "days": 1
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "addReply",
+          "parameters": {
+            "comment": "This issue has been marked as fixed and has not had any activity for **1 day**. It has been closed for housekeeping purposes."
+          }
+        },
+        {
+          "name": "closeIssue",
+          "parameters": {}
+        }
+      ]
+    }
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "PullRequestResponder",
+    "version": "1.0",
+    "config": {
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "operator": "not",
+            "operands": [
+              {
+                "name": "isAssignedToSomeone",
+                "parameters": {}
+              }
+            ]
+          },
+          {
+            "name": "isAction",
+            "parameters": {
+              "action": "opened"
+            }
+          }
+        ]
+      },
+      "eventType": "pull_request",
+      "eventNames": [
+        "pull_request",
+        "issues",
+        "project_card"
+      ],
+      "actions": [
+        {
+          "name": "assignToGitHubUserGroup",
+          "parameters": {
+            "groupId": "5dd8713b90bf2e113c0e885e",
+            "skipOpener": true
+          }
+        }
+      ],
+      "taskName": "Assign unassigned PRs - on push"
+    }
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "PullRequestCommentResponder",
+    "version": "1.0",
+    "config": {
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "operator": "not",
+            "operands": [
+              {
+                "name": "isAssignedToSomeone",
+                "parameters": {}
+              }
+            ]
+          }
+        ]
+      },
+      "eventType": "pull_request",
+      "eventNames": [
+        "issue_comment"
+      ],
+      "taskName": "Assign unassigned PRs  - on comments",
+      "actions": [
+        {
+          "name": "assignToGitHubUserGroup",
+          "parameters": {
+            "groupId": "5dd8713b90bf2e113c0e885e"
+          }
+        }
+      ]
+    },
+    "disabled": true
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "EmailCleanser",
+    "subCapability": "EmailCleanser",
+    "version": "1.0",
+    "config": {
+      "taskName": "Email reply cleanser"
+    }
+  },
+  {
+    "taskType": "scheduled",
+    "capabilityId": "ScheduledSearch",
+    "subCapability": "ScheduledSearch",
+    "version": "1.1",
+    "config": {
+      "taskName": "Needs attention",
+      "frequency": [
+        {
+          "weekDay": 0,
+          "hours": [
+            6,
+            18
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 1,
+          "hours": [
+            6,
+            18
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 2,
+          "hours": [
+            6,
+            18
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 3,
+          "hours": [
+            6,
+            18
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 4,
+          "hours": [
+            6,
+            18
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 5,
+          "hours": [
+            6,
+            18
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 6,
+          "hours": [
+            6,
+            18
+          ],
+          "timezoneOffset": -8
+        }
+      ],
+      "searchTerms": [
+        {
+          "name": "isPr",
+          "parameters": {}
+        },
+        {
+          "name": "isOpen",
+          "parameters": {}
+        },
+        {
+          "name": "noLabel",
+          "parameters": {
+            "label": "Waiting on Author"
+          }
+        },
+        {
+          "name": "noActivitySince",
+          "parameters": {
+            "days": 7
+          }
+        },
+        {
+          "name": "noLabel",
+          "parameters": {
+            "label": "Stale"
+          }
+        },
+        {
+          "name": "noLabel",
+          "parameters": {
+            "label": "Review - Needed"
+          }
+        },
+        {
+          "name": "noLabel",
+          "parameters": {
+            "label": "Review - Committee"
+          }
+        },
+        {
+          "name": "isDraftPr",
+          "parameters": {
+            "value": "false"
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "addLabel",
+          "parameters": {
+            "label": "Review - Needed"
+          }
+        },
+        {
+          "name": "addReply",
+          "parameters": {
+            "comment": "This pull request has been automatically marked as Review Needed because it has been there has not been any activity for **7 days**.\nMaintainer, please provide feedback and/or mark it as `Waiting on Author`"
+          }
+        }
+      ]
+    }
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "PullRequestResponder",
+    "version": "1.0",
+    "config": {
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Review - Needed"
+            }
+          },
+          {
+            "operator": "or",
+            "operands": [
+              {
+                "name": "isAction",
+                "parameters": {
+                  "action": "merged"
+                }
+              },
+              {
+                "name": "isAction",
+                "parameters": {
+                  "action": "closed"
+                }
+              },
+              {
+                "name": "isAction",
+                "parameters": {
+                  "action": "reopened"
+                }
+              },
+              {
+                "name": "isAction",
+                "parameters": {
+                  "action": "assigned"
+                }
+              },
+              {
+                "name": "isAction",
+                "parameters": {
+                  "action": "unassigned"
+                }
+              },
+              {
+                "name": "isAction",
+                "parameters": {
+                  "action": "unlabeled"
+                }
+              }
+            ]
+          },
+          {
+            "operator": "or",
+            "operands": [
+              {
+                "name": "activitySenderHasPermissions",
+                "parameters": {
+                  "association": "MEMBER",
+                  "permissions": "admin"
+                }
+              },
+              {
+                "name": "isActivitySender",
+                "parameters": {
+                  "user": "iSazonov"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "eventType": "pull_request",
+      "eventNames": [
+        "pull_request",
+        "issues",
+        "project_card"
+      ],
+      "actions": [
+        {
+          "name": "removeLabel",
+          "parameters": {
+            "label": "Review - Needed"
+          }
+        }
+      ],
+      "taskName": "remove review - need when PR updated"
+    },
+    "disabled": false
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "PullRequestCommentResponder",
+    "version": "1.0",
+    "config": {
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Review - Needed"
+            }
+          },
+          {
+            "operator": "or",
+            "operands": [
+              {
+                "name": "activitySenderHasPermissions",
+                "parameters": {
+                  "association": "MEMBER",
+                  "permissions": "admin"
+                }
+              },
+              {
+                "name": "isActivitySender",
+                "parameters": {
+                  "user": "iSazonov"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "eventType": "pull_request",
+      "eventNames": [
+        "issue_comment"
+      ],
+      "taskName": "remove review - need when PR updated - comment created",
+      "actions": [
+        {
+          "name": "removeLabel",
+          "parameters": {
+            "label": "Review - Needed"
+          }
+        }
+      ]
+    }
+  },
+  {
+    "taskType": "scheduled",
+    "capabilityId": "ScheduledSearch",
+    "subCapability": "ScheduledSearch",
+    "version": "1.1",
+    "config": {
+      "frequency": [
+        {
+          "weekDay": 0,
+          "hours": [
+            0,
+            12
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 1,
+          "hours": [
+            0,
+            12
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 2,
+          "hours": [
+            0,
+            12
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 3,
+          "hours": [
+            0,
+            12
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 4,
+          "hours": [
+            0,
+            12
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 5,
+          "hours": [
+            0,
+            12
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 6,
+          "hours": [
+            0,
+            12
+          ],
+          "timezoneOffset": -7
+        }
+      ],
+      "searchTerms": [
+        {
+          "name": "isOpen",
+          "parameters": {}
+        },
+        {
+          "name": "isDraftPr",
+          "parameters": {
+            "value": "true"
+          }
+        },
+        {
+          "name": "noLabel",
+          "parameters": {
+            "label": "Review - Committee"
+          }
+        },
+        {
+          "name": "noLabel",
+          "parameters": {
+            "label": "Waiting on Author"
+          }
+        },
+        {
+          "name": "noLabel",
+          "parameters": {
+            "label": "Stale"
+          }
+        },
+        {
+          "name": "noActivitySince",
+          "parameters": {
+            "days": 3
+          }
+        }
+      ],
+      "actions": [
+        {
+          "name": "addLabel",
+          "parameters": {
+            "label": "Waiting on Author"
+          }
+        }
+      ],
+      "taskName": "Label draft PRs as waiting on author"
+    },
+    "disabled": false
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "PullRequestResponder",
+    "version": "1.0",
+    "config": {
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "name": "addedToMilestone",
+            "parameters": {}
+          },
+          {
+            "name": "isOpen",
+            "parameters": {}
+          }
+        ]
+      },
+      "eventType": "pull_request",
+      "eventNames": [
+        "pull_request",
+        "issues",
+        "project_card"
+      ],
+      "actions": [
+        {
+          "name": "removeMilestone",
+          "parameters": {}
+        },
+        {
+          "name": "addReply",
+          "parameters": {
+            "comment": "Open PRs should not be assigned to milestone, so they are not assigned to the wrong milestone after they are merged.  For backport consideration, use a `backport` label. "
+          }
+        }
+      ],
+      "taskName": "Remove label on Open PRs"
+    }
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "IssuesOnlyResponder",
+    "version": "1.0",
+    "config": {
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "name": "isAction",
+            "parameters": {
+              "action": "closed"
+            }
+          }
+        ]
+      },
+      "eventType": "issue",
+      "eventNames": [
+        "issues",
+        "project_card"
+      ],
+      "taskName": "Remove 'Needs-Triage' label when an issue is closed",
+      "actions": [
+        {
+          "name": "removeLabel",
+          "parameters": {
+            "label": "Needs-Triage"
+          }
+        }
+      ]
+    }
+  },
+  {
+    "taskType": "scheduled",
+    "capabilityId": "ScheduledSearch",
+    "subCapability": "ScheduledSearch",
+    "version": "1.1",
+    "config": {
+      "frequency": [
+        {
+          "weekDay": 0,
+          "hours": [
+            3,
+            15
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 1,
+          "hours": [
+            3,
+            15
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 2,
+          "hours": [
+            3,
+            15
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 3,
+          "hours": [
+            3,
+            15
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 4,
+          "hours": [
+            3,
+            15
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 5,
+          "hours": [
+            3,
+            15
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 6,
+          "hours": [
+            3,
+            15
+          ],
+          "timezoneOffset": -7
+        }
+      ],
+      "searchTerms": [
+        {
+          "name": "isIssue",
+          "parameters": {}
+        },
+        {
+          "name": "isOpen",
+          "parameters": {}
+        },
+        {
+          "name": "hasLabel",
+          "parameters": {
+            "label": "Resolution-Declined"
+          }
+        },
+        {
+          "name": "noActivitySince",
+          "parameters": {
+            "days": 1
+          }
+        }
+      ],
+      "taskName": "Close declined issues",
+      "actions": [
+        {
+          "name": "addReply",
+          "parameters": {
+            "comment": "This issue has been marked as declined and has not had any activity for **1 day**. It has been closed for housekeeping purposes."
+          }
+        },
+        {
+          "name": "closeIssue",
+          "parameters": {}
+        }
+      ]
+    }
+  },
+  {
+    "taskType": "scheduled",
+    "capabilityId": "ScheduledSearch",
+    "subCapability": "ScheduledSearch",
+    "version": "1.1",
+    "config": {
+      "frequency": [
+        {
+          "weekDay": 0,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 1,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 2,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 3,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 4,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 5,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 6,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        }
+      ],
+      "searchTerms": [
+        {
+          "name": "isIssue",
+          "parameters": {}
+        },
+        {
+          "name": "isOpen",
+          "parameters": {}
+        },
+        {
+          "name": "hasLabel",
+          "parameters": {
+            "label": "Resolution-By Design"
+          }
+        },
+        {
+          "name": "noActivitySince",
+          "parameters": {
+            "days": 1
+          }
+        }
+      ],
+      "taskName": "Close by-design issues",
+      "actions": [
+        {
+          "name": "addReply",
+          "parameters": {
+            "comment": "This issue has been marked as by-design and has not had any activity for **1 day**. It has been closed for housekeeping purposes."
+          }
+        },
+        {
+          "name": "closeIssue",
+          "parameters": {}
+        }
+      ]
+    }
+  },
+  {
+    "taskType": "scheduled",
+    "capabilityId": "ScheduledSearch",
+    "subCapability": "ScheduledSearch",
+    "version": "1.1",
+    "config": {
+      "frequency": [
+        {
+          "weekDay": 0,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 1,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 2,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 3,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 4,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 5,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        },
+        {
+          "weekDay": 6,
+          "hours": [
+            2,
+            14
+          ],
+          "timezoneOffset": -7
+        }
+      ],
+      "searchTerms": [
+        {
+          "name": "isIssue",
+          "parameters": {}
+        },
+        {
+          "name": "isOpen",
+          "parameters": {}
+        },
+        {
+          "name": "hasLabel",
+          "parameters": {
+            "label": "Resolution-Won't Fix"
+          }
+        },
+        {
+          "name": "noActivitySince",
+          "parameters": {
+            "days": 1
+          }
+        }
+      ],
+      "taskName": "Close won't fix issues",
+      "actions": [
+        {
+          "name": "addReply",
+          "parameters": {
+            "comment": "This issue has been marked as won't fix and has not had any activity for **1 day**. It has been closed for housekeeping purposes."
+          }
+        },
+        {
+          "name": "closeIssue",
+          "parameters": {}
+        }
+      ]
+    }
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "InPrLabel",
+    "subCapability": "InPrLabel",
+    "version": "1.0",
+    "config": {
+      "taskName": "Add 'In-PR' label to issue",
+      "label_inPr": "In-PR",
+      "fixedLabelEnabled": true,
+      "label_fixed": "Resolution-Fixed"
+    }
+  },
+  {
+    "taskType": "trigger",
+    "capabilityId": "IssueResponder",
+    "subCapability": "IssueCommentResponder",
+    "version": "1.0",
+    "config": {
+      "conditions": {
+        "operator": "and",
+        "operands": [
+          {
+            "name": "isActivitySender",
+            "parameters": {
+              "user": {
+                "type": "author"
+              }
+            }
+          },
+          {
+            "name": "hasLabel",
+            "parameters": {
+              "label": "Waiting on Author"
+            }
+          }
+        ]
+      },
+      "eventType": "issue",
+      "eventNames": [
+        "issue_comment"
+      ],
+      "taskName": "Remove needs author feedback label when the author comments on an issue",
+      "actions": [
+        {
+          "name": "removeLabel",
+          "parameters": {
+            "label": "Waiting on Author"
+          }
+        }
+      ]
+    }
+  },
+  {
+    "taskType": "scheduled",
+    "capabilityId": "ScheduledSearch",
+    "subCapability": "ScheduledSearch",
+    "version": "1.1",
+    "config": {
+      "frequency": [
+        {
+          "weekDay": 0,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 1,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 2,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 3,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 4,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 5,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        },
+        {
+          "weekDay": 6,
+          "hours": [
+            8,
+            20
+          ],
+          "timezoneOffset": -8
+        }
+      ],
+      "searchTerms": [
+        {
+          "name": "isOpen",
+          "parameters": {}
+        },
+        {
+          "name": "isIssue",
+          "parameters": {}
+        },
+        {
+          "name": "hasLabel",
+          "parameters": {
+            "label": "Waiting on Author"
+          }
+        },
+        {
+          "name": "noActivitySince",
+          "parameters": {
+            "days": 7
+          }
+        }
+      ],
+      "taskName": "Close stale issues",
+      "actions": [
+        {
+          "name": "addReply",
+          "parameters": {
+            "comment": "This issue has been marked as \"Waiting on Author\" and has not had any activity for **7 day**. It has been closed for housekeeping purposes."
+          }
+        },
+        {
+          "name": "closeIssue",
+          "parameters": {}
+        }
+      ]
+    }
+  }
+]

From 83132cfa195d414c06134a8ee9365ffb3881bde8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 14:46:38 -0700
Subject: [PATCH 402/645] Update to the latest NOTICES file (#17401)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 ThirdPartyNotices.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index ed77de6d3ca..67df0db5b52 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -650,7 +650,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-NJsonSchema 10.7.0 - MIT
+NJsonSchema 10.7.1 - MIT
 
 
 

From da6fde03805fad76459122b7e3d4acbb28474a64 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Mon, 23 May 2022 14:58:23 -0700
Subject: [PATCH 403/645] Add `AppX` capabilities in MSIX manifest so that PS7
 can call the `AppX` APIs (#17416)

---
 assets/AppxManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/AppxManifest.xml b/assets/AppxManifest.xml
index bba68ca976b..c646bcdf94b 100644
--- a/assets/AppxManifest.xml
+++ b/assets/AppxManifest.xml
@@ -45,5 +45,7 @@
     <Capability Name="internetClient" />
     <rescap:Capability Name="runFullTrust" />
     <rescap:Capability Name="unvirtualizedResources" />
+    <rescap:Capability Name="packageManagement" />
+    <rescap:Capability Name="packageQuery" />
   </Capabilities>
 </Package>

From 957b7bd33f565f8859c4c4e47beb80251805ace3 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 23 May 2022 15:21:04 -0700
Subject: [PATCH 404/645] Add reminder workflows (#17387)

* Create processReminders.yml

* Create createReminders.yml

* Delete settings.json
---
 .github/workflows/createReminders.yml  | 13 ++++++
 .github/workflows/processReminders.yml | 14 +++++++
 .poshchan/settings.json                | 58 --------------------------
 3 files changed, 27 insertions(+), 58 deletions(-)
 create mode 100644 .github/workflows/createReminders.yml
 create mode 100644 .github/workflows/processReminders.yml
 delete mode 100644 .poshchan/settings.json

diff --git a/.github/workflows/createReminders.yml b/.github/workflows/createReminders.yml
new file mode 100644
index 00000000000..b779e19d545
--- /dev/null
+++ b/.github/workflows/createReminders.yml
@@ -0,0 +1,13 @@
+name: 'Create reminder'
+
+on:
+  issue_comment:
+    types: [created, edited]
+
+jobs:
+  reminder:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: check for reminder
+        uses: agrc/create-reminder-action@v1
diff --git a/.github/workflows/processReminders.yml b/.github/workflows/processReminders.yml
new file mode 100644
index 00000000000..65322ebd7bf
--- /dev/null
+++ b/.github/workflows/processReminders.yml
@@ -0,0 +1,14 @@
+name: 'Process reminders'
+
+on:
+  schedule:
+    - cron: '*/15 * * * *'
+  workflow_dispatch:
+
+jobs:
+  reminder:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: check reminders and notify
+        uses: agrc/reminder-action@v1
diff --git a/.poshchan/settings.json b/.poshchan/settings.json
deleted file mode 100644
index 21ad0f08b48..00000000000
--- a/.poshchan/settings.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-    "version": "0.1",
-    "azdevops": {
-        "build_targets": {
-            "static": "PowerShell-CI-static-analysis",
-            "windows": "PowerShell-CI-Windows",
-            "macos": "PowerShell-CI-macOS",
-            "linux": "PowerShell-CI-Linux",
-            "ssh": "PowerShell-CI-SSH",
-            "all": [
-                "PowerShell-CI-static-analysis",
-                "PowerShell-CI-Windows",
-                "PowerShell-CI-macOS",
-                "PowerShell-CI-Linux",
-                "PowerShell-CI-SSH"
-            ]
-        },
-        "authorized_users": [
-            "adityapatwardhan",
-            "anmenaga",
-            "bergmeister",
-            "daxian-dbw",
-            "iSazonov",
-            "JamesWTruher",
-            "KirkMunro",
-            "PaulHigin",
-            "rjmholt",
-            "SteveL-MSFT",
-            "TravisEz13",
-            "TylerLeonhardt",
-            "vexx32"
-        ]
-    },
-    "failures": {
-        "authorized_users": [
-            "adityapatwardhan",
-            "anmenaga",
-            "bergmeister",
-            "daxian-dbw",
-            "IISResetMe",
-            "iSazonov",
-            "JamesWTruher",
-            "KirkMunro",
-            "kwkam",
-            "PaulHigin",
-            "powercode",
-            "rjmholt",
-            "rkeithhill",
-            "SteveL-MSFT",
-            "TravisEz13",
-            "TylerLeonhardt",
-            "vexx32"
-        ]
-    },
-    "reminders": {
-        "authorized_users": "*"
-    }
-}

From 8cb7e35ccf30394b825b19e669e976e86f8850b5 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 23 May 2022 22:35:27 -0700
Subject: [PATCH 405/645] Increase reference assembly count to 161 (#17420)

---
 .../commands/utility/AddType.cs                                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
index 5ce91a36a48..f084d964998 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
@@ -686,7 +686,7 @@ private void LoadAssemblies(IEnumerable<string> assemblies)
         private static IEnumerable<PortableExecutableReference> InitDefaultRefAssemblies()
         {
             // Define number of reference assemblies distributed with PowerShell.
-            const int maxPowershellRefAssemblies = 160;
+            const int maxPowershellRefAssemblies = 161;
 
             const int capacity = maxPowershellRefAssemblies + 1;
             var defaultRefAssemblies = new List<PortableExecutableReference>(capacity);

From 14aa8f07417ce4a3976ca1a887e73eec84e8d845 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 24 May 2022 10:55:29 -0700
Subject: [PATCH 406/645] Do not publish package for Mariner 1.0 (#17415)

---
 tools/packages.microsoft.com/mapping.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tools/packages.microsoft.com/mapping.json b/tools/packages.microsoft.com/mapping.json
index 854285fb56a..fa70f465a0d 100644
--- a/tools/packages.microsoft.com/mapping.json
+++ b/tools/packages.microsoft.com/mapping.json
@@ -15,11 +15,6 @@
           "distribution" : ["trusty"],
           "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.rh.x86_64.rpm"
       },
-      {
-          "url": "cbl-mariner-1.0-prod-Microsoft-x86_64-rpms",
-          "distribution" : ["mariner"],
-          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm"
-      },
       {
           "url": "cbl-mariner-2.0-prod-Microsoft-x86_64",
           "distribution" : ["bionic"],

From 97281ed3d15746521704f908516486f8a548a277 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 18:03:31 +0000
Subject: [PATCH 407/645] Update to the latest NOTICES file (#17421)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 ThirdPartyNotices.txt | 64 -------------------------------------------
 1 file changed, 64 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 67df0db5b52..ee9456cee85 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -126,7 +126,6 @@ limitations under the License.
 Markdig.Signed 0.22.0 - BSD-2-Clause
 
 
-(c) 2008 VeriSign, Inc.
 
 Copyright (c) <year> <owner> . All rights reserved.
 
@@ -145,7 +144,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 Microsoft.ApplicationInsights 2.20.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 
 MIT License
@@ -165,7 +163,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 Microsoft.Bcl.AsyncInterfaces 5.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -271,7 +268,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 Microsoft.Management.Infrastructure 2.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 
 MIT License
@@ -291,7 +287,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 Microsoft.Management.Infrastructure.Runtime.Unix 2.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 
 MIT License
@@ -311,7 +306,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 Microsoft.PowerShell.MarkdownRender 7.2.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 (c) Microsoft Corporation. PowerShell's Markdown Rendering project PowerShell Markdown Renderer
 
@@ -332,7 +326,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 Microsoft.PowerShell.Native 7.2.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) by P.J. Plauger
 
@@ -371,7 +364,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 Microsoft.Win32.Registry 4.7.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
@@ -425,7 +417,6 @@ SOFTWARE.
 Microsoft.Win32.Registry.AccessControl 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -529,7 +520,6 @@ SOFTWARE.
 Microsoft.Windows.Compatibility 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -600,7 +590,6 @@ SOFTWARE.
 Namotion.Reflection 2.0.10 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 
 MIT License
 
@@ -619,7 +608,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 Newtonsoft.Json 13.0.1 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 Copyright James Newton-King 2008
 Copyright (c) 2007 James Newton-King
 Copyright (c) James Newton-King 2008
@@ -671,7 +659,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 runtime.linux-arm.runtime.native.System.IO.Ports 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -742,7 +729,6 @@ SOFTWARE.
 runtime.linux-arm64.runtime.native.System.IO.Ports 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -813,7 +799,6 @@ SOFTWARE.
 runtime.linux-x64.runtime.native.System.IO.Ports 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -884,7 +869,6 @@ SOFTWARE.
 runtime.native.System.Data.SqlClient.sni 4.7.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
@@ -938,7 +922,6 @@ SOFTWARE.
 runtime.native.System.IO.Ports 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -1009,7 +992,6 @@ SOFTWARE.
 runtime.osx-arm64.runtime.native.System.IO.Ports 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -1080,7 +1062,6 @@ SOFTWARE.
 runtime.osx-x64.runtime.native.System.IO.Ports 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -1151,7 +1132,6 @@ SOFTWARE.
 System.CodeDom 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -1222,7 +1202,6 @@ SOFTWARE.
 System.Collections.Immutable 5.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -1292,7 +1271,6 @@ SOFTWARE.
 System.ComponentModel.Composition 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -1363,7 +1341,6 @@ SOFTWARE.
 System.ComponentModel.Composition.Registration 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -1434,7 +1411,6 @@ SOFTWARE.
 System.Configuration.ConfigurationManager 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -1505,7 +1481,6 @@ SOFTWARE.
 System.Data.Odbc 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -1576,7 +1551,6 @@ SOFTWARE.
 System.Data.OleDb 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -1648,7 +1622,6 @@ System.Data.SqlClient 4.8.3 - MIT
 
 
 2008 SQL Server 2012
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
@@ -1702,7 +1675,6 @@ SOFTWARE.
 System.Diagnostics.DiagnosticSource 5.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -1772,7 +1744,6 @@ SOFTWARE.
 System.Diagnostics.EventLog 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -1876,7 +1847,6 @@ SOFTWARE.
 System.DirectoryServices 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -1947,7 +1917,6 @@ SOFTWARE.
 System.DirectoryServices.AccountManagement 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -2018,7 +1987,6 @@ SOFTWARE.
 System.DirectoryServices.Protocols 6.0.1 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -2093,7 +2061,6 @@ SOFTWARE.
 System.Drawing.Common 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -2164,7 +2131,6 @@ SOFTWARE.
 System.Formats.Asn1 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -2235,7 +2201,6 @@ SOFTWARE.
 System.IO.Packaging 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -2306,7 +2271,6 @@ SOFTWARE.
 System.IO.Ports 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -2377,7 +2341,6 @@ SOFTWARE.
 System.Management 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -2448,7 +2411,6 @@ SOFTWARE.
 System.Memory 4.5.4 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) 2011, Google Inc.
 (c) 1997-2005 Sean Eron Anderson.
@@ -2529,7 +2491,6 @@ SOFTWARE.
 System.Numerics.Vectors 4.5.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) 2011, Google Inc.
 (c) 1997-2005 Sean Eron Anderson.
@@ -2577,7 +2538,6 @@ SOFTWARE.
 System.Private.ServiceModel 4.9.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
@@ -2614,7 +2574,6 @@ SOFTWARE.
 System.Reflection.Context 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -2685,7 +2644,6 @@ SOFTWARE.
 System.Reflection.DispatchProxy 4.7.1 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
@@ -2739,7 +2697,6 @@ SOFTWARE.
 System.Reflection.Metadata 5.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -2809,7 +2766,6 @@ SOFTWARE.
 System.Runtime.Caching 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -2880,7 +2836,6 @@ SOFTWARE.
 System.Runtime.CompilerServices.Unsafe 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -2951,7 +2906,6 @@ SOFTWARE.
 System.Security.AccessControl 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -3055,7 +3009,6 @@ SOFTWARE.
 System.Security.Cryptography.ProtectedData 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -3126,7 +3079,6 @@ SOFTWARE.
 System.Security.Cryptography.Xml 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -3197,7 +3149,6 @@ SOFTWARE.
 System.Security.Permissions 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -3268,7 +3219,6 @@ SOFTWARE.
 System.Security.Principal.Windows 5.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -3338,7 +3288,6 @@ SOFTWARE.
 System.ServiceModel.Duplex 4.9.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
@@ -3375,7 +3324,6 @@ SOFTWARE.
 System.ServiceModel.Http 4.9.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
@@ -3412,7 +3360,6 @@ SOFTWARE.
 System.ServiceModel.NetTcp 4.9.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
@@ -3449,7 +3396,6 @@ SOFTWARE.
 System.ServiceModel.Primitives 4.9.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
@@ -3486,7 +3432,6 @@ SOFTWARE.
 System.ServiceModel.Security 4.9.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
@@ -3523,7 +3468,6 @@ SOFTWARE.
 System.ServiceModel.Syndication 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -3594,7 +3538,6 @@ SOFTWARE.
 System.ServiceProcess.ServiceController 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -3665,7 +3608,6 @@ SOFTWARE.
 System.Speech 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -3736,7 +3678,6 @@ SOFTWARE.
 System.Text.Encoding.CodePages 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -3807,7 +3748,6 @@ SOFTWARE.
 System.Text.Encodings.Web 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -3878,7 +3818,6 @@ SOFTWARE.
 System.Threading.AccessControl 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire
@@ -3949,7 +3888,6 @@ SOFTWARE.
 System.Threading.Tasks.Extensions 4.5.4 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) 2011, Google Inc.
 (c) 1997-2005 Sean Eron Anderson.
@@ -3997,7 +3935,6 @@ SOFTWARE.
 System.Web.Services.Description 4.9.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
@@ -4034,7 +3971,6 @@ SOFTWARE.
 System.Windows.Extensions 6.0.0 - MIT
 
 
-(c) 2008 VeriSign, Inc.
 (c) Microsoft Corporation.
 Copyright (c) Andrew Arnott
 Copyright 2018 Daniel Lemire

From 736cf3ecbf441af05baec72ac31bad9619a2b3e2 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 24 May 2022 11:14:39 -0700
Subject: [PATCH 408/645] Remove the assert and use a relatively larger
 capacity to cover possible increase of .NET reference assemblies (#17423)

---
 .../commands/utility/AddType.cs                    | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
index f084d964998..6cdfb512dce 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
@@ -685,11 +685,10 @@ private void LoadAssemblies(IEnumerable<string> assemblies)
         /// </summary>
         private static IEnumerable<PortableExecutableReference> InitDefaultRefAssemblies()
         {
-            // Define number of reference assemblies distributed with PowerShell.
-            const int maxPowershellRefAssemblies = 161;
-
-            const int capacity = maxPowershellRefAssemblies + 1;
-            var defaultRefAssemblies = new List<PortableExecutableReference>(capacity);
+            // Default reference assemblies consist of .NET reference assemblies and the 'S.M.A' assembly.
+            // Today, there are 161 .NET reference assemblies, so the needed capacity is 162, but we use 200
+            // as the initial capacity to cover the possible increase of .NET reference assemblies in future.
+            var defaultRefAssemblies = new List<PortableExecutableReference>(capacity: 200);
 
             foreach (string file in Directory.EnumerateFiles(s_netcoreAppRefFolder, "*.dll", SearchOption.TopDirectoryOnly))
             {
@@ -699,11 +698,6 @@ private static IEnumerable<PortableExecutableReference> InitDefaultRefAssemblies
             // Add System.Management.Automation.dll
             defaultRefAssemblies.Add(MetadataReference.CreateFromFile(typeof(PSObject).Assembly.Location));
 
-            // We want to avoid reallocating the internal array, so we assert if the list capacity has increased.
-            Diagnostics.Assert(
-                defaultRefAssemblies.Capacity <= capacity,
-                $"defaultRefAssemblies was resized because of insufficient initial capacity! A capacity of {defaultRefAssemblies.Count} is required.");
-
             return defaultRefAssemblies;
         }
 

From 80a207160b8aca2923eb34a064df620d073d01fa Mon Sep 17 00:00:00 2001
From: Staffan Gustafsson <staffangu@outlook.com>
Date: Wed, 25 May 2022 06:25:24 +0200
Subject: [PATCH 409/645] Start-PSPester: argument completer for -Path (#17334)

---
 build.psm1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.psm1 b/build.psm1
index d8796b78e1b..2f2f0bc2d97 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1167,6 +1167,7 @@ function Start-PSPester {
     [CmdletBinding(DefaultParameterSetName='default')]
     param(
         [Parameter(Position=0)]
+        [ArgumentCompleter({param($c,$p,$word) Get-ChildItem -Recurse -File -LiteralPath $PSScriptRoot/Test/PowerShell -filter *.tests.ps1 | Where-Object FullName -like "*$word*" })]
         [string[]]$Path = @("$PSScriptRoot/test/powershell"),
         [string]$OutputFormat = "NUnitXml",
         [string]$OutputFile = "pester-tests.xml",

From 0882737efb830d8072dc0c2830b50a74ab2166df Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 25 May 2022 14:29:47 -0700
Subject: [PATCH 410/645] Write out OSC indicator only if the stdout is not
 redirected (#17419)

---
 .../host/msh/ConsoleHostUserInterfaceProgress.cs          | 7 ++++---
 test/powershell/engine/Formatting/PSStyle.Tests.ps1       | 8 ++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs
index ff0117c6e99..a36bc096d10 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Management.Automation;
+using System.Management.Automation.Host;
 using System.Threading;
 
 using Dbg = System.Management.Automation.Diagnostics;
@@ -10,7 +11,7 @@
 namespace Microsoft.PowerShell
 {
     internal partial
-    class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInterface
+    class ConsoleHostUserInterface : PSHostUserInterface
     {
         /// <summary>
         /// Called at the end of a prompt loop to take down any progress display that might have appeared and purge any
@@ -48,7 +49,7 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt
 
                 _pendingProgress = null;
 
-                if (SupportsVirtualTerminal && PSStyle.Instance.Progress.UseOSCIndicator)
+                if (SupportsVirtualTerminal && !PSHost.IsStdOutputRedirected && PSStyle.Instance.Progress.UseOSCIndicator)
                 {
                     // OSC sequence to turn off progress indicator
                     // https://github.com/microsoft/terminal/issues/6700
@@ -99,7 +100,7 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt
             {
                 // Update the progress pane only when the timer set up the update flag or WriteProgress is completed.
                 // As a result, we do not block WriteProgress and whole script and eliminate unnecessary console locks and updates.
-                if (SupportsVirtualTerminal && PSStyle.Instance.Progress.UseOSCIndicator)
+                if (SupportsVirtualTerminal && !PSHost.IsStdOutputRedirected && PSStyle.Instance.Progress.UseOSCIndicator)
                 {
                     int percentComplete = record.PercentComplete;
                     if (percentComplete < 0)
diff --git a/test/powershell/engine/Formatting/PSStyle.Tests.ps1 b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
index aa54a63dc05..e20534223f3 100644
--- a/test/powershell/engine/Formatting/PSStyle.Tests.ps1
+++ b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
@@ -237,6 +237,14 @@ Describe 'Tests for $PSStyle automatic variable' {
             $PSStyle.Progress.MaxWidth = $maxWidth
         }
     }
+
+    It 'Do not use OSC indicator when the stdout is redirected' {
+        $pwsh = Join-Path $PSHOME 'pwsh'
+
+        ## In the case that the stdout is redirected, pwsh should not write the OSC indicator Ansi sequence.
+        $result = & $pwsh -noprofile -Command { $PSStyle.Progress.UseOSCIndicator = $true; 'hello'} | Format-List
+        $result | Out-String -Stream | Should -BeExactly 'hello'
+    }
 }
 
 Describe 'Handle strings with escape sequences in formatting' {

From 2fa20974cc3334e13aae9e824388f0feb0aae9ee Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 27 May 2022 09:52:54 -0700
Subject: [PATCH 411/645] Update script to pin to .NET 7 preview 5 version
 (#17448)

---
 DotnetRuntimeMetadata.json    |  6 +++---
 tools/UpdateDotnetRuntime.ps1 | 13 +++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 308c57cf662..e1db727ce6e 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "channel": "7.0.1xx-preview4",
+    "channel": "7.0.1xx-preview5",
     "quality": "daily",
     "qualityFallback": "preview",
-    "packageVersionPattern": "7.0.0-preview.4",
+    "packageVersionPattern": "7.0.0-preview.5",
     "sdkImageVersion": "7.0.100",
-    "nextChannel": "7.0.1xx",
+    "nextChannel": "7.0.1xx-preview5",
     "azureFeed": "",
     "sdkImageOverride": ""
   },
diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index 39bfa1ff014..a6e6ca613b9 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -227,6 +227,7 @@ function Get-DotnetUpdate {
         } else {
             $shouldUpdate = $false
             $newVersion = $latestSDKVersionString
+
             $Message = $null -eq $currentVersion.PreReleaseLabel ? "$latestSDKversion is not preview, update manually." : "No update needed."
         }
     } catch {
@@ -257,7 +258,7 @@ function Update-DevContainer {
 <#
  .DESCRIPTION Update the DotnetMetadata.json file with the latest version of the SDK
  #>
-function Update-DotnetRuntimeMetadataChannel {
+function Update-DotnetRuntimeMetadata {
     param (
         [string] $newSdk
     )
@@ -267,11 +268,15 @@ function Update-DotnetRuntimeMetadataChannel {
 
     # Transform SDK Version '7.0.100-preview.5.22263.22' -> '7.0.1xx-preview5'
     $newChannel = $sdkParts[0] + "." + $sdkParts[1] + "." + ($sdkParts[2] -replace '0','x') + $sdkParts[3]
-
     Write-Verbose -Verbose -Message "Updating DotnetRuntimeMetadata.json with channel $newChannel"
 
+    # Transform SDK Version '7.0.100-preview.5.22263.22' -> '7.0.100-preview.5'
+    $newPackageVersionPattern = $sdkParts[0] + "." + $sdkParts[1] + "." + '0-' + ($sdkParts[2] -split '-')[-1] + "." + $sdkParts[3]
+    Write-Verbose -Verbose -Message "Updating DotnetRuntimeMetadata.json with package filter $newPackageVersionPattern"
+
     $metadata = Get-Content -Raw "$PSScriptRoot/../DotnetRuntimeMetadata.json" | ConvertFrom-Json
     $metadata.sdk.channel = $newChannel
+    $metadata.sdk.packageVersionPattern = $newPackageVersionPattern
     $metadata | ConvertTo-Json | Out-File -FilePath "$PSScriptRoot/../DotnetRuntimeMetadata.json" -Force
 }
 
@@ -355,6 +360,8 @@ if ($dotnetUpdate.ShouldUpdate) {
 
     Write-Verbose -Message "Updating global.json completed." -Verbose
 
+    Update-DotnetRuntimeMetadata -newSdk $latestSdkVersion
+
     Update-PackageVersion
 
     Write-Verbose -Message "Updating project files completed." -Verbose
@@ -385,8 +392,6 @@ if ($dotnetUpdate.ShouldUpdate) {
     }
 
     Update-DevContainer
-
-    Update-DotnetRuntimeMetadataChannel -newSdk $latestSdkVersion
 }
 else {
     Write-Verbose -Verbose -Message $dotnetUpdate.Message

From e7f705adeff51c2d2c95726423cf3b4a5970b230 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Fri, 27 May 2022 20:17:53 +0200
Subject: [PATCH 412/645] Add type inference support for generic methods with
 type parameters (#16951)

---
 .../engine/parser/TypeInferenceVisitor.cs     | 68 ++++++++++++++++---
 .../engine/Api/TypeInference.Tests.ps1        |  6 ++
 2 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs b/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
index d1e3c7155d7..fa4a8a23ac1 100644
--- a/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
+++ b/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
@@ -1494,8 +1494,16 @@ private IEnumerable<PSTypeName> InferTypesFrom(MemberExpressionAst memberExpress
                 return Array.Empty<PSTypeName>();
             }
 
+            bool isInvokeMemberExpressionAst = false;
             var res = new List<PSTypeName>(10);
-            bool isInvokeMemberExpressionAst = memberExpressionAst is InvokeMemberExpressionAst;
+            IList<ITypeName> genericTypeArguments = null;
+
+            if (memberExpressionAst is InvokeMemberExpressionAst invokeMemberExpression)
+            {
+                isInvokeMemberExpressionAst = true;
+                genericTypeArguments = invokeMemberExpression.GenericTypeArguments;
+            }
+
             var maybeWantDefaultCtor = isStatic
                                        && isInvokeMemberExpressionAst
                                        && memberAsStringConst.Value.EqualsOrdinalIgnoreCase("new");
@@ -1512,7 +1520,7 @@ private IEnumerable<PSTypeName> InferTypesFrom(MemberExpressionAst memberExpress
 
                 var members = _context.GetMembersByInferredType(type, isStatic, filter: null);
 
-                AddTypesOfMembers(type, memberNameList, members, ref maybeWantDefaultCtor, isInvokeMemberExpressionAst, res);
+                AddTypesOfMembers(type, memberNameList, members, ref maybeWantDefaultCtor, isInvokeMemberExpressionAst, genericTypeArguments, res);
 
                 // We didn't find any constructors but they used [T]::new() syntax
                 if (maybeWantDefaultCtor)
@@ -1533,7 +1541,7 @@ private void GetTypesOfMembers(
             List<PSTypeName> inferredTypes)
         {
             var memberNamesToCheck = new List<string> { memberName };
-            AddTypesOfMembers(thisType, memberNamesToCheck, members, ref maybeWantDefaultCtor, isInvokeMemberExpressionAst, inferredTypes);
+            AddTypesOfMembers(thisType, memberNamesToCheck, members, ref maybeWantDefaultCtor, isInvokeMemberExpressionAst, genericTypeArguments: null, inferredTypes);
         }
 
         private void AddTypesOfMembers(
@@ -1542,6 +1550,7 @@ private void AddTypesOfMembers(
             IList<object> members,
             ref bool maybeWantDefaultCtor,
             bool isInvokeMemberExpressionAst,
+            IList<ITypeName> genericTypeArguments,
             List<PSTypeName> result)
         {
             for (int i = 0; i < memberNamesToCheck.Count; i++)
@@ -1549,7 +1558,7 @@ private void AddTypesOfMembers(
                 string memberNameToCheck = memberNamesToCheck[i];
                 foreach (var member in members)
                 {
-                    if (TryGetTypeFromMember(currentType, member, memberNameToCheck, ref maybeWantDefaultCtor, isInvokeMemberExpressionAst, result, memberNamesToCheck))
+                    if (TryGetTypeFromMember(currentType, member, memberNameToCheck, ref maybeWantDefaultCtor, isInvokeMemberExpressionAst, genericTypeArguments, result, memberNamesToCheck))
                     {
                         break;
                     }
@@ -1563,6 +1572,7 @@ private bool TryGetTypeFromMember(
             string memberName,
             ref bool maybeWantDefaultCtor,
             bool isInvokeMemberExpressionAst,
+            IList<ITypeName> genericTypeArguments,
             List<PSTypeName> result,
             List<string> memberNamesToCheck)
         {
@@ -1588,7 +1598,7 @@ private bool TryGetTypeFromMember(
                     if (methodCacheEntry[0].method.Name.Equals(memberName, StringComparison.OrdinalIgnoreCase))
                     {
                         maybeWantDefaultCtor = false;
-                        AddTypesFromMethodCacheEntry(methodCacheEntry, result, isInvokeMemberExpressionAst);
+                        AddTypesFromMethodCacheEntry(methodCacheEntry, genericTypeArguments, result, isInvokeMemberExpressionAst);
                         return true;
                     }
 
@@ -1637,7 +1647,7 @@ private bool TryGetTypeFromMember(
                         case PSMethod m:
                             if (m.adapterData is DotNetAdapter.MethodCacheEntry methodCacheEntry)
                             {
-                                AddTypesFromMethodCacheEntry(methodCacheEntry, result, isInvokeMemberExpressionAst);
+                                AddTypesFromMethodCacheEntry(methodCacheEntry, genericTypeArguments, result, isInvokeMemberExpressionAst);
                                 return true;
                             }
 
@@ -1701,16 +1711,58 @@ private bool TryGetTypeFromMember(
 
         private static void AddTypesFromMethodCacheEntry(
             DotNetAdapter.MethodCacheEntry methodCacheEntry,
+            IList<ITypeName> genericTypeArguments,
             List<PSTypeName> result,
             bool isInvokeMemberExpressionAst)
         {
             if (isInvokeMemberExpressionAst)
             {
+                Type[] resolvedTypeArguments = null;
+                if (genericTypeArguments is not null)
+                {
+                    resolvedTypeArguments = new Type[genericTypeArguments.Count];
+                    for (int i = 0; i < genericTypeArguments.Count; i++)
+                    {
+                        Type resolvedType = genericTypeArguments[i].GetReflectionType();
+                        if (resolvedType is null)
+                        {
+                            // If any generic type argument cannot be resolved yet,
+                            // we simply assume this information is unavailable.
+                            resolvedTypeArguments = null;
+                            break;
+                        }
+
+                        resolvedTypeArguments[i] = resolvedType;
+                    }
+                }
+
+                var tempResult = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "System.Void" };
                 foreach (var method in methodCacheEntry.methodInformationStructures)
                 {
-                    if (method.method is MethodInfo methodInfo && !methodInfo.ReturnType.ContainsGenericParameters)
+                    if (method.method is MethodInfo methodInfo)
                     {
-                        result.Add(new PSTypeName(methodInfo.ReturnType));
+                        Type retType = null;
+                        if (!methodInfo.ReturnType.ContainsGenericParameters)
+                        {
+                            retType = methodInfo.ReturnType;
+                        }
+                        else if (resolvedTypeArguments is not null)
+                        {
+                            try
+                            {
+                                retType = methodInfo.MakeGenericMethod(resolvedTypeArguments).ReturnType;
+                            }
+                            catch
+                            {
+                                // If we can't build the generic method then just skip it to retain other completion results.
+                                continue;
+                            }
+                        }
+
+                        if (retType is not null && tempResult.Add(retType.FullName))
+                        {
+                            result.Add(new PSTypeName(retType));
+                        }
                     }
                 }
 
diff --git a/test/powershell/engine/Api/TypeInference.Tests.ps1 b/test/powershell/engine/Api/TypeInference.Tests.ps1
index 56c4ad074bc..a98b04d150f 100644
--- a/test/powershell/engine/Api/TypeInference.Tests.ps1
+++ b/test/powershell/engine/Api/TypeInference.Tests.ps1
@@ -1227,6 +1227,12 @@ Describe "Type inference Tests" -tags "CI" {
 
         $res.Count | Should -Be BaseType
     }
+
+    It 'Infers type of generic method invocation with type parameters' {
+        $res = [AstTypeInference]::InferTypeOf( { [array]::Empty[int]() }.Ast)
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be 'System.Int32[]'
+    }
 }
 
 Describe "AstTypeInference tests" -Tags CI {

From 5b6407741cd2b85409538c1b99e858846a1259e7 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Fri, 27 May 2022 12:41:44 -0700
Subject: [PATCH 413/645] Publish preview versions of mariner to preview repo
 (#17451)

---
 tools/packages.microsoft.com/mapping.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/packages.microsoft.com/mapping.json b/tools/packages.microsoft.com/mapping.json
index fa70f465a0d..5e468041253 100644
--- a/tools/packages.microsoft.com/mapping.json
+++ b/tools/packages.microsoft.com/mapping.json
@@ -18,7 +18,14 @@
       {
           "url": "cbl-mariner-2.0-prod-Microsoft-x86_64",
           "distribution" : ["bionic"],
-          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm"
+          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm",
+          "channel" : "stable"
+      },
+      {
+          "url": "cbl-mariner-2.0-preview-Microsoft-x86_64",
+          "distribution" : ["bionic"],
+          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm",
+          "channel" : "preview"
       },
       {
           "distribution" : ["stretch"],

From 12de67ca5da2a56514ece5644b5bf83cd3ad6d88 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 2 Jun 2022 09:20:32 -0700
Subject: [PATCH 414/645] Fix formatting to act appropriately when the style of
 table header or list label is empty string (#17463)

---
 .../FormatAndOutput/common/ListWriter.cs      | 21 ++++++++----
 .../FormatAndOutput/common/PSStyle.cs         |  5 +++
 .../FormatAndOutput/common/TableWriter.cs     | 12 +++++--
 .../engine/Formatting/PSStyle.Tests.ps1       | 32 +++++++++++++++++++
 4 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
index 786a25c2d7b..407c0d5dca8 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
@@ -227,6 +227,10 @@ private void WriteSingleLineHelper(string prependString, string line, LineOutput
             // The padding to use in the lines after the first.
             string headPadding = null;
 
+            // The VT style used for the list label.
+            string style = PSStyle.Instance.Formatting.FormatAccent;
+            string reset = PSStyle.Instance.Reset;
+
             // display the string collection
             for (int k = 0; k < sc.Count; k++)
             {
@@ -235,18 +239,21 @@ private void WriteSingleLineHelper(string prependString, string line, LineOutput
 
                 if (k == 0)
                 {
-                    if (string.IsNullOrWhiteSpace(prependString))
+                    if (string.IsNullOrWhiteSpace(prependString) || style == string.Empty)
                     {
-                        // Sometimes 'prependString' is just padding white spaces.
-                        // We don't need to add formatting escape sequences in such a case.
+                        // - Sometimes 'prependString' is just padding white spaces, and we don't
+                        //   need to add formatting escape sequences in such a case.
+                        // - Otherwise, if the style is an empty string, then the user has chosen
+                        //   to not apply a style to the list label.
                         _cachedBuilder.Append(prependString).Append(str);
                     }
                     else
                     {
+                        // Apply the style to the list label.
                         _cachedBuilder
-                            .Append(PSStyle.Instance.Formatting.FormatAccent)
+                            .Append(style)
                             .Append(prependString)
-                            .Append(PSStyle.Instance.Reset)
+                            .Append(reset)
                             .Append(str);
                     }
                 }
@@ -257,9 +264,9 @@ private void WriteSingleLineHelper(string prependString, string line, LineOutput
                     _cachedBuilder.Append(headPadding).Append(str);
                 }
 
-                if (str.Contains(ValueStringDecorated.ESC) && !str.EndsWith(PSStyle.Instance.Reset))
+                if (str.Contains(ValueStringDecorated.ESC) && !str.EndsWith(reset))
                 {
-                    _cachedBuilder.Append(PSStyle.Instance.Reset);
+                    _cachedBuilder.Append(reset);
                 }
 
                 lo.WriteLine(_cachedBuilder.ToString());
diff --git a/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
index 3a641edc429..3a5dcb36f0b 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
@@ -698,6 +698,11 @@ private PSStyle()
 
         private static string ValidateNoContent(string text)
         {
+            if (text is null)
+            {
+                throw new ArgumentNullException(nameof(text));
+            }
+
             var decorartedString = new ValueStringDecorated(text);
             if (decorartedString.ContentLength > 0)
             {
diff --git a/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs
index eae65766bb9..eb540f4904b 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs
@@ -151,9 +151,12 @@ internal int GenerateHeader(string[] values, LineOutput lo)
             }
             else if (_header != null)
             {
+                string style = PSStyle.Instance.Formatting.TableHeader;
+                string reset = PSStyle.Instance.Reset;
+
                 foreach (string line in _header)
                 {
-                    lo.WriteLine(PSStyle.Instance.Formatting.TableHeader + line + PSStyle.Instance.Reset);
+                    lo.WriteLine(style == string.Empty ? line : style + line + reset);
                 }
 
                 return _header.Count;
@@ -226,6 +229,9 @@ internal void GenerateRow(string[] values, LineOutput lo, bool multiLine, ReadOn
                 }
             }
 
+            string style = PSStyle.Instance.Formatting.TableHeader;
+            string reset = PSStyle.Instance.Reset;
+
             if (multiLine)
             {
                 foreach (string line in GenerateTableRow(values, currentAlignment, lo.DisplayCells))
@@ -233,7 +239,7 @@ internal void GenerateRow(string[] values, LineOutput lo, bool multiLine, ReadOn
                     generatedRows?.Add(line);
                     if (isHeader)
                     {
-                        lo.WriteLine(PSStyle.Instance.Formatting.TableHeader + line + PSStyle.Instance.Reset);
+                        lo.WriteLine(style == string.Empty ? line : style + line + reset);
                     }
                     else
                     {
@@ -247,7 +253,7 @@ internal void GenerateRow(string[] values, LineOutput lo, bool multiLine, ReadOn
                 generatedRows?.Add(line);
                 if (isHeader)
                 {
-                    lo.WriteLine(PSStyle.Instance.Formatting.TableHeader + line + PSStyle.Instance.Reset);
+                    lo.WriteLine(style == string.Empty ? line : style + line + reset);
                 }
                 else
                 {
diff --git a/test/powershell/engine/Formatting/PSStyle.Tests.ps1 b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
index e20534223f3..6855ea713c1 100644
--- a/test/powershell/engine/Formatting/PSStyle.Tests.ps1
+++ b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
@@ -151,6 +151,22 @@ Describe 'Tests for $PSStyle automatic variable' {
         }
     }
 
+    It '$PSStyle.Formatting.FormatAccent is ignored when it''s set to be an empty string' {
+        $old = $PSStyle.Formatting.FormatAccent
+        $oldRender = $PSStyle.OutputRendering
+
+        try {
+            $PSStyle.OutputRendering = 'Ansi'
+            $PSStyle.Formatting.FormatAccent = ''
+            $out = $PSVersionTable | Format-List | Out-String
+            $out.Contains("`e[") | Should -BeFalse
+        }
+        finally {
+            $PSStyle.OutputRendering = $oldRender
+            $PSStyle.Formatting.FormatAccent = $old
+        }
+    }
+
     It '$PSStyle.Formatting.TableHeader is applied to Format-Table' {
         $old = $PSStyle.Formatting.TableHeader
         $oldRender = $PSStyle.OutputRendering
@@ -167,6 +183,22 @@ Describe 'Tests for $PSStyle automatic variable' {
         }
     }
 
+    It '$PSStyle.Formatting.TableHeader is ignored when it''s set to be an empty string' {
+        $old = $PSStyle.Formatting.TableHeader
+        $oldRender = $PSStyle.OutputRendering
+
+        try {
+            $PSStyle.OutputRendering = 'Ansi'
+            $PSStyle.Formatting.TableHeader = ''
+            $out = $PSVersionTable | Format-Table | Out-String
+            $out.Contains("`e[") | Should -BeFalse
+        }
+        finally {
+            $PSStyle.OutputRendering = $oldRender
+            $PSStyle.Formatting.TableHeader = $old
+        }
+    }
+
     It 'Should fail if setting formatting contains printable characters: <member>.<submember>' -TestCases @(
         @{ Submember = 'Reset' }
         @{ Submember = 'BlinkOff' }

From d99626927d028020fc285850cb3edde2c4ee1f25 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 3 Jun 2022 09:25:24 -0700
Subject: [PATCH 415/645] Update `Get-Error` test to not depend on DNS APIs
 (#17471)

---
 .../Get-Error.Tests.ps1                            | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Error.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Error.Tests.ps1
index 0627de64b3a..624649fdfc4 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Error.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Error.Tests.ps1
@@ -107,23 +107,15 @@ Describe 'Get-Error tests' -Tag CI {
     }
 
     It 'Get-Error adds ExceptionType for Exceptions' {
+
         try {
-            [System.Net.DNS]::GetHostByName((New-Guid))
+            throw [ArgumentException] 'myexception'
         }
         catch {
         }
 
         $out = Get-Error | Out-String
-        $out | Should -BeLikeExactly '*Type*'
-
-        if ($IsWindows) {
-            $expectedExceptionType = "System.Management.Automation.ParentContainsErrorRecordException"
-        }
-        else {
-            $expectedExceptionType = "System.Net.Internals.SocketExceptionFactory+ExtendedSocketException"
-        }
-
-        $out | Should -BeLikeExactly "*$expectedExceptionType*"
+        $out | Should -Match "Type\s+:\s(.\[\d+m)?System.ArgumentException"
     }
 
     It 'Get-Error uses Error color for Message and PositionMessage members' {

From ad7647bd7e325f4ed18f2b54b2b8ae816d3c15a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Jun 2022 10:35:42 -0700
Subject: [PATCH 416/645] Bump `NJsonSchema` from 10.7.1 to 10.7.2 (#17475)

---
 .../Microsoft.PowerShell.Commands.Utility.csproj                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 4da9862aec4..454bd026391 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -34,7 +34,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-1.final" />
     <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.4.22229.4" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.4.22229.4" />
-    <PackageReference Include="NJsonSchema" Version="10.7.1" />
+    <PackageReference Include="NJsonSchema" Version="10.7.2" />
   </ItemGroup>
 
 </Project>

From 0bb290844bfdfe8f58296ccc4c96122b64d02361 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Jun 2022 13:39:38 -0700
Subject: [PATCH 417/645] Bump Microsoft.CodeAnalysis.NetAnalyzers (#17476)

Bumps [Microsoft.CodeAnalysis.NetAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 7.0.0-preview1.22252.2 to 7.0.0-preview1.22302.1.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/main/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/commits)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.NetAnalyzers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index 9c16cc7f9e2..443e82b1f68 100644
--- a/Analyzers.props
+++ b/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="7.0.0-preview1.22252.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22302.1" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From c798f74056a4e8a8af3a870f23b5445068aa37b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <marcandre.moreau@gmail.com>
Date: Sat, 4 Jun 2022 11:20:59 -0400
Subject: [PATCH 418/645] Fix native library loading for osx-arm64 (#17365)

---
 .../CoreCLR/CorePsAssemblyLoadContext.cs                     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
index fad311df98d..c87815d15d9 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
@@ -232,6 +232,9 @@ internal IEnumerable<Assembly> GetAssembly(string namespaceQualifiedTypeName)
         ///                     |
         ///                     |--- 'osx-x64' subfolder
         ///                     |       |--- native.dylib
+        ///                     |
+        ///                     |--- 'osx-arm64' subfolder
+        ///                     |       |--- native.dylib
         /// </summary>
         internal static IntPtr NativeDllHandler(Assembly assembly, string libraryName)
         {
@@ -552,7 +555,7 @@ private static string GetNativeDllSubFolderName(out string ext)
             }
             else if (Platform.IsMacOS)
             {
-                folderName = "osx-x64";
+                folderName = "osx-" + processArch;
                 ext = ".dylib";
             }
 

From c5d31c9e10b4f581aad4c75eccaaf111fa0a07fd Mon Sep 17 00:00:00 2001
From: Shuangchi He <34329208+Yulv-git@users.noreply.github.com>
Date: Tue, 7 Jun 2022 00:55:33 +0800
Subject: [PATCH 419/645] Correct spelling in Comments and tests (#17480)

---
 build.psm1                                                  | 2 +-
 test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1  | 2 +-
 .../Language/Operators/PipelineChainOperator.Tests.ps1      | 2 +-
 test/powershell/Language/Parser/Parser.Tests.ps1            | 2 +-
 .../Microsoft.PowerShell.Management/Copy-Item.Tests.ps1     | 4 ++--
 .../Microsoft.PowerShell.Utility/Wait-Event.Tests.ps1       | 2 +-
 test/tools/Modules/PSSysLog/PSSysLog.psm1                   | 6 +++---
 tools/UpdateDotnetRuntime.ps1                               | 2 +-
 tools/performance/JIT.Regions.xml                           | 4 ++--
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 2f2f0bc2d97..c5ceec38c4e 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1561,7 +1561,7 @@ function Publish-TestResults
 
         # If we attempt to upload a result file which has no test cases in it, then vsts will produce a warning
         # so check to be sure we actually have a result file that contains test cases to upload.
-        # If the the "test-case" count is greater than 0, then we have results.
+        # If the "test-case" count is greater than 0, then we have results.
         # Regardless, we want to upload this as an artifact, so this logic doesn't pertain to that.
         if ( @(([xml](Get-Content $Path)).SelectNodes(".//test-case")).Count -gt 0 -or $Type -eq 'XUnit' ) {
             Write-Host "##vso[results.publish type=$Type;mergeResults=true;runTitle=$Title;publishRunAttachments=true;resultFiles=$tempFilePath;failTaskOnFailedTests=true]"
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index f984e3b72c0..6844ad1a6cb 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -877,7 +877,7 @@ switch ($x)
                 @{ inputStr = '[math].G'; expected = 'GenericParameterAttributes'; setup = $null }
                 @{ inputStr = '[Environment+specialfolder]::App'; expected = 'ApplicationData'; setup = $null }
                 @{ inputStr = 'icm {get-pro'; expected = 'Get-Process'; setup = $null }
-                @{ inputStr = 'write-ouput (get-pro'; expected = 'Get-Process'; setup = $null }
+                @{ inputStr = 'write-output (get-pro'; expected = 'Get-Process'; setup = $null }
                 @{ inputStr = 'iex "get-pro'; expected = '"Get-Process"'; setup = $null }
                 @{ inputStr = '$variab'; expected = '$variableA'; setup = { $variableB = 2; $variableA = 1 } }
                 @{ inputStr = 'a -'; expected = '-keys'; setup = { function a {param($keys) $a} } }
diff --git a/test/powershell/Language/Operators/PipelineChainOperator.Tests.ps1 b/test/powershell/Language/Operators/PipelineChainOperator.Tests.ps1
index e2e54c32170..15340dd18e6 100644
--- a/test/powershell/Language/Operators/PipelineChainOperator.Tests.ps1
+++ b/test/powershell/Language/Operators/PipelineChainOperator.Tests.ps1
@@ -47,7 +47,7 @@ Describe "Experimental Feature: && and || operators - Feature-Enabled" -Tag CI {
             @{ Statement = 'testexe -returncode -1 || testexe -returncode -2 && testexe -echoargs "A"'; Output = @('-1', '-2') }
             @{ Statement = 'testexe -returncode -1 || testexe -returncode -2 || testexe -echoargs "B"'; Output = @('-1', '-2', 'Arg 0 is <B>') }
 
-            # Native command and succesful cmdlet
+            # Native command and successful cmdlet
             @{ Statement = 'Test-SuccessfulCommand && testexe -returncode 0'; Output = @('SUCCESS', '0') }
             @{ Statement = 'testexe -returncode 0 && Test-SuccessfulCommand'; Output = @('0', 'SUCCESS') }
             @{ Statement = 'Test-SuccessfulCommand && testexe -returncode 1'; Output = @('SUCCESS', '1') }
diff --git a/test/powershell/Language/Parser/Parser.Tests.ps1 b/test/powershell/Language/Parser/Parser.Tests.ps1
index 0368dfe9c49..3c38dc0dca0 100644
--- a/test/powershell/Language/Parser/Parser.Tests.ps1
+++ b/test/powershell/Language/Parser/Parser.Tests.ps1
@@ -143,7 +143,7 @@ Describe "ParserTests (admin\monad\tests\monad\src\engine\core\ParserTests.cs)"
         { ExecuteCommand "(" } | Should -Throw -ErrorId "IncompleteParseException"
     }
 
-    It "Throws an exception if the the first statement starts with an empty pipe element (line 188)" {
+    It "Throws an exception if the first statement starts with an empty pipe element (line 188)" {
         { ExecuteCommand "| Get-Location" } | Should -Throw -ErrorId "ParseException"
     }
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Copy-Item.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Copy-Item.Tests.ps1
index 7ee3677b5bd..1ec37b9c5b5 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Copy-Item.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Copy-Item.Tests.ps1
@@ -813,7 +813,7 @@ Describe "Copy-Item remotely bug fixes" -Tags "Feature" {
             # Copy file to session
             Copy-Item -Path "TestDrive:\Source\testFile1.txt" -Destination "$TestDrive\Destination\testFile1.txt" -ToSession $s
 
-            # Validate the the file was overwritten
+            # Validate the file was overwritten
             $fileContent = Get-Content "TestDrive:\Destination\testFile1.txt" -ErrorAction SilentlyContinue -Raw
             $fileContent | Should -Match $newContent
         }
@@ -823,7 +823,7 @@ Describe "Copy-Item remotely bug fixes" -Tags "Feature" {
             # Copy file to session
             Copy-Item -Path "$TestDrive\Source\testFile1.txt" -Destination "TestDrive:\Destination\testFile1.txt" -FromSession $s
 
-            # Validate the the file was overwritten
+            # Validate the file was overwritten
             $fileContent = Get-Content "TestDrive:\Destination\testFile1.txt" -ErrorAction SilentlyContinue -Raw
             $fileContent | Should -Match $newContent
         }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Wait-Event.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Wait-Event.Tests.ps1
index 0e9e806002e..19628138e98 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Wait-Event.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Wait-Event.Tests.ps1
@@ -6,7 +6,7 @@ Describe "Wait-Event" -Tags "CI" {
 	It "Should time out when it does not receive a FakeEvent" {
 	    # Don't depend on Measure-Command
 $stopwatch = [System.Diagnostics.Stopwatch]::startNew()
-# Testing the the timeout, so wait for an event that will never be
+# Testing the timeout, so wait for an event that will never be
 # raised because it is fake
 Wait-Event -Timeout 1 -SourceIdentifier "FakeEvent"
 $stopwatch.Stop()
diff --git a/test/tools/Modules/PSSysLog/PSSysLog.psm1 b/test/tools/Modules/PSSysLog/PSSysLog.psm1
index 00dd74be5af..4dd0da0ade2 100644
--- a/test/tools/Modules/PSSysLog/PSSysLog.psm1
+++ b/test/tools/Modules/PSSysLog/PSSysLog.psm1
@@ -38,7 +38,7 @@ log show ./system.logarchive/ --info --predicate 'process == "pwsh"' >pwsh.log.t
 Parsing Notes:
 * Sample contains 6.0.1 content (which is out of date) revise with 6.1.0 preview
 * Ensure analytic data is considered when parsing; specifically Provider_Lifecycle:ProviderStart.Method.Informational
-* Multi-line output is expected. Parsing needs to detect the timestamp at the begining
+* Multi-line output is expected. Parsing needs to detect the timestamp at the beginning
 of a line and append subsequent lines to the message until the next 'log' line is found.
 * Header lines need to be skipped.
 
@@ -564,7 +564,7 @@ function ConvertFrom-SysLog
     PS> $time = [DateTime]::Parse('1/19/2018 1:26:49 PM')
     PS> Get-PSSysLog -id 'powershell' -logPath '/var/log/syslog' -After $time
 
-    Gets log entries with the id 'powershell' that occured on or after a specific date/time
+    Gets log entries with the id 'powershell' that occurred on or after a specific date/time
 
 .NOTES
     This function reads syslog entries using Get-Content, filters based on the id, and
@@ -908,7 +908,7 @@ function Export-PSOsLog
             Write-Output $log
         }
         else {
-            throw "did not recieve at least $MinimumCount records but $($logToCount.Count) instead."
+            throw "did not receive at least $MinimumCount records but $($logToCount.Count) instead."
         }
     } -TimeoutInMilliseconds $TimeoutInMilliseconds -IntervalInMilliseconds $IntervalInMilliseconds -LogErrorSb {
         $log = Start-NativeExecution -command {log show --info @extraParams}
diff --git a/tools/UpdateDotnetRuntime.ps1 b/tools/UpdateDotnetRuntime.ps1
index a6e6ca613b9..339153bcf0c 100644
--- a/tools/UpdateDotnetRuntime.ps1
+++ b/tools/UpdateDotnetRuntime.ps1
@@ -231,7 +231,7 @@ function Get-DotnetUpdate {
             $Message = $null -eq $currentVersion.PreReleaseLabel ? "$latestSDKversion is not preview, update manually." : "No update needed."
         }
     } catch {
-        Write-Verbose -Verbose "Error occured: $_.message"
+        Write-Verbose -Verbose "Error occurred: $_.message"
         $shouldUpdate = $false
         $newVersion = $null
         Write-Error "Error while checking .NET SDK update: $($_.message)"
diff --git a/tools/performance/JIT.Regions.xml b/tools/performance/JIT.Regions.xml
index a6b4f072da4..9e339c11bbb 100644
--- a/tools/performance/JIT.Regions.xml
+++ b/tools/performance/JIT.Regions.xml
@@ -3,8 +3,8 @@
 <!-- Created by Alois Kraus. Free for public use.
    The JIT time is determined by the MethodJitStart event and the directly on this thread following MethodLoadUnload event which signals when the JIT compilation for this
    method is complete.
-   Unfortunately the Region sums as it is currently in WPA it will sum not the JIT times of all threads but if e.g. 2 threads JIT for one second each then the WPA sum accross all threads will be only 1s.
-   WPA seems to sum on a timeline only the active time accross all threads and uses this as sum which is not a good measure to compare results. This should be changed although this logic might
+   Unfortunately the Region sums as it is currently in WPA it will sum not the JIT times of all threads but if e.g. 2 threads JIT for one second each then the WPA sum across all threads will be only 1s.
+   WPA seems to sum on a timeline only the active time across all threads and uses this as sum which is not a good measure to compare results. This should be changed although this logic might
    be well suited for regions where each region signals a bottleneck on which others have to wait e.g. during boot.
 -->
 <InstrumentationManifest>

From ecc97c11addb9703125cb3240cf57e7eef754bf2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 6 Jun 2022 09:56:47 -0700
Subject: [PATCH 420/645] Update the cgmanifest (#17478)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 tools/cgmanifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 0c61a6002a4..1f792a61def 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -265,7 +265,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "NJsonSchema",
-          "Version": "10.7.1"
+          "Version": "10.7.2"
         }
       },
       "DevelopmentDependency": false

From 8cc39848bcd4fb98517adc79cdbe60234b375c59 Mon Sep 17 00:00:00 2001
From: Shuangchi He <34329208+Yulv-git@users.noreply.github.com>
Date: Tue, 7 Jun 2022 01:14:53 +0800
Subject: [PATCH 421/645] Fix some typos in source code (#17481)

---
 .../ManagementList/Common/KeyboardHelp.cs                     | 2 +-
 .../ManagementList/Common/ListOrganizerItem.cs                | 2 +-
 .../FilterProviders/FilterRuleTemplateSelector.cs             | 2 +-
 .../commandHelpers/HelpWindowHelper.cs                        | 2 +-
 .../commandHelpers/ShowCommandHelper.cs                       | 2 +-
 .../commands/management/Eventlog.cs                           | 2 +-
 .../commands/management/GetContentCommand.cs                  | 2 +-
 .../commands/utility/WebCmdlet/ConvertFromJsonCommand.cs      | 2 +-
 src/Microsoft.PowerShell.ScheduledJob/ScheduledJobStore.cs    | 2 +-
 src/Microsoft.WSMan.Management/CurrentConfigurations.cs       | 2 +-
 src/Schemas/PSMaml/Maml_HTML_Style.xsl                        | 4 ++--
 .../FormatAndOutput/common/DisplayDatabase/FormatTable.cs     | 4 ++--
 .../FormatAndOutput/common/ListWriter.cs                      | 2 +-
 .../FormatAndOutput/common/TableWriter.cs                     | 2 +-
 .../engine/ComInterop/ComRuntimeHelpers.cs                    | 2 +-
 .../engine/ComInterop/VarEnumSelector.cs                      | 2 +-
 src/System.Management.Automation/engine/CommandDiscovery.cs   | 2 +-
 src/System.Management.Automation/engine/CommandSearcher.cs    | 2 +-
 src/System.Management.Automation/engine/CoreAdapter.cs        | 2 +-
 src/System.Management.Automation/engine/ExternalScriptInfo.cs | 2 +-
 .../engine/Modules/PSModuleInfo.cs                            | 2 +-
 .../engine/NativeCommandProcessor.cs                          | 2 +-
 src/System.Management.Automation/engine/TransactedString.cs   | 2 +-
 .../engine/hostifaces/ConnectionBase.cs                       | 2 +-
 src/System.Management.Automation/engine/hostifaces/History.cs | 2 +-
 .../engine/hostifaces/LocalConnection.cs                      | 2 +-
 .../engine/hostifaces/NativeCultureResolver.cs                | 2 +-
 .../engine/hostifaces/PSDataCollection.cs                     | 2 +-
 .../engine/hostifaces/PowerShell.cs                           | 4 ++--
 .../engine/hostifaces/RunspacePoolInternal.cs                 | 2 +-
 .../engine/hostifaces/pipelinebase.cs                         | 2 +-
 .../engine/interpreter/ControlFlowInstructions.cs             | 2 +-
 src/System.Management.Automation/engine/lang/scriptblock.cs   | 2 +-
 src/System.Management.Automation/engine/parser/Parser.cs      | 2 +-
 .../engine/remoting/client/Job.cs                             | 4 ++--
 .../engine/remoting/client/Job2.cs                            | 2 +-
 .../client/clientremotesessionprotocolstatemachine.cs         | 2 +-
 .../engine/remoting/client/remotepipeline.cs                  | 2 +-
 .../engine/remoting/client/remoterunspace.cs                  | 2 +-
 .../engine/remoting/commands/PushRunspaceCommand.cs           | 2 +-
 .../engine/remoting/commands/ReceivePSSession.cs              | 4 ++--
 .../engine/remoting/fanin/InitialSessionStateProvider.cs      | 2 +-
 .../remoting/server/ServerSteppablePipelineSubscriber.cs      | 2 +-
 .../engine/remoting/server/serverremotesession.cs             | 2 +-
 src/System.Management.Automation/help/BaseCommandHelpInfo.cs  | 2 +-
 src/System.Management.Automation/help/HelpUtils.cs            | 2 +-
 src/System.Management.Automation/help/MamlCommandHelpInfo.cs  | 2 +-
 src/System.Management.Automation/help/MamlNode.cs             | 2 +-
 src/System.Management.Automation/help/PSClassHelpProvider.cs  | 2 +-
 src/System.Management.Automation/help/ProviderHelpInfo.cs     | 2 +-
 .../namespaces/FileSystemContentStream.cs                     | 2 +-
 .../namespaces/FileSystemProvider.cs                          | 2 +-
 .../namespaces/FileSystemSecurity.cs                          | 2 +-
 .../namespaces/LocationGlobber.cs                             | 2 +-
 .../namespaces/TransactedRegistryKey.cs                       | 2 +-
 src/System.Management.Automation/utils/ClrFacade.cs           | 2 +-
 .../utils/tracing/SysLogProvider.cs                           | 2 +-
 src/powershell-native/Install-PowerShellRemoting.ps1          | 4 ++--
 58 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/Common/KeyboardHelp.cs b/src/Microsoft.Management.UI.Internal/ManagementList/Common/KeyboardHelp.cs
index 0d174fb25ed..386b33996c1 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/Common/KeyboardHelp.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/Common/KeyboardHelp.cs
@@ -106,7 +106,7 @@ public static FocusNavigationDirection GetNavigationDirection(DependencyObject e
         /// <summary>
         /// Determines if the control key is pressed.
         /// </summary>
-        /// <returns>True if a control is is pressed.</returns>
+        /// <returns>True if a control is pressed.</returns>
         public static bool IsControlPressed()
         {
             if ((Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control)
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/Common/ListOrganizerItem.cs b/src/Microsoft.Management.UI.Internal/ManagementList/Common/ListOrganizerItem.cs
index 469ed5aec77..24ff69bc35b 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/Common/ListOrganizerItem.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/Common/ListOrganizerItem.cs
@@ -153,7 +153,7 @@ private void RevertTextAndChangeFromEditToDisplayMode()
         private void ChangeFromEditToDisplayMode()
         {
             // NOTE : This is to resolve a race condition where clicking
-            // on the rename button causes the the edit box to change and
+            // on the rename button causes the edit box to change and
             // then have re-toggle.
             DependencyObject d = Mouse.DirectlyOver as DependencyObject;
             if (d == null || !(this.renameButton.IsAncestorOf(d) && Mouse.LeftButton == MouseButtonState.Pressed))
diff --git a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRuleTemplateSelector.cs b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRuleTemplateSelector.cs
index fc40c3c5768..0381ef0e63c 100644
--- a/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRuleTemplateSelector.cs
+++ b/src/Microsoft.Management.UI.Internal/ManagementList/FilterProviders/FilterRuleTemplateSelector.cs
@@ -26,7 +26,7 @@ public IDictionary<Type, DataTemplate> TemplateDictionary
         }
 
         /// <summary>
-        /// Selects a template based upon the type of the item and and the
+        /// Selects a template based upon the type of the item and the
         /// corresponding template that is registered in the TemplateDictionary.
         /// </summary>
         /// <param name="item">
diff --git a/src/Microsoft.Management.UI.Internal/commandHelpers/HelpWindowHelper.cs b/src/Microsoft.Management.UI.Internal/commandHelpers/HelpWindowHelper.cs
index efed820e71c..ddb9ab191ae 100644
--- a/src/Microsoft.Management.UI.Internal/commandHelpers/HelpWindowHelper.cs
+++ b/src/Microsoft.Management.UI.Internal/commandHelpers/HelpWindowHelper.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.PowerShell.Commands.Internal
 {
     /// <summary>
-    /// Implements thw WPF window part of the the ShowWindow option of get-help.
+    /// Implements thw WPF window part of the ShowWindow option of get-help.
     /// </summary>
     internal static class HelpWindowHelper
     {
diff --git a/src/Microsoft.Management.UI.Internal/commandHelpers/ShowCommandHelper.cs b/src/Microsoft.Management.UI.Internal/commandHelpers/ShowCommandHelper.cs
index 873f15e2c41..2268edb99f5 100644
--- a/src/Microsoft.Management.UI.Internal/commandHelpers/ShowCommandHelper.cs
+++ b/src/Microsoft.Management.UI.Internal/commandHelpers/ShowCommandHelper.cs
@@ -1200,7 +1200,7 @@ private void Buttons_CopyClick(object sender, RoutedEventArgs e)
         }
 
         /// <summary>
-        /// Sets a succesfull dialog result and then closes the window.
+        /// Sets a successful dialog result and then closes the window.
         /// </summary>
         /// <param name="sender">Event sender.</param>
         /// <param name="e">Event arguments.</param>
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Eventlog.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Eventlog.cs
index 45c484744fa..89c58acbf57 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Eventlog.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Eventlog.cs
@@ -1344,7 +1344,7 @@ public class RemoveEventLogCommand : PSCmdlet
 
         /// <summary>
         /// The following is the definition of the input parameter "RemoveSource".
-        /// Specifies either to remove the event log and and associated source or
+        /// Specifies either to remove the event log and associated source or
         /// source. alone.
         /// When this parameter is not specified, the cmdlet uses Delete Method which
         /// clears the eventlog and also the source associated with it.
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
index f689695fc38..f2e4598c1bc 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
@@ -277,7 +277,7 @@ protected override void ProcessRecord()
         /// <param name="holder"></param>
         /// <param name="currentContext"></param>
         /// <returns>
-        /// true if no error occured
+        /// true if no error occurred
         /// false if there was an error
         /// </returns>
         private bool ScanForwardsForTail(in ContentHolder holder, CmdletProviderContext currentContext)
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertFromJsonCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertFromJsonCommand.cs
index 0af97b061a9..392a58e13d4 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertFromJsonCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertFromJsonCommand.cs
@@ -86,7 +86,7 @@ protected override void EndProcessing()
                     catch (ArgumentException)
                     {
                         // The first input string does not represent a complete Json Syntax.
-                        // Hence consider the the entire input as a single Json content.
+                        // Hence consider the entire input as a single Json content.
                     }
 
                     if (successfullyConverted)
diff --git a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobStore.cs b/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobStore.cs
index bd9d7439696..0938d9829b9 100644
--- a/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobStore.cs
+++ b/src/Microsoft.PowerShell.ScheduledJob/ScheduledJobStore.cs
@@ -115,7 +115,7 @@ public static FileStream GetFileForJobDefinition(
         }
 
         /// <summary>
-        /// Checks the provided path against the the default path of scheduled jobs
+        /// Checks the provided path against the default path of scheduled jobs
         /// for the current user.
         /// </summary>
         /// <param name="definitionPath">Path for scheduled job definitions.</param>
diff --git a/src/Microsoft.WSMan.Management/CurrentConfigurations.cs b/src/Microsoft.WSMan.Management/CurrentConfigurations.cs
index 0129554c30b..95b8f4ba584 100644
--- a/src/Microsoft.WSMan.Management/CurrentConfigurations.cs
+++ b/src/Microsoft.WSMan.Management/CurrentConfigurations.cs
@@ -98,7 +98,7 @@ public bool RefreshCurrentConfiguration(string responseOfGet)
         /// Issues a PUT request with the ResourceUri provided.
         /// </summary>
         /// <param name="resourceUri">Resource URI to use.</param>
-        /// <returns>False, if operation is not succesful.</returns>
+        /// <returns>False, if operation is not successful.</returns>
         public void PutConfigurationOnServer(string resourceUri)
         {
             if (string.IsNullOrEmpty(resourceUri))
diff --git a/src/Schemas/PSMaml/Maml_HTML_Style.xsl b/src/Schemas/PSMaml/Maml_HTML_Style.xsl
index 3f66ee3f968..955966526cc 100644
--- a/src/Schemas/PSMaml/Maml_HTML_Style.xsl
+++ b/src/Schemas/PSMaml/Maml_HTML_Style.xsl
@@ -172,7 +172,7 @@
 					</xsl:when>
 					<xsl:otherwise>
 						<!-- the default vertical alignment depends on whether
-						     this cell is the the table header, footer or body -->
+						     this cell is the table header, footer or body -->
 						<xsl:choose>
 							<xsl:when test='parent::*/parent::thead'>
 								bottom
@@ -381,4 +381,4 @@
 		
 		</xsl:choose>
 	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/FormatTable.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/FormatTable.cs
index 43cab48d003..91d0fabf44c 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/FormatTable.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/FormatTable.cs
@@ -19,7 +19,7 @@ namespace System.Management.Automation.Runspaces
 {
     /// <summary>
     /// This exception is used by Formattable constructor to indicate errors
-    /// occured during construction time.
+    /// occurred during construction time.
     /// </summary>
     [Serializable]
     [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "FormatTable")]
@@ -70,7 +70,7 @@ public FormatTableLoadException(string message, Exception innerException)
         /// time.
         /// </summary>
         /// <param name="loadErrors">
-        /// The errors that occured
+        /// The errors that occurred.
         /// </param>
         internal FormatTableLoadException(ConcurrentBag<string> loadErrors)
             : base(StringUtil.Format(FormatAndOutXmlLoadingStrings.FormatTableLoadErrors))
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
index 407c0d5dca8..165f042f70d 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
@@ -210,7 +210,7 @@ private void WriteProperty(int k, string propertyValue, LineOutput lo)
         /// </summary>
         /// <param name="prependString">String to add to the left.</param>
         /// <param name="line">Line to print.</param>
-        /// <param name="lo">LineOuput to write to.</param>
+        /// <param name="lo">LineOutput to write to.</param>
         private void WriteSingleLineHelper(string prependString, string line, LineOutput lo)
         {
             if (line is null)
diff --git a/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs
index eb540f4904b..e21ef5b20d9 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs
@@ -483,7 +483,7 @@ private static string GenerateRowField(string val, int width, int alignment, Dis
             if (currentValueDisplayLength < width)
             {
                 // the string is shorter than the width of the column
-                // need to pad with with blanks to reach the desired width
+                // need to pad with blanks to reach the desired width
                 int padCount = width - currentValueDisplayLength;
                 switch (alignment)
                 {
diff --git a/src/System.Management.Automation/engine/ComInterop/ComRuntimeHelpers.cs b/src/System.Management.Automation/engine/ComInterop/ComRuntimeHelpers.cs
index 436aad04e6d..5bd086874a6 100644
--- a/src/System.Management.Automation/engine/ComInterop/ComRuntimeHelpers.cs
+++ b/src/System.Management.Automation/engine/ComInterop/ComRuntimeHelpers.cs
@@ -322,7 +322,7 @@ internal static void InitVariantForObject(object obj, ref Variant variant)
             Debug.Assert(obj != null);
 
             // GetNativeVariantForObject is very expensive for values that marshal as VT_DISPATCH
-            // also is is extremely common scenario when object at hand is an RCW.
+            // also is extremely common scenario when object at hand is an RCW.
             // Therefore we are going to test for IDispatch before defaulting to GetNativeVariantForObject.
             if (obj is IDispatch)
             {
diff --git a/src/System.Management.Automation/engine/ComInterop/VarEnumSelector.cs b/src/System.Management.Automation/engine/ComInterop/VarEnumSelector.cs
index c7f6b120919..275f75f4bb2 100644
--- a/src/System.Management.Automation/engine/ComInterop/VarEnumSelector.cs
+++ b/src/System.Management.Automation/engine/ComInterop/VarEnumSelector.cs
@@ -211,7 +211,7 @@ private static List<VarEnum> GetConversionsToComPrimitiveTypeFamilies(Type argum
                     if (TypeUtils.IsImplicitlyConvertible(argumentType, candidateManagedType, true))
                     {
                         compatibleComTypes.Add(candidateType);
-                        // Move on to the next type family. We need atmost one type from each family
+                        // Move on to the next type family. We need at most one type from each family
                         break;
                     }
                 }
diff --git a/src/System.Management.Automation/engine/CommandDiscovery.cs b/src/System.Management.Automation/engine/CommandDiscovery.cs
index 5de18cdc952..1b000d0ec3d 100644
--- a/src/System.Management.Automation/engine/CommandDiscovery.cs
+++ b/src/System.Management.Automation/engine/CommandDiscovery.cs
@@ -1473,7 +1473,7 @@ internal IEnumerator<CmdletInfo> GetCmdletInfo(string cmdletName, bool searchAll
                         }
                         // The engine cmdlets get imported (via Import-Module) once when PowerShell starts and the cmdletInfo is added to PSSnapinHelpers._cmdletcache(static) with ModuleName
                         // as "System.Management.Automation.dll" instead of the actual snapin name. The next time we load something in an InitialSessionState, we look at this _cmdletcache and
-                        // if the the assembly is already loaded, we just return the cmdlets back. So, the CmdletInfo has moduleName has "System.Management.Automation.dll". So, when M3P Activity
+                        // if the assembly is already loaded, we just return the cmdlets back. So, the CmdletInfo has moduleName has "System.Management.Automation.dll". So, when M3P Activity
                         // tries to access Microsoft.PowerShell.Core\\Get-Command, it cannot. So, adding an additional check to return the correct cmdletInfo for cmdlets from core modules.
                         else if (InitialSessionState.IsEngineModule(cmdletInfo.ModuleName))
                         {
diff --git a/src/System.Management.Automation/engine/CommandSearcher.cs b/src/System.Management.Automation/engine/CommandSearcher.cs
index 9745d2aa9ad..434c36dfecf 100644
--- a/src/System.Management.Automation/engine/CommandSearcher.cs
+++ b/src/System.Management.Automation/engine/CommandSearcher.cs
@@ -158,7 +158,7 @@ public bool MoveNext()
                     }
                     else
                     {
-                        // Ok see it it's in the applications list
+                        // Ok, see if it's in the applications list
                         foreach (string path in _context.EngineSessionState.Applications)
                         {
                             if (checkPath(path, _commandName))
diff --git a/src/System.Management.Automation/engine/CoreAdapter.cs b/src/System.Management.Automation/engine/CoreAdapter.cs
index c685fa4613b..42da6126188 100644
--- a/src/System.Management.Automation/engine/CoreAdapter.cs
+++ b/src/System.Management.Automation/engine/CoreAdapter.cs
@@ -5940,7 +5940,7 @@ private static MethodInfo Infer(MethodInfo genericMethod, ICollection<Type> type
                 try
                 {
                     MethodInfo instantiatedMethod = genericMethod.MakeGenericMethod(inferredTypeParameters.ToArray());
-                    s_tracer.WriteLine("Inference succesful: {0}", instantiatedMethod);
+                    s_tracer.WriteLine("Inference successful: {0}", instantiatedMethod);
                     return instantiatedMethod;
                 }
                 catch (ArgumentException e)
diff --git a/src/System.Management.Automation/engine/ExternalScriptInfo.cs b/src/System.Management.Automation/engine/ExternalScriptInfo.cs
index 642eb4d8fe9..bcd75bf85f3 100644
--- a/src/System.Management.Automation/engine/ExternalScriptInfo.cs
+++ b/src/System.Management.Automation/engine/ExternalScriptInfo.cs
@@ -384,7 +384,7 @@ internal override bool ImplementsDynamicParameters
 
                 // If we got here, there was some sort of parsing exception.  We'll just
                 // ignore it and assume the script does not implement dynamic parameters.
-                // Futhermore, we'll clear out the fields so that the next attempt to
+                // Furthermore, we'll clear out the fields so that the next attempt to
                 // access ScriptBlock will result in an exception that doesn't get ignored.
                 _scriptBlock = null;
                 _scriptContents = null;
diff --git a/src/System.Management.Automation/engine/Modules/PSModuleInfo.cs b/src/System.Management.Automation/engine/Modules/PSModuleInfo.cs
index 1c56e8f920b..8dae7db0deb 100644
--- a/src/System.Management.Automation/engine/Modules/PSModuleInfo.cs
+++ b/src/System.Management.Automation/engine/Modules/PSModuleInfo.cs
@@ -453,7 +453,7 @@ internal void SetVersion(Version version)
         public ModuleType ModuleType { get; private set; } = ModuleType.Script;
 
         /// <summary>
-        /// This this module as being a compiled module...
+        /// This module as being a compiled module...
         /// </summary>
         internal void SetModuleType(ModuleType moduleType) { ModuleType = moduleType; }
 
diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index efc8b660c37..5ebaccca2cd 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -1277,7 +1277,7 @@ private bool UseSpecialArgumentPassing(string filePath) =>
         /// <param name="redirectOutput">A boolean that indicates that, when true, output from the process is redirected to a stream, and otherwise is sent to stdout.</param>
         /// <param name="redirectError">A boolean that indicates that, when true, error output from the process is redirected to a stream, and otherwise is sent to stderr.</param>
         /// <param name="redirectInput">A boolean that indicates that, when true, input to the process is taken from a stream, and otherwise is taken from stdin.</param>
-        /// <param name="soloCommand">A boolean that indicates, when true, that the command to be executed is not part of a pipeline, and otherwise indicates that is is.</param>
+        /// <param name="soloCommand">A boolean that indicates, when true, that the command to be executed is not part of a pipeline, and otherwise indicates that it is.</param>
         /// <returns>A ProcessStartInfo object which is the base of the native invocation.</returns>
         private ProcessStartInfo GetProcessStartInfo(
             bool redirectOutput,
diff --git a/src/System.Management.Automation/engine/TransactedString.cs b/src/System.Management.Automation/engine/TransactedString.cs
index 948cf1d9d81..f1bc8f586b4 100644
--- a/src/System.Management.Automation/engine/TransactedString.cs
+++ b/src/System.Management.Automation/engine/TransactedString.cs
@@ -8,7 +8,7 @@
 namespace Microsoft.PowerShell.Commands.Management
 {
     /// <summary>
-    /// Represents a a string that can be used in transactions.
+    /// Represents a string that can be used in transactions.
     /// </summary>
     public class TransactedString : IEnlistmentNotification
     {
diff --git a/src/System.Management.Automation/engine/hostifaces/ConnectionBase.cs b/src/System.Management.Automation/engine/hostifaces/ConnectionBase.cs
index b6b571e90e7..ca3847cc593 100644
--- a/src/System.Management.Automation/engine/hostifaces/ConnectionBase.cs
+++ b/src/System.Management.Automation/engine/hostifaces/ConnectionBase.cs
@@ -661,7 +661,7 @@ protected RunspaceState RunspaceState
         }
 
         /// <summary>
-        /// This is queue of all the state change event which have occured for
+        /// This is queue of all the state change event which have occurred for
         /// this runspace. RaiseRunspaceStateEvents raises event for each
         /// item in this queue. We don't raise events from with SetRunspaceState
         /// because SetRunspaceState is often called from with in the a lock.
diff --git a/src/System.Management.Automation/engine/hostifaces/History.cs b/src/System.Management.Automation/engine/hostifaces/History.cs
index dc74a46213f..3fe2acb19c5 100644
--- a/src/System.Management.Automation/engine/hostifaces/History.cs
+++ b/src/System.Management.Automation/engine/hostifaces/History.cs
@@ -1471,7 +1471,7 @@ void ProcessRecord()
                 );
             } while (false);
 
-            // If we are here, an error has occured.
+            // If we are here, an error has occurred.
             Exception ex =
                 new InvalidDataException
                 (
diff --git a/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs b/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
index 9f195d7e687..647cc38f3c1 100644
--- a/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
@@ -884,7 +884,7 @@ private void DoCloseHelper()
                     return runspaces;
                 });
 
-            // Notify Engine components that that runspace is closing.
+            // Notify Engine components that runspace is closing.
             _engine.Context.RunspaceClosingNotification();
 
             // Log engine lifecycle event.
diff --git a/src/System.Management.Automation/engine/hostifaces/NativeCultureResolver.cs b/src/System.Management.Automation/engine/hostifaces/NativeCultureResolver.cs
index 74306b822df..1c6779a0f37 100644
--- a/src/System.Management.Automation/engine/hostifaces/NativeCultureResolver.cs
+++ b/src/System.Management.Automation/engine/hostifaces/NativeCultureResolver.cs
@@ -136,7 +136,7 @@ private VistaCultureInfo ImmediateParent
                                     }
                                 }
 
-                                // There is atleast 1 duplicate in m_fallbacks which was not added to
+                                // There is at least 1 duplicate in m_fallbacks which was not added to
                                 // fallbacksForTheParent array. Resize the array to take care of this.
                                 if (_fallbacks.Length != currentIndex)
                                 {
diff --git a/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs b/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
index d51c96a33e0..2630a9b3448 100644
--- a/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
@@ -1522,7 +1522,7 @@ internal void InternalAddRange(Guid psInstanceId, ICollection collection)
                 {
                     InsertItem(psInstanceId, _data.Count, (T)o);
 
-                    // set raise events if atleast one item is
+                    // set raise events if at least one item is
                     // added.
                     raiseEvents = true;
                 }
diff --git a/src/System.Management.Automation/engine/hostifaces/PowerShell.cs b/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
index a2c3c8b4ebe..2f8c1564a93 100644
--- a/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
@@ -4351,7 +4351,7 @@ internal void SetStateChanged(PSInvocationStateInfo stateInfo)
                     }
                     finally
                     {
-                        // takes care exception occured with invokeAsyncResult
+                        // takes care exception occurred with invokeAsyncResult
                         if (isExceptionOccured && (tempStopAsyncResult != null))
                         {
                             tempStopAsyncResult.Release();
@@ -4402,7 +4402,7 @@ internal void SetStateChanged(PSInvocationStateInfo stateInfo)
                     }
                     finally
                     {
-                        // takes care exception occured with invokeAsyncResult
+                        // takes care exception occurred with invokeAsyncResult
                         if (isExceptionOccured && (tempStopAsyncResult != null))
                         {
                             tempStopAsyncResult.Release();
diff --git a/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs b/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs
index aac3acfbdf8..dbfdeb1f34e 100644
--- a/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs
+++ b/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs
@@ -1306,7 +1306,7 @@ protected void DestroyRunspace(Runspace runspace)
         /// <summary>
         /// Cleans the pool closing the runspaces that are idle.
         /// This method is called as part of a timer callback.
-        /// This method will make sure atleast minPoolSz number
+        /// This method will make sure at least minPoolSz number
         /// of Runspaces are active.
         /// </summary>
         /// <param name="state"></param>
diff --git a/src/System.Management.Automation/engine/hostifaces/pipelinebase.cs b/src/System.Management.Automation/engine/hostifaces/pipelinebase.cs
index 0eaa30daae0..b4efa770880 100644
--- a/src/System.Management.Automation/engine/hostifaces/pipelinebase.cs
+++ b/src/System.Management.Automation/engine/hostifaces/pipelinebase.cs
@@ -760,7 +760,7 @@ protected bool IsPipelineFinished()
         }
 
         /// <summary>
-        /// This is queue of all the state change event which have occured for
+        /// This is queue of all the state change event which have occurred for
         /// this pipeline. RaisePipelineStateEvents raises event for each
         /// item in this queue. We don't raise the event with in SetPipelineState
         /// because often SetPipelineState is called with in a lock.
diff --git a/src/System.Management.Automation/engine/interpreter/ControlFlowInstructions.cs b/src/System.Management.Automation/engine/interpreter/ControlFlowInstructions.cs
index 0fddd203346..debe5284eb5 100644
--- a/src/System.Management.Automation/engine/interpreter/ControlFlowInstructions.cs
+++ b/src/System.Management.Automation/engine/interpreter/ControlFlowInstructions.cs
@@ -509,7 +509,7 @@ public override int Run(InterpretedFrame frame)
             frame.PopPendingContinuation();
 
             // If _pendingContinuation == -1 then we were getting into the finally block because an exception was thrown
-            // In this case we just return 1, and the the real instruction index will be calculated by GotoHandler later
+            // In this case we just return 1, and the real instruction index will be calculated by GotoHandler later
             if (!frame.IsJumpHappened()) { return 1; }
             // jump to goto target or to the next finally:
             return frame.YieldToPendingContinuation();
diff --git a/src/System.Management.Automation/engine/lang/scriptblock.cs b/src/System.Management.Automation/engine/lang/scriptblock.cs
index 07f53c132ff..1ce9c9a4267 100644
--- a/src/System.Management.Automation/engine/lang/scriptblock.cs
+++ b/src/System.Management.Automation/engine/lang/scriptblock.cs
@@ -545,7 +545,7 @@ internal T InvokeAsMemberFunctionT<T>(object instance, object[] args)
             // is a pipeline that emits nothing then result.Count will
             // be zero so we catch that and "convert" it to null. Note that
             // the return statement is still required in the method, it
-            // just recieves nothing from it's argument.
+            // just receives nothing from it's argument.
             if (result.Count == 0)
             {
                 return default(T);
diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
index 1d3f299f304..c01a1157fc8 100644
--- a/src/System.Management.Automation/engine/parser/Parser.cs
+++ b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -5226,7 +5226,7 @@ private StatementAst MethodDeclarationRule(Token functionNameToken, string class
                                 SkipToken();
                                 // we don't allow syntax
                                 // : base{ script }
-                                // as a short for for
+                                // as a short for
                                 // : base( { script } )
                                 baseCtorCallParams = InvokeParamParenListRule(lParen, out baseCallLastExtent);
                                 this.SkipNewlines();
diff --git a/src/System.Management.Automation/engine/remoting/client/Job.cs b/src/System.Management.Automation/engine/remoting/client/Job.cs
index 26778bfea5f..517fda61113 100644
--- a/src/System.Management.Automation/engine/remoting/client/Job.cs
+++ b/src/System.Management.Automation/engine/remoting/client/Job.cs
@@ -2360,7 +2360,7 @@ private void SetStatusMessage()
 
         #region finish logic
 
-        // This variable is set to true if atleast one child job failed.
+        // This variable is set to true if at least one child job failed.
         private bool _atleastOneChildJobFailed = false;
 
         // count of number of child jobs which have finished
@@ -3926,7 +3926,7 @@ public override void SetBreakpoints(IEnumerable<Breakpoint> breakpoints, int? ru
         /// </summary>
         /// <param name="id">Id of the breakpoint you want.</param>
         /// <param name="runspaceId">The runspace id of the runspace you want to interact with. A null value will use the current runspace.</param>
-        /// <returns>A a breakpoint with the specified id.</returns>
+        /// <returns>A breakpoint with the specified id.</returns>
         public override Breakpoint GetBreakpoint(int id, int? runspaceId) =>
             _wrappedDebugger.GetBreakpoint(id, runspaceId);
 
diff --git a/src/System.Management.Automation/engine/remoting/client/Job2.cs b/src/System.Management.Automation/engine/remoting/client/Job2.cs
index b89c9433697..df60a2c17f5 100644
--- a/src/System.Management.Automation/engine/remoting/client/Job2.cs
+++ b/src/System.Management.Automation/engine/remoting/client/Job2.cs
@@ -506,7 +506,7 @@ public sealed class ContainerParentJob : Job2
 
         private const int DisposedTrue = 1;
         private const int DisposedFalse = 0;
-        // This variable is set to true if atleast one child job failed.
+        // This variable is set to true if at least one child job failed.
 
         // count of number of child jobs which have finished
         private int _finishedChildJobsCount = 0;
diff --git a/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs b/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs
index d035ce6e820..a0dbd5bbc9a 100644
--- a/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs
+++ b/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs
@@ -456,7 +456,7 @@ internal ClientRemoteSessionDSHandlerStateMachine()
             _stateMachineHandle[(int)RemoteSessionState.EstablishedAndKeyRequested, (int)RemoteSessionEvent.KeySendFailed] += SetStateToClosedHandler;
 
             // TODO: All these are potential unexpected state transitions.. should have a way to track these calls..
-            // should atleast put a dbg assert in this handler
+            // should at least put a dbg assert in this handler
             for (int i = 0; i < _stateMachineHandle.GetLength(0); i++)
             {
                 for (int j = 0; j < _stateMachineHandle.GetLength(1); j++)
diff --git a/src/System.Management.Automation/engine/remoting/client/remotepipeline.cs b/src/System.Management.Automation/engine/remoting/client/remotepipeline.cs
index 164e9f11f39..67e4b7153f3 100644
--- a/src/System.Management.Automation/engine/remoting/client/remotepipeline.cs
+++ b/src/System.Management.Automation/engine/remoting/client/remotepipeline.cs
@@ -34,7 +34,7 @@ internal class RemotePipeline : Pipeline
         private readonly ConnectCommandInfo _connectCmdInfo = null;
 
         /// <summary>
-        /// This is queue of all the state change event which have occured for
+        /// This is queue of all the state change event which have occurred for
         /// this pipeline. RaisePipelineStateEvents raises event for each
         /// item in this queue. We don't raise the event with in SetPipelineState
         /// because often SetPipelineState is called with in a lock.
diff --git a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
index c8e61148746..dc85e049838 100644
--- a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
+++ b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
@@ -48,7 +48,7 @@ internal class RemoteRunspace : Runspace, IDisposable
         private long _currentLocalPipelineId = 0;
 
         /// <summary>
-        /// This is queue of all the state change event which have occured for
+        /// This is queue of all the state change event which have occurred for
         /// this runspace. RaiseRunspaceStateEvents raises event for each
         /// item in this queue. We don't raise events from with SetRunspaceState
         /// because SetRunspaceState is often called from with in the a lock.
diff --git a/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs b/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
index bf8041d2e48..4268c21dee5 100644
--- a/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
@@ -265,7 +265,7 @@ protected override void ProcessRecord()
             }
 
             // for the console host and Graphical PowerShell host
-            // we want to skip pushing into the the runspace if
+            // we want to skip pushing into the runspace if
             // the host is in a nested prompt
             System.Management.Automation.Internal.Host.InternalHost chost =
                 this.Host as System.Management.Automation.Internal.Host.InternalHost;
diff --git a/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs b/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs
index 98d2afa3b5f..0cab5f02a7a 100644
--- a/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs
@@ -36,7 +36,7 @@ namespace Microsoft.PowerShell.Commands
     ///
     /// The user can specify how command output data is returned by using the public
     /// OutTarget enumeration (Host, Job).
-    /// The default actions of this cmdlet is to always direct ouput to host unless
+    /// The default actions of this cmdlet is to always direct output to host unless
     /// a job object already exists on the client that is associated with the running
     /// command.  In this case the existing job object is connected to the running
     /// command and returned.
@@ -1340,7 +1340,7 @@ public enum OutTarget
         Host = 1,
 
         /// <summary>
-        /// Asynchronous mode.  Receive-PSSession ouput data goes to returned job object.
+        /// Asynchronous mode.  Receive-PSSession output data goes to returned job object.
         /// </summary>
         Job = 2
     }
diff --git a/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs b/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
index 9e751dcdb7d..d428e521fe2 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
@@ -2446,7 +2446,7 @@ private static void ProcessVisibleCommands(InitialSessionState iss, object[] com
             // Parameters = A dictionary of parameter names -> Modifications
             // Modifications = A dictionary of modification types (ValidatePattern, ValidateSet) to the interim value
             //  for that attribute, as a HashSet of strings. For ValidateSet, this will be used as a collection of strings
-            //  directly during proxy generation. For For ValidatePattern, it will be combined into a regex
+            //  directly during proxy generation. For ValidatePattern, it will be combined into a regex
             //  like: '^(Pattern1|Pattern2|Pattern3)$' during proxy generation.
             Dictionary<string, Hashtable> commandModifications = new Dictionary<string, Hashtable>(StringComparer.OrdinalIgnoreCase);
 
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineSubscriber.cs b/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineSubscriber.cs
index 328571647cb..068849ec1b3 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineSubscriber.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineSubscriber.cs
@@ -162,7 +162,7 @@ private void HandleProcessRecord(object sender, PSEventArgs args)
                             if (!driver.NoInput || isProcessCalled)
                             {
                                 // if there is noInput then we
-                                // need to call process atleast once
+                                // need to call process at least once
                                 break;
                             }
                         }
diff --git a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
index c09c75d345d..fe31e0fad7e 100644
--- a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
+++ b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
@@ -900,7 +900,7 @@ private void HandleCreateRunspacePool(object sender, RemoteDataEventArgs createR
         }
 
         /// <summary>
-        /// This handler method runs the negotiation algorithm. It decides if the negotiation is succesful,
+        /// This handler method runs the negotiation algorithm. It decides if the negotiation is successful,
         /// or fails.
         /// </summary>
         /// <param name="sender"></param>
diff --git a/src/System.Management.Automation/help/BaseCommandHelpInfo.cs b/src/System.Management.Automation/help/BaseCommandHelpInfo.cs
index 0c70b815928..58ecdf28d07 100644
--- a/src/System.Management.Automation/help/BaseCommandHelpInfo.cs
+++ b/src/System.Management.Automation/help/BaseCommandHelpInfo.cs
@@ -462,7 +462,7 @@ internal string DetailedDescription
                     return string.Empty;
                 }
 
-                // I think every cmdlet description should atleast have 400 characters...
+                // I think every cmdlet description should at least have 400 characters...
                 // so starting with this assumption..I did an average of all the cmdlet
                 // help content available at the time of writing this code and came up
                 // with this number.
diff --git a/src/System.Management.Automation/help/HelpUtils.cs b/src/System.Management.Automation/help/HelpUtils.cs
index d4f2abe255b..ab4a39f362a 100644
--- a/src/System.Management.Automation/help/HelpUtils.cs
+++ b/src/System.Management.Automation/help/HelpUtils.cs
@@ -41,7 +41,7 @@ internal static string GetModuleBaseForUserHelp(string moduleBase, string module
             // In case of other modules, the help is under moduleBase/<current_culture> or
             // under moduleBase/<Version>/<current_culture>.
             // The code below creates a similar layout for CurrentUser scope.
-            // If the the scope is AllUsers, then the help goes under moduleBase.
+            // If the scope is AllUsers, then the help goes under moduleBase.
 
             var userHelpPath = GetUserHomeHelpSearchPath();
             string moduleBaseParent = Directory.GetParent(moduleBase).Name;
diff --git a/src/System.Management.Automation/help/MamlCommandHelpInfo.cs b/src/System.Management.Automation/help/MamlCommandHelpInfo.cs
index 774ef1fc1c0..81a9a4a743d 100644
--- a/src/System.Management.Automation/help/MamlCommandHelpInfo.cs
+++ b/src/System.Management.Automation/help/MamlCommandHelpInfo.cs
@@ -343,7 +343,7 @@ private string ExtractText(PSObject psObject)
                 return string.Empty;
             }
 
-            // I think every cmdlet description should atleast have 400 characters...
+            // I think every cmdlet description should at least have 400 characters...
             // so starting with this assumption..I did an average of all the cmdlet
             // help content available at the time of writing this code and came up
             // with this number.
diff --git a/src/System.Management.Automation/help/MamlNode.cs b/src/System.Management.Automation/help/MamlNode.cs
index 8f8df05bb79..fa175391501 100644
--- a/src/System.Management.Automation/help/MamlNode.cs
+++ b/src/System.Management.Automation/help/MamlNode.cs
@@ -209,7 +209,7 @@ private PSObject GetPSObject(XmlNode xmlNode)
             {
                 mshObject = new PSObject(GetInsidePSObject(xmlNode));
                 // Add typeNames to this MSHObject and create views so that
-                // the ouput is readable. This is done only for complex nodes.
+                // the output is readable. This is done only for complex nodes.
                 mshObject.TypeNames.Clear();
 
                 if (xmlNode.Attributes["type"] != null)
diff --git a/src/System.Management.Automation/help/PSClassHelpProvider.cs b/src/System.Management.Automation/help/PSClassHelpProvider.cs
index e4c74c6398a..2d80b2cc863 100644
--- a/src/System.Management.Automation/help/PSClassHelpProvider.cs
+++ b/src/System.Management.Automation/help/PSClassHelpProvider.cs
@@ -279,7 +279,7 @@ private void LoadHelpFile(string helpFile, string helpFileIdentifier, string com
             }
 
             if (e != null)
-                s_tracer.WriteLine("Error occured in PSClassHelpProvider {0}", e.Message);
+                s_tracer.WriteLine("Error occurred in PSClassHelpProvider {0}", e.Message);
 
             if (reportErrors && (e != null))
             {
diff --git a/src/System.Management.Automation/help/ProviderHelpInfo.cs b/src/System.Management.Automation/help/ProviderHelpInfo.cs
index 01ae3729420..c55a1eaaa5f 100644
--- a/src/System.Management.Automation/help/ProviderHelpInfo.cs
+++ b/src/System.Management.Automation/help/ProviderHelpInfo.cs
@@ -101,7 +101,7 @@ internal string DetailedDescription
                     return string.Empty;
                 }
 
-                // I think every provider description should atleast have 400 characters...
+                // I think every provider description should at least have 400 characters...
                 // so starting with this assumption..I did an average of all the help content
                 // available at the time of writing this code and came up with this number.
                 Text.StringBuilder result = new Text.StringBuilder(400);
diff --git a/src/System.Management.Automation/namespaces/FileSystemContentStream.cs b/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
index 1a9935cb1ad..83309319549 100644
--- a/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
@@ -413,7 +413,7 @@ public IList Read(long readCount)
                     (e is UnauthorizedAccessException) ||
                     (e is ArgumentNullException))
                 {
-                    // Exception contains specific message about the error occured and so no need for errordetails.
+                    // Exception contains specific message about the error occurred and so no need for errordetails.
                     _provider.WriteError(new ErrorRecord(e, "GetContentReaderIOError", ErrorCategory.ReadError, _path));
                     return null;
                 }
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index 12c1b193a69..3f8c32a2fed 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -9155,7 +9155,7 @@ function PSRemoteDestinationPathIsFile
 
         # Return a hash table in the following format:
         #      DirectoryPath is the directory to be created.
-        #      PathExists is a bool to to keep track of whether the directory already exist.
+        #      PathExists is a bool to keep track of whether the directory already exist.
         #
         # 1) If DirectoryPath already exists:
         #     a) If -Force is specified, force create the directory. Set DirectoryPath to the created directory path.
diff --git a/src/System.Management.Automation/namespaces/FileSystemSecurity.cs b/src/System.Management.Automation/namespaces/FileSystemSecurity.cs
index 97ab38158ae..c886bbd0a0b 100644
--- a/src/System.Management.Automation/namespaces/FileSystemSecurity.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemSecurity.cs
@@ -222,7 +222,7 @@ private void SetSecurityDescriptor(string path, ObjectSecurity sd, AccessControl
 
                 // Transfer it to the new file / directory.
                 // We keep these two code branches so that we can have more
-                // granular information when we ouput the object type via
+                // granular information when we output the object type via
                 // WriteSecurityDescriptorObject.
                 if (Directory.Exists(path))
                 {
diff --git a/src/System.Management.Automation/namespaces/LocationGlobber.cs b/src/System.Management.Automation/namespaces/LocationGlobber.cs
index e4ab1f3cfc5..e5ae0d7b9fd 100644
--- a/src/System.Management.Automation/namespaces/LocationGlobber.cs
+++ b/src/System.Management.Automation/namespaces/LocationGlobber.cs
@@ -1967,7 +1967,7 @@ CmdletProviderContext context
             string driveRoot = drive.Root.Replace(StringLiterals.AlternatePathSeparator, StringLiterals.DefaultPathSeparator);
             driveRoot = driveRoot.TrimEnd(StringLiterals.DefaultPathSeparator);
 
-            // Keep on lopping off children until the the remaining path
+            // Keep on lopping off children until the remaining path
             // is the drive root.
             while ((!string.IsNullOrEmpty(providerPath)) &&
                 (!providerPath.Equals(driveRoot, StringComparison.OrdinalIgnoreCase)))
diff --git a/src/System.Management.Automation/namespaces/TransactedRegistryKey.cs b/src/System.Management.Automation/namespaces/TransactedRegistryKey.cs
index dac6f6c0897..443c2547dfa 100644
--- a/src/System.Management.Automation/namespaces/TransactedRegistryKey.cs
+++ b/src/System.Management.Automation/namespaces/TransactedRegistryKey.cs
@@ -1331,7 +1331,7 @@ public RegistryValueKind GetValueKind(string name)
         /**
          * Retrieves the current state of the dirty property.
          *
-         * A key is marked as dirty if any operation has occured that modifies the
+         * A key is marked as dirty if any operation has occurred that modifies the
          * contents of the key.
          *
          * @return <b>true</b> if the key has been modified.
diff --git a/src/System.Management.Automation/utils/ClrFacade.cs b/src/System.Management.Automation/utils/ClrFacade.cs
index 0372b249ca1..cabac1bd335 100644
--- a/src/System.Management.Automation/utils/ClrFacade.cs
+++ b/src/System.Management.Automation/utils/ClrFacade.cs
@@ -356,7 +356,7 @@ internal static string ToDmtfDateTime(DateTime date)
             dmtfDateTime += date.Second.ToString(frmInt32).PadLeft(2, '0');
             dmtfDateTime += ".";
 
-            // Construct a DateTime with with the precision to Second as same as the passed DateTime and so get
+            // Construct a DateTime with the precision to Second as same as the passed DateTime and so get
             // the ticks difference so that the microseconds can be calculated
             DateTime dtTemp = new DateTime(date.Year, date.Month, date.Day, date.Hour, date.Minute, date.Second, 0);
             Int64 microsec = ((date.Ticks - dtTemp.Ticks) * 1000) / TimeSpan.TicksPerMillisecond;
diff --git a/src/System.Management.Automation/utils/tracing/SysLogProvider.cs b/src/System.Management.Automation/utils/tracing/SysLogProvider.cs
index 27d0e133fd5..93e959fff20 100755
--- a/src/System.Management.Automation/utils/tracing/SysLogProvider.cs
+++ b/src/System.Management.Automation/utils/tracing/SysLogProvider.cs
@@ -381,7 +381,7 @@ internal static class NativeMethods
         /// See man 3 syslog for more info.
         /// </summary>
         /// <param name="priority">
-        /// The OR of a priority and facility in the SysLogPriority enum indicating the the priority and facility of the log entry.
+        /// The OR of a priority and facility in the SysLogPriority enum indicating the priority and facility of the log entry.
         /// </param>
         /// <param name="message">The message to put in the log entry.</param>
         [DllImport(libpslnative, CharSet = CharSet.Ansi, EntryPoint = "Native_SysLog")]
diff --git a/src/powershell-native/Install-PowerShellRemoting.ps1 b/src/powershell-native/Install-PowerShellRemoting.ps1
index f42fcde2da6..ea164367af3 100644
--- a/src/powershell-native/Install-PowerShellRemoting.ps1
+++ b/src/powershell-native/Install-PowerShellRemoting.ps1
@@ -11,7 +11,7 @@
 # If no parameter is specified, it means that this instance of PowerShell is registering itself.
 #
 # Assumptions:
-#     1. The CoreCLR and the the PowerShell assemblies are side-by-side in $PSHOME
+#     1. The CoreCLR and the PowerShell assemblies are side-by-side in $PSHOME
 #     2. Plugins are registered by version number. Only one plugin can be automatically registered
 #        per PowerShell version. However, multiple endpoints may be manually registered for a given
 #        plugin.
@@ -188,7 +188,7 @@ function Install-PluginEndpoint {
 
     $pluginPath = Join-Path $resolvedPluginAbsolutePath "pwrshplugin.dll"
 
-    # This is forced to ensure the the file is placed correctly
+    # This is forced to ensure the file is placed correctly
     Copy-Item $targetPsHome\pwrshplugin.dll $resolvedPluginAbsolutePath -Force -Verbose -ErrorAction Stop
 
     $pluginFile = Join-Path $resolvedPluginAbsolutePath "RemotePowerShellConfig.txt"

From 97e8e0c43ade4476eb03b68cbe65e91b3c1ad902 Mon Sep 17 00:00:00 2001
From: Patrick Meinecke <SeeminglyScience@users.noreply.github.com>
Date: Mon, 6 Jun 2022 13:33:52 -0400
Subject: [PATCH 422/645] Use AST extent for `PSScriptRoot` path completion
 (#17376)

---
 .../CommandCompletion/CompletionCompleters.cs | 44 +++++++++++--------
 .../TabCompletion/TabCompletion.Tests.ps1     | 20 +++++++++
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index acdbe2233bc..a41a336b12b 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -7168,7 +7168,7 @@ internal static List<CompletionResult> CompleteHashtableKey(CompletionContext co
                         switch (binding.CommandName)
                         {
                             case "Get-WinEvent":
-                                return GetSpecialHashTableKeyMembers(excludedKeys, wordToComplete, "LogName", "ProviderName", "Path", "Keywords", "ID", "Level", 
+                                return GetSpecialHashTableKeyMembers(excludedKeys, wordToComplete, "LogName", "ProviderName", "Path", "Keywords", "ID", "Level",
                                     "StartTime", "EndTime", "UserID", "Data", "SuppressHashFilter");
                         }
                     }
@@ -7298,32 +7298,40 @@ internal static bool IsPathSafelyExpandable(ExpandableStringExpressionAst expand
         internal static string CombineVariableWithPartialPath(VariableExpressionAst variableAst, string extraText, ExecutionContext executionContext)
         {
             var varPath = variableAst.VariablePath;
-            if (varPath.IsVariable || varPath.DriveName.Equals("env", StringComparison.OrdinalIgnoreCase))
+            if (!varPath.IsVariable && !varPath.DriveName.Equals("env", StringComparison.OrdinalIgnoreCase))
             {
-                try
-                {
-                    // We check the strict mode inside GetVariableValue
-                    object value = VariableOps.GetVariableValue(varPath, executionContext, variableAst);
-                    var strValue = (value == null) ? string.Empty : value as string;
+                return null;
+            }
 
-                    if (strValue == null)
-                    {
-                        object baseObj = PSObject.Base(value);
-                        if (baseObj is string || baseObj.GetType().IsPrimitive)
-                        {
-                            strValue = LanguagePrimitives.ConvertTo<string>(value);
-                        }
-                    }
+            if (varPath.UnqualifiedPath.Equals(SpecialVariables.PSScriptRoot, StringComparison.OrdinalIgnoreCase)
+                && !string.IsNullOrEmpty(variableAst.Extent.File))
+            {
+                return Path.GetDirectoryName(variableAst.Extent.File) + extraText;
+            }
 
-                    if (strValue != null)
+            try
+            {
+                // We check the strict mode inside GetVariableValue
+                object value = VariableOps.GetVariableValue(varPath, executionContext, variableAst);
+                var strValue = (value == null) ? string.Empty : value as string;
+
+                if (strValue == null)
+                {
+                    object baseObj = PSObject.Base(value);
+                    if (baseObj is string || baseObj?.GetType()?.IsPrimitive is true)
                     {
-                        return strValue + extraText;
+                        strValue = LanguagePrimitives.ConvertTo<string>(value);
                     }
                 }
-                catch (Exception)
+
+                if (strValue != null)
                 {
+                    return strValue + extraText;
                 }
             }
+            catch (Exception)
+            {
+            }
 
             return null;
         }
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 6844ad1a6cb..9ec2bb45dd0 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -822,6 +822,26 @@ switch ($x)
             $expected = ($expected | Sort-Object -CaseSensitive | ForEach-Object { "./$_" }) -join ":"
 
         }
+
+        It "PSScriptRoot path completion when AST extent has file identity" {
+            $scriptText = '"$PSScriptRoot\BugFix.Tests"'
+            $tokens = $null
+            $scriptAst = [System.Management.Automation.Language.Parser]::ParseInput(
+                $scriptText,
+                $PSCommandPath,
+                [ref] $tokens,
+                [ref] $null)
+
+            $cursorPosition = $scriptAst.Extent.StartScriptPosition.
+                GetType().
+                GetMethod('CloneWithNewOffset', [System.Reflection.BindingFlags]'NonPublic, Instance').
+                Invoke($scriptAst.Extent.StartScriptPosition, @($scriptText.Length - 1))
+
+            $res = TabExpansion2 -ast $scriptAst -tokens $tokens -positionOfCursor $cursorPosition
+            $res.CompletionMatches | Should -HaveCount 1
+            $expectedPath = Join-Path $PSScriptRoot -ChildPath BugFix.Tests.ps1
+            $res.CompletionMatches[0].CompletionText | Should -Be "`"$expectedPath`""
+        }
     }
 
     Context "Cmdlet name completion" {

From a8d55851e0167bdead4e7c106f0592d5d6de7fb1 Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Mon, 6 Jun 2022 12:12:53 -0700
Subject: [PATCH 423/645] Add the `-ConfigurationFile` command line parameter
 to `pwsh` to support local session configuration (#17447)

---
 .../host/msh/CommandLineParameterParser.cs    |  24 +++
 .../host/msh/ConsoleHost.cs                   | 108 +++++++++----
 .../host/msh/ConsoleShell.cs                  |  34 +++-
 .../host/msh/ManagedEntrance.cs               |   5 +-
 .../CommandLineParameterParserStrings.resx    |   5 +-
 .../resources/ConsoleHostStrings.resx         |   3 +
 .../resources/ManagedEntranceStrings.resx     |   8 +
 .../engine/InitialSessionState.cs             |  48 +++++-
 .../commands/NewPSSessionConfigurationFile.cs |   2 -
 .../fanin/InitialSessionStateProvider.cs      | 149 +++++++++++++++++-
 .../fanin/OutOfProcTransportManager.cs        |  10 +-
 .../engine/remoting/fanin/WSManPlugin.cs      |  14 +-
 .../server/OutOfProcServerMediator.cs         |  83 +++++++---
 .../remoting/server/serverremotesession.cs    |  65 ++++----
 .../resources/ConsoleInfoErrorStrings.resx    |   6 +
 .../resources/RemotingErrorIdStrings.resx     |   9 ++
 test/SSHRemoting/SSHRemoting.Basic.Tests.ps1  |  23 ++-
 test/hosting/test_HostingBasic.cs             |  13 ++
 .../engine/Basic/DefaultCommands.Tests.ps1    |   2 +-
 .../HelpersRemoting/HelpersRemoting.psm1      |  23 ++-
 .../Microsoft.PowerShell.RemotingTools.psm1   |  31 ++--
 test/xUnit/csharp/test_CommandLineParser.cs   |  33 ++++
 22 files changed, 571 insertions(+), 127 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
index aefcb58cfd8..8d31f357741 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
@@ -227,6 +227,7 @@ internal enum ParameterBitmap : long
             Version             = 0x00800000, // -Version | -v
             WindowStyle         = 0x01000000, // -WindowStyle | -w
             WorkingDirectory    = 0x02000000, // -WorkingDirectory | -wd
+            ConfigurationFile   = 0x04000000, // -ConfigurationFile
             // Enum values for specified ExecutionPolicy
             EPUnrestricted      = 0x0000000100000000, // ExecutionPolicy unrestricted
             EPRemoteSigned      = 0x0000000200000000, // ExecutionPolicy remote signed
@@ -370,6 +371,15 @@ internal Collection<CommandParameter> Args
             }
         }
 
+        internal string? ConfigurationFile
+        {
+            get
+            {
+                AssertArgumentsParsed();
+                return _configurationFile;
+            }
+        }
+
         internal string? ConfigurationName
         {
             get
@@ -915,6 +925,19 @@ private void ParseHelper(string[] args)
                     _noInteractive = false;
                     ParametersUsed |= ParameterBitmap.Interactive;
                 }
+                else if (MatchSwitch(switchKey, "configurationfile", "configurationfile"))
+                {
+                    ++i;
+                    if (i >= args.Length)
+                    {
+                        SetCommandLineError(
+                            CommandLineParameterParserStrings.MissingConfigurationFileArgument);
+                        break;
+                    }
+
+                    _configurationFile = args[i];
+                    ParametersUsed |= ParameterBitmap.ConfigurationFile;
+                }
                 else if (MatchSwitch(switchKey, "configurationname", "config"))
                 {
                     ++i;
@@ -1474,6 +1497,7 @@ private bool CollectArgs(string[] args, ref int i)
         private bool _namedPipeServerMode;
         private bool _sshServerMode;
         private bool _showVersion;
+        private string? _configurationFile;
         private string? _configurationName;
         private string? _error;
         private bool _showHelp;
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
index 6a78b4c864e..9dbfdf8c808 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -73,6 +73,9 @@ internal sealed partial class ConsoleHost
         /// <param name="helpText">
         /// Help text for minishell. This is displayed on 'minishell -?'.
         /// </param>
+        /// <param name="issProvidedExternally">
+        /// True when an external caller provides an InitialSessionState object, which can conflict with '-ConfigurationFile' argument.
+        /// </param>
         /// <returns>
         /// The exit code for the shell.
         ///
@@ -99,7 +102,10 @@ internal sealed partial class ConsoleHost
         /// Anyone checking the exit code of the shell or monitor can mask off the high word to determine the exit code passed
         /// by the script that the shell last executed.
         /// </returns>
-        internal static int Start(string bannerText, string helpText)
+        internal static int Start(
+            string bannerText,
+            string helpText,
+            bool issProvidedExternally)
         {
 #if DEBUG
             if (Environment.GetEnvironmentVariable("POWERSHELL_DEBUG_STARTUP") != null)
@@ -111,6 +117,12 @@ internal static int Start(string bannerText, string helpText)
             }
 #endif
 
+            // Check for external InitialSessionState configuration conflict with '-ConfigurationFile' argument.
+            if (issProvidedExternally && !string.IsNullOrEmpty(s_cpp.ConfigurationFile))
+            {
+                throw new ConsoleHostStartupException(ConsoleHostStrings.ShellCannotBeStartedWithConfigConflict);
+            }
+
             // put PSHOME in front of PATH so that calling `powershell` within `powershell` always starts the same running version
             string path = Environment.GetEnvironmentVariable("PATH");
             string pshome = Utils.DefaultPowerShellAppBase + Path.PathSeparator;
@@ -188,7 +200,6 @@ internal static int Start(string bannerText, string helpText)
 #if !UNIX
                 TaskbarJumpList.CreateRunAsAdministratorJumpList();
 #endif
-
                 // First check for and handle PowerShell running in a server mode.
                 if (s_cpp.ServerMode)
                 {
@@ -197,7 +208,9 @@ internal static int Start(string bannerText, string helpText)
                     StdIOProcessMediator.Run(
                         initialCommand: s_cpp.InitialCommand,
                         workingDirectory: s_cpp.WorkingDirectory,
-                        configurationName: null);
+                        configurationName: null,
+                        configurationFile: s_cpp.ConfigurationFile,
+                        combineErrOutStream: false);
                     exitCode = 0;
                 }
                 else if (s_cpp.SSHServerMode)
@@ -207,7 +220,9 @@ internal static int Start(string bannerText, string helpText)
                     StdIOProcessMediator.Run(
                         initialCommand: s_cpp.InitialCommand,
                         workingDirectory: null,
-                        configurationName: null);
+                        configurationName: null,
+                        configurationFile: s_cpp.ConfigurationFile,
+                        combineErrOutStream: true);
                     exitCode = 0;
                 }
                 else if (s_cpp.NamedPipeServerMode)
@@ -301,8 +316,8 @@ internal static void ParseCommandLine(string[] args)
                 PowerShellConfig.Instance.SetSystemConfigFilePath(s_cpp.SettingsFile);
             }
 
-            // Check registry setting for a Group Policy ConfigurationName entry and
-            // use it to override anything set by the user.
+            // Check registry setting for a Group Policy ConfigurationName entry,
+            // and use it to override anything set by the user on the command line.
             // It depends on setting file so 'SetSystemConfigFilePath()' should be called before.
             s_cpp.ConfigurationName = CommandLineParameterParser.GetConfigurationNameFromGroupPolicy();
         }
@@ -1489,7 +1504,7 @@ private uint Run(CommandLineParameterParser cpp, bool isPrestartWarned)
 
                 // NTRAID#Windows Out Of Band Releases-915506-2005/09/09
                 // Removed HandleUnexpectedExceptions infrastructure
-                exitCode = DoRunspaceLoop(cpp.InitialCommand, cpp.SkipProfiles, cpp.Args, cpp.StaMode, cpp.ConfigurationName);
+                exitCode = DoRunspaceLoop(cpp.InitialCommand, cpp.SkipProfiles, cpp.Args, cpp.StaMode, cpp.ConfigurationName, cpp.ConfigurationFile);
             }
             while (false);
 
@@ -1502,13 +1517,19 @@ private uint Run(CommandLineParameterParser cpp, bool isPrestartWarned)
         /// <returns>
         /// The process exit code to be returned by Main.
         /// </returns>
-        private uint DoRunspaceLoop(string initialCommand, bool skipProfiles, Collection<CommandParameter> initialCommandArgs, bool staMode, string configurationName)
+        private uint DoRunspaceLoop(
+            string initialCommand,
+            bool skipProfiles,
+            Collection<CommandParameter> initialCommandArgs,
+            bool staMode,
+            string configurationName,
+            string configurationFilePath)
         {
             ExitCode = ExitCodeSuccess;
 
             while (!ShouldEndSession)
             {
-                RunspaceCreationEventArgs args = new RunspaceCreationEventArgs(initialCommand, skipProfiles, staMode, configurationName, initialCommandArgs);
+                RunspaceCreationEventArgs args = new RunspaceCreationEventArgs(initialCommand, skipProfiles, staMode, configurationName, configurationFilePath, initialCommandArgs);
                 CreateRunspace(args);
 
                 if (ExitCode == ExitCodeInitFailure) { break; }
@@ -1584,14 +1605,12 @@ private Exception InitializeRunspaceHelper(string command, Executor exec, Execut
             return e;
         }
 
-        private void CreateRunspace(object runspaceCreationArgs)
+        private void CreateRunspace(RunspaceCreationEventArgs runspaceCreationArgs)
         {
-            RunspaceCreationEventArgs args = null;
             try
             {
-                args = runspaceCreationArgs as RunspaceCreationEventArgs;
-                Dbg.Assert(args != null, "Event Arguments to CreateRunspace should not be null");
-                DoCreateRunspace(args.InitialCommand, args.SkipProfiles, args.StaMode, args.ConfigurationName, args.InitialCommandArgs);
+                Dbg.Assert(runspaceCreationArgs != null, "Arguments to CreateRunspace should not be null.");
+                DoCreateRunspace(runspaceCreationArgs);
             }
             catch (ConsoleHostStartupException startupException)
             {
@@ -1603,7 +1622,7 @@ private void CreateRunspace(object runspaceCreationArgs)
         /// <summary>
         /// Check if a screen reviewer utility is running.
         /// When a screen reader is running, we don't auto-load the PSReadLine module at startup,
-        /// since PSReadLine is not accessibility-firendly enough as of today.
+        /// since PSReadLine is not accessibility-friendly enough as of today.
         /// </summary>
         private bool IsScreenReaderActive()
         {
@@ -1646,12 +1665,33 @@ private static bool LoadPSReadline()
         /// Opens and Initializes the Host's sole Runspace.  Processes the startup scripts and runs any command passed on the
         /// command line.
         /// </summary>
-        private void DoCreateRunspace(string initialCommand, bool skipProfiles, bool staMode, string configurationName, Collection<CommandParameter> initialCommandArgs)
+        /// <param name="args">Runspace creation event arguments.</param>
+        private void DoCreateRunspace(RunspaceCreationEventArgs args)
         {
-            Dbg.Assert(_runspaceRef == null, "runspace should be null");
+            Dbg.Assert(_runspaceRef == null, "_runspaceRef field should be null");
             Dbg.Assert(DefaultInitialSessionState != null, "DefaultInitialSessionState should not be null");
             s_runspaceInitTracer.WriteLine("Calling RunspaceFactory.CreateRunspace");
 
+            // Use session configuration file if provided.
+            bool customConfigurationProvided = false;
+            if (!string.IsNullOrEmpty(args.ConfigurationFilePath))
+            {
+                try
+                {
+                    // Replace DefaultInitialSessionState with the initial state configuration defined by the file.
+                    DefaultInitialSessionState = InitialSessionState.CreateFromSessionConfigurationFile(
+                        path: args.ConfigurationFilePath,
+                        roleVerifier: null,
+                        validateFile: true);
+                }
+                catch (Exception ex)
+                {
+                    throw new ConsoleHostStartupException(ConsoleHostStrings.ShellCannotBeStarted, ex);
+                }
+
+                customConfigurationProvided = true;
+            }
+
             try
             {
                 Runspace consoleRunspace = null;
@@ -1667,7 +1707,7 @@ private void DoCreateRunspace(string initialCommand, bool skipProfiles, bool sta
                 //    powershell -command "Update-Module PSReadline"
                 // This should work just fine as long as no other instances of PowerShell are running.
                 ReadOnlyCollection<ModuleSpecification> defaultImportModulesList = null;
-                if (LoadPSReadline())
+                if (!customConfigurationProvided && LoadPSReadline())
                 {
                     if (IsScreenReaderActive())
                     {
@@ -1682,7 +1722,7 @@ private void DoCreateRunspace(string initialCommand, bool skipProfiles, bool sta
                         consoleRunspace = RunspaceFactory.CreateRunspace(this, DefaultInitialSessionState);
                         try
                         {
-                            OpenConsoleRunspace(consoleRunspace, staMode);
+                            OpenConsoleRunspace(consoleRunspace, args.StaMode);
                         }
                         catch (Exception)
                         {
@@ -1702,7 +1742,7 @@ private void DoCreateRunspace(string initialCommand, bool skipProfiles, bool sta
                     }
 
                     consoleRunspace = RunspaceFactory.CreateRunspace(this, DefaultInitialSessionState);
-                    OpenConsoleRunspace(consoleRunspace, staMode);
+                    OpenConsoleRunspace(consoleRunspace, args.StaMode);
                 }
 
                 Runspace.PrimaryRunspace = consoleRunspace;
@@ -1734,7 +1774,7 @@ private void DoCreateRunspace(string initialCommand, bool skipProfiles, bool sta
             _readyForInputTimeInMS = (DateTime.Now - Process.GetCurrentProcess().StartTime).TotalMilliseconds;
 #endif
 
-            DoRunspaceInitialization(skipProfiles, initialCommand, configurationName, initialCommandArgs);
+            DoRunspaceInitialization(args);
         }
 
         private static void OpenConsoleRunspace(Runspace runspace, bool staMode)
@@ -1751,7 +1791,7 @@ private static void OpenConsoleRunspace(Runspace runspace, bool staMode)
             runspace.Open();
         }
 
-        private void DoRunspaceInitialization(bool skipProfiles, string initialCommand, string configurationName, Collection<CommandParameter> initialCommandArgs)
+        private void DoRunspaceInitialization(RunspaceCreationEventArgs args)
         {
             if (_runspaceRef.Runspace.Debugger != null)
             {
@@ -1786,13 +1826,13 @@ private void DoRunspaceInitialization(bool skipProfiles, string initialCommand,
                 }
             }
 
-            if (!string.IsNullOrEmpty(configurationName))
+            if (!string.IsNullOrEmpty(args.ConfigurationName))
             {
                 // If an endpoint configuration is specified then create a loop-back remote runspace targeting
                 // the endpoint and push onto runspace ref stack.  Ignore profile and configuration scripts.
                 try
                 {
-                    RemoteRunspace remoteRunspace = HostUtilities.CreateConfiguredRunspace(configurationName, this);
+                    RemoteRunspace remoteRunspace = HostUtilities.CreateConfiguredRunspace(args.ConfigurationName, this);
                     remoteRunspace.ShouldCloseOnPop = true;
                     PushRunspace(remoteRunspace);
 
@@ -1827,7 +1867,7 @@ private void DoRunspaceInitialization(bool skipProfiles, string initialCommand,
                         currentUserProfile,
                         currentUserHostSpecificProfile));
 
-                if (!skipProfiles)
+                if (!args.SkipProfiles)
                 {
                     // Run the profiles.
                     // Profiles are run in the following order:
@@ -1887,11 +1927,11 @@ private void DoRunspaceInitialization(bool skipProfiles, string initialCommand,
 
                 tempPipeline.Commands.Add(c);
 
-                if (initialCommandArgs != null)
+                if (args.InitialCommandArgs != null)
                 {
                     // add the args passed to the command.
 
-                    foreach (CommandParameter p in initialCommandArgs)
+                    foreach (CommandParameter p in args.InitialCommandArgs)
                     {
                         c.Parameters.Add(p);
                     }
@@ -1948,19 +1988,19 @@ private void DoRunspaceInitialization(bool skipProfiles, string initialCommand,
                     ReportException(e1, exec);
                 }
             }
-            else if (!string.IsNullOrEmpty(initialCommand))
+            else if (!string.IsNullOrEmpty(args.InitialCommand))
             {
                 // Run the command passed on the command line
 
                 s_tracer.WriteLine("running initial command");
 
-                Pipeline tempPipeline = exec.CreatePipeline(initialCommand, true);
+                Pipeline tempPipeline = exec.CreatePipeline(args.InitialCommand, true);
 
-                if (initialCommandArgs != null)
+                if (args.InitialCommandArgs != null)
                 {
                     // add the args passed to the command.
 
-                    foreach (CommandParameter p in initialCommandArgs)
+                    foreach (CommandParameter p in args.InitialCommandArgs)
                     {
                         tempPipeline.Commands[0].Parameters.Add(p);
                     }
@@ -1976,7 +2016,7 @@ private void DoRunspaceInitialization(bool skipProfiles, string initialCommand,
                     ParseError[] errors;
 
                     // Detect if they're using input. If so, read from it.
-                    Ast parsedInput = Parser.ParseInput(initialCommand, out tokens, out errors);
+                    Ast parsedInput = Parser.ParseInput(args.InitialCommand, out tokens, out errors);
                     if (AstSearcher.IsUsingDollarInput(parsedInput))
                     {
                         executionOptions |= Executor.ExecutionOptions.ReadInputObjects;
@@ -3021,12 +3061,14 @@ internal RunspaceCreationEventArgs(
             bool skipProfiles,
             bool staMode,
             string configurationName,
+            string configurationFilePath,
             Collection<CommandParameter> initialCommandArgs)
         {
             InitialCommand = initialCommand;
             SkipProfiles = skipProfiles;
             StaMode = staMode;
             ConfigurationName = configurationName;
+            ConfigurationFilePath = configurationFilePath;
             InitialCommandArgs = initialCommandArgs;
         }
 
@@ -3038,6 +3080,8 @@ internal RunspaceCreationEventArgs(
 
         internal string ConfigurationName { get; set; }
 
+        internal string ConfigurationFilePath { get; set; }
+
         internal Collection<CommandParameter> InitialCommandArgs { get; set; }
     }
 }   // namespace
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleShell.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleShell.cs
index 11dd276a52d..44f29311622 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleShell.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleShell.cs
@@ -21,7 +21,12 @@ public static class ConsoleShell
         /// <returns>An integer value which should be used as exit code for the process.</returns>
         public static int Start(string? bannerText, string? helpText, string[] args)
         {
-            return Start(InitialSessionState.CreateDefault2(), bannerText, helpText, args);
+            return StartImpl(
+                initialSessionState: InitialSessionState.CreateDefault2(),
+                bannerText,
+                helpText,
+                args,
+                issProvided: false);
         }
 
         /// <summary>Entry point in to ConsoleShell. Used to create a custom Powershell console application.</summary>
@@ -31,6 +36,31 @@ public static int Start(string? bannerText, string? helpText, string[] args)
         /// <param name="args">Commandline parameters specified by user.</param>
         /// <returns>An integer value which should be used as exit code for the process.</returns>
         public static int Start(InitialSessionState initialSessionState, string? bannerText, string? helpText, string[] args)
+        {
+            return StartImpl(
+                initialSessionState,
+                bannerText,
+                helpText,
+                args,
+                issProvided: true);
+        }
+
+        /// <summary>
+        /// Implementation of entry point to ConsoleShell.
+        /// Used to create a custom Powershell console application.
+        /// </summary>
+        /// <param name="initialSessionState">InitialSessionState to be used by the ConsoleHost.</param>
+        /// <param name="bannerText">Banner text to be displayed by ConsoleHost.</param>
+        /// <param name="helpText">Help text for the shell.</param>
+        /// <param name="args">Commandline parameters specified by user.</param>
+        /// <param name="issProvided">True when the InitialSessionState object is provided by caller.</param>
+        /// <returns>An integer value which should be used as exit code for the process.</returns>
+        private static int StartImpl(
+            InitialSessionState initialSessionState,
+            string? bannerText,
+            string? helpText,
+            string[] args,
+            bool issProvided)
         {
             if (initialSessionState == null)
             {
@@ -45,7 +75,7 @@ public static int Start(InitialSessionState initialSessionState, string? bannerT
             ConsoleHost.ParseCommandLine(args);
             ConsoleHost.DefaultInitialSessionState = initialSessionState;
 
-            return ConsoleHost.Start(bannerText, helpText);
+            return ConsoleHost.Start(bannerText, helpText, issProvided);
         }
     }
 }
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs
index 6dbc21ab242..18df48d3600 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs
@@ -96,7 +96,10 @@ public static int Start([MarshalAs(UnmanagedType.LPArray, ArraySubType = Unmanag
 
                 ConsoleHost.DefaultInitialSessionState = InitialSessionState.CreateDefault2();
 
-                exitCode = ConsoleHost.Start(banner, ManagedEntranceStrings.UsageHelp);
+                exitCode = ConsoleHost.Start(
+                    bannerText: banner,
+                    helpText: ManagedEntranceStrings.UsageHelp,
+                    issProvidedExternally: false);
             }
             catch (HostException e)
             {
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/CommandLineParameterParserStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/CommandLineParameterParserStrings.resx
index ab893b91a0a..e346331b414 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/CommandLineParameterParserStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/CommandLineParameterParserStrings.resx
@@ -187,7 +187,10 @@ Valid formats are:
     <value>Cannot process the command because -STA and -MTA are both specified. Specify either -STA or -MTA.</value>
   </data>
   <data name="MissingConfigurationNameArgument" xml:space="preserve">
-    <value>Cannot process the command because -Configuration requires an argument that is a remote endpoint configuration name. Specify this argument and try again.</value>
+    <value>Cannot process the command because -ConfigurationName requires an argument that is a remote endpoint configuration name. Specify this argument and try again.</value>
+  </data>
+  <data name="MissingConfigurationFileArgument" xml:space="preserve">
+    <value>Cannot process the command because -ConfigurationFile requires an argument that is a session configuration (.pssc) file path. Specify this argument and try again.</value>
   </data>
   <data name="MissingCustomPipeNameArgument" xml:space="preserve">
     <value>Cannot process the command because -CustomPipeName requires an argument that is a name of the pipe you want to use. Specify this argument and try again.</value>
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostStrings.resx
index 7296bb30feb..49c22783c1f 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ConsoleHostStrings.resx
@@ -135,6 +135,9 @@
   <data name="ShellCannotBeStarted" xml:space="preserve">
     <value>The shell cannot be started. A failure occurred during initialization:</value>
   </data>
+  <data name="ShellCannotBeStartedWithConfigConflict" xml:space="preserve">
+    <value>The shell cannot be started. An InitialSessionState object has been provided along with a -ConfigurationFile argument. Both configuration directives cannot be used at the same time.</value>
+  </data>
   <data name="UnhandledExceptionShutdownMessage" xml:space="preserve">
     <value>An error has occurred that was not properly handled. Additional information is shown below. The PowerShell process will exit.</value>
   </data>
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
index 481a4216cf9..24a6e78ad6f 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
@@ -288,6 +288,14 @@ All parameters are case-insensitive.</value>
 
     Example: "pwsh -ConfigurationName AdminRoles"
 
+-ConfigurationFile
+
+    Specifies a session configuration (.pssc) file path. The configuration
+    contained in the configuration file will be applied to the PowerShell
+    session.
+
+    Example: "pwsh -ConfigurationFile "C:\ProgramData\PowerShell\MyConfig.pssc"
+
 -CustomPipeName
 
     Specifies the name to use for an additional IPC server (named pipe) used
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index bfae1b3e6b4..cb4126ed1fb 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -1312,7 +1312,7 @@ private static void MakeDisallowedEntriesPrivate<T>(InitialSessionStateEntryColl
         /// Creates an initial session state from a PSSC configuration file.
         /// </summary>
         /// <param name="path">The path to the PSSC session configuration file.</param>
-        /// <returns></returns>
+        /// <returns>InitialSessionState object.</returns>
         public static InitialSessionState CreateFromSessionConfigurationFile(string path)
         {
             return CreateFromSessionConfigurationFile(path, null);
@@ -1327,10 +1327,48 @@ public static InitialSessionState CreateFromSessionConfigurationFile(string path
         /// target session. If you have a WindowsPrincipal for a user, for example, create a Function that
         /// checks windowsPrincipal.IsInRole().
         /// </param>
-        /// <returns></returns>
-        public static InitialSessionState CreateFromSessionConfigurationFile(string path, Func<string, bool> roleVerifier)
+        /// <returns>InitialSessionState object.</returns>
+        public static InitialSessionState CreateFromSessionConfigurationFile(
+            string path,
+            Func<string, bool> roleVerifier)
         {
-            Remoting.DISCPowerShellConfiguration discConfiguration = new Remoting.DISCPowerShellConfiguration(path, roleVerifier);
+            return CreateFromSessionConfigurationFile(path, roleVerifier, validateFile: false);
+        }
+
+        /// <summary>
+        /// Creates an initial session state from a PSSC configuration file.
+        /// </summary>
+        /// <param name="path">The path to the PSSC session configuration file.</param>
+        /// <param name="roleVerifier">
+        /// The verifier that PowerShell should call to determine if groups in the Role entry apply to the
+        /// target session. If you have a WindowsPrincipal for a user, for example, create a Function that
+        /// checks windowsPrincipal.IsInRole().
+        /// </param>
+        /// <param name="validateFile">Validates the file contents for supported SessionState options.</param>
+        /// <returns>InitialSessionState object.</returns>
+        public static InitialSessionState CreateFromSessionConfigurationFile(
+            string path,
+            Func<string, bool> roleVerifier,
+            bool validateFile)
+        {
+            if (path is null)
+            {
+                throw new PSArgumentNullException(nameof(path));
+            }
+
+            if (!File.Exists(path))
+            {
+                throw new PSInvalidOperationException(
+                    StringUtil.Format(ConsoleInfoErrorStrings.ConfigurationFileDoesNotExist, path));
+            }
+
+            if (!path.EndsWith(".pssc", StringComparison.OrdinalIgnoreCase))
+            {
+                throw new PSInvalidOperationException(
+                    StringUtil.Format(ConsoleInfoErrorStrings.NotConfigurationFile, path));
+            }
+
+            Remoting.DISCPowerShellConfiguration discConfiguration = new Remoting.DISCPowerShellConfiguration(path, roleVerifier, validateFile);
             return discConfiguration.GetInitialSessionState(null);
         }
 
@@ -5241,7 +5279,6 @@ private static void InitializeCoreCmdletsAndProviders(
                 { "Enable-PSSessionConfiguration",     new SessionStateCmdletEntry("Enable-PSSessionConfiguration", typeof(EnablePSSessionConfigurationCommand), helpFile) },
                 { "Get-PSSessionCapability",           new SessionStateCmdletEntry("Get-PSSessionCapability", typeof(GetPSSessionCapabilityCommand), helpFile) },
                 { "Get-PSSessionConfiguration",        new SessionStateCmdletEntry("Get-PSSessionConfiguration", typeof(GetPSSessionConfigurationCommand), helpFile) },
-                { "New-PSSessionConfigurationFile",    new SessionStateCmdletEntry("New-PSSessionConfigurationFile", typeof(NewPSSessionConfigurationFileCommand), helpFile) },
                 { "Receive-PSSession",                 new SessionStateCmdletEntry("Receive-PSSession", typeof(ReceivePSSessionCommand), helpFile) },
                 { "Register-PSSessionConfiguration",   new SessionStateCmdletEntry("Register-PSSessionConfiguration", typeof(RegisterPSSessionConfigurationCommand), helpFile) },
                 { "Unregister-PSSessionConfiguration", new SessionStateCmdletEntry("Unregister-PSSessionConfiguration", typeof(UnregisterPSSessionConfigurationCommand), helpFile) },
@@ -5273,6 +5310,7 @@ private static void InitializeCoreCmdletsAndProviders(
                 { "New-ModuleManifest",                new SessionStateCmdletEntry("New-ModuleManifest", typeof(NewModuleManifestCommand), helpFile) },
                 { "New-PSRoleCapabilityFile",          new SessionStateCmdletEntry("New-PSRoleCapabilityFile", typeof(NewPSRoleCapabilityFileCommand), helpFile) },
                 { "New-PSSession",                     new SessionStateCmdletEntry("New-PSSession", typeof(NewPSSessionCommand), helpFile) },
+                { "New-PSSessionConfigurationFile",    new SessionStateCmdletEntry("New-PSSessionConfigurationFile", typeof(NewPSSessionConfigurationFileCommand), helpFile) },
                 { "New-PSSessionOption",               new SessionStateCmdletEntry("New-PSSessionOption", typeof(NewPSSessionOptionCommand), helpFile) },
                 { "New-PSTransportOption",             new SessionStateCmdletEntry("New-PSTransportOption", typeof(NewPSTransportOptionCommand), helpFile) },
                 { "Out-Default",                       new SessionStateCmdletEntry("Out-Default", typeof(OutDefaultCommand), helpFile) },
diff --git a/src/System.Management.Automation/engine/remoting/commands/NewPSSessionConfigurationFile.cs b/src/System.Management.Automation/engine/remoting/commands/NewPSSessionConfigurationFile.cs
index 658876c1d8d..e5aa6bef798 100644
--- a/src/System.Management.Automation/engine/remoting/commands/NewPSSessionConfigurationFile.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/NewPSSessionConfigurationFile.cs
@@ -15,7 +15,6 @@
 
 namespace Microsoft.PowerShell.Commands
 {
-#if !UNIX
     /// <summary>
     /// New-PSSessionConfigurationFile command implementation
     ///
@@ -1126,7 +1125,6 @@ private bool ShouldGenerateConfigurationSnippet(string parameterName)
 
         #endregion
     }
-#endif
 
     /// <summary>
     /// New-PSRoleCapabilityFile command implementation
diff --git a/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs b/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
index d428e521fe2..744e8ff8e1c 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
@@ -22,6 +22,8 @@
 
 namespace System.Management.Automation.Remoting
 {
+    #region WSMan endpoint configuration
+
     /// <summary>
     /// This struct is used to represent contents from configuration xml. The
     /// XML is passed to plugins by WSMan API.
@@ -56,6 +58,8 @@ internal class ConfigurationDataFromXML
 
         #endregion
 
+        #region Fields
+
         internal string StartupScript;
         // this field is used only by an Out-Of-Process (IPC) server process
         internal string InitializationScriptForOutOfProcessRunspace;
@@ -71,6 +75,10 @@ internal class ConfigurationDataFromXML
         internal PSSessionConfigurationData SessionConfigurationData;
         internal string ConfigFilePath;
 
+        #endregion
+
+        #region Methods
+
         /// <summary>
         /// Using optionName and optionValue updates the current object.
         /// </summary>
@@ -324,6 +332,8 @@ internal PSSessionConfiguration CreateEndPointConfigurationInstance()
             throw PSTraceSource.NewArgumentException("typeToLoad", RemotingErrorIdStrings.UnableToLoadType,
                     EndPointConfigurationTypeName, ConfigurationDataFromXML.INITPARAMETERSTOKEN);
         }
+
+        #endregion
     }
 
     /// <summary>
@@ -450,7 +460,8 @@ protected virtual void Dispose(bool isDisposing)
                     ...
                   </InitializationParameters>
          */
-        internal static ConfigurationDataFromXML LoadEndPointConfiguration(string shellId,
+        internal static ConfigurationDataFromXML LoadEndPointConfiguration(
+            string shellId,
             string initializationParameters)
         {
             ConfigurationDataFromXML configData = null;
@@ -798,6 +809,8 @@ private static string
     /// </summary>
     internal sealed class DefaultRemotePowerShellConfiguration : PSSessionConfiguration
     {
+        #region Method overrides
+
         /// <summary>
         /// </summary>
         /// <param name="senderInfo"></param>
@@ -852,9 +865,15 @@ public override InitialSessionState GetInitialSessionState(PSSessionConfiguratio
 
             return sessionState;
         }
+
+        #endregion
     }
 
-    #region Declarative Initial Session Configuration
+    #endregion
+
+    #region Declarative InitialSession Configuration
+
+    #region Supporting types
 
     /// <summary>
     /// Specifies type of initial session state to use. Valid values are Empty and Default.
@@ -898,6 +917,10 @@ internal ConfigTypeEntry(string key, TypeValidationCallback callback)
         }
     }
 
+    #endregion
+
+    #region ConfigFileConstants
+
     /// <summary>
     /// Configuration file constants.
     /// </summary>
@@ -1355,6 +1378,8 @@ private static bool StringOrHashtableArrayTypeValidationCallback(string key, obj
         }
     }
 
+    #endregion
+
     #region DISC Utilities
 
     /// <summary>
@@ -1681,6 +1706,8 @@ internal static void ValidateRoleDefinitions(IDictionary roleDefinitions)
 
     #endregion
 
+    #region DISCPowerShellConfiguration
+
     /// <summary>
     /// Creates an initial session state based on the configuration language for PSSC files.
     /// </summary>
@@ -1706,7 +1733,11 @@ internal Hashtable ConfigHash
         /// target session. If you have a WindowsPrincipal for a user, for example, create a Function that
         /// checks windowsPrincipal.IsInRole().
         /// </param>
-        internal DISCPowerShellConfiguration(string configFile, Func<string, bool> roleVerifier)
+        /// <param name="validateFile">Validate file for supported configuration options.</param>
+        internal DISCPowerShellConfiguration(
+            string configFile,
+            Func<string, bool> roleVerifier,
+            bool validateFile = false)
         {
             _configFile = configFile;
             if (roleVerifier == null)
@@ -1726,6 +1757,12 @@ internal DISCPowerShellConfiguration(string configFile, Func<string, bool> roleV
                     configFile, out scriptName);
 
                 _configHash = DISCUtils.LoadConfigFile(Runspace.DefaultRunspace.ExecutionContext, script);
+
+                if (validateFile)
+                {
+                    DISCFileValidation.ValidateContents(_configHash);
+                }
+
                 MergeRoleRulesIntoConfigHash(roleVerifier);
                 MergeRoleCapabilitiesIntoConfigHash();
 
@@ -2890,4 +2927,110 @@ internal static T[] TryGetObjectsOfType<T>(object hashObj, IEnumerable<Type> typ
         }
     }
     #endregion
+
+    #region DISCFileValidation
+
+    internal static class DISCFileValidation
+    {
+        // Set of supported configuration options for a PowerShell InitialSessionState.
+#if UNIX
+        private static readonly HashSet<string> SupportedConfigOptions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        {
+            "AliasDefinitions",
+            "AssembliesToLoad",
+            "Author",
+            "CompanyName",
+            "Copyright",
+            "Description",
+            "EnvironmentVariables",
+            "FormatsToProcess",
+            "FunctionDefinitions",
+            "GUID",
+            "LanguageMode",
+            "ModulesToImport",
+            "MountUserDrive",
+            "SchemaVersion",
+            "ScriptsToProcess",
+            "SessionType",
+            "TranscriptDirectory",
+            "TypesToProcess",
+            "UserDriveMaximumSize",
+            "VisibleAliases",
+            "VisibleCmdlets",
+            "VariableDefinitions",
+            "VisibleExternalCommands",
+            "VisibleFunctions",
+            "VisibleProviders"
+        };
+#else
+        private static readonly HashSet<string> SupportedConfigOptions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        {
+            "AliasDefinitions",
+            "AssembliesToLoad",
+            "Author",
+            "CompanyName",
+            "Copyright",
+            "Description",
+            "EnvironmentVariables",
+            "ExecutionPolicy",
+            "FormatsToProcess",
+            "FunctionDefinitions",
+            "GUID",
+            "LanguageMode",
+            "ModulesToImport",
+            "MountUserDrive",
+            "SchemaVersion",
+            "ScriptsToProcess",
+            "SessionType",
+            "TranscriptDirectory",
+            "TypesToProcess",
+            "UserDriveMaximumSize",
+            "VisibleAliases",
+            "VisibleCmdlets",
+            "VariableDefinitions",
+            "VisibleExternalCommands",
+            "VisibleFunctions",
+            "VisibleProviders"
+        };
+#endif
+
+        // These are configuration options for WSMan (WinRM) endpoint configurations, that 
+        // appearand in .pssc files, but are not part of PowerShell InitialSessionState.
+        private static readonly HashSet<string> UnsupportedConfigOptions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        {
+            "GroupManagedServiceAccount",
+            "PowerShellVersion",
+            "RequiredGroups",
+            "RoleDefinitions",
+            "RunAsVirtualAccount",
+            "RunAsVirtualAccountGroups"
+        };
+
+        internal static void ValidateContents(Hashtable configHash)
+        {
+            foreach (var key in configHash.Keys)
+            {
+                if (key is not string keyName)
+                {
+                    throw new PSInvalidOperationException(RemotingErrorIdStrings.DISCInvalidConfigKeyType);
+                }
+
+                if (UnsupportedConfigOptions.Contains(keyName))
+                {
+                    throw new PSInvalidOperationException(
+                        StringUtil.Format(RemotingErrorIdStrings.DISCUnsupportedConfigName, keyName));
+                }
+
+                if (!SupportedConfigOptions.Contains(keyName))
+                {
+                    throw new PSInvalidOperationException(
+                        StringUtil.Format(RemotingErrorIdStrings.DISCUnknownConfigName, keyName));
+                }
+            }
+        }
+    }
+
+    #endregion
+    
+    #endregion
 }
diff --git a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
index 2883bfd68fe..5636835e198 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
@@ -1980,10 +1980,10 @@ private void ProcessReaderThread(object state)
                         break;
                     }
 
-                    if (data.StartsWith(System.Management.Automation.Remoting.Server.NamedPipeErrorTextWriter.ErrorPrefix, StringComparison.OrdinalIgnoreCase))
+                    if (data.StartsWith(System.Management.Automation.Remoting.Server.FormattedErrorTextWriter.ErrorPrefix, StringComparison.OrdinalIgnoreCase))
                     {
                         // Error message from the server.
-                        string errorData = data.Substring(System.Management.Automation.Remoting.Server.NamedPipeErrorTextWriter.ErrorPrefix.Length);
+                        string errorData = data.Substring(System.Management.Automation.Remoting.Server.FormattedErrorTextWriter.ErrorPrefix.Length);
                         HandleErrorDataReceived(errorData);
                     }
                     else
@@ -2592,6 +2592,12 @@ internal OutOfProcessServerSessionTransportManager(OutOfProcessTextWriter outWri
             _stdOutWriter = outWriter;
             _stdErrWriter = errWriter;
             _cmdTransportManagers = new Dictionary<Guid, OutOfProcessServerTransportManager>();
+
+            this.WSManTransportErrorOccured += (object sender, TransportErrorOccuredEventArgs e) => 
+            {
+                string msg = e.Exception.TransportMessage ?? e.Exception.InnerException?.Message ?? string.Empty;
+                _stdErrWriter.WriteLine(StringUtil.Format(RemotingErrorIdStrings.RemoteTransportError, msg));
+            };
         }
 
         #endregion
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManPlugin.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManPlugin.cs
index 9382beb9b31..79d583e063f 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManPlugin.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManPlugin.cs
@@ -306,10 +306,16 @@ internal void CreateShell(
                     PSOpcode.Connect, PSTask.None,
                     PSKeyword.ManagedPlugin | PSKeyword.UseAlwaysAnalytic,
                     requestDetails.ToString(), senderInfo.UserInfo.Identity.Name, requestDetails.resourceUri);
-                ServerRemoteSession remoteShellSession = ServerRemoteSession.CreateServerRemoteSession(senderInfo,
-                requestDetails.resourceUri,
-                extraInfo,
-                serverTransportMgr);
+
+                ServerRemoteSession remoteShellSession = ServerRemoteSession.CreateServerRemoteSession(
+                    senderInfo: senderInfo,
+                    configurationProviderId: requestDetails.resourceUri,
+                    initializationParameters: extraInfo,
+                    transportManager: serverTransportMgr,
+                    initialCommand: null,       // Not used by WinRM endpoint.
+                    configurationName: null,    // Not used by WinRM endpoint, which has its own configuration.
+                    configurationFile: null,    // Same.
+                    initialLocation: null);     // Same.
 
                 if (remoteShellSession == null)
                 {
diff --git a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
index 510dbeea197..6fd6ae59cd4 100644
--- a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
+++ b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
@@ -300,6 +300,7 @@ protected void OnCloseAckPacketReceived(Guid psGuid)
 
         protected OutOfProcessServerSessionTransportManager CreateSessionTransportManager(
             string configurationName,
+            string configurationFile,
             PSRemotingCryptoHelperServer cryptoHelper,
             string workingDirectory)
         {
@@ -317,14 +318,20 @@ protected OutOfProcessServerSessionTransportManager CreateSessionTransportManage
             senderInfo = new PSSenderInfo(userPrincipal, "http://localhost");
 #endif
 
-            OutOfProcessServerSessionTransportManager tm = new OutOfProcessServerSessionTransportManager(originalStdOut, originalStdErr, cryptoHelper);
+            var tm = new OutOfProcessServerSessionTransportManager(
+                originalStdOut,
+                originalStdErr,
+                cryptoHelper);
 
             ServerRemoteSession.CreateServerRemoteSession(
-                senderInfo,
-                _initialCommand,
-                tm,
-                configurationName,
-                workingDirectory);
+                senderInfo: senderInfo,
+                configurationProviderId: "Microsoft.PowerShell",
+                initializationParameters: string.Empty,
+                transportManager: tm,
+                initialCommand: _initialCommand,
+                configurationName: configurationName,
+                configurationFile: configurationFile,
+                initialLocation: workingDirectory);
 
             return tm;
         }
@@ -333,11 +340,16 @@ protected void Start(
             string initialCommand,
             PSRemotingCryptoHelperServer cryptoHelper,
             string workingDirectory,
-            string configurationName)
+            string configurationName,
+            string configurationFile)
         {
             _initialCommand = initialCommand;
 
-            sessionTM = CreateSessionTransportManager(configurationName, cryptoHelper, workingDirectory);
+            sessionTM = CreateSessionTransportManager(
+                configurationName: configurationName,
+                configurationFile: configurationFile,
+                cryptoHelper: cryptoHelper,
+                workingDirectory: workingDirectory);
 
             try
             {
@@ -348,7 +360,11 @@ protected void Start(
                     {
                         if (sessionTM == null)
                         {
-                            sessionTM = CreateSessionTransportManager(configurationName, cryptoHelper, workingDirectory);
+                            sessionTM = CreateSessionTransportManager(
+                                configurationName: configurationName,
+                                configurationFile: configurationFile,
+                                cryptoHelper: cryptoHelper,
+                                workingDirectory: workingDirectory);
                         }
                     }
 
@@ -432,7 +448,8 @@ internal sealed class StdIOProcessMediator : OutOfProcessMediatorBase
         /// It will replace StdIn,StdOut and StdErr stream with TextWriter.Null. This is
         /// to make sure these streams are totally used by our Mediator.
         /// </summary>
-        private StdIOProcessMediator() : base(true)
+        /// <param name="combineErrOutStream">Redirects remoting errors to the Out stream.</param>
+        private StdIOProcessMediator(bool combineErrOutStream) : base(exitProcessOnError: true)
         {
             // Create input stream reader from Console standard input stream.
             // We don't use the provided Console.In TextReader because it can have
@@ -441,16 +458,23 @@ private StdIOProcessMediator() : base(true)
             // stream encoding.  This way the stream encoding is determined by the
             // stream BOM as needed.
             originalStdIn = new StreamReader(Console.OpenStandardInput(), true);
-            Console.SetIn(TextReader.Null);
 
-            // replacing StdOut with Null so that no other app messes with the
-            // original stream
+            // Remoting errors can optionally be written to stdErr or stdOut with
+            // special formatting.
             originalStdOut = new OutOfProcessTextWriter(Console.Out);
-            Console.SetOut(TextWriter.Null);
+            if (combineErrOutStream)
+            {
+                originalStdErr = new FormattedErrorTextWriter(Console.Out);
+            }
+            else
+            {
+                originalStdErr = new OutOfProcessTextWriter(Console.Error);
+            }
 
-            // replacing StdErr with Null so that no other app messes with the
-            // original stream
-            originalStdErr = new OutOfProcessTextWriter(Console.Error);
+            // Replacing StdIn, StdOut, StdErr with Null so that no other app messes with the
+            // original streams.
+            Console.SetIn(TextReader.Null);
+            Console.SetOut(TextWriter.Null);
             Console.SetError(TextWriter.Null);
         }
 
@@ -464,10 +488,14 @@ private StdIOProcessMediator() : base(true)
         /// <param name="initialCommand">Specifies the initialization script.</param>
         /// <param name="workingDirectory">Specifies the initial working directory. The working directory is set before the initial command.</param>
         /// <param name="configurationName">Specifies an optional configuration name that configures the endpoint session.</param>
+        /// <param name="configurationFile">Specifies an optional path to a configuration (.pssc) file for the session.</param>
+        /// <param name="combineErrOutStream">Specifies the option to write remoting errors to stdOut stream, with special formatting.</param>
         internal static void Run(
             string initialCommand,
             string workingDirectory,
-            string configurationName)
+            string configurationName,
+            string configurationFile,
+            bool combineErrOutStream)
         {
             lock (SyncObject)
             {
@@ -477,14 +505,15 @@ internal static void Run(
                     return;
                 }
 
-                s_singletonInstance = new StdIOProcessMediator();
+                s_singletonInstance = new StdIOProcessMediator(combineErrOutStream);
             }
 
             s_singletonInstance.Start(
                 initialCommand: initialCommand,
                 cryptoHelper: new PSRemotingCryptoHelperServer(),
                 workingDirectory: workingDirectory,
-                configurationName: configurationName);
+                configurationName: configurationName,
+                configurationFile: configurationFile);
         }
 
         #endregion
@@ -526,7 +555,7 @@ private NamedPipeProcessMediator(
             // Create transport reader/writers from named pipe.
             originalStdIn = namedPipeServer.TextReader;
             originalStdOut = new OutOfProcessTextWriter(namedPipeServer.TextWriter);
-            originalStdErr = new NamedPipeErrorTextWriter(namedPipeServer.TextWriter);
+            originalStdErr = new FormattedErrorTextWriter(namedPipeServer.TextWriter);
 
 #if !UNIX
             // Flow impersonation as needed.
@@ -557,17 +586,18 @@ internal static void Run(
                 initialCommand: initialCommand,
                 cryptoHelper: new PSRemotingCryptoHelperServer(),
                 workingDirectory: null,
-                configurationName: namedPipeServer.ConfigurationName);
+                configurationName: namedPipeServer.ConfigurationName,
+                configurationFile: null);
         }
 
         #endregion
     }
 
-    internal sealed class NamedPipeErrorTextWriter : OutOfProcessTextWriter
+    internal sealed class FormattedErrorTextWriter : OutOfProcessTextWriter
     {
         #region Constructors
 
-        internal NamedPipeErrorTextWriter(
+        internal FormattedErrorTextWriter(
             TextWriter textWriter) : base(textWriter)
         { }
 
@@ -575,6 +605,8 @@ internal NamedPipeErrorTextWriter(
 
         #region Base class overrides
 
+        // Write error data to stream with 'ErrorPrefix' prefix that will
+        // be interpreted by the client.
         public override void WriteLine(string data)
         {
             string dataToWrite = (data != null) ? ErrorPrefix + data : null;
@@ -632,7 +664,8 @@ internal static void Run(
                 initialCommand: initialCommand,
                 cryptoHelper: new PSRemotingCryptoHelperServer(),
                 workingDirectory: null,
-                configurationName: configurationName);
+                configurationName: configurationName,
+                configurationFile: null);
         }
 
         #endregion
diff --git a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
index fe31e0fad7e..8bfc137f35c 100644
--- a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
+++ b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
@@ -89,6 +89,10 @@ internal class ServerRemoteSession : RemoteSession
         // Creates a pushed remote runspace session created with this configuration name.
         private string _configurationName;
 
+        // Specifies an optional .pssc configuration file path for out-of-proc session use.
+        // The .pssc file is used to configure the runspace for the endpoint session.
+        private string _configurationFile;
+
         // Specifies an initial location of the powershell session.
         private string _initialLocation;
 
@@ -173,7 +177,9 @@ internal ServerRemoteSession(PSSenderInfo senderInfo,
         /// xml.
         /// </param>
         /// <param name="transportManager"></param>
+        /// <param name="initialCommand">Optional initial command used for OutOfProc sessions.</param>
         /// <param name="configurationName">Optional configuration endpoint name for OutOfProc sessions.</param>
+        /// <param name="configurationFile">Optional configuration file (.pssc) path for OutOfProc sessions.</param>
         /// <param name="initialLocation">Optional configuration initial location of the powershell session.</param>
         /// <returns></returns>
         /// <exception cref="InvalidOperationException">
@@ -192,8 +198,10 @@ internal static ServerRemoteSession CreateServerRemoteSession(
             string configurationProviderId,
             string initializationParameters,
             AbstractServerSessionTransportManager transportManager,
-            string configurationName = null,
-            string initialLocation = null)
+            string initialCommand,
+            string configurationName,
+            string configurationFile,
+            string initialLocation)
         {
             Dbg.Assert(
                 (senderInfo != null) && (senderInfo.UserInfo != null),
@@ -215,7 +223,9 @@ internal static ServerRemoteSession CreateServerRemoteSession(
                 initializationParameters,
                 transportManager)
             {
+                _initScriptForOutOfProcRS = initialCommand,
                 _configurationName = configurationName,
+                _configurationFile = configurationFile,
                 _initialLocation = initialLocation
             };
 
@@ -226,33 +236,6 @@ internal static ServerRemoteSession CreateServerRemoteSession(
             return result;
         }
 
-        /// <summary>
-        /// Used by OutOfProcessServerMediator to create a remote session.
-        /// </summary>
-        /// <param name="senderInfo"></param>
-        /// <param name="initializationScriptForOutOfProcessRunspace"></param>
-        /// <param name="transportManager"></param>
-        /// <param name="configurationName"></param>
-        /// <param name="initialLocation"></param>
-        /// <returns></returns>
-        internal static ServerRemoteSession CreateServerRemoteSession(
-            PSSenderInfo senderInfo,
-            string initializationScriptForOutOfProcessRunspace,
-            AbstractServerSessionTransportManager transportManager,
-            string configurationName,
-            string initialLocation)
-        {
-            ServerRemoteSession result = CreateServerRemoteSession(
-                senderInfo,
-                "Microsoft.PowerShell",
-                string.Empty,
-                transportManager,
-                configurationName: configurationName,
-                initialLocation: initialLocation);
-            result._initScriptForOutOfProcRS = initializationScriptForOutOfProcessRunspace;
-            return result;
-        }
-
         #endregion
 
         #region Overrides
@@ -754,8 +737,7 @@ private void HandleCreateRunspacePool(object sender, RemoteDataEventArgs createR
             // Get Initial Session State from custom session config suppliers
             // like Exchange.
             ConfigurationDataFromXML configurationData =
-                PSSessionConfiguration.LoadEndPointConfiguration(_configProviderId,
-                    _initParameters);
+                PSSessionConfiguration.LoadEndPointConfiguration(_configProviderId, _initParameters);
             // used by Out-Of-Proc (IPC) runspace.
             configurationData.InitializationScriptForOutOfProcessRunspace = _initScriptForOutOfProcRS;
             // start with data from configuration XML and then override with data
@@ -763,8 +745,6 @@ private void HandleCreateRunspacePool(object sender, RemoteDataEventArgs createR
             _maxRecvdObjectSize = configurationData.MaxReceivedObjectSizeMB;
             _maxRecvdDataSizeCommand = configurationData.MaxReceivedCommandSizeMB;
 
-            DISCPowerShellConfiguration discProvider = null;
-
             if (string.IsNullOrEmpty(configurationData.ConfigFilePath))
             {
                 _sessionConfigProvider = configurationData.CreateEndPointConfigurationInstance();
@@ -772,11 +752,8 @@ private void HandleCreateRunspacePool(object sender, RemoteDataEventArgs createR
             else
             {
                 System.Security.Principal.WindowsPrincipal windowsPrincipal = new System.Security.Principal.WindowsPrincipal(_senderInfo.UserInfo.WindowsIdentity);
-
                 Func<string, bool> validator = (role) => windowsPrincipal.IsInRole(role);
-
-                discProvider = new DISCPowerShellConfiguration(configurationData.ConfigFilePath, validator);
-                _sessionConfigProvider = discProvider;
+                _sessionConfigProvider = new DISCPowerShellConfiguration(configurationData.ConfigFilePath, validator);
             }
 
             // exchange of ApplicationArguments and ApplicationPrivateData is be done as early as possible
@@ -787,6 +764,7 @@ private void HandleCreateRunspacePool(object sender, RemoteDataEventArgs createR
 
             if (configurationData.SessionConfigurationData != null)
             {
+                // Use the provided WinRM endpoint runspace configuration information.
                 try
                 {
                     rsSessionStateToUse =
@@ -797,8 +775,21 @@ private void HandleCreateRunspacePool(object sender, RemoteDataEventArgs createR
                     rsSessionStateToUse = _sessionConfigProvider.GetInitialSessionState(_senderInfo);
                 }
             }
+            else if (!string.IsNullOrEmpty(_configurationFile))
+            {
+                // Use the optional _configurationFile parameter to create the endpoint runspace configuration.
+                // This parameter is only used by Out-Of-Proc transports (not WinRM transports).
+                var discConfiguration = new Remoting.DISCPowerShellConfiguration(
+                    configFile: _configurationFile,
+                    roleVerifier: null, 
+                    validateFile: true);
+                rsSessionStateToUse = discConfiguration.GetInitialSessionState(_senderInfo);
+            }
             else
             {
+                // Create a runspace configuration based on the provided PSSessionConfiguration provider.
+                // This can be either a 'default' configuration, or third party configuration PSSessionConfiguration provider object.
+                // So far, only Exchange provides a custom PSSessionConfiguration provider implementation.
                 rsSessionStateToUse = _sessionConfigProvider.GetInitialSessionState(_senderInfo);
             }
 
diff --git a/src/System.Management.Automation/resources/ConsoleInfoErrorStrings.resx b/src/System.Management.Automation/resources/ConsoleInfoErrorStrings.resx
index 201dde0e4ac..ba0809e9010 100644
--- a/src/System.Management.Automation/resources/ConsoleInfoErrorStrings.resx
+++ b/src/System.Management.Automation/resources/ConsoleInfoErrorStrings.resx
@@ -234,4 +234,10 @@
   <data name="ExportConsoleCannotDeleteFile" xml:space="preserve">
     <value>The Save operation failed. Cannot remove the file {0}.</value>
   </data>
+  <data name="ConfigurationFileDoesNotExist" xml:space="preserve">
+    <value>The provided configuration file '{0}' does not exist.</value>
+  </data>
+  <data name="NotConfigurationFile" xml:space="preserve">
+    <value>The provided configuration file '{0}' must have a .pssc file extension.</value>
+  </data>
 </root>
diff --git a/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx b/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
index 429557a7951..57d2a22a0a6 100644
--- a/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
+++ b/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
@@ -1705,4 +1705,13 @@ SSH client process terminated before connection could be established.</value>
   <data name="InvalidPSSessionArgument" xml:space="preserve">
     <value>The Runspace argument to Create must be a non-null RemoteRunspace object.</value>
   </data>
+  <data name="DISCInvalidConfigKeyType" xml:space="preserve">
+    <value>The session configuration hash table contains an invalid key type. Keys should be string types.</value>
+  </data>
+  <data name="DISCUnsupportedConfigName" xml:space="preserve">
+    <value>The session configuration file contains an unsupported configuration option: {0}. This is a remoting endpoint configuration option, that does not apply to PowerShell session state.</value>
+  </data>
+  <data name="DISCUnknownConfigName" xml:space="preserve">
+    <value>The session configuration file contains an unknown configuration option: {0}.</value>
+  </data>
 </root>
diff --git a/test/SSHRemoting/SSHRemoting.Basic.Tests.ps1 b/test/SSHRemoting/SSHRemoting.Basic.Tests.ps1
index 29e7096d49a..1aa87ba3d69 100644
--- a/test/SSHRemoting/SSHRemoting.Basic.Tests.ps1
+++ b/test/SSHRemoting/SSHRemoting.Basic.Tests.ps1
@@ -230,6 +230,25 @@ Describe "SSHRemoting Basic Tests" -tags CI {
             VerifySession $script:sessions[1]
             Write-Verbose -Verbose "It Complete"
         }
+
+        It "Verifies the 'pwshconfig' configured endpoint." {
+            Write-Verbose -Verbose "It Starting: Verifies the 'pwshconfig' configured endpoint."
+            $script:session = TryNewPSSession -HostName localhost -Subsystem 'pwshconfig'
+            $script:session | Should -Not -BeNullOrEmpty
+            # Configured session should be in ConstrainedLanguage mode.
+            $sessionLangMode = Invoke-Command -Session $script:session -ScriptBlock { "$($ExecutionContext.SessionState.LanguageMode)" }
+            $sessionLangMode | Should -BeExactly "ConstrainedLanguage"
+            Write-Verbose -Verbose "It Complete"
+        }
+
+        <#
+        It "Verifes that 'pwshbroken' throws expected error for missing config file." {
+            Write-Verbose -Verbose "It Starting: Verifes that 'pwshbroken' throws expected error for missing config file."
+            { $script:session = TryNewPSSession -HostName localhost -Subsystem 'pwshbroken' } | Should -Throw
+            $script:session = $null
+            Write-Verbose -Verbose "It Complete"
+        }
+        #>
     }
 
     function TryCreateRunspace
@@ -270,7 +289,7 @@ Describe "SSHRemoting Basic Tests" -tags CI {
             }
         }
 
-        if ($null -eq $rs)
+        if (($null -eq $rs) -or !($rs -is [runspace]))
         {
             $message = "Runspace open unable to connect to SSH remoting endpoint after two attempts. Error: $($connectionError.Message)"
             throw [System.Management.Automation.PSInvalidOperationException]::new($message)
@@ -319,7 +338,7 @@ Describe "SSHRemoting Basic Tests" -tags CI {
 
         AfterEach {
             Write-Verbose -Verbose "Starting Runspace close AfterEach"
-            if ($script:rs -ne $null) { $script:rs.Dispose() }
+            if (($script:rs -ne $null) -and ($script:rs -is [runspace])) { $script:rs.Dispose() }
             Write-Verbose -Verbose "AfterEach complete"
         }
 
diff --git a/test/hosting/test_HostingBasic.cs b/test/hosting/test_HostingBasic.cs
index 6cff7978e48..e29b14e38c0 100644
--- a/test/hosting/test_HostingBasic.cs
+++ b/test/hosting/test_HostingBasic.cs
@@ -183,6 +183,19 @@ public static void TestConsoleShellScenario()
             Assert.Equal(42, ret);
         }
 
+        /* Test disabled because CommandLineParser is static and can only be intialized once (above in TestConsoleShellScenario)
+        /// <summary>
+        /// ConsoleShell cannot start with both InitialSessionState and -ConfigurationFile argument configurations specified.
+        /// </summary>
+        [Fact]
+        public static void TestConsoleShellConfigConflictError()
+        {
+            var iss = System.Management.Automation.Runspaces.InitialSessionState.CreateDefault2();
+            int ret = ConsoleShell.Start(iss, "BannerText", string.Empty, new string[] { @"-ConfigurationFile ""noneSuch""" });
+            Assert.Equal(70, ret);  // ExitCodeInitFailure.
+        }
+        */
+
         [Fact]
         public static void TestBuiltInModules()
         {
diff --git a/test/powershell/engine/Basic/DefaultCommands.Tests.ps1 b/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
index e970d5a06a8..aaa6cb432bd 100644
--- a/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
+++ b/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
@@ -375,7 +375,7 @@ Describe "Verify approved aliases list" -Tags "CI" {
 "Cmdlet",       "New-PSDrive",                      "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "Low"
 "Cmdlet",       "New-PSRoleCapabilityFile",         "",                                 $(             $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "New-PSSession",                    "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
-"Cmdlet",       "New-PSSessionConfigurationFile",   "",                                 $($FullCLR -or $CoreWindows              ),     "",                     "",                     "None"
+"Cmdlet",       "New-PSSessionConfigurationFile",   "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "New-PSSessionOption",              "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "New-PSTransportOption",            "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "New-Service",                      "",                                 $($FullCLR -or $CoreWindows              ),     "",                     "",                     "Medium"
diff --git a/test/tools/Modules/HelpersRemoting/HelpersRemoting.psm1 b/test/tools/Modules/HelpersRemoting/HelpersRemoting.psm1
index b5544364260..5c88a4c0532 100644
--- a/test/tools/Modules/HelpersRemoting/HelpersRemoting.psm1
+++ b/test/tools/Modules/HelpersRemoting/HelpersRemoting.psm1
@@ -556,7 +556,28 @@ function Install-SSHRemotingOnLinux
     Write-Verbose -Verbose "Running Enable-SSHRemoting ..."
     Write-Verbose -Verbose "PSScriptRoot: $PSScriptRoot"
     $modulePath = "${PSScriptRoot}\..\Microsoft.PowerShell.RemotingTools\Microsoft.PowerShell.RemotingTools.psd1"
-    $cmdLine = "Import-Module ${modulePath}; Enable-SSHRemoting -SSHDConfigFilePath /etc/ssh/sshd_config -PowerShellFilePath $PowerShellPath -Force"
+    $sshdFilePath = '/etc/ssh/sshd_config'
+
+    # First create a default 'powershell' named endpoint.
+    $cmdLine = "Import-Module ${modulePath}; Enable-SSHRemoting -SSHDConfigFilePath $sshdFilePath -PowerShellFilePath $PowerShellPath -Force"
+    Write-Verbose -Verbose "CmdLine: $cmdLine"
+    sudo pwsh -c $cmdLine
+
+    # Next create a 'pwshconfig' named configured endpoint.
+    # Configuration file:
+    $configFilePath = Join-Path -Path "$env:HOME" -ChildPath 'PSTestConfig.pssc'
+    '@{
+        GUID = "4d667b90-25f8-47d5-9c90-619b27954748"
+        Author = "Microsoft"
+        Description = "Test local PowerShell session configuration"
+        LanguageMode = "ConstrainedLanguage"
+    }' | Out-File -FilePath $configFilePath
+    $cmdLine = "Import-Module ${modulePath}; Enable-SSHRemoting -SSHDConfigFilePath $sshdFilePath -PowerShellFilePath $PowerShellPath -ConfigFilePath $configFilePath -SubsystemName 'pwshconfig' -Force"
+    Write-Verbose -Verbose "CmdLine: $cmdLine"
+    sudo pwsh -c $cmdLine
+
+    # Finally create a 'pwshbroken' named configured endpoint.
+    $cmdLine = "Import-Module ${modulePath}; Enable-SSHRemoting -SSHDConfigFilePath $sshdFilePath -PowerShellFilePath $PowerShellPath -ConfigFilePath '$HOME/NoSuch.pssc' -SubsystemName 'pwshbroken' -Force"
     Write-Verbose -Verbose "CmdLine: $cmdLine"
     sudo pwsh -c $cmdLine
 
diff --git a/test/tools/Modules/Microsoft.PowerShell.RemotingTools/Microsoft.PowerShell.RemotingTools.psm1 b/test/tools/Modules/Microsoft.PowerShell.RemotingTools/Microsoft.PowerShell.RemotingTools.psm1
index 737d0e29302..41a57772fd3 100644
--- a/test/tools/Modules/Microsoft.PowerShell.RemotingTools/Microsoft.PowerShell.RemotingTools.psm1
+++ b/test/tools/Modules/Microsoft.PowerShell.RemotingTools/Microsoft.PowerShell.RemotingTools.psm1
@@ -85,14 +85,17 @@ class SSHRemotingConfig
     [PlatformInfo] $platformInfo
     [SSHSubSystemEntry[]] $psSubSystemEntries = @()
     [string] $configFilePath
+    [string] $subsystemName
     $configComponents = @()
 
     SSHRemotingConfig(
         [PlatformInfo] $platInfo,
-        [string] $configFilePath)
+        [string] $configFilePath,
+        [string] $subsystemName)
     {
         $this.platformInfo = $platInfo
         $this.configFilePath = $configFilePath
+        $this.subsystemName = $subsystemName
         $this.ParseSSHRemotingConfig()
     }
 
@@ -121,7 +124,7 @@ class SSHRemotingConfig
             $components = $this.SplitConfigLine($line)
             $this.configComponents += @{ Line = $line; Components = $components }
 
-            if (($components[0] -eq "Subsystem") -and ($components[1] -eq "powershell"))
+            if (($components[0] -eq "Subsystem") -and ($components[1] -eq $this.subsystemName))
             {
                 $entry = [SSHSubSystemEntry]::New()
                 $entry.subSystemLine = $line
@@ -143,7 +146,9 @@ function UpdateConfiguration
 {
     param (
         [SSHRemotingConfig] $config,
-        [string] $PowerShellPath
+        [string] $PowerShellPath,
+        [string] $SubsystemName,
+        [string] $ConfigFilePath
     )
 
     #
@@ -152,15 +157,19 @@ function UpdateConfiguration
 
     # Subsystem
     [System.Collections.Generic.List[string]] $newContents = [System.Collections.Generic.List[string]]::new()
-    $psSubSystemEntry = "Subsystem       powershell      {0} {1} {2} {3}" -f $powerShellPath, "-SSHS", "-NoProfile", "-NoLogo"
-    $subSystemAdded = $false
+    $psSubSystemEntry = "Subsystem       {0}      {1} -SSHS -NoProfile -NoLogo" -f $SubsystemName, $powerShellPath
+    if (![string]::IsNullOrEmpty($ConfigFilePath))
+    {
+        $psSubSystemEntry += " -ConfigurationFile {0}" -f $ConfigFilePath
+    }
 
+    $subSystemAdded = $false
     foreach ($lineItem in $config.configComponents)
     {
         $line = $lineItem.Line
         $components = $lineItem.Components
 
-        if ($components[0] -eq "SubSystem")
+        if ($components[0] -eq "Subsystem")
         {
             if (! $subSystemAdded)
             {
@@ -169,7 +178,7 @@ function UpdateConfiguration
                 $subSystemAdded = $true
             }
 
-            if ($components[1] -eq "powershell")
+            if ($components[1] -eq $SubsystemName)
             {
                 # Remove all existing powershell subsystem entries
                 continue
@@ -324,6 +333,10 @@ function Enable-SSHRemoting
 
         [string] $PowerShellFilePath,
 
+        [string] $SubsystemName = "powershell",
+
+        [string] $ConfigFilePath,
+
         [switch] $Force
     )
 
@@ -475,7 +488,7 @@ function Enable-SSHRemoting
     WriteLine "$SSHDConfigFilePath" -AppendLines 1
 
     # Get the SSHD configurtion
-    $sshdConfig = [SSHRemotingConfig]::new($platformInfo, $SSHDConfigFilePath)
+    $sshdConfig = [SSHRemotingConfig]::new($platformInfo, $SSHDConfigFilePath, $SubsystemName)
 
     if ($sshdConfig.psSubSystemEntries.Count -gt 0)
     {
@@ -499,7 +512,7 @@ function Enable-SSHRemoting
     {
         WriteLine "Updating configuration file ..." -PrependLines 1 -AppendLines 1
 
-        UpdateConfiguration $sshdConfig $PowerShellToUse
+        UpdateConfiguration $sshdConfig $PowerShellToUse $SubsystemName $ConfigFilePath
 
         WriteLine "The configuration file has been updated:" -PrependLines 1
         WriteLine $sshdConfig.configFilePath -AppendLines 1
diff --git a/test/xUnit/csharp/test_CommandLineParser.cs b/test/xUnit/csharp/test_CommandLineParser.cs
index cf2a1281219..70621dfdf0f 100644
--- a/test/xUnit/csharp/test_CommandLineParser.cs
+++ b/test/xUnit/csharp/test_CommandLineParser.cs
@@ -24,6 +24,7 @@ public static void TestDefaults()
             Assert.False(cpp.AbortStartup);
             Assert.Empty(cpp.Args);
             Assert.Null(cpp.ConfigurationName);
+            Assert.Null(cpp.ConfigurationFile);
             Assert.Null(cpp.CustomPipeName);
             Assert.Null(cpp.ErrorMessage);
             Assert.Null(cpp.ExecutionPolicy);
@@ -437,6 +438,38 @@ public static void TestParameter_ConfigurationName_With_Name(params string[] com
             Assert.Null(cpp.ErrorMessage);
         }
 
+        [Theory]
+        [InlineData("-configurationfile")]
+        public static void TestParameter_ConfigurationFile_No_Name(params string[] commandLine)
+        {
+            var cpp = new CommandLineParameterParser();
+
+            cpp.Parse(commandLine);
+
+            Assert.True(cpp.AbortStartup);
+            Assert.True(cpp.NoExit);
+            Assert.False(cpp.ShowShortHelp);
+            Assert.False(cpp.ShowBanner);
+            Assert.Equal((uint)ConsoleHost.ExitCodeBadCommandLineParameter, cpp.ExitCode);
+            Assert.Equal(CommandLineParameterParserStrings.MissingConfigurationFileArgument, cpp.ErrorMessage);
+        }
+
+        [Theory]
+        [InlineData("-configurationfile", "qwerty")]
+        public static void TestParameter_ConfigurationFile_With_Name(params string[] commandLine)
+        {
+            var cpp = new CommandLineParameterParser();
+
+            cpp.Parse(commandLine);
+
+            Assert.False(cpp.AbortStartup);
+            Assert.True(cpp.NoExit);
+            Assert.False(cpp.ShowShortHelp);
+            Assert.True(cpp.ShowBanner);
+            Assert.Equal("qwerty", cpp.ConfigurationFile);
+            Assert.Null(cpp.ErrorMessage);
+        }
+
         [Theory]
         [InlineData("-custompipename")]
         [InlineData("-cus")]

From 69831c15ba9b8eca97fd886330965fe839260759 Mon Sep 17 00:00:00 2001
From: Matt Gucci <matt9ucci@gmail.com>
Date: Tue, 7 Jun 2022 04:23:16 +0900
Subject: [PATCH 424/645] Improve array element completion for command
 arguments (#17078)

---
 .../CommandCompletion/CompletionAnalysis.cs   | 11 +++-
 .../CommandCompletion/CompletionCompleters.cs |  8 ++-
 .../TabCompletion/TabCompletion.Tests.ps1     | 55 +++++++++++++++++++
 3 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index e11557c9610..aacb855cfe5 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -524,9 +524,14 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                         break;
 
                     case TokenKind.Comma:
-                        // Handle array elements such as dir .\cd,<tab> || dir -Path: .\cd,<tab>
-                        if (lastAst is ErrorExpressionAst &&
-                            (lastAst.Parent is CommandAst || lastAst.Parent is CommandParameterAst))
+                        // Handle array elements such as the followings:
+                        //  - `dir .\cd,<tab>`
+                        //  - `dir -Path: .\cd,<tab>`
+                        //  - `dir .\abc.txt,<tab> -File`
+                        //  - `dir -Path .\abc.txt,<tab> -File`
+                        //  - `dir -Path: .\abc.txt,<tab> -File`
+                        if (lastAst is ErrorExpressionAst or ArrayLiteralAst &&
+                            lastAst.Parent is CommandAst or CommandParameterAst)
                         {
                             replacementIndex += replacementLength;
                             replacementLength = 0;
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index a41a336b12b..fce4590aa17 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -1759,7 +1759,7 @@ private static void ProcessParameter(
                 string separator = CultureInfo.CurrentUICulture.TextInfo.ListSeparator;
                 string[] enumArray = enumString.Split(separator, StringSplitOptions.RemoveEmptyEntries);
 
-                string wordToComplete = context.WordToComplete;
+                string wordToComplete = context.WordToComplete ?? string.Empty;
                 string quote = HandleDoubleAndSingleQuote(ref wordToComplete);
 
                 var pattern = WildcardPattern.Get(wordToComplete + "*", WildcardOptions.IgnoreCase);
@@ -4125,9 +4125,11 @@ private static ArgumentLocation FindTargetArgumentLocation(Collection<AstParamet
                                     return GenerateArgumentLocation(prevArg, position);
                                 }
 
-                                if (!arg.ParameterContainsArgument && arg.Argument.Extent.StartOffset > token.Extent.StartOffset)
+                                if (token.Kind == TokenKind.Parameter
+                                    || (token.Extent.StartOffset > arg.Argument.Extent.StartOffset && token.Extent.EndOffset < arg.Argument.Extent.EndOffset))
                                 {
-                                    // case: Get-Cmdlet -Param <tab> abc
+                                    // case 1: Get-Cmdlet -Param <tab> abc
+                                    // case 2: dir -Path .\abc.txt, <tab> -File
                                     return new ArgumentLocation() { Argument = arg, IsPositional = false, Position = -1 };
                                 }
                             }
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 9ec2bb45dd0..a00c7fb4539 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -1165,6 +1165,46 @@ switch ($x)
             $res.CompletionMatches[1].CompletionText | Should -BeExactly 'dog'
         }
 
+        It "Tab completion for enum members after colon with <Space> space" -TestCases @(
+            @{ Space = 0 }
+            @{ Space = 1 }
+        ) {
+            param ($Space)
+            $inputStr = "Get-Command -Type:$(' ' * $Space)Al"
+            $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length
+            $res.CompletionMatches | Should -HaveCount 2
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Alias'
+            $res.CompletionMatches[1].CompletionText | Should -BeExactly 'All'
+        }
+
+        It "Tab completion for enum members between colon with <LeftSpace> space and <RightSpace> space with value" -TestCases @(
+            @{ LeftSpace = 0; RightSpace = 0 }
+            @{ LeftSpace = 0; RightSpace = 1 }
+            @{ LeftSpace = 1; RightSpace = 0 }
+            @{ LeftSpace = 1; RightSpace = 1 }
+        ) {
+            param ($LeftSpace, $RightSpace)
+            $inputStrEndsWithCursor = "Get-Command -Type:$(' ' * $LeftSpace)"
+            $inputStr = $inputStrEndsWithCursor + "$(' ' * $RightSpace)Alias"
+            $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStrEndsWithCursor.Length
+            $expectedArray = [enum]::GetNames([System.Management.Automation.CommandTypes]) | Sort-Object
+            $res.CompletionMatches.CompletionText | Should -Be $expectedArray
+        }
+
+        It "Tab completion for enum members between comma with <LeftSpace> space and <RightSpace> space with parameter" -TestCases @(
+            @{ LeftSpace = 0; RightSpace = 0 }
+            @{ LeftSpace = 0; RightSpace = 1 }
+            @{ LeftSpace = 1; RightSpace = 0 }
+            @{ LeftSpace = 1; RightSpace = 1 }
+        ) {
+            param ($LeftSpace, $RightSpace)
+            $inputStrEndsWithCursor = "Get-Command -Type Alias,$(' ' * $LeftSpace)"
+            $inputStr = $inputStrEndsWithCursor + "$(' ' * $RightSpace)-All"
+            $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStrEndsWithCursor.Length
+            $expectedArray = [enum]::GetNames([System.Management.Automation.CommandTypes]) | Sort-Object
+            $res.CompletionMatches.CompletionText | Should -Be $expectedArray
+        }
+
         It "Tab completion for enum members after comma" {
             $inputStr = "Get-Command -Type Alias,c"
             $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length
@@ -1511,6 +1551,21 @@ dir -Recurse `
             $res.CompletionMatches[0].CompletionText | Should -BeExactly $expected
         }
 
+        It "Tab completion for file array element between comma with <LeftSpace> space and <RightSpace> space with parameter" -TestCases @(
+            @{ LeftSpace = 0; RightSpace = 0 }
+            @{ LeftSpace = 0; RightSpace = 1 }
+            @{ LeftSpace = 1; RightSpace = 0 }
+            @{ LeftSpace = 1; RightSpace = 1 }
+        ) {
+            param ($LeftSpace, $RightSpace)
+            $inputStrEndsWithCursor = "dir .\commaA.txt,$(' ' * $LeftSpace)"
+            $inputStr = $inputStrEndsWithCursor + "$(' ' * $RightSpace)-File"
+            $expected = ".${separator}commaA.txt"
+            $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStrEndsWithCursor.Length
+            $res.CompletionMatches | Should -HaveCount 1
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly $expected
+        }
+
         It "Test comma with Enum array element" {
             $inputStr = "gcm -CommandType Cmdlet,"
             $res = TabExpansion2 -inputScript $inputStr -cursorColumn $inputStr.Length

From 4e6909e7b803d6200ffb687ac1a85562184ad91a Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 6 Jun 2022 13:06:38 -0700
Subject: [PATCH 425/645] Make Assembly Load Native test work on a FX Dependent
 Linux Install (#17380)

* Make Assembly Load Native test work on a FX Dependent Linux Install

* Update Assembly.LoadNative.Tests.ps1
---
 .../engine/Basic/Assembly.LoadNative.Tests.ps1     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/powershell/engine/Basic/Assembly.LoadNative.Tests.ps1 b/test/powershell/engine/Basic/Assembly.LoadNative.Tests.ps1
index 9196ccc0e13..0dd8b23c7ee 100644
--- a/test/powershell/engine/Basic/Assembly.LoadNative.Tests.ps1
+++ b/test/powershell/engine/Basic/Assembly.LoadNative.Tests.ps1
@@ -24,15 +24,21 @@ Describe "Can load a native assembly" -Tags "CI" {
         if ($IsWindows) {
             $arch = "win-" + $processArch
             $nativeDllName = "nativedll.dll"
-            $sourceDllName = "hostpolicy.dll"
+            $sourceDllName = Join-Path $PSHome "hostpolicy.dll"
         } elseif ($IsLinux) {
             $arch = "linux-" + $processArch
             $nativeDllName = "nativedll.so"
-            $sourceDllName = "libhostpolicy.so"
+            $sourceDllName = Join-Path $PSHome "libhostpolicy.so"
+            # This won't be in PSHome in a FX Dependent install
+            # Fallback to finding it using the process object
+            if (!(Test-Path $sourceDllName)) {
+                $thisProcess = Get-Process -pid $pid
+                $sourceDllName = ($thisProcess.Modules | Where-Object {$_.moduleName -eq 'libhostpolicy.so'}).FileName
+            }
         } elseif ($IsMacOS) {
             $arch = "osx-" + $processArch
             $nativeDllName = "nativedll.dylib"
-            $sourceDllName = "libhostpolicy.dylib"
+            $sourceDllName = Join-Path $PSHome "libhostpolicy.dylib"
         } else {
             throw "Unsupported OS"
         }
@@ -40,7 +46,7 @@ Describe "Can load a native assembly" -Tags "CI" {
         $archFolder = Join-Path $root $arch
         New-Item -Path $archFolder -ItemType Directory -Force > $null
         #New-Item -Path $archFolder\$nativeDllName -ItemType File -Force > $null
-        Copy-Item -Path $PSHOME\$sourceDllName -Destination $archFolder\$nativeDllName
+        Copy-Item -Path $sourceDllName -Destination $archFolder\$nativeDllName
 
         $managedDllPath = Join-Path $root managed.dll
 

From 042765dd1c4d46a86a4545e7e0df0a7ee19f4dd6 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Mon, 6 Jun 2022 23:28:04 +0200
Subject: [PATCH 426/645] Improve completion on operators (#17486)

---
 .../CommandCompletion/CompletionAnalysis.cs   | 53 ++++++++++++++++++-
 .../TabCompletion/TabCompletion.Tests.ps1     |  8 +++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index aacb855cfe5..d15f8c763af 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -471,7 +471,7 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                         replacementIndex += tokenAtCursor.Text.Length;
                         replacementLength = 0;
                         result = CompletionCompleters.CompleteMember(completionContext, @static: tokenAtCursor.Kind == TokenKind.ColonColon, ref replacementLength);
-                        
+
                         break;
 
                     case TokenKind.Comment:
@@ -691,6 +691,57 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
 
                             break;
                         }
+
+                    case TokenKind.Format:
+                    case TokenKind.Not:
+                    case TokenKind.Bnot:
+                    case TokenKind.And:
+                    case TokenKind.Or:
+                    case TokenKind.Xor:
+                    case TokenKind.Band:
+                    case TokenKind.Bor:
+                    case TokenKind.Bxor:
+                    case TokenKind.Join:
+                    case TokenKind.Ieq:
+                    case TokenKind.Ine:
+                    case TokenKind.Ige:
+                    case TokenKind.Igt:
+                    case TokenKind.Ilt:
+                    case TokenKind.Ile:
+                    case TokenKind.Ilike:
+                    case TokenKind.Inotlike:
+                    case TokenKind.Imatch:
+                    case TokenKind.Inotmatch:
+                    case TokenKind.Ireplace:
+                    case TokenKind.Icontains:
+                    case TokenKind.Inotcontains:
+                    case TokenKind.Iin:
+                    case TokenKind.Inotin:
+                    case TokenKind.Isplit:
+                    case TokenKind.Ceq:
+                    case TokenKind.Cne:
+                    case TokenKind.Cge:
+                    case TokenKind.Cgt:
+                    case TokenKind.Clt:
+                    case TokenKind.Cle:
+                    case TokenKind.Clike:
+                    case TokenKind.Cnotlike:
+                    case TokenKind.Cmatch:
+                    case TokenKind.Cnotmatch:
+                    case TokenKind.Creplace:
+                    case TokenKind.Ccontains:
+                    case TokenKind.Cnotcontains:
+                    case TokenKind.Cin:
+                    case TokenKind.Cnotin:
+                    case TokenKind.Csplit:
+                    case TokenKind.Is:
+                    case TokenKind.IsNot:
+                    case TokenKind.As:
+                    case TokenKind.Shl:
+                    case TokenKind.Shr:
+                        result = CompletionCompleters.CompleteOperator(tokenAtCursor.Text);
+                        break;
+
                     default:
                         if ((tokenAtCursor.TokenFlags & TokenFlags.Keyword) != 0)
                         {
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index a00c7fb4539..38856465dbe 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -74,6 +74,14 @@ Describe "TabCompletion" -Tags CI {
         $res.CompletionMatches[0].CompletionText | Should -BeExactly 'pscustomobject'
     }
 
+    foreach ($Operator in [System.Management.Automation.CompletionCompleters]::CompleteOperator(""))
+    {
+        It "Should complete $($Operator.CompletionText)" {
+            $res = TabExpansion2 -inputScript "'' $($Operator.CompletionText)" -cursorColumn ($Operator.CompletionText.Length + 3)
+            $res.CompletionMatches[0].CompletionText | Should -BeExactly $Operator.CompletionText
+        }
+    }
+
     It '<Intent>' -TestCases @(
         @{
             Intent = 'Complete member with space between dot and cursor'

From a8cd40a0accb315a065acc159b8c5548ca3ebbe5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 08:22:14 -0700
Subject: [PATCH 427/645] Update to the latest NOTICES file (#17493)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 ThirdPartyNotices.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index ee9456cee85..c1f3a1d4270 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -638,7 +638,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-NJsonSchema 10.7.1 - MIT
+NJsonSchema 10.7.2 - MIT
 
 
 

From 6a522d9c682d7d49a572cf4908159d6218ec273c Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 8 Jun 2022 10:35:07 -0700
Subject: [PATCH 428/645] Make `AnsiRegex` able to capture Hyperlink ansi
 sequences (#17442)

* Add the hyperlink ansi regex

* Add test

* Add comment
---
 .../FormatAndOutput/common/StringDecorated.cs            | 5 ++++-
 test/powershell/engine/Formatting/PSStyle.Tests.ps1      | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs b/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
index c2497bdff59..4e647387416 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
@@ -109,8 +109,11 @@ private string PlainText
         // CSI escape sequences
         private const string CsiRegex = @"(\x1b\[\?\d+[hl])";
 
+        // Hyperlink escape sequences. Note: '.*?' makes '.*' do non-greedy match.
+        private const string HyperlinkRegex = @"(\x1b\]8;;.*?\x1b\\)";
+
         // replace regex with .NET 6 API once available
-        internal static readonly Regex AnsiRegex = new Regex($"{GraphicsRegex}|{CsiRegex}", RegexOptions.Compiled);
+        internal static readonly Regex AnsiRegex = new Regex($"{GraphicsRegex}|{CsiRegex}|{HyperlinkRegex}", RegexOptions.Compiled);
 
         /// <summary>
         /// Get the ranges of all escape sequences in the text.
diff --git a/test/powershell/engine/Formatting/PSStyle.Tests.ps1 b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
index 6855ea713c1..4fc8087a904 100644
--- a/test/powershell/engine/Formatting/PSStyle.Tests.ps1
+++ b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
@@ -277,6 +277,15 @@ Describe 'Tests for $PSStyle automatic variable' {
         $result = & $pwsh -noprofile -Command { $PSStyle.Progress.UseOSCIndicator = $true; 'hello'} | Format-List
         $result | Out-String -Stream | Should -BeExactly 'hello'
     }
+
+    It 'Able to handle Hyperlink ansi sequences' {
+        $word = "This is a link"
+        $hyperlink = $PSStyle.FormatHyperlink($word, "some random text as a link")
+        $strDec = [System.Management.Automation.Internal.StringDecorated]::new($hyperlink)
+        $strDec.IsDecorated | Should -BeTrue
+        $strDec.ContentLength | Should -Be $word.Length
+        $strDec.ToString("PlainText") | Should -Be $word
+    }
 }
 
 Describe 'Handle strings with escape sequences in formatting' {

From 57dbecb612c5cc49296f057c60f4ad118ab4fb12 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Thu, 9 Jun 2022 04:25:13 +0500
Subject: [PATCH 429/645] Add Amended switch to Get-CimClass cmdlet (#17477)

* Add Amended switch to Get-CimClass cmdlet

* Fix CodeFactor issues
---
 .../CimGetCimClass.cs                         |  1 +
 .../CimSessionProxy.cs                        | 20 +++++++++++++++++++
 .../GetCimClassCommand.cs                     |  6 ++++++
 .../Modules/CimCmdlets/Get-CimClass.Tests.ps1 |  5 +++++
 4 files changed, 32 insertions(+)

diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetCimClass.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetCimClass.cs
index 728ce6b8c8e..c775325094b 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetCimClass.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetCimClass.cs
@@ -165,6 +165,7 @@ private static void SetSessionProxyProperties(
             GetCimClassCommand cmdlet)
         {
             proxy.OperationTimeout = cmdlet.OperationTimeoutSec;
+            proxy.Amended = cmdlet.Amended;
         }
 
         /// <summary>
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs
index 9321c86ec77..f1e2c4ecfee 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs
@@ -539,6 +539,26 @@ private void CreateSetSession(
 
         #region set operation options
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to retrieve localized information for the CIM class.
+        /// </summary>
+        public bool Amended
+        {
+            get => OperationOptions.Flags.HasFlag(CimOperationFlags.LocalizedQualifiers);
+
+            set
+            {
+                if (value)
+                {
+                    OperationOptions.Flags |= CimOperationFlags.LocalizedQualifiers;
+                }
+                else
+                {
+                    OperationOptions.Flags &= ~CimOperationFlags.LocalizedQualifiers;
+                }
+            }
+        }
+
         /// <summary>
         /// Set timeout value (seconds) of the operation.
         /// </summary>
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs
index adc669ab645..baf55bb186c 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs
@@ -43,6 +43,12 @@ public GetCimClassCommand()
 
         #region parameters
 
+        /// <summary>
+        /// Gets or sets flag to retrieve a localized data for WMI class.
+        /// </summary>
+        [Parameter]
+        public SwitchParameter Amended { get; set; }
+
         /// <summary>
         /// <para>
         /// The following is the definition of the input parameter "ClassName".
diff --git a/test/powershell/Modules/CimCmdlets/Get-CimClass.Tests.ps1 b/test/powershell/Modules/CimCmdlets/Get-CimClass.Tests.ps1
index 248022bf032..71c252f761b 100644
--- a/test/powershell/Modules/CimCmdlets/Get-CimClass.Tests.ps1
+++ b/test/powershell/Modules/CimCmdlets/Get-CimClass.Tests.ps1
@@ -27,4 +27,9 @@ Describe 'Get-CimClass' -Tags @("Feature") {
     It 'can retrieve a class when a method is provided' -Pending:(-not $IsWindows) {
         Get-CimClass -MethodName Reboot | Should -Not -BeNullOrEmpty
     }
+
+    It 'can retrieve class amended qualifiers' -Pending:(-not $IsWindows) {
+        $a = Get-CimClass -Class 'Win32_PrinterConfiguration' -Amended
+        $a.CimClassProperties['Color'].Qualifiers.Item('Values').Value.Count | Should -Be 2
+    }
 }

From 17e4db9b1b308e592dd5ea422d1cb320ebed5be7 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 8 Jun 2022 18:13:40 -0700
Subject: [PATCH 430/645] Make `Out-String` and `Out-File` keep string input
 unchanged (#17455)

---
 .../common/BaseOutputtingCommand.cs           |  3 +-
 .../FormatAndOutput/common/ILineOutput.cs     | 22 +++++-
 .../engine/Formatting/ErrorView.Tests.ps1     |  3 +-
 .../Formatting/OutputRendering.Tests.ps1      |  2 +-
 .../engine/Formatting/PSStyle.Tests.ps1       | 71 +++++++++++++++++++
 5 files changed, 95 insertions(+), 6 deletions(-)

diff --git a/src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs b/src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs
index 136b7a26ef5..17cbae65894 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs
@@ -552,7 +552,8 @@ private void ProcessOutOfBandPayload(FormatEntryData fed)
                 }
                 else
                 {
-                    _lo.WriteLine(rte.text);
+                    // Write out raw text without any changes to it.
+                    _lo.WriteRawText(rte.text);
                 }
 
                 return;
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs b/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
index a1f373a5dd5..3c200664636 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
@@ -250,6 +250,13 @@ internal virtual void ExecuteBufferPlayBack(DoPlayBackCall playback) { }
         /// </param>
         internal abstract void WriteLine(string s);
 
+        /// <summary>
+        /// Write a line of string as raw text to the output device, with no change to the string.
+        /// For example, keeping VT escape sequences intact in it.
+        /// </summary>
+        /// <param name="s">The raw text to be written to the device.</param>
+        internal virtual void WriteRawText(string s) => WriteLine(s);
+
         internal WriteStreamType WriteStream
         {
             get;
@@ -431,7 +438,7 @@ private void WriteLineInternal(string val, int cols)
     /// Implementation of the ILineOutput interface accepting an instance of a
     /// TextWriter abstract class.
     /// </summary>
-    internal class TextWriterLineOutput : LineOutput
+    internal sealed class TextWriterLineOutput : LineOutput
     {
         #region ILineOutput methods
 
@@ -467,9 +474,17 @@ internal override int RowNumber
         /// <param name="s"></param>
         internal override void WriteLine(string s)
         {
-            CheckStopProcessing();
+            WriteRawText(PSHostUserInterface.GetOutputString(s, isHost: false));
+        }
 
-            s = PSHostUserInterface.GetOutputString(s, isHost: false);
+        /// <summary>
+        /// Write a raw text by delegating to the writer underneath, with no change to the text.
+        /// For example, keeping VT escape sequences intact in it.
+        /// </summary>
+        /// <param name="s">The raw text to be written to the device.</param>
+        internal override void WriteRawText(string s)
+        {
+            CheckStopProcessing();
 
             if (_suppressNewline)
             {
@@ -480,6 +495,7 @@ internal override void WriteLine(string s)
                 _writer.WriteLine(s);
             }
         }
+
         #endregion
 
         /// <summary>
diff --git a/test/powershell/engine/Formatting/ErrorView.Tests.ps1 b/test/powershell/engine/Formatting/ErrorView.Tests.ps1
index 7de4f9d431d..18173354a65 100644
--- a/test/powershell/engine/Formatting/ErrorView.Tests.ps1
+++ b/test/powershell/engine/Formatting/ErrorView.Tests.ps1
@@ -115,7 +115,8 @@ Describe 'Tests for $ErrorView' -Tag CI {
 
         It "Error shows for advanced function" {
             # need to have it virtually interactive so that InvocationInfo.MyCommand is empty
-            $e = '[cmdletbinding()]param()$pscmdlet.writeerror([System.Management.Automation.ErrorRecord]::new(([System.NotImplementedException]::new("myTest")),"stub","notimplemented","command"))' | pwsh -noprofile -file - 2>&1 | Out-String
+            $e = '[cmdletbinding()]param()$pscmdlet.writeerror([System.Management.Automation.ErrorRecord]::new(([System.NotImplementedException]::new("myTest")),"stub","notimplemented","command"))' | pwsh -noprofile -file - 2>&1
+            $e = $e | Where-Object { $_ -is [System.Management.Automation.ErrorRecord] } | Out-String
             $e | Should -Not -BeNullOrEmpty
 
             # need to see if ANSI escape sequences are in the output as ANSI is disabled for CI
diff --git a/test/powershell/engine/Formatting/OutputRendering.Tests.ps1 b/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
index 53732a2bd6a..7b67f71233c 100644
--- a/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
+++ b/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
@@ -39,7 +39,7 @@ Describe 'OutputRendering tests' {
         param($outputRendering, $ansi)
 
         $PSStyle.OutputRendering = $outputRendering
-        $out = "$($PSStyle.Foreground.Green)hello" | Out-String
+        $out = [pscustomobject] @{ key = "$($PSStyle.Foreground.Green)hello" } | Out-String
 
         if ($ansi) {
             $out | Should -BeLike "*`e*" -Because ($out | Format-Hex | Out-String)
diff --git a/test/powershell/engine/Formatting/PSStyle.Tests.ps1 b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
index 4fc8087a904..e232ebe6d57 100644
--- a/test/powershell/engine/Formatting/PSStyle.Tests.ps1
+++ b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
@@ -286,6 +286,77 @@ Describe 'Tests for $PSStyle automatic variable' {
         $strDec.ContentLength | Should -Be $word.Length
         $strDec.ToString("PlainText") | Should -Be $word
     }
+
+    It "String intput to Out-String should be intact with OutputRendering='<OutputRendering>'" -TestCases @(
+        @{ OutputRendering = 'Ansi'; ContainsAnsi = $true }
+        @{ OutputRendering = 'Host'; ContainsAnsi = $false }
+        @{ OutputRendering = 'PlainText'; ContainsAnsi = $false }
+    ) {
+        param($OutputRendering, $ContainsAnsi)
+
+        $oldRender = $PSStyle.OutputRendering
+        $testStr = "`e[31mABC`e[0m"
+
+        try {
+            $PSStyle.OutputRendering = $OutputRendering
+            ## For input that actually goes through formatting, Out-String should remove VT sequences
+            ## from the formatting output based on the output rendering option that is in effect.
+            (Get-Verb -Verb Get | Out-String).Contains("`e[") | Should -Be $ContainsAnsi
+            ## For string input, since no formatting is applied, Out-String should keep the string intact.
+            ($testStr | Out-String).Trim() | Should -BeExactly $testStr
+        }
+        finally {
+            $PSStyle.OutputRendering = $oldRender
+        }
+    }
+
+    It "String input to Out-File should be intact with OutputRendering='<OutputRendering>'" -TestCases @(
+        @{ OutputRendering = 'Ansi'; }
+        @{ OutputRendering = 'Host'; }
+        @{ OutputRendering = 'PlainText'; }
+    ) {
+        param($OutputRendering)
+
+        $oldRender = $PSStyle.OutputRendering
+        $content = "Read-Host -Prompt '`e[33mEnter your device code`e[0m'"
+        Set-Content -Path $TestDrive\test.ps1 -Value $content -Encoding utf8NoBOM
+
+        try {
+            $PSStyle.OutputRendering = $OutputRendering
+            Get-Content $TestDrive\test.ps1 > $TestDrive\copy.ps1
+            (Get-Content $TestDrive\copy.ps1 -Raw).Trim() | Should -BeExactly $content
+        }
+        finally {
+            $PSStyle.OutputRendering = $oldRender
+            Remove-Item $TestDrive\test.ps1 -Force
+            Remove-Item $TestDrive\copy.ps1 -Force
+        }
+    }
+
+    It "Comment based help works with `$PSStyle when OutputRendering='<OutputRendering>'" -TestCases @(
+        @{ OutputRendering = 'Ansi'; ContainsAnsi = $true }
+        @{ OutputRendering = 'Host'; ContainsAnsi = $false }
+        @{ OutputRendering = 'PlainText'; ContainsAnsi = $false }
+    ) {
+        param($OutputRendering, $ContainsAnsi)
+
+        $oldRender = $PSStyle.OutputRendering
+
+        function Test-PSStyle {
+            <#
+            .Description
+            Get-Function displays the name and syntax of all functions in the session.
+            #>
+        }
+
+        try {
+            $PSStyle.OutputRendering = $OutputRendering
+            (Get-Help Test-PSStyle | Out-String).Contains("`e[31mdisplays`e[0m") | Should -Be $ContainsAnsi
+        }
+        finally {
+            $PSStyle.OutputRendering = $oldRender
+        }
+    }
 }
 
 Describe 'Handle strings with escape sequences in formatting' {

From 12a2c82d0e45933d8c9fc80ad44388aa88bf8abe Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Thu, 9 Jun 2022 06:41:52 +0200
Subject: [PATCH 431/645] Fix various completion issues inside the param block
 (#17489)

---
 .../CommandCompletion/CompletionAnalysis.cs   |  8 ++++
 .../CommandCompletion/CompletionCompleters.cs |  6 +--
 .../TabCompletion/TabCompletion.Tests.ps1     | 37 +++++++++++++++++++
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index d15f8c763af..24a02ac7855 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -155,6 +155,14 @@ internal static AstAnalysisContext ExtractAstContext(Ast inputAst, Token[] input
                 ast => IsCursorWithinOrJustAfterExtent(positionForAstSearch, ast.Extent),
                 searchNestedScriptBlocks: true).ToList();
 
+            // If the last ast is an unnamed block that starts with "param" the cursor is inside a param block.
+            // To avoid adding special handling to all the completers that look at the last ast, we remove it here because it's not useful for completion. 
+            if (relatedAsts[^1].Extent.Text.StartsWith("param", StringComparison.OrdinalIgnoreCase)
+                && relatedAsts[^1] is NamedBlockAst namedBlock && namedBlock.Unnamed)
+            {
+                relatedAsts.RemoveAt(relatedAsts.Count - 1);
+            }
+
             Diagnostics.Assert(tokenAtCursor == null || tokenBeforeCursor == null, "Only one of these tokens can be non-null");
 
             return new AstAnalysisContext(tokenAtCursor, tokenBeforeCursor, relatedAsts, replacementIndex);
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index fce4590aa17..5877cfefbac 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -5529,7 +5529,7 @@ private static FunctionDefinitionAst GetCommentHelpFunctionTarget(CompletionCont
             }
 
             Ast lastAst = context.RelatedAsts[^1];
-            Ast firstAstAfterComment = lastAst.Find(ast => ast.Extent.StartOffset >= context.TokenAtCursor.Extent.EndOffset, searchNestedScriptBlocks: false);
+            Ast firstAstAfterComment = lastAst.Find(ast => ast.Extent.StartOffset >= context.TokenAtCursor.Extent.EndOffset && ast is not NamedBlockAst, searchNestedScriptBlocks: false);
 
             // Comment-based help can apply to a following function definition if it starts within 2 lines
             int commentEndLine = context.TokenAtCursor.Extent.EndLineNumber + 2;
@@ -5556,9 +5556,7 @@ private static FunctionDefinitionAst GetCommentHelpFunctionTarget(CompletionCont
                 // Helpblock before function
                 if (firstAstAfterComment is not null
                     && firstAstAfterComment.Extent.StartLineNumber <= commentEndLine
-                    && firstAstAfterComment is NamedBlockAst block
-                    && block.Statements.Count > 0
-                    && block.Statements[0] is FunctionDefinitionAst statement)
+                    && firstAstAfterComment is FunctionDefinitionAst statement)
                 {
                     return statement;
                 }
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 38856465dbe..7f22709416a 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -454,6 +454,19 @@ switch ($x)
         $actual | Should -BeExactly $expected
     }
 
+    It 'Should complete parameter in param block' {
+        $res = TabExpansion2 -inputScript 'Param($Param1=(Get-ChildItem -))' -cursorColumn 30
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly '-Path'
+    }
+    It 'Should complete member in param block' {
+        $res = TabExpansion2 -inputScript 'Param($Param1=($PSVersionTable.))' -cursorColumn 31
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Count'
+    }
+    It 'Should complete attribute argument in param block' {
+        $res = TabExpansion2 -inputScript 'Param([Parameter()]$Param1)' -cursorColumn 17
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Position'
+    }
+
     Context "Format cmdlet's View paramter completion" {
         BeforeAll {
             $viewDefinition = @'
@@ -2053,6 +2066,30 @@ function MyFunction ($param1, $param2)
     {
     }
 }
+'@
+            }
+            @{
+                Intent = 'Complete help keyword PARAMETER argument for function inside advanced function'
+                Expected = 'param1','param2'
+                TestString = @'
+function Verb-Noun
+{
+    Param
+    (
+        [Parameter()]
+        [string[]]
+        $ParamA
+    )
+    Begin
+    {
+        <#
+            .Parameter ^
+        #>
+        function MyFunction ($param1, $param2)
+        {
+        }
+    }
+}
 '@
             }
             @{

From 23b2b2f8771cca086eec9ee0655108fb22761cad Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 9 Jun 2022 11:10:33 -0700
Subject: [PATCH 432/645] Rename mariner package to cm (#17505)

* Rename mariner package to cm

* Add SBOM for mariner

* Correct issuse with sbom test

* fix condition

* fix signing pattern
---
 tools/packages.microsoft.com/mapping.json           |  4 ++--
 tools/packaging/packaging.psm1                      |  4 ++--
 tools/packaging/releaseTests/sbom.tests.ps1         |  2 +-
 tools/releaseBuild/azureDevOps/templates/linux.yml  | 13 ++++++++++++-
 .../templates/release-ValidatePackageNames.yml      |  2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/tools/packages.microsoft.com/mapping.json b/tools/packages.microsoft.com/mapping.json
index 5e468041253..8bb238e1e8f 100644
--- a/tools/packages.microsoft.com/mapping.json
+++ b/tools/packages.microsoft.com/mapping.json
@@ -18,13 +18,13 @@
       {
           "url": "cbl-mariner-2.0-prod-Microsoft-x86_64",
           "distribution" : ["bionic"],
-          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm",
+          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm.x86_64.rpm",
           "channel" : "stable"
       },
       {
           "url": "cbl-mariner-2.0-preview-Microsoft-x86_64",
           "distribution" : ["bionic"],
-          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm",
+          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm.x86_64.rpm",
           "channel" : "preview"
       },
       {
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 469c343ab0b..2e278182f9b 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -8,7 +8,7 @@ $packagingStrings = Import-PowerShellDataFile "$PSScriptRoot\packaging.strings.p
 Import-Module "$PSScriptRoot\..\Xml" -ErrorAction Stop -Force
 $DebianDistributions = @("deb")
 $RedhatFullDistributions = @("rh")
-$RedhatFddDistributions = @("cm1")
+$RedhatFddDistributions = @("cm")
 $RedhatDistributions = @()
 $RedhatDistributions += $RedhatFullDistributions
 $RedhatDistributions += $RedhatFddDistributions
@@ -1419,7 +1419,7 @@ function Get-PackageDependencies
                 "openssl-libs",
                 "libicu"
             )
-        } elseif ($Distribution -eq 'cm1') {
+        } elseif ($Distribution -eq 'cm') {
             # Taken from the list here:
             # https://github.com/dotnet/dotnet-docker/blob/d451d6e9427f58c8508f1297c862663a27eb609f/src/runtime-deps/6.0/cbl-mariner1.0/amd64/Dockerfile#L6
             $Dependencies = @(
diff --git a/tools/packaging/releaseTests/sbom.tests.ps1 b/tools/packaging/releaseTests/sbom.tests.ps1
index 9469f68576e..7c0c73ed17e 100644
--- a/tools/packaging/releaseTests/sbom.tests.ps1
+++ b/tools/packaging/releaseTests/sbom.tests.ps1
@@ -47,8 +47,8 @@ Describe "Verify SBOMs" {
                     try {
                         if (Get-Command -Name rpm2cpio -ErrorAction SilentlyContinue) {
                             rpm2cpio $case.FilePath | cpio -i --make-directories 2>cpio.log
-                            $manifestPath = Get-ChildItem -Path manifest.spdx.json -Recurse | Select-Object -First 1 -ExpandProperty FullName
                             $extractedPath = Get-ChildItem -Path system.management.automation.dll -Recurse  | Select-Object -First 1 -ExpandProperty DirectoryName
+                            $manifestPath = Join-Path $extractedPath -ChildPath '/_manifest/spdx_2.2/manifest.spdx.json'
                         } else {
                             $skip = "rpm2cpio not found"
                         }
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index 92224a74d04..53057fec716 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -84,6 +84,16 @@ jobs:
       PackageVersion: $(Version)
       sourceScanPath: '$(PowerShellRoot)/tools'
 
+  - ${{ if eq(variables.build,'rpm') }} :
+    - template: Sbom.yml@ComplianceRepo
+      parameters:
+        BuildDropPath: '$(System.ArtifactsDirectory)/pwshMarinerBuildAmd64'
+        Build_Repository_Uri: $(Github_Build_Repository_Uri)
+        displayName: Mariner SBOM
+        PackageName: PowerShell Linux Framework Dependent
+        PackageVersion: $(Version)
+        sourceScanPath: '$(PowerShellRoot)/tools'
+
   - ${{ if eq(variables.build,'deb') }} :
     - template: Sbom.yml@ComplianceRepo
       parameters:
@@ -269,7 +279,8 @@ jobs:
           signOutputPath: $(Build.StagingDirectory)\signedPackages
           certificateId: "CP-459159-Pgp"
           pattern: |
-            **\*.cm1.*.rpm
+            **\*.cm.*.rpm
+            **\*.cm?.*.rpm
           useMinimatch: true
           shouldSign: $(SHOULD_SIGN)
           displayName: Sign Mariner RPM
diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
index fbaf6c3a0f8..c6925ba8a0e 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
@@ -30,7 +30,7 @@ steps:
 - pwsh: |
     $message = @()
     Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.rpm | ForEach-Object {
-        if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d+\.\d+\.\d+(_[a-z]*\.\d+)?-1.(rh|cm1).x86_64\.rpm')
+        if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d+\.\d+\.\d+(_[a-z]*\.\d+)?-1.(rh|cm).x86_64\.rpm')
         {
             $messageInstance = "$($_.Name) is not a valid package name"
             $message += $messageInstance

From e1521117dbec32188bbba6598803f407251b6d66 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 13 Jun 2022 09:56:55 -0700
Subject: [PATCH 433/645] Downgrade the `Microsoft.CodeAnalysis.NetAnalyzers`
 package to `7.0.0-preview1.22217.1` (#17515)

Downgrade the package to the latest available version on NuGet.org
---
 Analyzers.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Analyzers.props b/Analyzers.props
index 443e82b1f68..8360903606e 100644
--- a/Analyzers.props
+++ b/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="7.0.0-preview1.22302.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22217.1" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From 4f6e574820fdba88b3a1f5b0f87ce88e60a400dd Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Mon, 13 Jun 2022 19:04:35 +0200
Subject: [PATCH 434/645] Improve type inference and completions (#16963)

---
 .../CommandCompletion/CompletionCompleters.cs |  32 ++++--
 .../engine/parser/TypeInferenceVisitor.cs     | 103 ++++++++++++------
 .../engine/parser/ast.cs                      |  56 +++++++---
 .../TabCompletion/TabCompletion.Tests.ps1     |  29 +++++
 .../ConstrainedLanguageRestriction.Tests.ps1  |  10 +-
 .../engine/Api/TypeInference.Tests.ps1        |  18 +++
 6 files changed, 188 insertions(+), 60 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index 5877cfefbac..40b39b71b75 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -2278,7 +2278,7 @@ private static void NativeCommandArgumentCompletion(
                     {
                         if (parameterName.Equals("MemberName", StringComparison.OrdinalIgnoreCase))
                         {
-                            NativeCompletionMemberName(context, result, commandAst, boundArguments?[parameterName]);
+                            NativeCompletionMemberName(context, result, commandAst, boundArguments?[parameterName], propertiesOnly: false);
                         }
 
                         break;
@@ -3951,7 +3951,7 @@ private static IEnumerable<PSTypeName> GetInferenceTypes(CompletionContext conte
             return prevType;
         }
 
-        private static void NativeCompletionMemberName(CompletionContext context, List<CompletionResult> result, CommandAst commandAst, AstParameterArgumentPair parameterInfo)
+        private static void NativeCompletionMemberName(CompletionContext context, List<CompletionResult> result, CommandAst commandAst, AstParameterArgumentPair parameterInfo, bool propertiesOnly = true)
         {
             IEnumerable<PSTypeName> prevType = GetInferenceTypes(context, commandAst);
             if (prevType is not null)
@@ -3962,7 +3962,8 @@ private static void NativeCompletionMemberName(CompletionContext context, List<C
                     excludedMembers = GetParameterValues(pair, context.CursorPosition.Offset);
                 }
 
-                CompleteMemberByInferredType(context.TypeInferenceContext, prevType, result, context.WordToComplete + "*", filter: IsPropertyMember, isStatic: false, excludedMembers);
+                Func<object, bool> filter = propertiesOnly ? IsPropertyMember : null;
+                CompleteMemberByInferredType(context.TypeInferenceContext, prevType, result, context.WordToComplete + "*", filter, isStatic: false, excludedMembers);
             }
 
             result.Add(CompletionResult.Null);
@@ -5816,6 +5817,11 @@ internal static List<CompletionResult> CompleteMember(CompletionContext context,
                     inferredTypes = AstTypeInference.InferTypeOf(targetExpr, context.TypeInferenceContext, TypeInferenceRuntimePermissions.AllowSafeEval).ToArray();
                 }
 
+                if (!@static && inferredTypes.Length == 1 && inferredTypes[0].Name.Equals("System.Void", StringComparison.OrdinalIgnoreCase))
+                {
+                    return results;
+                }
+
                 if (inferredTypes != null && inferredTypes.Length > 0)
                 {
                     // Use inferred types if we have any
@@ -6070,11 +6076,23 @@ private static void AddInferredMember(object member, WildcardPattern memberNameP
                 getToolTip = () => GetCimPropertyToString(cimProperty);
             }
 
-            var memberAst = member as MemberAst;
-            if (memberAst != null)
+            if (member is MemberAst memberAst)
             {
-                memberName = memberAst is CompilerGeneratedMemberFunctionAst ? "new" : memberAst.Name;
-                isMethod = memberAst is FunctionMemberAst || memberAst is CompilerGeneratedMemberFunctionAst;
+                if (memberAst is CompilerGeneratedMemberFunctionAst)
+                {
+                    memberName = "new";
+                    isMethod = true;
+                }
+                else if (memberAst is FunctionMemberAst functionMember)
+                {
+                    memberName = functionMember.IsConstructor ? "new" : functionMember.Name;
+                    isMethod = true;
+                }
+                else
+                {
+                    memberName = memberAst.Name;
+                    isMethod = false;
+                }
                 getToolTip = memberAst.GetTooltip;
             }
 
diff --git a/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs b/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
index fa4a8a23ac1..363ce3536d0 100644
--- a/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
+++ b/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
@@ -298,7 +298,7 @@ internal void AddMembersByInferredTypeDefinitionAst(
                 else
                 {
                     var functionMember = (FunctionMemberAst)member;
-                    add = functionMember.IsStatic == isStatic;
+                    add = (functionMember.IsConstructor && isStatic) || (!functionMember.IsConstructor && functionMember.IsStatic == isStatic);
                     foundConstructor |= functionMember.IsConstructor;
                 }
 
@@ -638,6 +638,13 @@ object ICustomAstVisitor.VisitMergingRedirection(MergingRedirectionAst mergingRe
 
         object ICustomAstVisitor.VisitBinaryExpression(BinaryExpressionAst binaryExpressionAst)
         {
+            // TODO: Handle other kinds of expressions on the right side.
+            if (binaryExpressionAst.Operator == TokenKind.As && binaryExpressionAst.Right is TypeExpressionAst typeExpression)
+            {
+                var type = typeExpression.TypeName.GetReflectionType();
+                var psTypeName = type != null ? new PSTypeName(type) : new PSTypeName(typeExpression.TypeName.FullName);
+                return new[] { psTypeName };
+            }
             return InferTypes(binaryExpressionAst.Left);
         }
 
@@ -1897,39 +1904,15 @@ private void InferTypeFrom(VariableExpressionAst variableExpressionAst, List<PST
                             return;
                         }
 
-                        foreach (var result in InferTypes(pipelineAst.PipelineElements[0]))
-                        {
-                            if (result.Type != null)
-                            {
-                                // Assume (because we're looking at $_ and we're inside a script block that is an
-                                // argument to some command) that the type we're getting is actually unrolled.
-                                // This might not be right in all cases, but with our simple analysis, it's
-                                // right more often than it's wrong.
-                                if (result.Type.IsArray)
-                                {
-                                    inferredTypes.Add(new PSTypeName(result.Type.GetElementType()));
-                                    continue;
-                                }
+                        AddInferredTypesForDollarUnderbar(pipelineAst.PipelineElements[0], inferredTypes);
 
-                                if (typeof(IEnumerable).IsAssignableFrom(result.Type))
-                                {
-                                    // We can't deduce much from IEnumerable, but we can if it's generic.
-                                    var enumerableInterfaces = result.Type.GetInterfaces();
-                                    foreach (var t in enumerableInterfaces)
-                                    {
-                                        if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(IEnumerable<>))
-                                        {
-                                            inferredTypes.Add(new PSTypeName(t.GetGenericArguments()[0]));
-                                        }
-                                    }
-
-                                    continue;
-                                }
-                            }
-
-                            inferredTypes.Add(result);
-                        }
+                        return;
+                    }
 
+                    if (parent.Parent is InvokeMemberExpressionAst memberExpression)
+                    {
+                        AddInferredTypesForDollarUnderbar(memberExpression.Expression, inferredTypes);
+                        
                         return;
                     }
                 }
@@ -1970,14 +1953,19 @@ private void InferTypeFrom(VariableExpressionAst variableExpressionAst, List<PST
                 return;
             }
 
+            if (parent is null)
+            {
+                return;
+            }
+
             // Look for our variable as a parameter or on the lhs of an assignment - hopefully we'll find either
             // a type constraint or at least we can use the rhs to infer the type.
-            while (parent?.Parent != null)
+            while (parent.Parent != null)
             {
                 parent = parent.Parent;
             }
 
-            if (parent?.Parent is FunctionDefinitionAst)
+            if (parent.Parent is FunctionDefinitionAst)
             {
                 parent = parent.Parent;
             }
@@ -2068,6 +2056,42 @@ private void InferTypeFrom(VariableExpressionAst variableExpressionAst, List<PST
             }
         }
 
+        private void AddInferredTypesForDollarUnderbar(Ast parentExpression, List<PSTypeName> results)
+        {
+            foreach (var result in InferTypes(parentExpression))
+            {
+                if (result.Type != null)
+                {
+                    // Assume (because we're looking at $_ and we're inside a script block that is an
+                    // argument to some command) that the type we're getting is actually unrolled.
+                    // This might not be right in all cases, but with our simple analysis, it's
+                    // right more often than it's wrong.
+                    if (result.Type.IsArray)
+                    {
+                        results.Add(new PSTypeName(result.Type.GetElementType()));
+                        continue;
+                    }
+
+                    if (typeof(IEnumerable).IsAssignableFrom(result.Type))
+                    {
+                        // We can't deduce much from IEnumerable, but we can if it's generic.
+                        var enumerableInterfaces = result.Type.GetInterfaces();
+                        foreach (var t in enumerableInterfaces)
+                        {
+                            if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(IEnumerable<>))
+                            {
+                                results.Add(new PSTypeName(t.GetGenericArguments()[0]));
+                            }
+                        }
+
+                        continue;
+                    }
+                }
+
+                results.Add(result);
+            }
+        }
+
         /// <summary>
         /// Gets the most specific array type possible from a group of inferred types.
         /// </summary>
@@ -2254,6 +2278,17 @@ private IEnumerable<PSTypeName> InferTypeFrom(IndexExpressionAst indexExpression
 
                         continue;
                     }
+                    
+                    if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(IList<>))
+                    {
+                        var valueType = type.GetGenericArguments()[0];
+                        if (!valueType.ContainsGenericParameters)
+                        {
+                            foundAny = true;
+                            yield return new PSTypeName(valueType);
+                        }
+                        continue;
+                    }
 
                     foreach (var iface in type.GetInterfaces())
                     {
diff --git a/src/System.Management.Automation/engine/parser/ast.cs b/src/System.Management.Automation/engine/parser/ast.cs
index bb817ec3d78..7c41559adc2 100644
--- a/src/System.Management.Automation/engine/parser/ast.cs
+++ b/src/System.Management.Automation/engine/parser/ast.cs
@@ -3469,6 +3469,8 @@ public bool IsConstructor
 
         internal IScriptExtent NameExtent { get { return _functionDefinitionAst.NameExtent; } }
 
+        private string _toolTip;
+
         /// <summary>
         /// Copy a function member ast.
         /// </summary>
@@ -3483,28 +3485,56 @@ public override Ast Copy()
 
         internal override string GetTooltip()
         {
-            var sb = new StringBuilder();
-            if (IsStatic)
+            if (!string.IsNullOrEmpty(_toolTip))
             {
-                sb.Append("static ");
+                return _toolTip;
             }
 
-            sb.Append(IsReturnTypeVoid() ? "void" : ReturnType.TypeName.FullName);
-            sb.Append(' ');
-            sb.Append(Name);
-            sb.Append('(');
-            for (int i = 0; i < Parameters.Count; i++)
+            var sb = new StringBuilder();
+            var classMembers = ((TypeDefinitionAst)Parent).Members;
+            for (int i = 0; i < classMembers.Count; i++)
             {
-                if (i > 0)
+                var methodMember = classMembers[i] as FunctionMemberAst;
+                if (methodMember is null ||
+                    !Name.Equals(methodMember.Name) ||
+                    IsStatic != methodMember.IsStatic)
                 {
-                    sb.Append(", ");
+                    continue;
                 }
 
-                sb.Append(Parameters[i].GetTooltip());
+                if (sb.Length > 0)
+                {
+                    sb.AppendLine();
+                }
+
+                if (methodMember.IsStatic)
+                {
+                    sb.Append("static ");
+                }
+
+                if (!methodMember.IsConstructor)
+                {
+                    sb.Append(methodMember.IsReturnTypeVoid() ? "void" : methodMember.ReturnType.TypeName.FullName);
+                    sb.Append(' ');
+                }
+
+                sb.Append(methodMember.Name);
+                sb.Append('(');
+                for (int j = 0; j < methodMember.Parameters.Count; j++)
+                {
+                    if (j > 0)
+                    {
+                        sb.Append(", ");
+                    }
+
+                    sb.Append(methodMember.Parameters[j].GetTooltip());
+                }
+
+                sb.Append(')');
             }
 
-            sb.Append(')');
-            return sb.ToString();
+            _toolTip = sb.ToString();
+            return _toolTip;
         }
 
         #region Visitors
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 7f22709416a..e8b2b60b969 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -454,14 +454,43 @@ switch ($x)
         $actual | Should -BeExactly $expected
     }
 
+    It 'ForEach-Object member completion results should include methods' {
+        $res = TabExpansion2 -inputScript '1..10 | ForEach-Object -MemberName '
+        $res.CompletionMatches.CompletionText | Should -Contain "GetType("
+    }
+
+    It 'Should not complete void instance members' {
+        $res = TabExpansion2 -inputScript '([void]("")).'
+        $res.CompletionMatches | Should -BeNullOrEmpty
+    }
+
+    It 'Should complete custom constructor from class using the AST' {
+        $res = TabExpansion2 -inputScript 'class ConstructorTestClass{ConstructorTestClass ([string] $s){}};[ConstructorTestClass]::'
+        $res.CompletionMatches | Should -HaveCount 3
+        $completionText = $res.CompletionMatches.CompletionText | Sort-Object
+        $completionText -join ' ' | Should -BeExactly 'Equals( new( ReferenceEquals('
+    }
+
+    It 'Should show multiple constructors in the tooltip' {
+        $res = TabExpansion2 -inputScript 'class ConstructorTestClass{ConstructorTestClass ([string] $s){}ConstructorTestClass ([int] $i){}ConstructorTestClass ([int] $i, [bool]$b){}};[ConstructorTestClass]::new'
+        $res.CompletionMatches | Should -HaveCount 1
+        $completionText = $res.CompletionMatches.ToolTip | Should -BeExactly @'
+ConstructorTestClass(string s)
+ConstructorTestClass(int i)
+ConstructorTestClass(int i, bool b)
+'@
+    }
+
     It 'Should complete parameter in param block' {
         $res = TabExpansion2 -inputScript 'Param($Param1=(Get-ChildItem -))' -cursorColumn 30
         $res.CompletionMatches[0].CompletionText | Should -BeExactly '-Path'
     }
+
     It 'Should complete member in param block' {
         $res = TabExpansion2 -inputScript 'Param($Param1=($PSVersionTable.))' -cursorColumn 31
         $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Count'
     }
+
     It 'Should complete attribute argument in param block' {
         $res = TabExpansion2 -inputScript 'Param([Parameter()]$Param1)' -cursorColumn 17
         $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Position'
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageRestriction.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageRestriction.Tests.ps1
index e9397f86ec9..72faa923f1e 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageRestriction.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Security/ConstrainedLanguageRestriction.Tests.ps1
@@ -554,22 +554,20 @@ try
         }
     }
 
-    Describe "Tab expansion in constrained language mode" -Tags 'Feature','RequireAdminOnWindows' {
+    Describe "Conversion in constrained language mode" -Tags 'Feature','RequireAdminOnWindows' {
 
-        It "Verifies that tab expansion cannot convert disallowed IntPtr type" {
+        It "Verifies that PowerShell cannot convert disallowed IntPtr type" {
 
             try
             {
                 $ExecutionContext.SessionState.LanguageMode = "ConstrainedLanguage"
-
-                $result = @(TabExpansion2 '(1234 -as [IntPtr]).' 20 | ForEach-Object CompletionMatches | Where-Object CompletionText -Match Pointer)
+                $result = 1234 -as [IntPtr]
+                $null -eq $result | Should -BeTrue
             }
             finally
             {
                 Invoke-LanguageModeTestingSupportCmdlet -EnableFullLanguageMode
             }
-
-            $result.Count | Should -Be 0
         }
     }
 
diff --git a/test/powershell/engine/Api/TypeInference.Tests.ps1 b/test/powershell/engine/Api/TypeInference.Tests.ps1
index a98b04d150f..2d86b9153ce 100644
--- a/test/powershell/engine/Api/TypeInference.Tests.ps1
+++ b/test/powershell/engine/Api/TypeInference.Tests.ps1
@@ -1228,6 +1228,24 @@ Describe "Type inference Tests" -tags "CI" {
         $res.Count | Should -Be BaseType
     }
 
+    It 'Infers type of "as" operator statement' {
+        $res = [AstTypeInference]::InferTypeOf( { $null -as [int] }.Ast)
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be 'System.Int32'
+    }
+
+    It 'Infers type of $_ in a method scriptblock' {
+        $res = [AstTypeInference]::InferTypeOf( { ("","").ForEach({$_}) }.Ast.Find({param($ast) $ast -is [System.Management.Automation.Language.VariableExpressionAst]}, $true))
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be 'System.String'
+    }
+
+    It 'Infers type of index item in an IList' {
+        $res = [AstTypeInference]::InferTypeOf( { ([System.Collections.Generic.IList[System.Text.StringBuilder]]$null)[0] }.Ast)
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be 'System.Text.StringBuilder'
+    }
+
     It 'Infers type of generic method invocation with type parameters' {
         $res = [AstTypeInference]::InferTypeOf( { [array]::Empty[int]() }.Ast)
         $res.Count | Should -Be 1

From cfc237ac85cf24fa760923ace568201c8f3256aa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 13 Jun 2022 13:09:30 -0700
Subject: [PATCH 435/645] Update .NET SDK version from
 `7.0.100-preview.4.22252.9` to `7.0.100-preview.5.22307.18` (#17402)

---
 assets/wix/files.wxs                          | 18 +++--------------
 global.json                                   |  2 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  4 ++--
 .../FormatAndOutput/format-hex/Format-Hex.cs  | 11 ----------
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           | 20 +++++++++----------
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 .../System.Management.Automation.csproj       | 14 ++++++-------
 .../ResultsComparer/ResultsComparer.csproj    |  2 +-
 .../TabCompletion/TabCompletion.Tests.ps1     |  6 +++---
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/WebListener.csproj     |  4 ++--
 13 files changed, 33 insertions(+), 56 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 020d9c09fd3..6c41d4345fe 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1554,18 +1554,9 @@
         <Component Id="cmp19ADFEFDD03047828CF493B5B5CE7B6E">
           <File Id="filCE65C019A32144BB9E9CCA3D5E634E32" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Net.Http.Json.dll" />
         </Component>
-        <Component Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" Guid="{ee32f38f-14ee-4a85-914f-d02522cc3635}">
-          <File Id="fil04B0F83A7AED430A86A7E6E3E99AB45D" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
-        </Component>
-        <Component Id="cmpEE26930D65E346FDAE1B3E07F5DBEF77">
-          <File Id="filBC93A3F22F78439F8D4173E4C64ACFDC" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
-        </Component>
         <Component Id="cmp834F3E0C83664E92B0D115A39A8FAACB">
           <File Id="fil6A09131961874B31AC3EBEC863CC12C4" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Runtime.CompilerServices.Unsafe.dll" />
         </Component>
-        <Component Id="cmp68158D010ECB439582D041355BFACCBB">
-          <File Id="filB8694A0190CA422E9462870B514B813C" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
-        </Component>
         <Component Id="cmp690F24F04C044127A61754363A4D63E3">
           <File Id="fil5BF6895A87684AC088DAB3759AA465BA" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\Microsoft.Win32.Registry.dll" />
         </Component>
@@ -3138,8 +3129,8 @@
       <Component Id="cmp8A466581FE0540CEB2210C64DA5F970B">
         <File Id="filE75D9761159B495A8DF7A1035E36EF05" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Formats.Tar.dll" />
       </Component>
-      <Component Id="cmp1BCC0D0458494D89B527324A8E131D18">
-        <File Id="fil81CF1F7D16E34E6BAD003EF106FE384A" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.22904.dll" />
+      <Component Id="cmp7B3D20B284F74CE38B349854F6AB21FD">
+        <File Id="fil2100DA01A95645ADBBDD7C73ED75B0A1" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.30112.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4092,15 +4083,12 @@
       <ComponentRef Id="cmpBB705B2570064C99A71B6FA65CDF9DC8" />
       <ComponentRef Id="cmpE9599A00802144DF98F5792E029C8875" />
       <ComponentRef Id="cmp0989343D60B74AF082291F612F0E6FA6" />
-      <ComponentRef Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" />
       <ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
       <ComponentRef Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D" />
       <ComponentRef Id="cmpB92B70CEFC2F438386F97264FB436CDD" />
-      <ComponentRef Id="cmpEE26930D65E346FDAE1B3E07F5DBEF77" />
       <ComponentRef Id="cmp8635213A03B04AAE8E1BFB7EA85E0DB2" />
       <ComponentRef Id="cmp834F3E0C83664E92B0D115A39A8FAACB" />
       <ComponentRef Id="cmp2BB002B115C247FFB3353C80CAAC10B3" />
-      <ComponentRef Id="cmp68158D010ECB439582D041355BFACCBB" />
       <ComponentRef Id="cmp3547A55EA9D04784B4CF2FC717447E16" />
       <ComponentRef Id="cmp690F24F04C044127A61754363A4D63E3" />
       <ComponentRef Id="cmpFAD6557C4AEC48B89DDC4E6485C020C4" />
@@ -4148,8 +4136,8 @@
       <ComponentRef Id="cmp0AB1EF494922410AB17DC61097295172" />
       <ComponentRef Id="cmpF735DF855B6A444E8874E7FD15796C37" />
       <ComponentRef Id="cmp8A466581FE0540CEB2210C64DA5F970B" />
-      <ComponentRef Id="cmp1BCC0D0458494D89B527324A8E131D18" />
       <ComponentRef Id="cmp044F67223E6D490D8533691BF50B2B86" />
+      <ComponentRef Id="cmp7B3D20B284F74CE38B349854F6AB21FD" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index e097be7392b..ab3a127e05e 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100-preview.4.22252.9"
+    "version": "7.0.100-preview.5.22307.18"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index b0e6f222c49..edc444a7dac 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.5.22308.7" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 454bd026391..957f5eb8205 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -32,8 +32,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-1.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.4.22229.4" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.5.22308.7" />
     <PackageReference Include="NJsonSchema" Version="10.7.2" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs
index 091903f011a..90d007adb2a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs
@@ -391,7 +391,6 @@ private byte[] ConvertToBytes(object inputObject)
             byte[] result = null;
             int elements = 1;
             bool isArray = false;
-            bool isBool = false;
             bool isEnum = false;
             if (baseType.IsArray)
             {
@@ -424,11 +423,6 @@ private byte[] ConvertToBytes(object inputObject)
                     _lastInputType = baseType;
                 }
 
-                if (baseType == typeof(bool))
-                {
-                    isBool = true;
-                }
-
                 var elementSize = Marshal.SizeOf(baseType);
                 result = new byte[elementSize * elements];
                 if (!isArray)
@@ -450,11 +444,6 @@ private byte[] ConvertToBytes(object inputObject)
                         {
                             toBytes = Convert.ChangeType(obj, baseType);
                         }
-                        else if (isBool)
-                        {
-                            // bool is 1 byte apparently
-                            toBytes = Convert.ToByte(obj);
-                        }
                         else
                         {
                             toBytes = obj;
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 76028af5a3d..63de1f196d3 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.5.22308.7" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index b4f715464c1..6e7b7d45353 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,19 +18,19 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.4.22229.4" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.4.22229.4" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.5.22308.7" />
     <!-- 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.10.0-preview1.22261.2" />
+    <PackageReference Include="System.ServiceModel.Http" Version="4.10.0-preview1.22261.2" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.10.0-preview1.22261.2" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0-preview1.22261.2" />
+    <PackageReference Include="System.ServiceModel.Security" Version="4.10.0-preview1.22261.2" />
+    <PackageReference Include="System.Private.ServiceModel" Version="4.10.0-preview1.22261.2" />
     <!-- 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="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.5.22308.7" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 073b47d1587..8423367605f 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.5.22308.7" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 76a93854def..bbcba5f46fd 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.4.22229.4" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.4.22229.4" />
-    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.5.22308.7" />
     <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
-    <PackageReference Include="System.Management" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.Management" Version="7.0.0-preview.5.22308.7" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.4.22229.4" />
-    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.4.22229.4" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.5.22308.7" />
     <!-- 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.3.0-preview.1" />
diff --git a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
index 5274b08d613..d424da9deaa 100644
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@@ -6,7 +6,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index e8b2b60b969..1431a9ac503 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -1382,7 +1382,7 @@ ConstructorTestClass(int i, bool b)
         It '<Intent>' -TestCases @(
             @{
                 Intent = 'Complete attribute members on empty line'
-                Expected = 'Position'
+                Expected = @('Position','ParameterSetName','Mandatory','ValueFromPipeline','ValueFromPipelineByPropertyName','ValueFromRemainingArguments','HelpMessage','HelpMessageBaseName','HelpMessageResourceId','DontShow')
                 TestString = @'
 function bar { [parameter(
 
@@ -1394,7 +1394,7 @@ function bar { [parameter(
             }
             @{
                 Intent = 'Complete attribute members on empty line with preceding member'
-                Expected = 'Position'
+                Expected = @('Position','ParameterSetName','Mandatory','ValueFromPipeline','ValueFromPipelineByPropertyName','ValueFromRemainingArguments','HelpMessage','HelpMessageBaseName','HelpMessageResourceId','DontShow')
                 TestString = @'
 function bar { [parameter(
 Mandatory,
@@ -1408,7 +1408,7 @@ Mandatory,
             param($Expected, $TestString)
             $CursorIndex = $TestString.IndexOf('^')
             $res = TabExpansion2 -cursorColumn $CursorIndex -inputScript $TestString.Remove($CursorIndex, 1)
-            $res.CompletionMatches[0].CompletionText | Should -BeExactly $Expected
+            $res.CompletionMatches[0].CompletionText | Should -BeIn $Expected
         }
 
         It "Test completion with line continuation" {
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index ce9637897b2..04bb9ad279a 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.5.22308.7" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 242e5f76242..2618f63975d 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.4.22251.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.5.22309.3" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.5.22308.7" />
   </ItemGroup>
 
   <ItemGroup>

From 3963e5b15bc1cb830f61fcc686fbef92bad58686 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Wed, 15 Jun 2022 02:39:07 +0900
Subject: [PATCH 436/645] Fix typo in CommonCommandParameters.cs (#17524)

---
 .../engine/CommonCommandParameters.cs                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/CommonCommandParameters.cs b/src/System.Management.Automation/engine/CommonCommandParameters.cs
index 376b9d0adbf..c3630fe0b43 100644
--- a/src/System.Management.Automation/engine/CommonCommandParameters.cs
+++ b/src/System.Management.Automation/engine/CommonCommandParameters.cs
@@ -59,7 +59,7 @@ public SwitchParameter Verbose
         /// </summary>
         /// <remarks>
         /// This parameter tells the command to provide Programmer/Support type
-        /// messages to understand what is really occuring and give the user the
+        /// messages to understand what is really occurring and give the user the
         /// opportunity to stop or debug the situation.
         /// </remarks>
         [Parameter]

From 2db0fe7207b5e22dc0043434dcb60af438086fb6 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 16 Jun 2022 11:31:46 -0700
Subject: [PATCH 437/645] Disable RPM SBOM test. (#17532)

---
 tools/packaging/releaseTests/sbom.tests.ps1 | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/tools/packaging/releaseTests/sbom.tests.ps1 b/tools/packaging/releaseTests/sbom.tests.ps1
index 7c0c73ed17e..fa108f1cea2 100644
--- a/tools/packaging/releaseTests/sbom.tests.ps1
+++ b/tools/packaging/releaseTests/sbom.tests.ps1
@@ -43,18 +43,7 @@ Describe "Verify SBOMs" {
                     $manifestPath = Join-Path $extractedPath -ChildPath '/_manifest/spdx_2.2/manifest.spdx.json'
                 }
                 '.rpm' {
-                    Push-Location $resolvedPath
-                    try {
-                        if (Get-Command -Name rpm2cpio -ErrorAction SilentlyContinue) {
-                            rpm2cpio $case.FilePath | cpio -i --make-directories 2>cpio.log
-                            $extractedPath = Get-ChildItem -Path system.management.automation.dll -Recurse  | Select-Object -First 1 -ExpandProperty DirectoryName
-                            $manifestPath = Join-Path $extractedPath -ChildPath '/_manifest/spdx_2.2/manifest.spdx.json'
-                        } else {
-                            $skip = "rpm2cpio not found"
-                        }
-                    } finally {
-                        Pop-Location
-                    }
+                    $skip = "rpm test is not stable"
                 }
                 Default {
                     throw "Unkown extension $($case.Extension)"

From 0f1c8e50c81863b28b1da60f5c88b56253f85f93 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 22 Jun 2022 15:25:20 -0700
Subject: [PATCH 438/645] Update `README.md` and `metadata.json` for upcoming
 releases (#17526)

---
 README.md           | 82 ++++++++++++++++++++++-----------------------
 tools/metadata.json | 10 +++---
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index 8a55acb803f..8e82fa60986 100644
--- a/README.md
+++ b/README.md
@@ -64,49 +64,49 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 | 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.4/PowerShell-7.2.4-win-x86.msi
-[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x64.msi
-[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-lts_7.2.4-1.deb_amd64.deb
-[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-lts-7.2.4-1.rh.x86_64.rpm
-[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-lts-7.2.4-osx-x64.pkg
-[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-lts-7.2.4-osx-arm64.pkg
-
-[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x64.msi
-[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x86.msi
-[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell_7.2.4-1.deb_amd64.deb
-[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell_7.2.4-1.deb_amd64.deb
-[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell_7.2.4-1.deb_amd64.deb
-[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell_7.2.4-1.deb_amd64.deb
-[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell_7.2.4-1.deb_amd64.deb
-[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell_7.2.4-1.deb_amd64.deb
-[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-1.rh.x86_64.rpm
-[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-1.rh.x86_64.rpm
-[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-osx-x64.pkg
-[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-osx-arm64.pkg
-[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-arm64.zip
-[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x86.zip
-[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x64.zip
-[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-osx-x64.tar.gz
-[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-osx-arm64.tar.gz
-[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-linux-x64.tar.gz
-[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-linux-arm32.tar.gz
-[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/powershell-7.2.4-linux-arm64.tar.gz
+[lts-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x86.msi
+[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x64.msi
+[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-lts_7.2.5-1.deb_amd64.deb
+[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-lts-7.2.5-1.rh.x86_64.rpm
+[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-lts-7.2.5-osx-x64.pkg
+[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-lts-7.2.5-osx-arm64.pkg
+
+[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x64.msi
+[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x86.msi
+[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell_7.2.5-1.deb_amd64.deb
+[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell_7.2.5-1.deb_amd64.deb
+[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell_7.2.5-1.deb_amd64.deb
+[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell_7.2.5-1.deb_amd64.deb
+[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell_7.2.5-1.deb_amd64.deb
+[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell_7.2.5-1.deb_amd64.deb
+[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-1.rh.x86_64.rpm
+[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-1.rh.x86_64.rpm
+[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-osx-x64.pkg
+[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-osx-arm64.pkg
+[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-arm64.zip
+[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x86.zip
+[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x64.zip
+[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-osx-x64.tar.gz
+[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-osx-arm64.tar.gz
+[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-linux-x64.tar.gz
+[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-linux-arm32.tar.gz
+[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-linux-arm64.tar.gz
 [rl-snap]: https://snapcraft.io/powershell
 
-[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/PowerShell-7.3.0-preview.4-win-x64.msi
-[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/PowerShell-7.3.0-preview.4-win-x86.msi
-[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-preview_7.3.0-preview.4-1.deb_amd64.deb
-[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-preview-7.3.0_preview.4-1.rh.x86_64.rpm
-[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-osx-x64.pkg
-[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-osx-arm64.pkg
-[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/PowerShell-7.3.0-preview.4-win-arm64.zip
-[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/PowerShell-7.3.0-preview.4-win-x86.zip
-[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/PowerShell-7.3.0-preview.4-win-x64.zip
-[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-osx-x64.tar.gz
-[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-osx-arm64.tar.gz
-[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-linux-x64.tar.gz
-[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-linux-arm32.tar.gz
-[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.4/powershell-7.3.0-preview.4-linux-arm64.tar.gz
+[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/PowerShell-7.3.0-preview.5-win-x64.msi
+[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/PowerShell-7.3.0-preview.5-win-x86.msi
+[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-preview_7.3.0-preview.5-1.deb_amd64.deb
+[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-preview-7.3.0_preview.5-1.rh.x86_64.rpm
+[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-osx-x64.pkg
+[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-osx-arm64.pkg
+[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/PowerShell-7.3.0-preview.5-win-arm64.zip
+[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/PowerShell-7.3.0-preview.5-win-x86.zip
+[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/PowerShell-7.3.0-preview.5-win-x64.zip
+[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-osx-x64.tar.gz
+[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-osx-arm64.tar.gz
+[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-linux-x64.tar.gz
+[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-linux-arm32.tar.gz
+[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-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
diff --git a/tools/metadata.json b/tools/metadata.json
index e652db44a4b..696d275eff7 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,10 +1,10 @@
 {
-  "StableReleaseTag": "v7.2.4",
-  "PreviewReleaseTag": "v7.3.0-preview.4",
+  "StableReleaseTag": "v7.2.5",
+  "PreviewReleaseTag": "v7.3.0-preview.5",
   "ServicingReleaseTag": "v7.0.11",
-  "ReleaseTag": "v7.2.4",
-  "LTSReleaseTag" : ["v7.2.4", "v7.0.11"],
-  "NextReleaseTag": "v7.3.0-preview.5",
+  "ReleaseTag": "v7.2.5",
+  "LTSReleaseTag" : ["v7.2.5", "v7.0.11"],
+  "NextReleaseTag": "v7.3.0-preview.6",
   "LTSRelease": { "Latest": false, "Package": false },
   "StableRelease":  { "Latest": false, "Package": false }
 }

From ea3ea96cc75f51eab30e0bd93c7b4f8c31bbf14b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 22 Jun 2022 15:39:42 -0700
Subject: [PATCH 439/645] Update change log for v7.2.5 and v7.3.0-preview.5
 (#17565)

* Merged PR 21320: Change log for 7.3.0-preview.5

Change log for 7.3.0-preview.5

* Merged PR 21268: Changelog for release v7.2.5

Changelog for release v7.2.5
---
 .spelling            |  6 +++
 CHANGELOG/7.2.md     | 44 ++++++++++++++++++++++
 CHANGELOG/preview.md | 88 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 138 insertions(+)

diff --git a/.spelling b/.spelling
index 1d5ecdb1480..12dd9d1da96 100644
--- a/.spelling
+++ b/.spelling
@@ -57,6 +57,7 @@ APIScan
 appimage
 applocker
 appveyor
+AppX
 args
 argumentlist
 arm32
@@ -127,6 +128,7 @@ ChrisLGardner
 cimsession
 cimsupport
 ci.psm1
+cgmanifest
 classlib
 clear-itemproperty
 cloudydino
@@ -514,6 +516,7 @@ messageanalyzer
 metadata
 metadata.json
 miaromero
+michaeltlombardi
 microsoft
 Microsoft.ApplicationInsights
 Microsoft.CodeAnalysis.CSharp
@@ -690,6 +693,7 @@ preview.5.20278.13
 preview.5.20269.29
 preview.5.20268.9
 preview.5.20272.6
+preview.5.22307.18
 preview.6
 preview.6.20318.15
 preview.6.21355.2
@@ -704,6 +708,7 @@ preview.4.20229.10
 preview.4.22252.9
 preview.8
 preview1-24530-04
+preview1.22217.1
 preview7
 productversion
 program.cs
@@ -1075,6 +1080,7 @@ yecril71pl
 yml
 youtube
 Youssef1313
+Yulv-git
 zackjknight
 ComInterop
 ryneandal
diff --git a/CHANGELOG/7.2.md b/CHANGELOG/7.2.md
index f74dec0b180..77890905734 100644
--- a/CHANGELOG/7.2.md
+++ b/CHANGELOG/7.2.md
@@ -1,5 +1,49 @@
 # 7.2 Changelog
 
+## [7.2.5] - 2022-06-21
+
+### Engine Updates and Fixes
+
+- Fix native library loading for osx-arm64 (#17495) (Thanks @awakecoding!)
+
+### Tests
+
+- Make Assembly Load Native test work on a FX Dependent Linux Install (#17496)
+- Enable more tests to be run in a container. (#17294)
+- Switch to using GitHub action to verify markdown links for PRs (#17281)
+- Try to stabilize a few tests that fail intermittently (#17426)
+- TLS test fix back-port (#17424)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump .NET SDK to 6.0.301 (Internal 21218)</p>
+
+</summary>
+
+<ul>
+<li>Update Wix file (Internal 21242)</li>
+<li>Conditionally add output argument</li>
+<li>Rename mariner package to cm (#17506)</li>
+<li>Backport test fixes for 7.2 (#17494)</li>
+<li>Update dotnet-runtime version (#17472)</li>
+<li>Update to use <code>windows-latest</code> as the build agent image (#17418)</li>
+<li>Publish preview versions of mariner to preview repo (#17464)</li>
+<li>Move <code>cgmanifest</code> generation to daily (#17258)</li>
+<li>Fix mariner mappings (#17413)</li>
+<li>Make sure we execute tests on LTS package for older LTS releases (#17430)</li>
+<li>Add a finalize template which causes jobs with issues to fail (#17428)</li>
+<li>Make mariner packages Framework dependent (#17425)</li>
+<li>Base work for adding mariner amd64 package (#17417)</li>
+</ul>
+
+</details>
+
+[7.2.5]: https://github.com/PowerShell/PowerShell/compare/v7.2.4...v7.2.5
+
 ## [7.2.4] - 2022-05-17
 
 ### Build and Packaging Improvements
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index aa09386b226..4c77a3d48d4 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,5 +1,93 @@
 # Current preview release
 
+## [7.3.0-preview.5] - 2022-06-21
+
+### Engine Updates and Fixes
+
+- Improve type inference and completions (#16963) (Thanks @MartinGC94!)
+- Make `Out-String` and `Out-File` keep string input unchanged (#17455)
+- Make `AnsiRegex` able to capture Hyperlink ANSI sequences (#17442)
+- Add the `-ConfigurationFile` command line parameter to `pwsh` to support local session configuration (#17447)
+- Fix native library loading for `osx-arm64` (#17365) (Thanks @awakecoding!)
+- Fix formatting to act appropriately when the style of table header or list label is empty string (#17463)
+
+### General Cmdlet Updates and Fixes
+
+- Fix various completion issues inside the `param` block (#17489) (Thanks @MartinGC94!)
+- Add Amended switch to `Get-CimClass` cmdlet (#17477) (Thanks @iSazonov!)
+- Improve completion on operators (#17486) (Thanks @MartinGC94!)
+- Improve array element completion for command arguments (#17078) (Thanks @matt9ucci!)
+- Use AST extent for `PSScriptRoot` path completion (#17376)
+- Add type inference support for generic methods with type parameters (#16951) (Thanks @MartinGC94!)
+- Write out OSC indicator only if the `stdout` is not redirected (#17419)
+- Remove the assert and use a relatively larger capacity to cover possible increase of .NET reference assemblies (#17423)
+- Increase reference assembly count to 161 (#17420)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@Yulv-git, @eltociear</p>
+
+</summary>
+
+<ul>
+<li>Fix some typos in source code (#17481) (Thanks @Yulv-git!)</li>
+<li>Fix typo in `AsyncResult.cs` (#17396) (Thanks @eltociear!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Update script to pin to .NET 7 preview 5 version (#17448)
+- Start-PSPester: argument completer for `-Path` (#17334) (Thanks @powercode!)
+- Add reminder workflows (#17387)
+- Move to configuring the fabric bot via JSON (#17411)
+- Update Documentation Issue Template URL (#17410) (Thanks @michaeltlombardi!)
+- Update script to automatically take new preview pre-release builds (#17375)
+
+### Tests
+
+- Make Assembly Load Native test work on a FX Dependent Linux Install (#17380)
+- Update `Get-Error` test to not depend on DNS APIs (#17471)
+
+### Build and Packaging Improvements
+
+<details>
+
+<ul>
+<li>Update .NET SDK version from <code>7.0.100-preview.4.22252.9</code> to <code>7.0.100-preview.5.22307.18</code> (#17402)</li>
+<li>Downgrade the <code>Microsoft.CodeAnalysis.NetAnalyzers</code> package to <code>7.0.0-preview1.22217.1</code> (#17515)</li>
+<li>Rename mariner package to cm (#17505)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#17476)</li>
+<li>Bump <code>NJsonSchema</code> from 10.7.1 to 10.7.2 (#17475)</li>
+<li>Publish preview versions of mariner to preview repo (#17451)</li>
+<li>Update to the latest NOTICES file (#17421)</li>
+<li>Do not publish package for Mariner 1.0 (#17415)</li>
+<li>Add <code>AppX</code> capabilities in MSIX manifest so that PS7 can call the <code>AppX</code> APIs (#17416)</li>
+<li>Update to the latest NOTICES file (#17401)</li>
+<li>Fix mariner mappings (#17413)</li>
+<li>Update the cgmanifest (#17393)</li>
+<li>Bump `NJsonSchema` from `10.7.0` to `10.7.1` (#17381)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update to the latest NOTICES file (#17493) (Thanks @github-actions[bot]!)
+- Update the cgmanifest (#17478) (Thanks @github-actions[bot]!)
+- Correct spelling in Comments and tests (#17480) (Thanks @Yulv-git!)
+- Fix spelling errors introduced in changelog (#17414)
+- Update change log for v7.3.0-preview.4 release (#17412)
+- Update readme and metadata for 7.3.0-preview.4 release (#17378)
+
+[7.3.0-preview.5]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.4...v7.3.0-preview.5
+
 ## [7.3.0-preview.4] - 2022-05-23
 
 ### Engine Updates and Fixes

From ba9e23732f0d199a844896c9e5edf153170c0982 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jun 2022 11:08:59 -0700
Subject: [PATCH 440/645] Bump Newtonsoft.Json in
 /test/perf/dotnet-tools/ResultsComparer (#17566)

---
 test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
index d424da9deaa..3180d45b64a 100644
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
     <PackageReference Include="Perfolizer" Version="0.2.1" />
   </ItemGroup>

From 0e59a73b251124b3a43388f37bf06094447248ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jun 2022 11:12:53 -0700
Subject: [PATCH 441/645] Bump Newtonsoft.Json in
 /test/perf/dotnet-tools/Reporting (#17592)

---
 test/perf/dotnet-tools/Reporting/Reporting.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/perf/dotnet-tools/Reporting/Reporting.csproj b/test/perf/dotnet-tools/Reporting/Reporting.csproj
index e0d2f3b8249..70447cf5d73 100644
--- a/test/perf/dotnet-tools/Reporting/Reporting.csproj
+++ b/test/perf/dotnet-tools/Reporting/Reporting.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="5.0.0-preview.5.20278.1" />
   </ItemGroup>
 

From 735096bcc1344fa3851dfedecb7f6750250fe8f3 Mon Sep 17 00:00:00 2001
From: Eugene Samoylov <eugenesmlv@gmail.com>
Date: Mon, 27 Jun 2022 22:21:25 +0300
Subject: [PATCH 442/645] Show optional parameters as such when displaying
 method definition and overloads (#13799)

* Extend `GetMethodInfoOverloadDefinition` to show optional parameters as such (#13728)

* Fix CodeFactor style issue

* Fix review issues

* Add tests for TabExpansion2 `ToolTip`

* Fix tooltip string splitting

* Fix tests

* Bring back the namespace
---
 .../engine/CoreAdapter.cs                     |  34 ++++
 .../GetMethodInfoOverloadDefinition.Tests.ps1 | 178 ++++++++++++++++++
 2 files changed, 212 insertions(+)
 create mode 100644 test/powershell/engine/Api/GetMethodInfoOverloadDefinition.Tests.ps1

diff --git a/src/System.Management.Automation/engine/CoreAdapter.cs b/src/System.Management.Automation/engine/CoreAdapter.cs
index 42da6126188..d8c2fec89a0 100644
--- a/src/System.Management.Automation/engine/CoreAdapter.cs
+++ b/src/System.Management.Automation/engine/CoreAdapter.cs
@@ -3865,6 +3865,33 @@ private static bool PropertyIsStatic(PSProperty property)
             return entry.isStatic;
         }
 
+        /// <summary>
+        /// Get the string representation of the default value of passed-in parameter.
+        /// </summary>
+        /// <param name="parameterInfo">ParameterInfo containing the parameter's default value.</param>
+        /// <returns>String representation of the parameter's default value.</returns>
+        private static string GetDefaultValueStringRepresentation(ParameterInfo parameterInfo)
+        {
+            var parameterType = parameterInfo.ParameterType;
+            var parameterDefaultValue = parameterInfo.DefaultValue;
+
+            if (parameterDefaultValue == null)
+            {
+                return (parameterType.IsValueType || parameterType.IsGenericMethodParameter)
+                    ? "default"
+                    : "null";
+            }
+
+            if (parameterType.IsEnum)
+            {
+                return string.Format(CultureInfo.InvariantCulture, "{0}.{1}", parameterType.ToString(), parameterDefaultValue.ToString());
+            }
+
+            return (parameterDefaultValue is string)
+                ? string.Format(CultureInfo.InvariantCulture, "\"{0}\"", parameterDefaultValue.ToString())
+                : parameterDefaultValue.ToString();
+        }
+
         #endregion auxiliary methods and classes
 
         #region virtual
@@ -4457,6 +4484,13 @@ internal static string GetMethodInfoOverloadDefinition(string memberName, Method
                     builder.Append(ToStringCodeMethods.Type(parameterType));
                     builder.Append(' ');
                     builder.Append(parameter.Name);
+
+                    if (parameter.HasDefaultValue)
+                    {
+                        builder.Append(" = ");
+                        builder.Append(GetDefaultValueStringRepresentation(parameter));
+                    }
+
                     builder.Append(", ");
                 }
 
diff --git a/test/powershell/engine/Api/GetMethodInfoOverloadDefinition.Tests.ps1 b/test/powershell/engine/Api/GetMethodInfoOverloadDefinition.Tests.ps1
new file mode 100644
index 00000000000..aa9fb401279
--- /dev/null
+++ b/test/powershell/engine/Api/GetMethodInfoOverloadDefinition.Tests.ps1
@@ -0,0 +1,178 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe "Method definition Tests" -tags "CI" {
+
+    BeforeAll {
+        Add-Type -NameSpace OverloadDefinitionTest -Name TestClass -MemberDefinition @"
+public static void Bar() { }
+public static void Bar(int param) { }
+public static void Bar(int param1, string param2) { }
+public static string Bar(int? param1, string param2) { return param2; }
+"@
+
+        Add-Type -NameSpace MethodDefinitionTest -Name TestClass -MemberDefinition @"
+public static void TestMethod_Ref(ref int refParam) { }
+
+public static void TestMethod_InOut(in int inParam, out string outParam) { outParam = null; }
+
+public static void TestMethod_Params(params int[] intParams) { }
+
+public static void TestMethod_Generic1<T>(T param) { }
+
+public static void TestMethod_Generic2<T, U>(T param1, U param2) { }
+
+public static void TestMethod_OptInt(int optParam = int.MinValue) { }
+
+public static void TestMethod_OptString(string optParam = "test string") { }
+
+public static void TestMethod_OptStruct(DateTime optParam = new DateTime()) { }
+
+public static void TestMethod_OptEnum(UriKind optParam = UriKind.Relative) { }
+
+public static void TestMethod_OptGeneric<T>(T param = default) { }
+"@
+
+        $testCases = @(
+            @{
+                Description = "parameter passed by reference";
+                MethodName = "TestMethod_Ref";
+                ExpectedDefinition = "static void TestMethod_Ref([ref] int refParam)"
+            }
+            @{
+                Description = "in and out parameters";
+                MethodName = "TestMethod_InOut";
+                ExpectedDefinition = "static void TestMethod_InOut([ref] int inParam, [ref] string outParam)"
+            }
+            @{
+                Description = "parameters array";
+                MethodName = "TestMethod_Params";
+                ExpectedDefinition = "static void TestMethod_Params(Params int[] intParams)"
+            }
+            @{
+                Description = "one generic parameter";
+                MethodName = "TestMethod_Generic1";
+                ExpectedDefinition = "static void TestMethod_Generic1[T](T param)"
+            }
+            @{
+                Description = "two generic parameters";
+                MethodName = "TestMethod_Generic2";
+                ExpectedDefinition = "static void TestMethod_Generic2[T, U](T param1, U param2)"
+            }
+            @{
+                Description = "optional int parameter";
+                MethodName = "TestMethod_OptInt";
+                ExpectedDefinition = "static void TestMethod_OptInt(int optParam = $([int]::MinValue))"
+            }
+            @{
+                Description = "optional string parameter";
+                MethodName = "TestMethod_OptString";
+                ExpectedDefinition = 'static void TestMethod_OptString(string optParam = "test string")'
+            }
+            @{
+                Description = "optional struct parameter";
+                MethodName = "TestMethod_OptStruct";
+                ExpectedDefinition = 'static void TestMethod_OptStruct(datetime optParam = default)'
+            }
+            @{
+                Description = "optional enum parameter";
+                MethodName = "TestMethod_OptEnum";
+                ExpectedDefinition = "static void TestMethod_OptEnum(System.UriKind optParam = System.UriKind.Relative)"
+            }
+            @{
+                Description = "optional generic parameter";
+                MethodName = "TestMethod_OptGeneric";
+                ExpectedDefinition = "static void TestMethod_OptGeneric[T](T param = default)"
+            }
+        )
+    }
+
+    Context "Verify method definitions" {
+
+        It "Get methods' overload definitions" {
+            $definitions = ([OverloadDefinitionTest.TestClass]::Bar).OverloadDefinitions
+            $definitions.Count | Should -Be 4
+            $definitions[0] | Should -BeExactly "static void Bar()"
+            $definitions[1] | Should -BeExactly "static void Bar(int param)"
+            $definitions[2] | Should -BeExactly "static void Bar(int param1, string param2)"
+            $definitions[3] | Should -BeExactly "static string Bar(System.Nullable[int] param1, string param2)"
+        }
+
+        It "Get definition of the method with <Description>" -TestCases $testCases {
+            param($MethodName, $ExpectedDefinition)
+
+            $definition = ([MethodDefinitionTest.TestClass] | Get-Member -Type Method -Static $MethodName).Definition
+            $definition | Should -BeExactly $ExpectedDefinition
+
+            $overloadDefinition = ([MethodDefinitionTest.TestClass]::$MethodName).OverloadDefinitions
+            $overloadDefinition | Should -BeExactly $definition
+        }
+    }
+
+    Context "Verify method definitions' tooltip" {
+
+        It "Tooltip should contain methods' overload definitions" {
+            $result = (TabExpansion2 -inputScript ($s = '[OverloadDefinitionTest.TestClass]::Bar') -cursorColumn $s.Length).CompletionMatches
+            $tooltipParts = $result.ToolTip -split "\r?\n"
+
+            $tooltipParts.Count | Should -Be 4
+            $tooltipParts[0] | Should -BeExactly "static void Bar()"
+            $tooltipParts[1] | Should -BeExactly "static void Bar(int param)"
+            $tooltipParts[2] | Should -BeExactly "static void Bar(int param1, string param2)"
+            $tooltipParts[3] | Should -BeExactly "static string Bar(System.Nullable[int] param1, string param2)"
+        }
+
+        It "Tooltip should contain definition of the method with an optional parameter" {
+            $result = (TabExpansion2 -inputScript ($s = "[MethodDefinitionTest.TestClass]::TestMethod_OptInt") -cursorColumn $s.Length).CompletionMatches
+            $result.ToolTip | Should -BeExactly "static void TestMethod_OptInt(int optParam = $([int]::MinValue))"
+        }
+    }
+
+    Context "Verify Definition of Parameterized Property" {
+        BeforeAll {
+            Add-Type -TypeDefinition @"
+namespace TestParameterizedPropertyDefinition {
+    public class TestClass1
+    {
+        private string[] _indexerArray = new string[1];
+        public string this[int i]
+        {
+            get => _indexerArray[i];
+            set => _indexerArray[i] = value;
+        }
+    }
+
+    public class TestClass2
+    {
+        public int this[int i] => 42;
+    }
+
+    public class TestClass3
+    {
+        [System.Runtime.CompilerServices.IndexerName("TheItem")]
+        public int this[int i] => 42;
+    }
+}
+"@
+        }
+
+        It "Get definition of parametrized property" {
+            $obj = [TestParameterizedPropertyDefinition.TestClass1]::new()
+            $result = $obj | Get-Member -Type ParameterizedProperty
+            $result.Definition | Should -BeExactly "string Item(int i) {get;set;}"
+        }
+
+        It "Get definition of readonly parametrized property" {
+            $obj = [TestParameterizedPropertyDefinition.TestClass2]::new()
+            $result = $obj | Get-Member -Type ParameterizedProperty
+            $result.Definition | Should -BeExactly "int Item(int i) {get;}"
+        }
+
+        It "Get definition of parametrized property with changed name" {
+            $obj = [TestParameterizedPropertyDefinition.TestClass3]::new()
+            $result = $obj | Get-Member -Type ParameterizedProperty
+            $result.Name | Should -BeExactly "TheItem"
+            $result.Definition | Should -BeExactly "int TheItem(int i) {get;}"
+        }
+    }
+}

From b88cd3ae2e96f5d2835cb7ce553e7a126903a661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20Vajk?= <tamasvajk@github.com>
Date: Tue, 28 Jun 2022 20:00:34 +0200
Subject: [PATCH 443/645] Fix `build.psm1` to not specify both version and
 quality for `dotnet-install` (#17589)

---
 build.psm1                                                 | 2 +-
 test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.psm1 b/build.psm1
index c5ceec38c4e..ef27381211a 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1868,7 +1868,7 @@ function Install-Dotnet {
             }
 
             if ($Version) {
-                $bashArgs = @("./$installScript", '-v', $Version, '-q', $Quality)
+                $bashArgs = @("./$installScript", '-v', $Version)
             }
             elseif ($Channel) {
                 $bashArgs = @("./$installScript", '-c', $Channel, '-q', $Quality)
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 1431a9ac503..477aaf8c921 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -493,7 +493,10 @@ ConstructorTestClass(int i, bool b)
 
     It 'Should complete attribute argument in param block' {
         $res = TabExpansion2 -inputScript 'Param([Parameter()]$Param1)' -cursorColumn 17
-        $res.CompletionMatches[0].CompletionText | Should -BeExactly 'Position'
+        $names = [Parameter].GetProperties() | Where-Object CanWrite | ForEach-Object Name
+
+        $diffs = Compare-Object -ReferenceObject $res.CompletionMatches.CompletionText -DifferenceObject $names
+        $diffs | Should -BeNullOrEmpty
     }
 
     Context "Format cmdlet's View paramter completion" {

From 3d7f7b586ec40ecf6192d03ddc397a08bbafb092 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 28 Jun 2022 12:00:11 -0700
Subject: [PATCH 444/645] Update to use PSReadLine v2.2.6 (#17595)

---
 src/Modules/PSGalleryModules.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj
index c831d438942..fe9a771f206 100644
--- a/src/Modules/PSGalleryModules.csproj
+++ b/src/Modules/PSGalleryModules.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="PowerShellGet" Version="2.2.5" />
     <PackageReference Include="PackageManagement" Version="1.4.7" />
     <PackageReference Include="Microsoft.PowerShell.Archive" Version="1.2.5" />
-    <PackageReference Include="PSReadLine" Version="2.2.5" />
+    <PackageReference Include="PSReadLine" Version="2.2.6" />
     <PackageReference Include="ThreadJob" Version="2.0.3" />
   </ItemGroup>
 

From b5277c0fb771edca57e98b0ebb6faa1ad256f852 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 28 Jun 2022 12:45:47 -0700
Subject: [PATCH 445/645] Install .NET 3.1 as it is required by the vPack task
 (#17600)

---
 .../releaseBuild/azureDevOps/templates/vpackReleaseJob.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
index ffa7aa2a0e3..c8988b90106 100644
--- a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+++ b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@@ -16,6 +16,13 @@ jobs:
   - checkout: self
     clean: true
 
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      packageType: sdk
+      version: 3.1.x
+      installationPath: $(Agent.ToolsDirectory)/dotnet
+
   - template: ./SetVersionVariables.yml
     parameters:
       ReleaseTagVar: $(ReleaseTagVar)

From c63957de27efcdd27a6e2d385fc7f8afd669dfa0 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Tue, 5 Jul 2022 09:54:46 -0700
Subject: [PATCH 446/645] Remove `katacoda.com` from doc as it now returns 404
 (#17625)

---
 docs/git/basics.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/git/basics.md b/docs/git/basics.md
index a8a9bacf046..aa7629cf746 100644
--- a/docs/git/basics.md
+++ b/docs/git/basics.md
@@ -40,11 +40,6 @@ changes, and issue a pull request.
 
 [Hello World]: https://guides.github.com/activities/hello-world/
 
-#### Katacoda
-
-Learn basic Git scenarios in the browser with interactive labs.
-[Git lessons on katacoda](https://www.katacoda.com/courses/git/).
-
 #### Githug
 
 [Githug](https://github.com/Gazler/githug) is a great gamified way to

From 03f3fbfc637a2a72365880fe4dda1ef1b9b8d642 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 5 Jul 2022 13:22:59 -0700
Subject: [PATCH 447/645] Update DotnetMetadata.json to start consuming .NET 7
 Preview 6 builds (#17630)

---
 DotnetRuntimeMetadata.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index e1db727ce6e..fcc7f4b0f33 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "channel": "7.0.1xx-preview5",
+    "channel": "7.0.1xx-preview6",
     "quality": "daily",
     "qualityFallback": "preview",
-    "packageVersionPattern": "7.0.0-preview.5",
+    "packageVersionPattern": "7.0.0-preview.6",
     "sdkImageVersion": "7.0.100",
-    "nextChannel": "7.0.1xx-preview5",
+    "nextChannel": "7.0.1xx-preview6",
     "azureFeed": "",
     "sdkImageOverride": ""
   },

From edac193cf05a540b1f5f59f23fd1eb29c2776ce1 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Tue, 5 Jul 2022 23:26:51 +0200
Subject: [PATCH 448/645] Use discards for unused variables (#17620)

---
 .../commands/management/Computer.cs           |  3 +-
 .../commands/utility/Update-TypeData.cs       |  3 +-
 .../host/msh/ConsoleControl.cs                |  6 ++--
 .../host/msh/ConsoleHost.cs                   |  3 +-
 .../host/msh/ConsoleHostRawUserInterface.cs   |  6 ++--
 .../host/msh/ConsoleHostUserInterface.cs      | 12 +++----
 .../host/msh/Executor.cs                      |  3 +-
 .../host/msh/Serialization.cs                 |  3 +-
 .../DscSupport/CimDSCParser.cs                |  3 +-
 .../CommandCompletion/CompletionAnalysis.cs   |  9 ++---
 .../CommandCompletion/CompletionCompleters.cs |  3 +-
 .../engine/ExecutionContext.cs                |  6 ++--
 .../engine/InitialSessionState.cs             |  3 +-
 .../engine/Modules/ModuleIntrinsics.cs        |  2 +-
 .../engine/ScriptCommandProcessor.cs          |  3 +-
 .../engine/SessionStateContainer.cs           |  9 ++---
 .../engine/SessionStateNavigation.cs          |  5 ++-
 .../engine/SessionStateVariableAPIs.cs        | 36 +++++++------------
 .../engine/TypeTable.cs                       |  3 +-
 .../engine/parser/Compiler.cs                 |  4 +--
 .../engine/parser/Parser.cs                   |  9 ++---
 .../engine/parser/VariableAnalysis.cs         |  3 +-
 .../engine/parser/ast.cs                      |  4 +--
 .../engine/runtime/Binding/Binders.cs         |  7 ++--
 .../utils/PsUtils.cs                          |  4 +--
 25 files changed, 50 insertions(+), 102 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
index c12859cb048..120537d0cea 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
@@ -2231,8 +2231,7 @@ internal static string ValidateComputerName(
                 bool isIPAddress = false;
                 try
                 {
-                    IPAddress unused;
-                    isIPAddress = IPAddress.TryParse(nameToCheck, out unused);
+                    isIPAddress = IPAddress.TryParse(nameToCheck, out _);
                 }
                 catch (Exception)
                 {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
index d137524629d..cc8c7cebbc1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
@@ -849,8 +849,7 @@ private void ProcessTypeFiles()
                         }
                         else if (sste.FileName != null)
                         {
-                            bool unused;
-                            Context.TypeTable.Update(sste.FileName, sste.FileName, errors, Context.AuthorizationManager, Context.InitialSessionState.Host, out unused);
+                            Context.TypeTable.Update(sste.FileName, sste.FileName, errors, Context.AuthorizationManager, Context.InitialSessionState.Host, out _);
                         }
                         else
                         {
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
index 5f453a1d5c4..7efda924ce9 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
@@ -2270,14 +2270,13 @@ Coordinates origin
             c.X = (short)origin.X;
             c.Y = (short)origin.Y;
 
-            DWORD unused = 0;
             bool result =
                 NativeMethods.FillConsoleOutputCharacter(
                     consoleHandle.DangerousGetHandle(),
                     character,
                     (DWORD)numberToWrite,
                     c,
-                    out unused);
+                    out _);
             if (!result)
             {
                 int err = Marshal.GetLastWin32Error();
@@ -2324,14 +2323,13 @@ Coordinates origin
             c.X = (short)origin.X;
             c.Y = (short)origin.Y;
 
-            DWORD unused = 0;
             bool result =
                 NativeMethods.FillConsoleOutputAttribute(
                     consoleHandle.DangerousGetHandle(),
                     attribute,
                     (DWORD)numberToWrite,
                     c,
-                    out unused);
+                    out _);
 
             if (!result)
             {
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
index 9dbfdf8c808..e8ca269711d 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -2873,8 +2873,7 @@ private void EvaluateSuggestions(ConsoleHostUserInterface ui)
 
             private string EvaluatePrompt()
             {
-                Exception unused = null;
-                string promptString = _promptExec.ExecuteCommandAndGetResultAsString("prompt", out unused);
+                string promptString = _promptExec.ExecuteCommandAndGetResultAsString("prompt", out _);
 
                 if (string.IsNullOrEmpty(promptString))
                 {
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs
index 41053ecea7a..4db0882221c 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs
@@ -85,9 +85,8 @@ public override
                 GetBufferInfo(out bufferInfo);
 
                 ConsoleColor foreground;
-                ConsoleColor unused;
 
-                ConsoleControl.WORDToColor(bufferInfo.Attributes, out foreground, out unused);
+                ConsoleControl.WORDToColor(bufferInfo.Attributes, out foreground, out _);
                 return foreground;
             }
 
@@ -135,9 +134,8 @@ public override
                 GetBufferInfo(out bufferInfo);
 
                 ConsoleColor background;
-                ConsoleColor unused;
 
-                ConsoleControl.WORDToColor(bufferInfo.Attributes, out unused, out background);
+                ConsoleControl.WORDToColor(bufferInfo.Attributes, out _, out background);
                 return background;
             }
 
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
index 98abed42576..16c83827221 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
@@ -207,9 +207,8 @@ public override string ReadLine()
             HandleThrowOnReadAndPrompt();
 
             // call our internal version such that it does not end input on a tab
-            ReadLineResult unused;
 
-            return ReadLine(false, string.Empty, out unused, true, true);
+            return ReadLine(false, string.Empty, out _, true, true);
         }
 
         /// <summary>
@@ -1209,8 +1208,7 @@ internal string WrapToCurrentWindowWidth(string text)
         public override void WriteDebugLine(string message)
         {
             // don't lock here as WriteLine is already protected.
-            bool unused;
-            message = HostUtilities.RemoveGuidFromMessage(message, out unused);
+            message = HostUtilities.RemoveGuidFromMessage(message, out _);
 
             // We should write debug to error stream only if debug is redirected.)
             if (_parent.ErrorFormat == Serialization.DataFormat.XML)
@@ -1270,8 +1268,7 @@ public override void WriteInformation(InformationRecord record)
         public override void WriteVerboseLine(string message)
         {
             // don't lock here as WriteLine is already protected.
-            bool unused;
-            message = HostUtilities.RemoveGuidFromMessage(message, out unused);
+            message = HostUtilities.RemoveGuidFromMessage(message, out _);
 
             // NTRAID#Windows OS Bugs-1061752-2004/12/15-sburns should read a skin setting here...)
             if (_parent.ErrorFormat == Serialization.DataFormat.XML)
@@ -1314,8 +1311,7 @@ public override void WriteVerboseLine(string message)
         public override void WriteWarningLine(string message)
         {
             // don't lock here as WriteLine is already protected.
-            bool unused;
-            message = HostUtilities.RemoveGuidFromMessage(message, out unused);
+            message = HostUtilities.RemoveGuidFromMessage(message, out _);
 
             // NTRAID#Windows OS Bugs-1061752-2004/12/15-sburns should read a skin setting here...)
             if (_parent.ErrorFormat == Serialization.DataFormat.XML)
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
index 25eca0d5fd6..8879b2660d3 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
@@ -510,9 +510,8 @@ internal string ExecuteCommandAndGetResultAsString(string command, out Exception
         /// </returns>
         internal bool? ExecuteCommandAndGetResultAsBool(string command)
         {
-            Exception unused = null;
 
-            bool? result = ExecuteCommandAndGetResultAsBool(command, out unused);
+            bool? result = ExecuteCommandAndGetResultAsBool(command, out _);
 
             return result;
         }
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Serialization.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Serialization.cs
index 4c1fb4fa4e9..5181ae63672 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Serialization.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Serialization.cs
@@ -189,8 +189,7 @@ class WrappedDeserializer : Serialization
                     return null;
 
                 case DataFormat.XML:
-                    string unused;
-                    o = _xmlDeserializer.Deserialize(out unused);
+                    o = _xmlDeserializer.Deserialize(out _);
                     break;
 
                 case DataFormat.Text:
diff --git a/src/System.Management.Automation/DscSupport/CimDSCParser.cs b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
index d89c557b84d..a84cb474f3a 100644
--- a/src/System.Management.Automation/DscSupport/CimDSCParser.cs
+++ b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
@@ -2148,8 +2148,7 @@ public static void LoadResourcesFromModule(IScriptExtent scriptExtent,
                         {
                             try
                             {
-                                string unused;
-                                foundResources = ImportCimKeywordsFromModule(moduleInfo, resourceToImport, out unused);
+                                foundResources = ImportCimKeywordsFromModule(moduleInfo, resourceToImport, out _);
                             }
                             catch (Exception)
                             {
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index 24a02ac7855..27bd522cd45 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -564,8 +564,7 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                             //     {
                             //         DependsOn=@('[user]x',|)
                             //
-                            bool unused;
-                            result = GetResultForEnumPropertyValueOfDSCResource(completionContext, string.Empty, ref replacementIndex, ref replacementLength, out unused);
+                            result = GetResultForEnumPropertyValueOfDSCResource(completionContext, string.Empty, ref replacementIndex, ref replacementLength, out _);
                         }
 
                         break;
@@ -693,8 +692,7 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                                 //         DependsOn=@(|)
                                 //         DependsOn=(|
                                 //
-                                bool unused;
-                                result = GetResultForEnumPropertyValueOfDSCResource(completionContext, string.Empty, ref replacementIndex, ref replacementLength, out unused);
+                                result = GetResultForEnumPropertyValueOfDSCResource(completionContext, string.Empty, ref replacementIndex, ref replacementLength, out _);
                             }
 
                             break;
@@ -944,8 +942,7 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                                             break;
                                         }
 
-                                        bool unused;
-                                        result = GetResultForEnumPropertyValueOfDSCResource(completionContext, string.Empty, ref replacementIndex, ref replacementLength, out unused);
+                                        result = GetResultForEnumPropertyValueOfDSCResource(completionContext, string.Empty, ref replacementIndex, ref replacementLength, out _);
                                         break;
                                     }
                                 case TokenKind.Break:
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index 40b39b71b75..9940d94618f 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -6024,8 +6024,7 @@ internal static void CompleteMemberByInferredType(TypeInferenceContext context,
                     .AddCommandWithPreferenceSetting("Microsoft.PowerShell.Utility\\Sort-Object")
                     .AddParameter("Property", new[] { "ResultType", "ListItemText" })
                     .AddParameter("Unique");
-                Exception unused;
-                var sortedResults = powerShellExecutionHelper.ExecuteCurrentPowerShell(out unused, results);
+                var sortedResults = powerShellExecutionHelper.ExecuteCurrentPowerShell(out _, results);
                 results.Clear();
                 results.AddRange(sortedResults.Select(static psobj => PSObject.Base(psobj) as CompletionResult));
             }
diff --git a/src/System.Management.Automation/engine/ExecutionContext.cs b/src/System.Management.Automation/engine/ExecutionContext.cs
index d73a1e97eb8..c835471e0ec 100644
--- a/src/System.Management.Automation/engine/ExecutionContext.cs
+++ b/src/System.Management.Automation/engine/ExecutionContext.cs
@@ -379,8 +379,7 @@ internal static bool IsMarkedAsUntrusted(object value)
             var baseValue = PSObject.Base(value);
             if (baseValue != null && baseValue != NullString.Value)
             {
-                object unused;
-                result = UntrustedObjects.TryGetValue(baseValue, out unused);
+                result = UntrustedObjects.TryGetValue(baseValue, out _);
             }
 
             return result;
@@ -1584,8 +1583,7 @@ internal void ReportEngineStartupError(ErrorRecord errorRecord)
             try
             {
                 Cmdlet currentRunningModuleCommand;
-                string unused;
-                if (IsModuleCommandCurrentlyRunning(out currentRunningModuleCommand, out unused))
+                if (IsModuleCommandCurrentlyRunning(out currentRunningModuleCommand, out _))
                 {
                     currentRunningModuleCommand.WriteError(errorRecord);
                 }
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index cb4126ed1fb..36f619aed77 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -3535,8 +3535,7 @@ internal void UpdateTypes(ExecutionContext context, bool updateOnly)
                             moduleName = sste.PSSnapIn.Name;
                         }
 
-                        bool unused;
-                        context.TypeTable.Update(moduleName, sste.FileName, errors, context.AuthorizationManager, context.EngineHostInterface, out unused);
+                        context.TypeTable.Update(moduleName, sste.FileName, errors, context.AuthorizationManager, context.EngineHostInterface, out _);
                     }
                 }
                 else if (sste.TypeTable != null)
diff --git a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
index c489610a9b1..e0241f726c6 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
@@ -721,7 +721,7 @@ internal static bool MatchesModulePath(string modulePath, string requiredPath)
             string moduleDirPath = Path.GetDirectoryName(modulePath);
 
             // The module itself may be in a versioned directory (case 3)
-            if (Version.TryParse(Path.GetFileName(moduleDirPath), out Version unused))
+            if (Version.TryParse(Path.GetFileName(moduleDirPath), out _))
             {
                 moduleDirPath = Path.GetDirectoryName(moduleDirPath);
             }
diff --git a/src/System.Management.Automation/engine/ScriptCommandProcessor.cs b/src/System.Management.Automation/engine/ScriptCommandProcessor.cs
index 54d4f45849b..3fcb66f3180 100644
--- a/src/System.Management.Automation/engine/ScriptCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/ScriptCommandProcessor.cs
@@ -143,9 +143,8 @@ internal override bool IsHelpRequested(out string helpTarget, out HelpCategory h
                     if (parameter.IsDashQuestion())
                     {
                         Dictionary<Ast, Token[]> scriptBlockTokenCache = new Dictionary<Ast, Token[]>();
-                        string unused;
                         HelpInfo helpInfo = _scriptBlock.GetHelpInfo(context: Context, commandInfo: CommandInfo,
-                            dontSearchOnRemoteComputer: false, scriptBlockTokenCache: scriptBlockTokenCache, helpFile: out unused, helpUriFromDotLink: out unused);
+                            dontSearchOnRemoteComputer: false, scriptBlockTokenCache: scriptBlockTokenCache, helpFile: out _, helpUriFromDotLink: out _);
                         if (helpInfo == null)
                         {
                             break;
diff --git a/src/System.Management.Automation/engine/SessionStateContainer.cs b/src/System.Management.Automation/engine/SessionStateContainer.cs
index b2d2e3c6837..cf833a7643b 100644
--- a/src/System.Management.Automation/engine/SessionStateContainer.cs
+++ b/src/System.Management.Automation/engine/SessionStateContainer.cs
@@ -1434,8 +1434,7 @@ internal void GetChildItems(
                                 return;
                             }
 
-                            int unUsedChildrenNotMatchingFilterCriteria = 0;
-                            ProcessPathItems(providerInstance, providerPath, recurse, depth, context, out unUsedChildrenNotMatchingFilterCriteria, ProcessMode.Enumerate);
+                            ProcessPathItems(providerInstance, providerPath, recurse, depth, context, out _, ProcessMode.Enumerate);
                         }
                     }
                     else
@@ -1496,12 +1495,11 @@ internal void GetChildItems(
                 {
                     // Do the recursion manually so that we can apply the
                     // include and exclude filters
-                    int unUsedChildrenNotMatchingFilterCriteria = 0;
                     try
                     {
                         // Temeporary set literal path as false to apply filter
                         context.SuppressWildcardExpansion = false;
-                        ProcessPathItems(providerInstance, path, recurse, depth, context, out unUsedChildrenNotMatchingFilterCriteria, ProcessMode.Enumerate);
+                        ProcessPathItems(providerInstance, path, recurse, depth, context, out _, ProcessMode.Enumerate);
                     }
                     finally
                     {
@@ -4162,7 +4160,6 @@ internal void CopyItem(
 
             // Get the provider specific path for the destination
 
-            PSDriveInfo unusedDrive = null;
             ProviderInfo destinationProvider = null;
             Microsoft.PowerShell.Commands.CopyItemDynamicParameters dynamicParams = context.DynamicParameters as Microsoft.PowerShell.Commands.CopyItemDynamicParameters;
             bool destinationIsRemote = false;
@@ -4213,7 +4210,7 @@ internal void CopyItem(
                        copyPath,
                        context,
                        out destinationProvider,
-                       out unusedDrive);
+                       out _);
             }
             else
             {
diff --git a/src/System.Management.Automation/engine/SessionStateNavigation.cs b/src/System.Management.Automation/engine/SessionStateNavigation.cs
index f6d1a28eb1c..a1139ebc198 100644
--- a/src/System.Management.Automation/engine/SessionStateNavigation.cs
+++ b/src/System.Management.Automation/engine/SessionStateNavigation.cs
@@ -1458,7 +1458,6 @@ internal void MoveItem(
                     }
                     else
                     {
-                        PSDriveInfo unusedPSDriveInfo = null;
                         ProviderInfo destinationProvider = null;
 
                         CmdletProviderContext destinationContext = new CmdletProviderContext(this.ExecutionContext);
@@ -1472,7 +1471,7 @@ internal void MoveItem(
                                     providerDestinationPaths[0].Path,
                                     destinationContext,
                                     out destinationProvider,
-                                    out unusedPSDriveInfo);
+                                    out _);
                         }
                         else
                         {
@@ -1484,7 +1483,7 @@ internal void MoveItem(
                                     destination,
                                     destinationContext,
                                     out destinationProvider,
-                                    out unusedPSDriveInfo);
+                                    out _);
                         }
 
                         // Now verify the providers are the same.
diff --git a/src/System.Management.Automation/engine/SessionStateVariableAPIs.cs b/src/System.Management.Automation/engine/SessionStateVariableAPIs.cs
index 8cc9e4bafa4..45d8db28015 100644
--- a/src/System.Management.Automation/engine/SessionStateVariableAPIs.cs
+++ b/src/System.Management.Automation/engine/SessionStateVariableAPIs.cs
@@ -352,8 +352,7 @@ internal object GetVariableValueFromProvider(
                     // First get the provider for the path.
 
                     ProviderInfo providerInfo = null;
-                    string unused =
-                        this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
+                    _ = this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
 
                     throw NewProviderInvocationException(
                         "ProviderCannotBeUsedAsVariable",
@@ -368,8 +367,7 @@ internal object GetVariableValueFromProvider(
                     // First get the provider for the path.
 
                     ProviderInfo providerInfo = null;
-                    string unused =
-                        this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
+                    _ = this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
 
                     throw NewProviderInvocationException(
                         "ProviderCannotBeUsedAsVariable",
@@ -407,8 +405,7 @@ internal object GetVariableValueFromProvider(
                     // First get the provider for the path.
 
                     ProviderInfo providerInfo = null;
-                    string unused =
-                        this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
+                    _ = this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
 
                     throw NewProviderInvocationException(
                         "ProviderVariableSyntaxInvalid",
@@ -445,8 +442,7 @@ internal object GetVariableValueFromProvider(
                 {
                     // First get the provider for the path.
                     ProviderInfo providerInfo = null;
-                    string unused =
-                        this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
+                    _ = this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
 
                     ProviderInvocationException providerException =
                         new ProviderInvocationException(
@@ -741,8 +737,7 @@ internal object GetVariableValueAtScope(string name, string scopeID)
                         // First get the provider for the path.
 
                         ProviderInfo providerInfo = null;
-                        string unused =
-                            this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
+                        _ = this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
 
                         throw NewProviderInvocationException(
                             "ProviderCannotBeUsedAsVariable",
@@ -757,8 +752,7 @@ internal object GetVariableValueAtScope(string name, string scopeID)
                         // First get the provider for the path.
 
                         ProviderInfo providerInfo = null;
-                        string unused =
-                            this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
+                        _ = this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
 
                         throw NewProviderInvocationException(
                             "ProviderCannotBeUsedAsVariable",
@@ -796,8 +790,7 @@ internal object GetVariableValueAtScope(string name, string scopeID)
                         // First get the provider for the path.
 
                         ProviderInfo providerInfo = null;
-                        string unused =
-                            this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
+                        _ = this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
 
                         throw NewProviderInvocationException(
                             "ProviderVariableSyntaxInvalid",
@@ -835,8 +828,7 @@ internal object GetVariableValueAtScope(string name, string scopeID)
                         // First get the provider for the path.
 
                         ProviderInfo providerInfo = null;
-                        string unused =
-                            this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
+                        _ = this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
 
                         ProviderInvocationException providerException =
                             new ProviderInvocationException(
@@ -1245,8 +1237,7 @@ internal object SetVariable(
                     // First get the provider for the path.
 
                     ProviderInfo providerInfo = null;
-                    string unused =
-                        this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
+                    _ = this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
 
                     throw NewProviderInvocationException(
                         "ProviderCannotBeUsedAsVariable",
@@ -1261,8 +1252,7 @@ internal object SetVariable(
                     // First get the provider for the path.
 
                     ProviderInfo providerInfo = null;
-                    string unused =
-                        this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
+                    _ = this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
 
                     throw NewProviderInvocationException(
                         "ProviderCannotBeUsedAsVariable",
@@ -1301,8 +1291,7 @@ internal object SetVariable(
                     // First get the provider for the path.
 
                     ProviderInfo providerInfo = null;
-                    string unused =
-                        this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
+                    _ = this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
 
                     throw NewProviderInvocationException(
                         "ProviderVariableSyntaxInvalid",
@@ -1325,8 +1314,7 @@ internal object SetVariable(
                     // First get the provider for the path.
 
                     ProviderInfo providerInfo = null;
-                    string unused =
-                        this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
+                    _ = this.Globber.GetProviderPath(variablePath.QualifiedName, out providerInfo);
 
                     ProviderInvocationException providerException =
                         new ProviderInvocationException(
diff --git a/src/System.Management.Automation/engine/TypeTable.cs b/src/System.Management.Automation/engine/TypeTable.cs
index 2242f86aff5..47238809c9f 100644
--- a/src/System.Management.Automation/engine/TypeTable.cs
+++ b/src/System.Management.Automation/engine/TypeTable.cs
@@ -3937,8 +3937,7 @@ internal TypeTable(IEnumerable<string> typeFiles, AuthorizationManager authoriza
                     throw PSTraceSource.NewArgumentException("typeFile", TypesXmlStrings.TypeFileNotRooted, typefile);
                 }
 
-                bool unused;
-                Initialize(string.Empty, typefile, errors, authorizationManager, host, out unused);
+                Initialize(string.Empty, typefile, errors, authorizationManager, host, out _);
                 _typeFileList.Add(typefile);
             }
 
diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index 68bb523427b..19abc077b0d 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -6135,9 +6135,7 @@ public object VisitConvertExpression(ConvertExpressionAst convertExpressionAst)
                 {
                     // We'll wrap the variable in a PSReference, but not the constant variables ($true, $false, $null) because those
                     // can't be changed.
-                    IEnumerable<PropertyInfo> unused1;
-                    bool unused2;
-                    var varType = varExpr.GetVariableType(this, out unused1, out unused2);
+                    var varType = varExpr.GetVariableType(this, out _, out _);
                     return Expression.Call(
                         CachedReflectionInfo.VariableOps_GetVariableAsRef,
                         Expression.Constant(varExpr.VariablePath),
diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
index c01a1157fc8..b7a1324c6d8 100644
--- a/src/System.Management.Automation/engine/parser/Parser.cs
+++ b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -280,8 +280,7 @@ internal static ITypeName ScanType(string typename, bool ignoreErrors)
             var parser = new Parser();
             var tokenizer = parser._tokenizer;
             tokenizer.Initialize(null, typename, null);
-            Token unused;
-            var result = parser.TypeNameRule(allowAssemblyQualifiedNames: true, firstTypeNameToken: out unused);
+            var result = parser.TypeNameRule(allowAssemblyQualifiedNames: true, firstTypeNameToken: out _);
 
             SemanticChecks.CheckArrayTypeNameDepth(result, PositionUtilities.EmptyExtent, parser);
             if (!ignoreErrors && parser.ErrorList.Count > 0)
@@ -4265,11 +4264,10 @@ private StatementAst ClassDefinitionRule(List<AttributeBaseAst> customAttributes
                     this.SkipToken();
                     SkipNewlines();
                     ITypeName superClass;
-                    Token unused;
                     Token commaToken = null;
                     while (true)
                     {
-                        superClass = this.TypeNameRule(allowAssemblyQualifiedNames: false, firstTypeNameToken: out unused);
+                        superClass = this.TypeNameRule(allowAssemblyQualifiedNames: false, firstTypeNameToken: out _);
                         if (superClass == null)
                         {
                             ReportIncompleteInput(After(ExtentFromFirstOf(commaToken, colonToken)),
@@ -4750,8 +4748,7 @@ private StatementAst EnumDefinitionRule(List<AttributeBaseAst> customAttributes,
                     this.SkipToken();
                     SkipNewlines();
                     ITypeName underlyingType;
-                    Token unused;
-                    underlyingType = this.TypeNameRule(allowAssemblyQualifiedNames: false, firstTypeNameToken: out unused);
+                    underlyingType = this.TypeNameRule(allowAssemblyQualifiedNames: false, firstTypeNameToken: out _);
                     if (underlyingType == null)
                     {
                         ReportIncompleteInput(
diff --git a/src/System.Management.Automation/engine/parser/VariableAnalysis.cs b/src/System.Management.Automation/engine/parser/VariableAnalysis.cs
index 09b336099cb..e07329c9975 100644
--- a/src/System.Management.Automation/engine/parser/VariableAnalysis.cs
+++ b/src/System.Management.Automation/engine/parser/VariableAnalysis.cs
@@ -185,8 +185,7 @@ private void VisitParameters(ReadOnlyCollection<ParameterAst> parameters)
                         // valuetype because the parameter has no value yet.  For example:
                         //     & { param([System.Reflection.MemberTypes]$m) ($null -eq $m) }
 
-                        object unused;
-                        if (!Compiler.TryGetDefaultParameterValue(analysisDetails.Type, out unused))
+                        if (!Compiler.TryGetDefaultParameterValue(analysisDetails.Type, out _))
                         {
                             analysisDetails.LocalTupleIndex = VariableAnalysis.ForceDynamic;
                         }
diff --git a/src/System.Management.Automation/engine/parser/ast.cs b/src/System.Management.Automation/engine/parser/ast.cs
index 7c41559adc2..54424ea4cc7 100644
--- a/src/System.Management.Automation/engine/parser/ast.cs
+++ b/src/System.Management.Automation/engine/parser/ast.cs
@@ -1639,9 +1639,7 @@ Tuple<string, string> IParameterMetadataProvider.GetWithInputHandlingForInvokeCo
         private string GetWithInputHandlingForInvokeCommandImpl(Tuple<List<VariableExpressionAst>, string> usingVariablesTuple)
         {
             // do not add "$input |" to complex pipelines
-            string unused1;
-            string unused2;
-            var pipelineAst = GetSimplePipeline(false, out unused1, out unused2);
+            var pipelineAst = GetSimplePipeline(false, out _, out _);
             if (pipelineAst == null)
             {
                 return (usingVariablesTuple == null)
diff --git a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
index c714520b81e..9c715534432 100644
--- a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
+++ b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
@@ -2089,9 +2089,7 @@ internal static void NoteTypeHasInstanceMemberOrTypeName(Type type)
 
         internal static object CopyInstanceMembersOfValueType<T>(T t, object boxedT) where T : struct
         {
-            PSMemberInfoInternalCollection<PSMemberInfo> unused1;
-            ConsolidatedString unused2;
-            if (PSObject.HasInstanceMembers(boxedT, out unused1) || PSObject.HasInstanceTypeName(boxedT, out unused2))
+            if (PSObject.HasInstanceMembers(boxedT, out _) || PSObject.HasInstanceTypeName(boxedT, out _))
             {
                 var psobj = PSObject.AsPSObject(boxedT);
                 return PSObject.Base(psobj.Copy());
@@ -5623,8 +5621,7 @@ internal PSMemberInfo GetPSMemberInfo(DynamicMetaObject target,
 
             canOptimize = false;
 
-            PSMemberInfo unused;
-            Diagnostics.Assert(!TryGetInstanceMember(target.Value, Name, out unused),
+            Diagnostics.Assert(!TryGetInstanceMember(target.Value, Name, out _),
                                 "shouldn't get here if there is an instance member");
 
             PSMemberInfo memberInfo = null;
diff --git a/src/System.Management.Automation/utils/PsUtils.cs b/src/System.Management.Automation/utils/PsUtils.cs
index cf1fdf5b956..667048d7709 100644
--- a/src/System.Management.Automation/utils/PsUtils.cs
+++ b/src/System.Management.Automation/utils/PsUtils.cs
@@ -350,9 +350,7 @@ internal static Hashtable GetModuleManifestProperties(string psDataFilePath, str
                     pe.Message);
             }
 
-            string unused1;
-            string unused2;
-            var pipeline = ast.GetSimplePipeline(false, out unused1, out unused2);
+            var pipeline = ast.GetSimplePipeline(false, out _, out _);
             if (pipeline != null)
             {
                 var hashtableAst = pipeline.GetPureExpression() as HashtableAst;

From 21ad3d77a4af4eb2f57692cd3932f13a9c7b8f8c Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 5 Jul 2022 15:38:46 -0700
Subject: [PATCH 449/645] Set the compound assignment preference to false
 (#17632)

---
 .editorconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.editorconfig b/.editorconfig
index 517c9656ba6..031eb23e217 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -114,6 +114,7 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
 dotnet_style_prefer_conditional_expression_over_assignment = true:silent
 dotnet_style_prefer_auto_properties = true:suggestion
 csharp_prefer_simple_default_expression = true:suggestion
+dotnet_style_prefer_compound_assignment = false:silent
 
 dotnet_code_quality_unused_parameters = non_public:suggestion
 

From 17b23e3ebca6d8b325506692ed2b4e9d270128ff Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 6 Jul 2022 17:35:59 -0700
Subject: [PATCH 450/645] Update .NET SDK version from
 `7.0.100-preview.5.22307.18` to `7.0.100-preview.6.22352.1` (#17634)

---
 assets/wix/files.wxs                               |  6 +++---
 build.psm1                                         |  7 +++++++
 global.json                                        |  2 +-
 ...Microsoft.PowerShell.Commands.Management.csproj |  2 +-
 .../Microsoft.PowerShell.Commands.Utility.csproj   |  6 +++---
 .../Microsoft.PowerShell.CoreCLR.Eventing.csproj   |  2 +-
 .../Microsoft.PowerShell.SDK.csproj                |  8 ++++----
 .../Microsoft.WSMan.Management.csproj              |  2 +-
 .../System.Management.Automation.csproj            | 14 +++++++-------
 test/powershell/engine/Api/TypeInference.Tests.ps1 |  2 +-
 test/tools/TestService/TestService.csproj          |  2 +-
 test/tools/WebListener/WebListener.csproj          |  4 ++--
 12 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 6c41d4345fe..614eaa2f8b2 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3129,8 +3129,8 @@
       <Component Id="cmp8A466581FE0540CEB2210C64DA5F970B">
         <File Id="filE75D9761159B495A8DF7A1035E36EF05" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Formats.Tar.dll" />
       </Component>
-      <Component Id="cmp7B3D20B284F74CE38B349854F6AB21FD">
-        <File Id="fil2100DA01A95645ADBBDD7C73ED75B0A1" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.30112.dll" />
+      <Component Id="cmpCFB2D3927EB549CC9C65DA87B6BDC1F0">
+        <File Id="filCDB455902F6848C4ADC51ECA2BD8D99E" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.32404.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4137,7 +4137,7 @@
       <ComponentRef Id="cmpF735DF855B6A444E8874E7FD15796C37" />
       <ComponentRef Id="cmp8A466581FE0540CEB2210C64DA5F970B" />
       <ComponentRef Id="cmp044F67223E6D490D8533691BF50B2B86" />
-      <ComponentRef Id="cmp7B3D20B284F74CE38B349854F6AB21FD" />
+      <ComponentRef Id="cmpCFB2D3927EB549CC9C65DA87B6BDC1F0" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/build.psm1 b/build.psm1
index ef27381211a..9f4e1641b9b 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1760,9 +1760,15 @@ function Start-PSxUnit {
         throw "PowerShell must be built before running tests!"
     }
 
+    $originalDOTNET_ROOT = $env:DOTNET_ROOT
+
     try {
         Push-Location $PSScriptRoot/test/xUnit
 
+        # Add workaround to unblock xUnit testing see issue: https://github.com/dotnet/sdk/issues/26462
+        $dotnetPath = if ($environment.IsWindows) { "$env:LocalAppData\Microsoft\dotnet" } else { "$env:HOME/.dotnet" }
+        $env:DOTNET_ROOT = $dotnetPath
+
         # Path manipulation to obtain test project output directory
 
         if(-not $environment.IsWindows)
@@ -1806,6 +1812,7 @@ function Start-PSxUnit {
         Publish-TestResults -Path $xUnitTestResultsFile -Type 'XUnit' -Title 'Xunit Sequential'
     }
     finally {
+        $env:DOTNET_ROOT = $originalDOTNET_ROOT
         Pop-Location
     }
 }
diff --git a/global.json b/global.json
index ab3a127e05e..05030bdd299 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100-preview.5.22307.18"
+    "version": "7.0.100-preview.6.22352.1"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index edc444a7dac..f05e342cbf4 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.6.22356.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 957f5eb8205..606e6ffebff 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-1.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.5.22308.7" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-2.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.6.22356.1" />
     <PackageReference Include="NJsonSchema" Version="10.7.2" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 63de1f196d3..509e7162ec4 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.6.22356.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 6e7b7d45353..45f77f0dd89 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.5.22308.7" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.5.22308.7" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.6.22356.1" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0-preview1.22261.2" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.10.0-preview1.22261.2" />
@@ -30,7 +30,7 @@
     <PackageReference Include="System.Private.ServiceModel" Version="4.10.0-preview1.22261.2" />
     <!-- 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="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.6.22356.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 8423367605f..1df5496da74 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.6.22356.1" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index bbcba5f46fd..b396d79abf0 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.5.22308.7" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.5.22308.7" />
-    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.6.22356.1" />
     <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
-    <PackageReference Include="System.Management" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="System.Management" Version="7.0.0-preview.6.22356.1" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.5.22308.7" />
-    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.5.22308.7" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.6.22356.1" />
     <!-- 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.3.0-preview.1" />
diff --git a/test/powershell/engine/Api/TypeInference.Tests.ps1 b/test/powershell/engine/Api/TypeInference.Tests.ps1
index 2d86b9153ce..b5f2f645672 100644
--- a/test/powershell/engine/Api/TypeInference.Tests.ps1
+++ b/test/powershell/engine/Api/TypeInference.Tests.ps1
@@ -504,7 +504,7 @@ Describe "Type inference Tests" -tags "CI" {
     It "Infers typeof Select-Object when Parameter is ExcludeProperty" {
         $res = [AstTypeInference]::InferTypeOf( {  [io.fileinfo]::new("file")  |  Select-Object -ExcludeProperty *Time*, E* }.Ast)
         $res.Count | Should -Be 1
-        $res[0].Name | Should -BeExactly "System.Management.Automation.PSObject#Attributes:BaseName:Directory:DirectoryName:FullName:IsReadOnly:Length:LengthString:LinkTarget:LinkType:Mode:ModeWithoutHardLink:Name:NameString:ResolvedTarget:Target:VersionInfo"
+        $res[0].Name | Should -BeExactly "System.Management.Automation.PSObject#Attributes:BaseName:Directory:DirectoryName:FullName:IsReadOnly:Length:LengthString:LinkTarget:LinkType:Mode:ModeWithoutHardLink:Name:NameString:ResolvedTarget:Target:UnixFileMode:VersionInfo"
         $names = $res[0].Members.Name
         $names -contains "BaseName" | Should -BeTrue
         $names -contains "Name" | Should -BeTrue
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 04bb9ad279a..1c5ddecbbce 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.6.22356.1" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 2618f63975d..5cccca789ec 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.5.22309.3" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.5.22308.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.6.22330.3" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.6.22356.1" />
   </ItemGroup>
 
   <ItemGroup>

From 81f492744dd6d774de86aba8694b4a3e699e3434 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Thu, 7 Jul 2022 12:45:50 +0200
Subject: [PATCH 451/645] Fix tab completion regression (#17628)

---
 .../engine/CommandCompletion/CompletionCompleters.cs  |  4 ++--
 .../Host/TabCompletion/TabCompletion.Tests.ps1        | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index 9940d94618f..b63691eb93e 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -1689,7 +1689,7 @@ private static void ProcessParameter(
                 {
                     RemoveLastNullCompletionResult(result);
 
-                    string wordToComplete = context.WordToComplete;
+                    string wordToComplete = context.WordToComplete ?? string.Empty;
                     string quote = HandleDoubleAndSingleQuote(ref wordToComplete);
 
                     var pattern = WildcardPattern.Get(wordToComplete + "*", WildcardOptions.IgnoreCase);
@@ -4126,7 +4126,7 @@ private static ArgumentLocation FindTargetArgumentLocation(Collection<AstParamet
                                     return GenerateArgumentLocation(prevArg, position);
                                 }
 
-                                if (token.Kind == TokenKind.Parameter
+                                if ((token.Kind == TokenKind.Parameter && token.Extent.StartOffset == arg.Parameter.Extent.StartOffset)
                                     || (token.Extent.StartOffset > arg.Argument.Extent.StartOffset && token.Extent.EndOffset < arg.Argument.Extent.EndOffset))
                                 {
                                     // case 1: Get-Cmdlet -Param <tab> abc
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 477aaf8c921..a2862f2b567 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -499,6 +499,17 @@ ConstructorTestClass(int i, bool b)
         $diffs | Should -BeNullOrEmpty
     }
 
+    It 'Should complete argument for second parameter' {
+        $res = TabExpansion2 -inputScript 'Get-ChildItem -Path $HOME -ErrorAction '
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly Break
+    }
+
+    It 'Should complete argument with validateset attribute after comma' {
+        $TestString = 'function Test-ValidateSet{Param([ValidateSet("Cat","Dog")]$Param1,$Param2)};Test-ValidateSet -Param1 Dog, -Param2'
+        $res = TabExpansion2 -inputScript $TestString -cursorColumn ($TestString.LastIndexOf(',') + 1)
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly Cat
+    }
+
     Context "Format cmdlet's View paramter completion" {
         BeforeAll {
             $viewDefinition = @'

From 9a9c7666e7004ead95076a6f8ee78f303dd75bb4 Mon Sep 17 00:00:00 2001
From: Jordan Borean <jborean93@gmail.com>
Date: Thu, 7 Jul 2022 22:33:12 +1000
Subject: [PATCH 452/645] Set-AuthenticodeSignature hash default to SHA256
 (#17560)

---
 src/Microsoft.PowerShell.Security/security/SignatureCommands.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs b/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
index 5d5bb06b667..d7c8dcbb78f 100644
--- a/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
+++ b/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
@@ -404,7 +404,7 @@ public string HashAlgorithm
             }
         }
 
-        private string _hashAlgorithm = null;
+        private string _hashAlgorithm = "SHA256";
 
         /// <summary>
         /// Property that sets force parameter.

From 1ba64540542ab9f2743800f1e4e306a0672a8093 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 11 Jul 2022 10:55:20 -0700
Subject: [PATCH 453/645] Update to the latest NOTICES file (#17607)

---
 ThirdPartyNotices.txt | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index c1f3a1d4270..64621d33567 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -611,6 +611,7 @@ Newtonsoft.Json 13.0.1 - MIT
 Copyright James Newton-King 2008
 Copyright (c) 2007 James Newton-King
 Copyright (c) James Newton-King 2008
+Copyright James Newton-King 2008 Json.NET
 
 The MIT License (MIT)
 
@@ -1814,6 +1815,47 @@ SOFTWARE.
 System.Diagnostics.PerformanceCounter 6.0.1 - MIT
 
 
+(c) Microsoft Corporation
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright (c) .NET Foundation
+Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
+Copyright (c) 1998 Microsoft. To
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2020 Unicode, Inc.
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 2011-2020 Microsoft Corp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
+Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
+Portions (c) International Organization
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
+Copyright (c) .NET Foundation Contributors
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 

From ca0178a80219a2ca12f323a15501fda76340ba16 Mon Sep 17 00:00:00 2001
From: Bryan Berns <berns@uwalumni.com>
Date: Tue, 12 Jul 2022 02:09:19 -0400
Subject: [PATCH 454/645] Add Milliseconds Parameter to New-TimeSpan (#17621)

---
 .../commands/utility/NewTimeSpanCommand.cs    |  8 ++++-
 .../New-TimeSpan.Tests.ps1                    | 30 ++++++++++---------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs
index 53c39250763..a5d784da9bb 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs
@@ -88,6 +88,12 @@ public DateTime End
         [Parameter(ParameterSetName = "Time")]
         public int Seconds { get; set; }
 
+        /// <summary>
+        /// Allows the user to override the millisecond.
+        /// </summary>
+        [Parameter(ParameterSetName = "Time")]
+        public int Milliseconds { get; set; }
+
         #endregion
 
         #region methods
@@ -119,7 +125,7 @@ protected override void ProcessRecord()
                     break;
 
                 case "Time":
-                    result = new TimeSpan(Days, Hours, Minutes, Seconds);
+                    result = new TimeSpan(Days, Hours, Minutes, Seconds, Milliseconds);
                     break;
 
                 default:
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/New-TimeSpan.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/New-TimeSpan.Tests.ps1
index ad8cb8a6121..5dcc815b089 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/New-TimeSpan.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/New-TimeSpan.Tests.ps1
@@ -3,12 +3,13 @@
 Describe "New-TimeSpan DRT Unit Tests" -Tags "CI" {
 
      It "Should works proper with new-timespan"{
-         $results =  New-TimeSpan -Days 10 -Hours 10 -Minutes 10 -Seconds 10
+         $results =  New-TimeSpan -Days 10 -Hours 10 -Minutes 10 -Seconds 10 -Milliseconds 10
          $results | Should -BeOfType System.Timespan
          $results.Days | Should -Be 10
          $results.Hours | Should -Be 10
          $results.Minutes | Should -Be 10
          $results.Seconds | Should -Be 10
+         $results.Milliseconds | Should -Be 10
     }
 }
 
@@ -20,29 +21,30 @@ Describe "New-TimeSpan" -Tags "CI" {
     }
 
     Context "Core Functionality Tests" {
-	New-Variable -Name testObject -Value $(New-TimeSpan -Days 2 -Hours 23 -Minutes 4 -Seconds 3) -Force
+	New-Variable -Name testObject -Value $(New-TimeSpan -Days 2 -Hours 23 -Minutes 4 -Seconds 3 -Milliseconds 2) -Force
 
 	$expectedOutput = @{ "Days"              = "2";
 			     "Hours"             = "23";
 			     "Minutes"           = "4";
 			     "Seconds"           = "3";
-			     "Milliseconds"      = "0";
-			     "Ticks"             = "2558430000000";
-			     "TotalDays"         = "2.96114583333333";
-			     "TotalHours"        = "71.0675";
-			     "TotalMinutes"      = "4264.05";
-			     "TotalSeconds"      = "255843";
-			     "TotalMilliseconds" = "255843000"
+			     "Milliseconds"      = "2";
+			     "Ticks"             = "2558430020000";
+			     "TotalDays"         = "2.96114585648148";
+			     "TotalHours"        = "71.0675005555556";
+			     "TotalMinutes"      = "4264.05003333333";
+			     "TotalSeconds"      = "255843.002";
+			     "TotalMilliseconds" = "255843002"
 			   }
 
 	$TEN_MILLION = 10000000
 
 	It "Should have expected values for time properties set during creation" {
-	    $testObject.Days    | Should -Be $expectedOutput["Days"]
-	    $testObject.Hours   | Should -Be $expectedOutput["Hours"]
-	    $testObject.Minutes | Should -Be $expectedOutput["Minutes"]
-	    $testObject.Seconds | Should -Be $expectedOutput["Seconds"]
-	    $testObject.Ticks   | Should -Be $expectedOutput["Ticks"]
+	    $testObject.Days         | Should -Be $expectedOutput["Days"]
+	    $testObject.Hours        | Should -Be $expectedOutput["Hours"]
+	    $testObject.Minutes      | Should -Be $expectedOutput["Minutes"]
+	    $testObject.Seconds      | Should -Be $expectedOutput["Seconds"]
+	    $testObject.Milliseconds | Should -Be $expectedOutput["Milliseconds"]
+	    $testObject.Ticks        | Should -Be $expectedOutput["Ticks"]
 	}
 
     }

From 0295cc6d076177346ae70ec3d1cdb23e9b2e9dba Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Tue, 12 Jul 2022 09:41:57 -0700
Subject: [PATCH 455/645] Remove potential ANSI escape sequences in strings
 before using in `Out-GridView` (#17664)

---
 .../commandHelpers/OutGridView.cs                     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Microsoft.Management.UI.Internal/commandHelpers/OutGridView.cs b/src/Microsoft.Management.UI.Internal/commandHelpers/OutGridView.cs
index f38a8a70945..81621624992 100644
--- a/src/Microsoft.Management.UI.Internal/commandHelpers/OutGridView.cs
+++ b/src/Microsoft.Management.UI.Internal/commandHelpers/OutGridView.cs
@@ -6,6 +6,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Management.Automation;
+using System.Management.Automation.Internal;
 using System.Threading;
 using System.Windows;
 using System.Windows.Automation;
@@ -496,6 +497,16 @@ private void AddItem(PSObject value)
                     {
                         try
                         {
+                            // Remove any potential ANSI decoration
+                            foreach (var property in value.Properties)
+                            {
+                                if (property.Value is string str)
+                                {
+                                    StringDecorated decoratedString = new StringDecorated(str);
+                                    property.Value = decoratedString.ToString(OutputRendering.PlainText);
+                                }
+                            }
+
                             this.listItems.Add(value);
                         }
                         catch (Exception e)

From ff0506d63216347772de7b2b22b77fffcc3bf828 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Tue, 12 Jul 2022 21:23:03 -0700
Subject: [PATCH 456/645] Change `ConvertFrom-Json -AsHashtable` to use ordered
 hashtable (#17405)

JSON typically has ordering to make it easier to read. Currently, a Hashtable does not preserve ordering so for complex JSON, the members are not where you would expect in terms of order. This change wraps OrderedDictionary into a OrderedHashtable that derives from Hashtable. This preserves existing compatibility with scripts that expect a Hashtable to be returned, but preserves the order of elements.
---
 .../commands/utility/WebCmdlet/JsonObject.cs  |   2 +-
 .../engine/OrderedHashtable.cs                | 246 ++++++++++++++++++
 .../ConvertFrom-Json.Tests.ps1                |  11 +
 .../engine/OrderedHashtable.Tests.ps1         | 162 ++++++++++++
 4 files changed, 420 insertions(+), 1 deletion(-)
 create mode 100644 src/System.Management.Automation/engine/OrderedHashtable.cs
 create mode 100644 test/powershell/engine/OrderedHashtable.Tests.ps1

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
index ff576c7e68f..3113dc40d85 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
@@ -344,7 +344,7 @@ private static ICollection<object> PopulateFromJArray(JArray list, out ErrorReco
         private static Hashtable PopulateHashTableFromJDictionary(JObject entries, out ErrorRecord error)
         {
             error = null;
-            Hashtable result = new(entries.Count);
+            OrderedHashtable result = new(entries.Count);
             foreach (var entry in entries)
             {
                 // Case sensitive duplicates should normally not occur since JsonConvert.DeserializeObject
diff --git a/src/System.Management.Automation/engine/OrderedHashtable.cs b/src/System.Management.Automation/engine/OrderedHashtable.cs
new file mode 100644
index 00000000000..d14d3dc2449
--- /dev/null
+++ b/src/System.Management.Automation/engine/OrderedHashtable.cs
@@ -0,0 +1,246 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Runtime.Serialization;
+
+#nullable enable
+
+namespace System.Management.Automation
+{
+    /// <summary>
+    /// OrderedHashtable is a hashtable that preserves the order of the keys.
+    /// </summary>
+    public sealed class OrderedHashtable : Hashtable, IEnumerable
+    {
+        private readonly OrderedDictionary _orderedDictionary;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OrderedHashtable"/> class.
+        /// </summary>
+        public OrderedHashtable()
+        {
+            _orderedDictionary = new OrderedDictionary();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OrderedHashtable"/> class.
+        /// </summary>
+        /// <param name="capacity">The capacity.</param>
+        public OrderedHashtable(int capacity) : base(capacity)
+        {
+            _orderedDictionary = new OrderedDictionary(capacity);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OrderedHashtable"/> class.
+        /// </summary>
+        /// <param name="dictionary">The dictionary to use for initialization.</param>
+        public OrderedHashtable(IDictionary dictionary)
+        {
+            _orderedDictionary = new OrderedDictionary(dictionary.Count);
+            foreach (DictionaryEntry entry in dictionary)
+            {
+                _orderedDictionary.Add(entry.Key, entry.Value);
+            }
+        }
+
+        /// <summary>
+        /// Get the number of items in the hashtable.
+        /// </summary>
+        public override int Count
+        {
+            get
+            {
+                return _orderedDictionary.Count;
+            }
+        }
+
+        /// <summary>
+        /// Get if the hashtable is a fixed size.
+        /// </summary>
+        public override bool IsFixedSize
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Get if the hashtable is read-only.
+        /// </summary>
+        public override bool IsReadOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Get if the hashtable is synchronized.
+        /// </summary>
+        public override bool IsSynchronized
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets the keys in the hashtable.
+        /// </summary>
+        public override ICollection Keys
+        {
+            get
+            {
+                return _orderedDictionary.Keys;
+            }
+        }
+
+        /// <summary>
+        /// Gets the values in the hashtable.
+        /// </summary>
+        public override ICollection Values
+        {
+            get
+            {
+                return _orderedDictionary.Values;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value associated with the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns>The value associated with the key.</returns>
+        public override object? this[object key]
+        {
+            get
+            {
+                return _orderedDictionary[key];
+            }
+
+            set
+            {
+                _orderedDictionary[key] = value;
+            }
+        }
+
+        /// <summary>
+        /// Adds the specified key and value to the hashtable.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value.</param>
+        public override void Add(object key, object? value)
+        {
+            _orderedDictionary.Add(key, value);
+        }
+
+        /// <summary>
+        /// Removes all keys and values from the hashtable.
+        /// </summary>
+        public override void Clear()
+        {
+            _orderedDictionary.Clear();
+        }
+
+        /// <summary>
+        /// Get a shallow clone of the hashtable.
+        /// </summary>
+        /// <returns>A shallow clone of the hashtable.</returns>
+        public override object Clone()
+        {
+            return new OrderedHashtable(_orderedDictionary);
+        }
+
+        /// <summary>
+        /// Determines whether the hashtable contains a specific key.
+        /// </summary>
+        /// <param name="key">The key to locate in the hashtable.</param>
+        /// <returns>true if the hashtable contains an element with the specified key; otherwise, false.</returns>
+        public override bool Contains(object key)
+        {
+            return _orderedDictionary.Contains(key);
+        }
+
+        /// <summary>
+        /// Determines whether the hashtable contains a specific key.
+        /// </summary>
+        /// <param name="key">The key to locate in the hashtable.</param>
+        /// <returns>true if the hashtable contains an element with the specified key; otherwise, false.</returns>
+        public override bool ContainsKey(object key)
+        {
+            return _orderedDictionary.Contains(key);
+        }
+
+        /// <summary>
+        /// Determines whether the hashtable contains a specific value.
+        /// </summary>
+        /// <param name="value">The value to locate in the hashtable.</param>
+        /// <returns>true if the hashtable contains an element with the specified value; otherwise, false.</returns>
+        public override bool ContainsValue(object? value)
+        {
+            foreach (DictionaryEntry entry in _orderedDictionary)
+            {
+                if (Equals(entry.Value, value))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Copies the elements of the hashtable to an array of type object, starting at the specified array index.
+        /// </summary>
+        /// <param name="array">The one-dimensional array that is the destination of the elements copied from the hashtable. The array must have zero-based indexing.</param>
+        /// <param name="arrayIndex">The zero-based index in array at which copying begins.</param>
+        public override void CopyTo(Array array, int arrayIndex)
+        {
+            _orderedDictionary.CopyTo(array, arrayIndex);
+        }
+
+        /// <summary>
+        /// Get the enumerator.
+        /// </summary>
+        /// <returns>The enumerator.</returns>
+        public override IDictionaryEnumerator GetEnumerator()
+        {
+            return _orderedDictionary.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Get the enumerator.
+        /// </summary>
+        /// <returns>The enumerator.</returns>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        /// <summary>
+        /// Returns the data needed to seralize the Hashtable.
+        /// </summary>
+        /// <param name="info">The serialization info.</param>
+        /// <param name="context">The serialization context.</param>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            _orderedDictionary.GetObjectData(info, context);
+        }
+
+        /// <summary>
+        /// Removes the specified key from the hashtable.
+        /// </summary>
+        /// <param name="key">The key to remove.</param>
+        public override void Remove(object key)
+        {
+            _orderedDictionary.Remove(key);
+        }
+    }
+}
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Json.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Json.Tests.ps1
index 029e7a70039..135625db986 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Json.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Json.Tests.ps1
@@ -142,6 +142,17 @@ Describe 'ConvertFrom-Json Unit Tests' -tags "CI" {
         $out[1] | Should -Be $null
         $out[2] | Should -Be 2
     }
+
+    It 'Order is preserved for a hashtable' {
+        $json = '{"a":1,"b":2,"c":3}' | ConvertFrom-Json -AsHashtable
+        ($json | Out-String).Trim() | Should -BeExactly @"
+Name                           Value
+----                           -----
+a                              1
+b                              2
+c                              3
+"@
+    }
 }
 
 Describe 'ConvertFrom-Json -Depth Tests' -tags "Feature" {
diff --git a/test/powershell/engine/OrderedHashtable.Tests.ps1 b/test/powershell/engine/OrderedHashtable.Tests.ps1
new file mode 100644
index 00000000000..4df61c49edb
--- /dev/null
+++ b/test/powershell/engine/OrderedHashtable.Tests.ps1
@@ -0,0 +1,162 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe 'Tests for OrderedHashtable' {
+
+    It 'Can create an empty OrderedHashtable' {
+        $oh =[System.Management.Automation.OrderedHashtable]::new()
+        $oh.Count | Should -Be 0
+        $oh.GetType().Name | Should -BeExactly 'OrderedHashtable'
+    }
+
+    It 'Can create an empty OrderedHashtable with a capacity' {
+        $oh = [System.Management.Automation.OrderedHashtable]::new(10)
+        $oh.Count | Should -Be 0
+        $oh.GetType().Name | Should -BeExactly 'OrderedHashtable'
+    }
+
+    It 'Can create an OrderedHashtable with an initial dictionary' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh.Count | Should -Be 2
+        $oh['a'] | Should -Be $h['a']
+        $oh['b'] | Should -Be $h['b']
+    }
+
+    It 'Can use the Add() method' {
+        $oh = [System.Management.Automation.OrderedHashtable]::new()
+        $oh.Add('a', 1)
+        $oh.Add('b', 2)
+        $oh.Count | Should -Be 2
+        $oh['a'] | Should -Be 1
+        $oh['b'] | Should -Be 2
+    }
+
+    It 'Can use the Clear() method' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh.Count | Should -Be 2
+        $oh.Clear()
+        $oh.Count | Should -Be 0
+    }
+
+    It 'Can use the Clone() method' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh2 = $oh.Clone()
+        $oh2.Count | Should -Be 2
+        $oh2['a'] | Should -Be $h['a']
+        $oh2['b'] | Should -Be $h['b']
+    }
+
+    It 'Can use the Contains() method' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh.Contains('a') | Should -BeTrue
+        $oh.Contains('b') | Should -BeTrue
+        $oh.Contains('c') | Should -BeFalse
+    }
+
+    It 'Can use the ContainsKey() method' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh.ContainsKey('a') | Should -BeTrue
+        $oh.ContainsKey('b') | Should -BeTrue
+        $oh.ContainsKey('c') | Should -BeFalse
+    }
+
+    It 'Can use the ContainsValue() method' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh.ContainsValue(1) | Should -BeTrue
+        $oh.ContainsValue(2) | Should -BeTrue
+        $oh.ContainsValue(3) | Should -BeFalse
+    }
+
+    It 'Can use the CopyTo() method' {
+        $oh = [System.Management.Automation.OrderedHashtable]::new()
+        $oh.Add('a', 1)
+        $oh.Add('b', 2)
+        $oh.Add('c', 3)
+        $a = (4, 5, 6, 7)
+        $oh.CopyTo($a, 1)
+        $a[0] | Should -Be 4
+        # OrderedDictionary.CopyTo() doesn't guarantee to preserve order
+        # so we can't easily test the values
+        $a[1].GetType().Name | Should -BeExactly 'DictionaryEntry'
+        $a[2].GetType().Name | Should -BeExactly 'DictionaryEntry'
+        $a[3].GetType().Name | Should -BeExactly 'DictionaryEntry'
+    }
+
+    It 'Can use the Equals() method' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh2 = $oh.Clone()
+        $oh3 = $oh
+        $oh.Equals($oh2) | Should -BeFalse
+        $oh.Equals($oh3) | Should -BeTrue
+    }
+
+    It 'Can use the GetEnumerator() method' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh.GetEnumerator().GetType().Name | Should -BeExactly 'OrderedDictionaryEnumerator'
+    }
+
+    It 'Can use the GetHashCode() method' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh.GetHashCode() | Should -BeGreaterThan 0
+        $oh2 = $oh.Clone()
+        $oh.GetHashCode() | Should -Not -Be $oh2.GetHashCode()
+        $oh3 = $oh
+        $oh.GetHashCode() | Should -Be $oh3.GetHashCode()
+    }
+
+    It 'Can use Remove() method' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh.Remove('a')
+        $oh.Count | Should -Be 1
+        $oh.Contains('a') | Should -BeFalse
+    }
+
+    It 'Can use Item property' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh['a'] | Should -Be 1
+        $oh['b'] | Should -Be 2
+    }
+
+    It 'Can use IsFixedSize property' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh.IsFixedSize | Should -BeFalse
+    }
+
+    It 'Can use IsReadOnly property' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh.IsReadOnly | Should -BeFalse
+    }
+
+    It 'Can use IsSynchronized property' {
+        $h = @{ a = 1; b = 2 }
+        $oh = [System.Management.Automation.OrderedHashtable]::new($h)
+        $oh.IsSynchronized | Should -BeFalse
+    }
+
+    It 'Can use Keys property' {
+        $oh = [System.Management.Automation.OrderedHashtable]::new()
+        $oh['a'] = 1
+        $oh['b'] = 2
+        $oh.Keys | Should -Be ('a', 'b')
+    }
+
+    It 'Can use Values property' {
+        $oh = [System.Management.Automation.OrderedHashtable]::new()
+        $oh['a'] = 1
+        $oh['b'] = 2
+        $oh.Values | Should -Be (1, 2)
+    }
+}

From 667ea982ce72a6708254bc120b2a09a7f99d6af7 Mon Sep 17 00:00:00 2001
From: Sergey Vasin <sethvs@users.noreply.github.com>
Date: Wed, 13 Jul 2022 08:19:29 +0300
Subject: [PATCH 457/645] Fix comment in InternalCommands.cs (#17669)

---
 src/System.Management.Automation/engine/InternalCommands.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/InternalCommands.cs b/src/System.Management.Automation/engine/InternalCommands.cs
index 58a37444a89..f86478e7450 100644
--- a/src/System.Management.Automation/engine/InternalCommands.cs
+++ b/src/System.Management.Automation/engine/InternalCommands.cs
@@ -1539,7 +1539,7 @@ public SwitchParameter LT
         }
 
         /// <summary>
-        /// Gets -sets case sensitive binary operator -clt.
+        /// Gets or sets case sensitive binary operator -clt.
         /// </summary>
         [Parameter(Mandatory = true, ParameterSetName = "CaseSensitiveLessThanSet")]
         public SwitchParameter CLT

From f9d424dd860cc036cd35c901c3e51fd8fdad9d08 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 13 Jul 2022 13:31:57 -0700
Subject: [PATCH 458/645] Fix `Export-PSSession` to not throw error when a
 rooted path is specified for `-OutputModule` (#17671)

---
 .../resources/PathUtilsStrings.resx           |  2 +-
 .../utils/PathUtils.cs                        | 31 ++++++++++++-------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/System.Management.Automation/resources/PathUtilsStrings.resx b/src/System.Management.Automation/resources/PathUtilsStrings.resx
index b7675e53268..07a4677fa2f 100644
--- a/src/System.Management.Automation/resources/PathUtilsStrings.resx
+++ b/src/System.Management.Automation/resources/PathUtilsStrings.resx
@@ -139,7 +139,7 @@
     <value>The directory '{0}' already exists.  Use the -Force parameter if you want to overwrite the directory and files within the directory.</value>
   </data>
   <data name="ExportPSSession_ErrorModuleNameOrPath" xml:space="preserve">
-    <value>The -OutputModule parameter does not resolve to a path, and a user module path cannot be found for the provided name.</value>
+    <value>The user module path does not exist, and hence a module folder cannot be created for the provided module name '{0}'.</value>
   </data>
   <data name="ExportPSSession_CannotCreateOutputDirectory" xml:space="preserve">
     <value>Cannot create the module {0} due to the following: {1}. Use a different argument for the -OutputModule parameter and retry.</value>
diff --git a/src/System.Management.Automation/utils/PathUtils.cs b/src/System.Management.Automation/utils/PathUtils.cs
index 848fcbd6bfc..48d0acb5f49 100644
--- a/src/System.Management.Automation/utils/PathUtils.cs
+++ b/src/System.Management.Automation/utils/PathUtils.cs
@@ -7,7 +7,7 @@
 using System.Management.Automation.Internal;
 using System.Runtime.CompilerServices;
 using System.Text;
-
+using Microsoft.PowerShell.Commands;
 using Dbg = System.Management.Automation.Diagnostics;
 
 namespace System.Management.Automation
@@ -357,7 +357,9 @@ internal static DirectoryInfo CreateModuleDirectory(PSCmdlet cmdlet, string modu
             DirectoryInfo directoryInfo = null;
             try
             {
-                string rootedPath = Microsoft.PowerShell.Commands.ModuleCmdletBase.ResolveRootedFilePath(moduleNameOrPath, cmdlet.Context);
+                // Even if 'moduleNameOrPath' is a rooted path, 'ResolveRootedFilePath' may return null when the path doesn't exist yet,
+                // or when it contains wildcards but cannot be resolved to a single path.
+                string rootedPath = ModuleCmdletBase.ResolveRootedFilePath(moduleNameOrPath, cmdlet.Context);
                 if (string.IsNullOrEmpty(rootedPath) && moduleNameOrPath.StartsWith('.'))
                 {
                     PathInfo currentPath = cmdlet.CurrentProviderLocation(cmdlet.Context.ProviderNames.FileSystem);
@@ -366,18 +368,25 @@ internal static DirectoryInfo CreateModuleDirectory(PSCmdlet cmdlet, string modu
 
                 if (string.IsNullOrEmpty(rootedPath))
                 {
-                    string personalModuleRoot = ModuleIntrinsics.GetPersonalModulePath();
-                    if (string.IsNullOrEmpty(personalModuleRoot))
+                    if (Path.IsPathRooted(moduleNameOrPath))
                     {
-                        cmdlet.ThrowTerminatingError(
-                            new ErrorRecord(
-                                new ArgumentException(PathUtilsStrings.ExportPSSession_ErrorModuleNameOrPath),
-                                "ExportPSSession_ErrorModuleNameOrPath",
-                                ErrorCategory.InvalidArgument,
-                                cmdlet));
+                        rootedPath = moduleNameOrPath;
                     }
+                    else
+                    {
+                        string personalModuleRoot = ModuleIntrinsics.GetPersonalModulePath();
+                        if (string.IsNullOrEmpty(personalModuleRoot))
+                        {
+                            cmdlet.ThrowTerminatingError(
+                                new ErrorRecord(
+                                    new ArgumentException(StringUtil.Format(PathUtilsStrings.ExportPSSession_ErrorModuleNameOrPath, moduleNameOrPath)),
+                                    "ExportPSSession_ErrorModuleNameOrPath",
+                                    ErrorCategory.InvalidArgument,
+                                    cmdlet));
+                        }
 
-                    rootedPath = Path.Combine(personalModuleRoot, moduleNameOrPath);
+                        rootedPath = Path.Combine(personalModuleRoot, moduleNameOrPath);
+                    }
                 }
 
                 directoryInfo = new DirectoryInfo(rootedPath);

From 417d9315f9753901e8815336fc8d29081fc59da6 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 13 Jul 2022 14:16:08 -0700
Subject: [PATCH 459/645] Create test artifacts for windows arm64 (#17675)

---
 tools/releaseBuild/azureDevOps/templates/testartifacts.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
index 99122b59de6..b75ade828a3 100644
--- a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
+++ b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
@@ -37,6 +37,7 @@ jobs:
         {
           win7-x64 { $packageName = "TestPackage-win-x64.zip" }
           win7-x86 { $packageName = "TestPackage-win-x86.zip" }
+          win-arm64 { $packageName = "TestPackage-win-arm64.zip" }
           linux-x64 { $packageName = "TestPackage-linux-x64.zip" }
           linux-arm { $packageName = "TestPackage-linux-arm.zip" }
           linux-arm64 { $packageName = "TestPackage-linux-arm64.zip" }
@@ -50,6 +51,7 @@ jobs:
 
       BuildTestPackage -runtime win7-x64
       BuildTestPackage -runtime win7-x86
+      BuildTestPackage -runtime win-arm64
       BuildTestPackage -runtime linux-x64
       BuildTestPackage -runtime linux-arm
       BuildTestPackage -runtime linux-arm64

From bcafe74c174091a0f47cf7a5eeb4bca8aefa8718 Mon Sep 17 00:00:00 2001
From: Patrick Meinecke <SeeminglyScience@users.noreply.github.com>
Date: Wed, 13 Jul 2022 17:21:27 -0400
Subject: [PATCH 460/645] Fix SDK tests for release build (#17678)

---
 tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
index 03b54aed9e4..b417df7da08 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@@ -122,6 +122,10 @@ jobs:
 
         Get-Content ./NuGet.Config
 
+        # Add workaround to unblock xUnit testing see issue: https://github.com/dotnet/sdk/issues/26462
+        $dotnetPath = if ($IsWindows) { "$env:LocalAppData\Microsoft\dotnet" } else { "$env:HOME/.dotnet" }
+        $env:DOTNET_ROOT = $dotnetPath
+
         dotnet --info
         dotnet restore
         dotnet test /property:RELEASE_VERSION=$releaseVersion --test-adapter-path:. "--logger:xunit;LogFilePath=$(System.DefaultWorkingDirectory)/test-hosting.xml"

From 08baf27b80e604d1685c065ea75761508634de12 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Mon, 18 Jul 2022 14:27:06 -0700
Subject: [PATCH 461/645] Render decimal numbers in a table using current
 culture (#17650)

---
 .../DisplayDatabase/displayDescriptionData.cs |  1 +
 .../common/FormatViewGenerator_Table.cs       |  6 ++
 .../common/Utilities/MshObjectUtil.cs         | 79 ++++++++++++-------
 .../Format-List.Tests.ps1                     | 21 +++++
 .../Format-Table.Tests.ps1                    | 19 +++++
 5 files changed, 98 insertions(+), 28 deletions(-)

diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs
index f126dddcadc..7c9d8241657 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs
@@ -361,6 +361,7 @@ internal sealed class FieldPropertyToken : PropertyTokenBase
     internal sealed class FieldFormattingDirective
     {
         internal string formatString = null; // optional
+        internal bool isTable = false;
     }
 
     #endregion Elementary Tokens
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
index bfd3291dd46..f4a6aa4e45f 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
@@ -483,6 +483,12 @@ private TableRowEntry GenerateTableRowEntryFromFromProperties(PSObject so, int e
                     directive = activeAssociationList[k].OriginatingParameter.GetEntry(FormatParameterDefinitionKeys.FormatStringEntryKey) as FieldFormattingDirective;
                 }
 
+                if (directive is null)
+                {
+                    directive = new FieldFormattingDirective();
+                    directive.isTable = true;
+                }
+
                 fpf.propertyValue = this.GetExpressionDisplayValue(so, enumerationLimit, this.activeAssociationList[k].ResolvedExpression, directive);
                 tre.formatPropertyFieldList.Add(fpf);
             }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs b/src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs
index 8d95f8fd9a1..ce3590520a5 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs
@@ -208,8 +208,9 @@ private static string GetObjectName(object x, PSPropertyExpressionFactory expres
         /// <param name="expressionFactory">Expression factory to create PSPropertyExpression.</param>
         /// <param name="enumerationLimit">Limit on IEnumerable enumeration.</param>
         /// <param name="formatErrorObject">Stores errors during string conversion.</param>
+        /// <param name="formatFloat">Determine if to format floating point numbers using current culture.</param>
         /// <returns>String representation.</returns>
-        internal static string SmartToString(PSObject so, PSPropertyExpressionFactory expressionFactory, int enumerationLimit, StringFormatError formatErrorObject)
+        internal static string SmartToString(PSObject so, PSPropertyExpressionFactory expressionFactory, int enumerationLimit, StringFormatError formatErrorObject, bool formatFloat = false)
         {
             if (so == null)
                 return string.Empty;
@@ -294,7 +295,23 @@ internal static string SmartToString(PSObject so, PSPropertyExpressionFactory ex
                     return sb.ToString();
                 }
 
-                // take care of the case there is no base object
+                if (formatFloat && so.BaseObject is not null)
+                {
+                    // format numbers using the current culture
+                    if (so.BaseObject is double dbl)
+                    {
+                        return dbl.ToString("F");
+                    }
+                    else if (so.BaseObject is float f)
+                    {
+                        return f.ToString("F");
+                    }
+                    else if (so.BaseObject is decimal d)
+                    {
+                        return d.ToString("F");
+                    }
+                }
+
                 return so.ToString();
             }
             catch (Exception e) when (e is ExtendedTypeSystemException || e is InvalidOperationException)
@@ -333,43 +350,49 @@ internal static string FormatField(FieldFormattingDirective directive, object va
             StringFormatError formatErrorObject, PSPropertyExpressionFactory expressionFactory)
         {
             PSObject so = PSObjectHelper.AsPSObject(val);
-            if (directive != null && !string.IsNullOrEmpty(directive.formatString))
+            bool isTable = false;
+            if (directive is not null)
             {
-                // we have a formatting directive, apply it
-                // NOTE: with a format directive, we do not make any attempt
-                // to deal with IEnumerable
-                try
+                isTable = directive.isTable;
+                if (!string.IsNullOrEmpty(directive.formatString))
                 {
-                    // use some heuristics to determine if we have "composite formatting"
-                    // 2004/11/16-JonN This is heuristic but should be safe enough
-                    if (directive.formatString.Contains("{0") || directive.formatString.Contains('}'))
+                    // we have a formatting directive, apply it
+                    // NOTE: with a format directive, we do not make any attempt
+                    // to deal with IEnumerable
+                    try
                     {
-                        // we do have it, just use it
-                        return string.Format(CultureInfo.CurrentCulture, directive.formatString, so);
+                        // use some heuristics to determine if we have "composite formatting"
+                        // 2004/11/16-JonN This is heuristic but should be safe enough
+                        if (directive.formatString.Contains("{0") || directive.formatString.Contains('}'))
+                        {
+                            // we do have it, just use it
+                            return string.Format(CultureInfo.CurrentCulture, directive.formatString, so);
+                        }
+                        // we fall back to the PSObject's IFormattable.ToString()
+                        // pass a null IFormatProvider
+                        return so.ToString(directive.formatString, formatProvider: null);
                     }
-                    // we fall back to the PSObject's IFormattable.ToString()
-                    // pass a null IFormatProvider
-                    return so.ToString(directive.formatString, null);
-                }
-                catch (Exception e) // 2004/11/17-JonN This covers exceptions thrown in
-                                    // string.Format and PSObject.ToString().
-                                    // I think we can swallow these.
-                {
-                    // NOTE: we catch all the exceptions, since we do not know
-                    // what the underlying object access would throw
-                    if (formatErrorObject != null)
+                    catch (Exception e) // 2004/11/17-JonN This covers exceptions thrown in
+                                        // string.Format and PSObject.ToString().
+                                        // I think we can swallow these.
                     {
-                        formatErrorObject.sourceObject = so;
-                        formatErrorObject.exception = e;
-                        formatErrorObject.formatString = directive.formatString;
-                        return string.Empty;
+                        // NOTE: we catch all the exceptions, since we do not know
+                        // what the underlying object access would throw
+                        if (formatErrorObject is not null)
+                        {
+                            formatErrorObject.sourceObject = so;
+                            formatErrorObject.exception = e;
+                            formatErrorObject.formatString = directive.formatString;
+                            return string.Empty;
+                        }
                     }
                 }
             }
+
             // we do not have a formatting directive or we failed the formatting (fallback)
             // but we did not report as an error;
             // this call would deal with IEnumerable if the object implements it
-            return PSObjectHelper.SmartToString(so, expressionFactory, enumerationLimit, formatErrorObject);
+            return PSObjectHelper.SmartToString(so, expressionFactory, enumerationLimit, formatErrorObject, isTable);
         }
 
         private static PSMemberSet MaskDeserializedAndGetStandardMembers(PSObject so)
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
index cd8d0d037b9..675d1fd5106 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
@@ -209,6 +209,27 @@ dbda : KM
         $actual = $actual -replace "`r`n", "`n"
         $actual | Should -BeExactly $expected
     }
+
+    It 'Float, double, and decimal should not be truncated to number of decimals from current culture' {
+        $o = [PSCustomObject]@{
+            double = [double]1234.56789
+            float = [float]9876.543
+            decimal = [decimal]4567.123456789
+        }
+
+        $expected = @"
+
+double  : 1234.56789
+float   : 9876.543
+decimal : 4567.123456789
+
+
+
+"@
+
+        $actual = $o | Format-List | Out-String
+        ($actual.Replace("`r`n", "`n")) | Should -BeExactly ($expected.Replace("`r`n", "`n"))
+    }
 }
 
 Describe 'Format-List color tests' {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1
index 3d4111e89a5..47364842b78 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1
@@ -845,6 +845,25 @@ A Name                                  B
             $actual = $obj | Format-Table | Out-String
             ($actual.Replace("`r`n", "`n")) | Should -BeExactly ($expected.Replace("`r`n", "`n"))
         }
+
+        It 'Table should format floats, doubles, and decimals with number of decimals from current culture' {
+            $o = [PSCustomObject]@{
+                double = [double]1234.56789
+                float = [float]9876.54321
+                decimal = [decimal]4567.123456789
+            }
+
+            $table = $o | Format-Table | Out-String
+
+            $line = foreach ($line in $table.split([System.Environment]::NewLine)) { if ($line -match '^1234') { $line } }
+            $line | Should -Not -BeNullOrEmpty
+            $expectedDecimals = (Get-Culture).NumberFormat.NumberDecimalDigits
+
+            foreach ($num in $line.split(' ', [System.StringSplitOptions]::RemoveEmptyEntries)) {
+                $numDecimals = $num.length - $num.indexOf((Get-Culture).NumberFormat.NumberDecimalSeparator) - 1
+                $numDecimals | Should -Be $expectedDecimals -Because $num
+            }
+        }
     }
 
 Describe 'Table color tests' {

From b06bcee10e0a404407210fbf8a2cd1879e2767a9 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Mon, 18 Jul 2022 23:28:04 +0200
Subject: [PATCH 462/645] Avoid binding positional parameters when completing
 parameter in front of value (#17693)

---
 .../CommandCompletion/CompletionCompleters.cs  | 17 ++++++++++++++++-
 .../CommandCompletion/PseudoParameterBinder.cs | 18 +++++++++++-------
 .../Host/TabCompletion/TabCompletion.Tests.ps1 |  7 +++++++
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index b63691eb93e..58d3254d8ec 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -533,6 +533,7 @@ internal static List<CompletionResult> CompleteCommandParameter(CompletionContex
                 return result;
             }
 
+            bool bindPositionalParameters = true;
             if (parameterAst != null)
             {
                 // Parent must be a command
@@ -551,10 +552,24 @@ internal static List<CompletionResult> CompleteCommandParameter(CompletionContex
                 // Parent must be a command
                 commandAst = (CommandAst)dashAst.Parent;
                 partialName = string.Empty;
+
+                // If the user tries to tab complete a new parameter in front of a positional argument like: dir -<Tab> C:\
+                // the user may want to add the parameter name so we don't want to bind positional arguments
+                if (commandAst is not null)
+                {
+                    foreach (var element in commandAst.CommandElements)
+                    {
+                        if (element.Extent.StartOffset > context.TokenAtCursor.Extent.StartOffset)
+                        {
+                            bindPositionalParameters = element is CommandParameterAst;
+                            break;
+                        }
+                    }
+                }
             }
 
             PseudoBindingInfo pseudoBinding = new PseudoParameterBinder()
-                                                .DoPseudoParameterBinding(commandAst, null, parameterAst, PseudoParameterBinder.BindingType.ParameterCompletion);
+                                                .DoPseudoParameterBinding(commandAst, null, parameterAst, PseudoParameterBinder.BindingType.ParameterCompletion, bindPositionalParameters);
             // The command cannot be found or it's not a cmdlet, not a script cmdlet, not a function.
             // Try completing as if it the parameter is a command argument for native command completion.
             if (pseudoBinding == null)
diff --git a/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs b/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
index c98be4ccac8..0d5b166a5e8 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
@@ -949,8 +949,9 @@ internal enum BindingType
         /// <param name="pipeArgumentType">Indicate the type of the piped-in argument.</param>
         /// <param name="paramAstAtCursor">The CommandParameterAst the cursor is pointing at.</param>
         /// <param name="bindingType">Indicates whether pseudo binding is for argument binding, argument completion, or parameter completion.</param>
+        /// <param name="bindPositional">Indicates if the pseudo binding should bind positional parameters</param>
         /// <returns>PseudoBindingInfo.</returns>
-        internal PseudoBindingInfo DoPseudoParameterBinding(CommandAst command, Type pipeArgumentType, CommandParameterAst paramAstAtCursor, BindingType bindingType)
+        internal PseudoBindingInfo DoPseudoParameterBinding(CommandAst command, Type pipeArgumentType, CommandParameterAst paramAstAtCursor, BindingType bindingType, bool bindPositional = true)
         {
             if (command == null)
             {
@@ -1008,12 +1009,15 @@ internal PseudoBindingInfo DoPseudoParameterBinding(CommandAst command, Type pip
                 unboundArguments = BindNamedParameters();
                 _bindingEffective = _currentParameterSetFlag != 0;
 
-                // positional binding
-                unboundArguments = BindPositionalParameter(
-                    unboundArguments,
-                    _currentParameterSetFlag,
-                    _defaultParameterSetFlag,
-                    bindingType);
+                if (bindPositional)
+                {
+                    // positional binding
+                    unboundArguments = BindPositionalParameter(
+                        unboundArguments,
+                        _currentParameterSetFlag,
+                        _defaultParameterSetFlag,
+                        bindingType);
+                }
 
                 // VFRA/pipeline binding if the given command is a binary cmdlet or a script cmdlet
                 if (!_function)
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index a2862f2b567..ba5cec30db6 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -691,6 +691,13 @@ ConstructorTestClass(int i, bool b)
         $completionText -join ' ' | Should -BeExactly 'blg csv tsv'
     }
 
+    it 'Should include positionally bound parameters when completing in front of parameter value' {
+        $TestString = 'Get-ChildItem -^ $HOME'
+        $CursorIndex = $TestString.IndexOf('^')
+        $res = TabExpansion2 -inputScript $TestString.Remove($CursorIndex, 1) -cursorColumn $CursorIndex
+        $res.CompletionMatches.CompletionText | Should -Contain "-Path"
+    }
+
     Context "Script name completion" {
         BeforeAll {
             Setup -f 'install-powershell.ps1' -Content ""

From 56bab81fc78b176bd208cb831b016cd924411d3f Mon Sep 17 00:00:00 2001
From: Patrick Meinecke <SeeminglyScience@users.noreply.github.com>
Date: Mon, 18 Jul 2022 18:13:42 -0400
Subject: [PATCH 463/645] Update `README` and `metadata.json` for next release
 (#17676)

---
 README.md           | 28 ++++++++++++++--------------
 tools/metadata.json |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 8e82fa60986..d2fef66fb0b 100644
--- a/README.md
+++ b/README.md
@@ -93,20 +93,20 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 [rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-linux-arm64.tar.gz
 [rl-snap]: https://snapcraft.io/powershell
 
-[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/PowerShell-7.3.0-preview.5-win-x64.msi
-[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/PowerShell-7.3.0-preview.5-win-x86.msi
-[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-preview_7.3.0-preview.5-1.deb_amd64.deb
-[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-preview-7.3.0_preview.5-1.rh.x86_64.rpm
-[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-osx-x64.pkg
-[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-osx-arm64.pkg
-[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/PowerShell-7.3.0-preview.5-win-arm64.zip
-[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/PowerShell-7.3.0-preview.5-win-x86.zip
-[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/PowerShell-7.3.0-preview.5-win-x64.zip
-[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-osx-x64.tar.gz
-[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-osx-arm64.tar.gz
-[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-linux-x64.tar.gz
-[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-linux-arm32.tar.gz
-[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.5/powershell-7.3.0-preview.5-linux-arm64.tar.gz
+[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/PowerShell-7.3.0-preview.6-win-x64.msi
+[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/PowerShell-7.3.0-preview.6-win-x86.msi
+[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-preview_7.3.0-preview.6-1.deb_amd64.deb
+[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-preview-7.3.0_preview.6-1.rh.x86_64.rpm
+[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-osx-x64.pkg
+[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-osx-arm64.pkg
+[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/PowerShell-7.3.0-preview.6-win-arm64.zip
+[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/PowerShell-7.3.0-preview.6-win-x86.zip
+[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/PowerShell-7.3.0-preview.6-win-x64.zip
+[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-osx-x64.tar.gz
+[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-osx-arm64.tar.gz
+[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-linux-x64.tar.gz
+[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-linux-arm32.tar.gz
+[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-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
diff --git a/tools/metadata.json b/tools/metadata.json
index 696d275eff7..986bd104fab 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,10 +1,10 @@
 {
   "StableReleaseTag": "v7.2.5",
-  "PreviewReleaseTag": "v7.3.0-preview.5",
+  "PreviewReleaseTag": "v7.3.0-preview.6",
   "ServicingReleaseTag": "v7.0.11",
   "ReleaseTag": "v7.2.5",
   "LTSReleaseTag" : ["v7.2.5", "v7.0.11"],
-  "NextReleaseTag": "v7.3.0-preview.6",
+  "NextReleaseTag": "v7.3.0-preview.7",
   "LTSRelease": { "Latest": false, "Package": false },
   "StableRelease":  { "Latest": false, "Package": false }
 }

From 53adf5d5d478e98df1ee53f19c14e12e8e0bf7b8 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Tue, 19 Jul 2022 00:32:06 +0200
Subject: [PATCH 464/645] Improve dynamic parameter tab completion (#17661)

---
 .../PseudoParameterBinder.cs                  | 33 ++++++++++++-------
 .../TabCompletion/TabCompletion.Tests.ps1     | 13 ++++++++
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs b/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
index 0d5b166a5e8..44f18d7c695 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
@@ -1235,21 +1235,32 @@ private bool PrepareCommandElements(ExecutionContext context)
                     }
                     else
                     {
-                        var dash = _commandElements[commandIndex] as StringConstantExpressionAst;
-                        if (dash != null && dash.Value.Trim().Equals("-", StringComparison.OrdinalIgnoreCase))
+                        object valueToAdd;
+                        ExpressionAst expressionToAdd;
+                        if (_commandElements[commandIndex] is ConstantExpressionAst constant)
                         {
-                            // "-" is represented by StringConstantExpressionAst. Most likely the user type a tab here,
-                            // and we don't want it be treated as an argument
-                            continue;
-                        }
+                            if (constant.Extent.Text.Equals("-", StringComparison.Ordinal))
+                            {
+                                // A value of "-" is most likely the user trying to tab here,
+                                // and we don't want it be treated as an argument
+                                continue;
+                            }
 
-                        var expressionArgument = _commandElements[commandIndex] as ExpressionAst;
-                        if (expressionArgument != null)
+                            valueToAdd = constant.Value;
+                            expressionToAdd = constant;
+                        }
+                        else if (_commandElements[commandIndex] is ExpressionAst expression)
                         {
-                            argumentsToGetDynamicParameters?.Add(expressionArgument.Extent.Text);
-
-                            _arguments.Add(new AstPair(null, expressionArgument));
+                            valueToAdd = expression.Extent.Text;
+                            expressionToAdd = expression;
                         }
+                        else
+                        {
+                            continue;
+                        }
+
+                        argumentsToGetDynamicParameters?.Add(valueToAdd);
+                        _arguments.Add(new AstPair(null, expressionToAdd));
                     }
                 }
             }
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index ba5cec30db6..ec698b8762f 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -510,6 +510,19 @@ ConstructorTestClass(int i, bool b)
         $res.CompletionMatches[0].CompletionText | Should -BeExactly Cat
     }
 
+    it 'Should complete provider dynamic parameters with quoted path' {
+        $Script = if ($IsWindows)
+        {
+            'Get-ChildItem -Path "C:\" -Director'
+        }
+        else
+        {
+            'Get-ChildItem -Path "/" -Director'
+        }
+        $res = TabExpansion2 -inputScript $Script
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly '-Directory'
+    }
+
     Context "Format cmdlet's View paramter completion" {
         BeforeAll {
             $viewDefinition = @'

From 1437d85a44cba7e43f7c7477d98c6eec09102b24 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Mon, 18 Jul 2022 17:07:47 -0700
Subject: [PATCH 465/645] Fix legacy `ErrorView` types to use
 `$host.PrivateData` colors (#17705)

---
 .../DefaultFormatters/PowerShellCore_format_ps1xml.cs  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
index ef7c40fd37b..f4b9d03489c 100644
--- a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
+++ b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
@@ -1296,6 +1296,16 @@ function Get-ConciseViewPositionMessage {
                                         $myinv = $err.InvocationInfo
                                     }
 
+                                    if ($ErrorView -ne 'ConciseView' -and $null -ne $host.PrivateData) {
+                                        if ($null -ne $host.PrivateData.ErrorForegroundColor) {
+                                            [Console]::ForegroundColor = $host.PrivateData.ErrorForegroundColor
+                                        }
+
+                                        if ($null -ne $host.PrivateData.ErrorBackgroundColor) {
+                                            [Console]::BackgroundColor = $host.PrivateData.ErrorBackgroundColor
+                                        }
+                                    }
+
                                     if ($err.FullyQualifiedErrorId -eq 'NativeCommandErrorMessage' -or $err.FullyQualifiedErrorId -eq 'NativeCommandError') {
                                         $err.Exception.Message
                                     }

From b7c875b0f2bd2d3e1c68c4173f536414ee035f08 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Mon, 18 Jul 2022 17:25:46 -0700
Subject: [PATCH 466/645] Remove `PSNativePSPathResolution` experimental
 feature (#17670)

---
 experimental-feature-linux.json               |   1 -
 experimental-feature-windows.json             |   1 -
 .../ExperimentalFeature.cs                    |   3 -
 .../engine/NativeCommandParameterBinder.cs    | 242 ++++++------------
 .../NativeCommandArguments.Tests.ps1          |  96 +------
 5 files changed, 78 insertions(+), 265 deletions(-)

diff --git a/experimental-feature-linux.json b/experimental-feature-linux.json
index 12df4c5db5c..b0a5a696381 100644
--- a/experimental-feature-linux.json
+++ b/experimental-feature-linux.json
@@ -7,7 +7,6 @@
   "PSLoadAssemblyFromNativeCode",
   "PSNativeCommandArgumentPassing",
   "PSNativeCommandErrorActionPreference",
-  "PSNativePSPathResolution",
   "PSRemotingSSHTransportErrorHandling",
   "PSStrictModeAssignment",
   "PSSubsystemPluginModel"
diff --git a/experimental-feature-windows.json b/experimental-feature-windows.json
index 12df4c5db5c..b0a5a696381 100644
--- a/experimental-feature-windows.json
+++ b/experimental-feature-windows.json
@@ -7,7 +7,6 @@
   "PSLoadAssemblyFromNativeCode",
   "PSNativeCommandArgumentPassing",
   "PSNativeCommandErrorActionPreference",
-  "PSNativePSPathResolution",
   "PSRemotingSSHTransportErrorHandling",
   "PSStrictModeAssignment",
   "PSSubsystemPluginModel"
diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index f6e3632e16e..8a3e428b9c4 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -113,9 +113,6 @@ static ExperimentalFeature()
                 new ExperimentalFeature(
                     name: "PSCommandNotFoundSuggestion",
                     description: "Recommend potential commands based on fuzzy search on a CommandNotFoundException"),
-                new ExperimentalFeature(
-                    name: "PSNativePSPathResolution",
-                    description: "Convert PSPath to filesystem path, if possible, for native commands"),
                 new ExperimentalFeature(
                     name: "PSSubsystemPluginModel",
                     description: "A plugin model for registering and un-registering PowerShell subsystems"),
diff --git a/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs b/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
index 200cfeee2ef..1c2e835b953 100644
--- a/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
+++ b/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
@@ -83,7 +83,7 @@ internal void BindParameters(Collection<CommandParameterInternal> parameters)
                 if (parameter.ParameterNameSpecified)
                 {
                     Diagnostics.Assert(!parameter.ParameterText.Contains(' '), "Parameters cannot have whitespace");
-                    PossiblyGlobArg(parameter.ParameterText, parameter, StringConstantType.BareWord);
+                    PossiblyGlobArg(parameter.ParameterText, parameter, usedQuotes: false);
 
                     if (parameter.SpaceAfterParameter)
                     {
@@ -108,30 +108,22 @@ internal void BindParameters(Collection<CommandParameterInternal> parameters)
                         //    windbg  -k com:port=\\devbox\pipe\debug,pipe,resets=0,reconnect
                         // The parser produced an array of strings but marked the parameter so we
                         // can properly reconstruct the correct command line.
-                        StringConstantType stringConstantType = StringConstantType.BareWord;
+                        bool usedQuotes = false;
                         ArrayLiteralAst arrayLiteralAst = null;
                         switch (parameter?.ArgumentAst)
                         {
                             case StringConstantExpressionAst sce:
-                                stringConstantType = sce.StringConstantType;
+                                usedQuotes = sce.StringConstantType != StringConstantType.BareWord;
                                 break;
                             case ExpandableStringExpressionAst ese:
-                                stringConstantType = ese.StringConstantType;
+                                usedQuotes = ese.StringConstantType != StringConstantType.BareWord;
                                 break;
                             case ArrayLiteralAst ala:
                                 arrayLiteralAst = ala;
                                 break;
                         }
 
-                        // Prior to PSNativePSPathResolution experimental feature, a single quote worked the same as a double quote
-                        // so if the feature is not enabled, we treat any quotes as double quotes.  When this feature is no longer
-                        // experimental, this code here needs to be removed.
-                        if (!ExperimentalFeature.IsEnabled("PSNativePSPathResolution") && stringConstantType == StringConstantType.SingleQuoted)
-                        {
-                            stringConstantType = StringConstantType.DoubleQuoted;
-                        }
-
-                        AppendOneNativeArgument(Context, parameter, argValue, arrayLiteralAst, sawVerbatimArgumentMarker, stringConstantType);
+                        AppendOneNativeArgument(Context, parameter, argValue, arrayLiteralAst, sawVerbatimArgumentMarker, usedQuotes);
                     }
                 }
             }
@@ -225,8 +217,8 @@ internal NativeArgumentPassingStyle ArgumentPassingStyle
         /// <param name="obj">The object to append.</param>
         /// <param name="argArrayAst">If the argument was an array literal, the Ast, otherwise null.</param>
         /// <param name="sawVerbatimArgumentMarker">True if the argument occurs after --%.</param>
-        /// <param name="stringConstantType">Bare, SingleQuoted, or DoubleQuoted.</param>
-        private void AppendOneNativeArgument(ExecutionContext context, CommandParameterInternal parameter, object obj, ArrayLiteralAst argArrayAst, bool sawVerbatimArgumentMarker, StringConstantType stringConstantType)
+        /// <param name="usedQuotes">True if the argument was a quoted string (single or double).</param>
+        private void AppendOneNativeArgument(ExecutionContext context, CommandParameterInternal parameter, object obj, ArrayLiteralAst argArrayAst, bool sawVerbatimArgumentMarker, bool usedQuotes)
         {
             IEnumerator list = LanguagePrimitives.GetEnumerator(obj);
 
@@ -291,20 +283,11 @@ private void AppendOneNativeArgument(ExecutionContext context, CommandParameterI
                         if (NeedQuotes(arg))
                         {
                             _arguments.Append('"');
-
-                            if (stringConstantType == StringConstantType.DoubleQuoted)
-                            {
-                                _arguments.Append(ResolvePath(arg, Context));
-                                AddToArgumentList(parameter, ResolvePath(arg, Context));
-                            }
-                            else
-                            {
-                                _arguments.Append(arg);
-                                AddToArgumentList(parameter, arg);
-                            }
+                            AddToArgumentList(parameter, arg);
 
                             // need to escape all trailing backslashes so the native command receives it correctly
                             // according to http://www.daviddeley.com/autohotkey/parameters/parameters.htm#WINCRULESDOC
+                            _arguments.Append(arg);
                             for (int i = arg.Length - 1; i >= 0 && arg[i] == '\\'; i--)
                             {
                                 _arguments.Append('\\');
@@ -319,14 +302,14 @@ private void AppendOneNativeArgument(ExecutionContext context, CommandParameterI
                                 // We have a literal array, so take the extent, break it on spaces and add them to the argument list.
                                 foreach (string element in argArrayAst.Extent.Text.Split(' ', StringSplitOptions.RemoveEmptyEntries))
                                 {
-                                    PossiblyGlobArg(element, parameter, stringConstantType);
+                                    PossiblyGlobArg(element, parameter, usedQuotes);
                                 }
 
                                 break;
                             }
                             else
                             {
-                                PossiblyGlobArg(arg, parameter, stringConstantType);
+                                PossiblyGlobArg(arg, parameter, usedQuotes);
                             }
                         }
                     }
@@ -346,101 +329,91 @@ private void AppendOneNativeArgument(ExecutionContext context, CommandParameterI
         /// </summary>
         /// <param name="arg">The argument that possibly needs expansion.</param>
         /// <param name="parameter">The parameter associated with the operation.</param>
-        /// <param name="stringConstantType">Bare, SingleQuoted, or DoubleQuoted.</param>
-        private void PossiblyGlobArg(string arg, CommandParameterInternal parameter, StringConstantType stringConstantType)
+        /// <param name="usedQuotes">True if the argument was a quoted string (single or double).</param>
+        private void PossiblyGlobArg(string arg, CommandParameterInternal parameter, bool usedQuotes)
         {
             var argExpanded = false;
 
 #if UNIX
             // On UNIX systems, we expand arguments containing wildcard expressions against
             // the file system just like bash, etc.
-
-            if (stringConstantType == StringConstantType.BareWord)
+            if (!usedQuotes && WildcardPattern.ContainsWildcardCharacters(arg))
             {
-                if (WildcardPattern.ContainsWildcardCharacters(arg))
+                // See if the current working directory is a filesystem provider location
+                // We won't do the expansion if it isn't since native commands can only access the file system.
+                var cwdinfo = Context.EngineSessionState.CurrentLocation;
+
+                // If it's a filesystem location then expand the wildcards
+                if (cwdinfo.Provider.Name.Equals(FileSystemProvider.ProviderName, StringComparison.OrdinalIgnoreCase))
                 {
-                    // See if the current working directory is a filesystem provider location
-                    // We won't do the expansion if it isn't since native commands can only access the file system.
-                    var cwdinfo = Context.EngineSessionState.CurrentLocation;
+                    // On UNIX, paths starting with ~ or absolute paths are not normalized
+                    bool normalizePath = arg.Length == 0 || !(arg[0] == '~' || arg[0] == '/');
 
-                    // If it's a filesystem location then expand the wildcards
-                    if (cwdinfo.Provider.Name.Equals(FileSystemProvider.ProviderName, StringComparison.OrdinalIgnoreCase))
+                    // See if there are any matching paths otherwise just add the pattern as the argument
+                    Collection<PSObject> paths = null;
+                    try
                     {
-                        // On UNIX, paths starting with ~ or absolute paths are not normalized
-                        bool normalizePath = arg.Length == 0 || !(arg[0] == '~' || arg[0] == '/');
-
-                        // See if there are any matching paths otherwise just add the pattern as the argument
-                        Collection<PSObject> paths = null;
-                        try
-                        {
-                            paths = Context.EngineSessionState.InvokeProvider.ChildItem.Get(arg, false);
-                        }
-                        catch
-                        {
-                            // Fallthrough will append the pattern unchanged.
-                        }
+                        paths = Context.EngineSessionState.InvokeProvider.ChildItem.Get(arg, false);
+                    }
+                    catch
+                    {
+                        // Fallthrough will append the pattern unchanged.
+                    }
 
-                        // Expand paths, but only from the file system.
-                        if (paths?.Count > 0 && paths.All(static p => p.BaseObject is FileSystemInfo))
+                    // Expand paths, but only from the file system.
+                    if (paths?.Count > 0 && paths.All(p => p.BaseObject is FileSystemInfo))
+                    {
+                        var sep = string.Empty;
+                        foreach (var path in paths)
                         {
-                            var sep = string.Empty;
-                            foreach (var path in paths)
+                            _arguments.Append(sep);
+                            sep = " ";
+                            var expandedPath = (path.BaseObject as FileSystemInfo).FullName;
+                            if (normalizePath)
                             {
-                                _arguments.Append(sep);
-                                sep = " ";
-                                var expandedPath = (path.BaseObject as FileSystemInfo).FullName;
-                                if (normalizePath)
-                                {
-                                    expandedPath =
-                                        Context.SessionState.Path.NormalizeRelativePath(expandedPath, cwdinfo.ProviderPath);
-                                }
-                                // If the path contains spaces, then add quotes around it.
-                                if (NeedQuotes(expandedPath))
-                                {
-                                    _arguments.Append('"');
-                                    _arguments.Append(expandedPath);
-                                    _arguments.Append('"');
-                                    AddToArgumentList(parameter, expandedPath);
-                                }
-                                else
-                                {
-                                    _arguments.Append(expandedPath);
-                                    AddToArgumentList(parameter, expandedPath);
-                                }
-
-                                argExpanded = true;
+                                expandedPath =
+                                    Context.SessionState.Path.NormalizeRelativePath(expandedPath, cwdinfo.ProviderPath);
+                            }
+                            // If the path contains spaces, then add quotes around it.
+                            if (NeedQuotes(expandedPath))
+                            {
+                                _arguments.Append('"');
+                                _arguments.Append(expandedPath);
+                                _arguments.Append('"');
                             }
+                            else
+                            {
+                                _arguments.Append(expandedPath);
+                            }
+
+                            AddToArgumentList(parameter, expandedPath);
+                            argExpanded = true;
                         }
                     }
                 }
-                else
+            }
+            else if (!usedQuotes)
+            {
+                // Even if there are no wildcards, we still need to possibly
+                // expand ~ into the filesystem provider home directory path
+                ProviderInfo fileSystemProvider = Context.EngineSessionState.GetSingleProvider(FileSystemProvider.ProviderName);
+                string home = fileSystemProvider.Home;
+                if (string.Equals(arg, "~"))
                 {
-                    // Even if there are no wildcards, we still need to possibly
-                    // expand ~ into the filesystem provider home directory path
-                    ProviderInfo fileSystemProvider = Context.EngineSessionState.GetSingleProvider(FileSystemProvider.ProviderName);
-                    string home = fileSystemProvider.Home;
-                    if (string.Equals(arg, "~"))
-                    {
-                        _arguments.Append(home);
-                        AddToArgumentList(parameter, home);
-                        argExpanded = true;
-                    }
-                    else if (arg.StartsWith("~/", StringComparison.OrdinalIgnoreCase))
-                    {
-                        string replacementString = string.Concat(home, arg.AsSpan(1));
-                        _arguments.Append(replacementString);
-                        AddToArgumentList(parameter, replacementString);
-                        argExpanded = true;
-                    }
+                    _arguments.Append(home);
+                    AddToArgumentList(parameter, home);
+                    argExpanded = true;
+                }
+                else if (arg.StartsWith("~/", StringComparison.OrdinalIgnoreCase))
+                {
+                    var replacementString = string.Concat(home, arg.AsSpan(1));
+                    _arguments.Append(replacementString);
+                    AddToArgumentList(parameter, replacementString);
+                    argExpanded = true;
                 }
             }
 #endif // UNIX
 
-            if (stringConstantType != StringConstantType.SingleQuoted)
-            {
-                arg = ResolvePath(arg, Context);
-            }
-
             if (!argExpanded)
             {
                 _arguments.Append(arg);
@@ -448,71 +421,6 @@ private void PossiblyGlobArg(string arg, CommandParameterInternal parameter, Str
             }
         }
 
-        /// <summary>
-        /// Check if string is prefixed by psdrive, if so, expand it if filesystem path.
-        /// </summary>
-        /// <param name="path">The potential PSPath to resolve.</param>
-        /// <param name="context">The current ExecutionContext.</param>
-        /// <returns>Resolved PSPath if applicable otherwise the original path</returns>
-        internal static string ResolvePath(string path, ExecutionContext context)
-        {
-            if (ExperimentalFeature.IsEnabled("PSNativePSPathResolution"))
-            {
-#if !UNIX
-                // on Windows, we need to expand ~ to point to user's home path
-                if (string.Equals(path, "~", StringComparison.Ordinal) || path.StartsWith(TildeDirectorySeparator, StringComparison.Ordinal) || path.StartsWith(TildeAltDirectorySeparator, StringComparison.Ordinal))
-                {
-                    try
-                    {
-                        ProviderInfo fileSystemProvider = context.EngineSessionState.GetSingleProvider(FileSystemProvider.ProviderName);
-                        return new StringBuilder(fileSystemProvider.Home)
-                            .Append(path.AsSpan(1))
-                            .Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar)
-                            .ToString();
-                    }
-                    catch
-                    {
-                        return path;
-                    }
-                }
-
-                // check if the driveName is an actual disk drive on Windows, if so, no expansion
-                if (path.Length >= 2 && path[1] == ':')
-                {
-                    foreach (var drive in DriveInfo.GetDrives())
-                    {
-                        if (drive.Name.StartsWith(new string(path[0], 1), StringComparison.OrdinalIgnoreCase))
-                        {
-                            return path;
-                        }
-                    }
-                }
-#endif
-
-                if (path.Contains(':'))
-                {
-                    LocationGlobber globber = new LocationGlobber(context.SessionState);
-                    try
-                    {
-                        ProviderInfo providerInfo;
-
-                        // replace the argument with resolved path if it's a filesystem path
-                        string pspath = globber.GetProviderPath(path, out providerInfo);
-                        if (string.Equals(providerInfo.Name, FileSystemProvider.ProviderName, StringComparison.OrdinalIgnoreCase))
-                        {
-                            path = pspath;
-                        }
-                    }
-                    catch
-                    {
-                        // if it's not a provider path, do nothing
-                    }
-                }
-            }
-
-            return path;
-        }
-
         /// <summary>
         /// Check to see if the string contains spaces and therefore must be quoted.
         /// </summary>
@@ -567,8 +475,6 @@ private static string GetEnumerableArgSeparator(ArrayLiteralAst arrayLiteralAst,
         /// The native command to bind to.
         /// </summary>
         private readonly NativeCommand _nativeCommand;
-        private static readonly string TildeDirectorySeparator = $"~{Path.DirectorySeparatorChar}";
-        private static readonly string TildeAltDirectorySeparator = $"~{Path.AltDirectorySeparatorChar}";
 
         #endregion private members
     }
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
index c8e3c75cb17..b4e92d43179 100644
--- a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
+++ b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
@@ -285,99 +285,11 @@ foreach ( $argumentListValue in "Standard","Legacy","Windows" ) {
             }
 
         }
-    }
-}
-Describe 'PSPath to native commands' -tags "CI" {
-    BeforeAll {
-        $featureEnabled = $EnabledExperimentalFeatures.Contains('PSNativePSPathResolution')
-        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-
-        $PSDefaultParameterValues["it:skip"] = (-not $featureEnabled)
 
-        if ($IsWindows) {
-            $cmd = "cmd"
-            $cmdArg1 = "/c"
-            $cmdArg2 = "type"
-            $dir = "cmd"
-            $dirArg1 = "/c"
-            $dirArg2 = "dir"
+        It 'Should treat a PSPath as literal' {
+            $lines = testexe -echoargs temp:/foo
+            $lines.Count | Should -Be 1
+            $lines | Should -BeExactly 'Arg 0 is <temp:/foo>'
         }
-        else {
-            $cmd = "cat"
-            $dir = "ls"
-        }
-
-        Set-Content -Path testdrive:/test.txt -Value 'Hello'
-        Set-Content -Path "testdrive:/test file.txt" -Value 'Hello'
-        Set-Content -Path "env:/test var" -Value 'Hello'
-        $filePath = Join-Path -Path ~ -ChildPath (New-Guid)
-        Set-Content -Path $filePath -Value 'Home'
-        $complexDriveName = 'My test! ;+drive'
-        New-PSDrive -Name $complexDriveName -Root $testdrive -PSProvider FileSystem
-    }
-
-    AfterAll {
-        $global:PSDefaultParameterValues = $originalDefaultParameterValues
-
-        Remove-Item -Path "env:/test var"
-        Remove-Item -Path $filePath
-        Remove-PSDrive -Name $complexDriveName
-    }
-
-    It 'PSPath with ~/path works' {
-        $out = & $cmd $cmdArg1 $cmdArg2 $filePath
-        $LASTEXITCODE | Should -Be 0
-        $out | Should -BeExactly 'Home'
-    }
-
-    It 'PSPath with ~ works' {
-        $out = & $dir $dirArg1 $dirArg2 ~
-        $LASTEXITCODE | Should -Be 0
-        $out | Should -Not -BeNullOrEmpty
-    }
-
-    It 'PSPath that is file system path works with native commands: <path>' -TestCases @(
-        @{ path = "testdrive:/test.txt" }
-        @{ path = "testdrive:/test file.txt" }
-    ){
-        param($path)
-
-        $out = & $cmd $cmdArg1 $cmdArg2 "$path"
-        $LASTEXITCODE | Should -Be 0
-        $out | Should -BeExactly 'Hello'
-    }
-
-    It 'PSPath passed with single quotes should be treated as literal' {
-        $out = & $cmd $cmdArg1 $cmdArg2 'testdrive:/test.txt'
-        $LASTEXITCODE | Should -Not -Be 0
-        $out | Should -BeNullOrEmpty
-    }
-
-    It 'PSPath that is not a file system path fails with native commands: <path>' -TestCases @(
-        @{ path = "env:/PSModulePath" }
-        @{ path = "env:/test var" }
-    ){
-        param($path)
-
-        $out = & $cmd $cmdArg1 $cmdArg2 "$path"
-        $LASTEXITCODE | Should -Not -Be 0
-        $out | Should -BeNullOrEmpty
-    }
-
-    It 'Relative PSPath works' {
-        New-Item -Path $testdrive -Name TestFolder -ItemType Directory -ErrorAction Stop
-        $cwd = Get-Location
-        Set-Content -Path (Join-Path -Path $testdrive -ChildPath 'TestFolder' -AdditionalChildPath 'test.txt') -Value 'hello'
-        Set-Location -Path (Join-Path -Path $testdrive -ChildPath 'TestFolder')
-        Set-Location -Path $cwd
-        $out = & $cmd $cmdArg1 $cmdArg2 "TestDrive:test.txt"
-        $LASTEXITCODE | Should -Be 0
-        $out | Should -BeExactly 'Hello'
-    }
-
-    It 'Complex PSDrive name works' {
-        $out = & $cmd $cmdArg1 $cmdArg2 "${complexDriveName}:/test.txt"
-        $LASTEXITCODE | Should -Be 0
-        $out | Should -BeExactly 'Hello'
     }
 }

From b6a619099b029201dac8b08d73302bcc261e4233 Mon Sep 17 00:00:00 2001
From: Keith Hill <r_keith_hill@hotmail.com>
Date: Mon, 18 Jul 2022 18:33:16 -0600
Subject: [PATCH 467/645] Fix #16929 do not show profile load time msg with new
 pwsh parameter (#17535)

* Fix #16929 do not show profile load time msg by default

This PR adds a new pwsh command line parameter to enable display of the
profile load time message.

* Switch to an opt-out paramater called -NoProfileLoadTime
---
 .../host/msh/CommandLineParameterParser.cs      | 17 +++++++++++++++++
 .../host/msh/ConsoleHost.cs                     |  2 +-
 .../resources/ManagedEntranceStrings.resx       | 11 +++++++++--
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
index 8d31f357741..0b54bcff24a 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
@@ -186,6 +186,7 @@ internal static int MaxNameLength()
             "nologo",
             "noninteractive",
             "noprofile",
+            "noprofileloadtime",
             "outputformat",
             "removeworkingdirectorytrailingcharacter",
             "settingsfile",
@@ -228,6 +229,7 @@ internal enum ParameterBitmap : long
             WindowStyle         = 0x01000000, // -WindowStyle | -w
             WorkingDirectory    = 0x02000000, // -WorkingDirectory | -wd
             ConfigurationFile   = 0x04000000, // -ConfigurationFile
+            NoProfileLoadTime   = 0x08000000, // -NoProfileLoadTime
             // Enum values for specified ExecutionPolicy
             EPUnrestricted      = 0x0000000100000000, // ExecutionPolicy unrestricted
             EPRemoteSigned      = 0x0000000200000000, // ExecutionPolicy remote signed
@@ -463,6 +465,15 @@ internal bool ShowExtendedHelp
             }
         }
 
+        internal bool NoProfileLoadTime
+        {
+            get
+            {
+                AssertArgumentsParsed();
+                return _noProfileLoadTime;
+            }
+        }
+
         internal bool ShowVersion
         {
             get
@@ -920,6 +931,11 @@ private void ParseHelper(string[] args)
                     _sshServerMode = true;
                     ParametersUsed |= ParameterBitmap.SSHServerMode;
                 }
+                else if (MatchSwitch(switchKey, "noprofileloadtime", "noprofileloadtime"))
+                {
+                    _noProfileLoadTime = true;
+                    ParametersUsed |= ParameterBitmap.NoProfileLoadTime;
+                }
                 else if (MatchSwitch(switchKey, "interactive", "i"))
                 {
                     _noInteractive = false;
@@ -1496,6 +1512,7 @@ private bool CollectArgs(string[] args, ref int i)
         private bool _serverMode;
         private bool _namedPipeServerMode;
         private bool _sshServerMode;
+        private bool _noProfileLoadTime;
         private bool _showVersion;
         private string? _configurationFile;
         private string? _configurationName;
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
index e8ca269711d..949684f487b 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -1885,7 +1885,7 @@ private void DoRunspaceInitialization(RunspaceCreationEventArgs args)
                     sw.Stop();
 
                     var profileLoadTimeInMs = sw.ElapsedMilliseconds;
-                    if (profileLoadTimeInMs > 500 && s_cpp.ShowBanner)
+                    if (s_cpp.ShowBanner && !s_cpp.NoProfileLoadTime && profileLoadTimeInMs > 500)
                     {
                         Console.Error.WriteLine(ConsoleHostStrings.SlowProfileLoadingMessage, profileLoadTimeInMs);
                     }
diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
index 24a6e78ad6f..778584742b6 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
@@ -149,8 +149,10 @@
                   [-EncodedCommand &lt;Base64EncodedCommand&gt;]
                   [-ExecutionPolicy &lt;ExecutionPolicy&gt;] [-InputFormat {Text | XML}]
                   [-Interactive] [-MTA] [-NoExit] [-NoLogo] [-NonInteractive] [-NoProfile]
-                  [-OutputFormat {Text | XML}] [-SettingsFile &lt;filePath&gt;] [-SSHServerMode] [-STA]
-                  [-Version] [-WindowStyle &lt;style&gt;] [-WorkingDirectory &lt;directoryPath&gt;]
+                  [-NoProfileLoadTime] [-OutputFormat {Text | XML}] 
+                  [-SettingsFile &lt;filePath&gt;] [-SSHServerMode] [-STA] 
+                  [-Version] [-WindowStyle &lt;style&gt;] 
+                  [-WorkingDirectory &lt;directoryPath&gt;]
 
        pwsh[.exe] -h | -Help | -? | /?
 
@@ -399,6 +401,11 @@ All parameters are case-insensitive.</value>
 
     Does not load the PowerShell profiles.
 
+-NoProfileLoadTime
+
+    Hides the PowerShell profile load time text shown at startup when the load
+    time exceeds 500 milliseconds.
+
 -OutputFormat | -o | -of
 
     Determines how output from PowerShell is formatted. Valid values are "Text"

From bfb59f1acf3928c4b85c48cd44e5e07e1abc4d63 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Mon, 18 Jul 2022 17:51:51 -0700
Subject: [PATCH 468/645] Do not always collapse space between parameter and
 value for native arguments. (#17708)

---
 .../engine/NativeCommandParameterBinder.cs           | 12 +++++++++++-
 .../NativeExecution/NativeCommandArguments.Tests.ps1 |  8 ++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs b/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
index 1c2e835b953..aa0e94a5837 100644
--- a/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
+++ b/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
@@ -165,7 +165,17 @@ internal void AddToArgumentList(CommandParameterInternal parameter, string argum
             {
                 if (argument != parameter.ParameterText)
                 {
-                    _argumentList.Add(parameter.ParameterText + argument);
+                    // Only combine the text and argument if there was no space after the parameter,
+                    // otherwise, add the parameter and arguments as separate elements.
+                    if (parameter.SpaceAfterParameter)
+                    {
+                        _argumentList.Add(parameter.ParameterText);
+                        _argumentList.Add(argument);
+                    }
+                    else
+                    {
+                        _argumentList.Add(parameter.ParameterText + argument);
+                    }
                 }
             }
             else
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
index b4e92d43179..aead692cc69 100644
--- a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
+++ b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
@@ -239,6 +239,14 @@ foreach ( $argumentListValue in "Standard","Legacy","Windows" ) {
             $lines[1] | Should -BeExactly "Arg 1 is <com:port=\\devbox\pipe\debug,pipe,resets=0,reconnect>"
         }
 
+        It "Should handle when the ':' is the parameter value" {
+            $lines = testexe -echoargs awk -F: '{print $1}'
+            $lines.Count | Should -Be 3
+            $lines[0] | Should -BeExactly 'Arg 0 is <awk>'
+            $lines[1] | Should -BeExactly 'Arg 1 is <-F:>'
+            $lines[2] | Should -BeExactly 'Arg 2 is <{print $1}>'
+        }
+
         It "Should handle DOS style arguments" {
             $lines = testexe -echoargs /arg1 /c:"a string"
             $lines.Count | Should -Be 2

From 618b348cdb1193bcc7eea29a1a5257158c147079 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Tue, 19 Jul 2022 18:08:10 +0200
Subject: [PATCH 469/645] Fix type completion for attribute tokens (#17484)

---
 .../engine/CommandCompletion/CompletionAnalysis.cs          | 4 ++--
 test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1  | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index 27bd522cd45..6b32856c014 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -424,7 +424,7 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                     case TokenKind.Generic:
                     case TokenKind.MinusMinus: // for native commands '--'
                     case TokenKind.Identifier:
-                        if (tokenAtCursor.TokenFlags != TokenFlags.TypeName)
+                        if (!tokenAtCursor.TokenFlags.HasFlag(TokenFlags.TypeName))
                         {
                             result = GetResultForIdentifier(completionContext, ref replacementIndex, ref replacementLength, isQuotedString);
                         }
@@ -1021,7 +1021,7 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                     }
                 }
                 
-                if (typeNameToComplete is null && tokenAtCursor?.TokenFlags == TokenFlags.TypeName)
+                if (typeNameToComplete is null && tokenAtCursor?.TokenFlags.HasFlag(TokenFlags.TypeName) == true)
                 {
                     typeNameToComplete = new TypeName(tokenAtCursor.Extent, tokenAtCursor.Text);
                 }
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index ec698b8762f..250809bf448 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -1209,6 +1209,12 @@ ConstructorTestClass(int i, bool b)
             $res.CompletionMatches[1].CompletionText | Should -BeExactly 'DarkCyan'
         }
 
+        It "Tab completion for attribute type" {
+            $inputStr = '[validateset()]$var1'
+            $res = TabExpansion2 -inputScript $inputStr -cursorColumn 2
+            $res.CompletionMatches.CompletionText | Should -Contain 'ValidateSet'
+        }
+
         It "Tab completion for ArgumentCompleter when AST is passed to CompleteInput" {
             $scriptBl = {
                 function Test-Completion {

From b130db38dd0387cab57535b5f381f51bf7bdba41 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 19 Jul 2022 10:35:50 -0700
Subject: [PATCH 470/645] Exclude ARM images from running in CI (#17713)

---
 tools/ci.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.psm1 b/tools/ci.psm1
index 7991a03fba6..e2feca60dd3 100644
--- a/tools/ci.psm1
+++ b/tools/ci.psm1
@@ -837,7 +837,7 @@ function Invoke-InitializeContainerStage {
 
     # Chose images that are validated or validating, Linux and can be used in CI.
     $linuxImages = $matrix.preview |
-      Where-Object {$_.IsLinux -and $_.UseInCi -and $_.DistributionState -match 'Validat.*' -and $_.JobName -match $ContainerPattern} |
+      Where-Object {$_.IsLinux -and $_.UseInCi -and $_.DistributionState -match 'Validat.*' -and $_.JobName -match $ContainerPattern -and $_.JobName -notlike "*arm*"} |
       Select-Object JobName, Taglist |
       Sort-Object -property JobName
 

From 84241c3c592f6ba21b45e0061b7368e27e233420 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Tue, 19 Jul 2022 19:42:31 +0200
Subject: [PATCH 471/645] Fix parser exception in using statements with empty
 aliases (#16745)

---
 .../engine/parser/Parser.cs                   | 24 ++++++++++++++++---
 .../Language/Parser/Parsing.Tests.ps1         | 20 ++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
index b7a1324c6d8..75df984ad21 100644
--- a/src/System.Management.Automation/engine/parser/Parser.cs
+++ b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -2932,7 +2932,7 @@ private StatementAst ConfigurationStatementRule(IEnumerable<AttributeAst> custom
                 return null;
             }
 
-            if (configurationNameToken.Kind == TokenKind.EndOfInput)
+            if (configurationNameToken.Kind is TokenKind.EndOfInput or TokenKind.Comma)
             {
                 UngetToken(configurationNameToken);
 
@@ -5017,7 +5017,7 @@ private StatementAst UsingStatementRule(Token usingToken)
                     SkipToken();
 
                     var aliasToken = NextToken();
-                    if (aliasToken.Kind == TokenKind.EndOfInput)
+                    if (aliasToken.Kind is TokenKind.EndOfInput or TokenKind.NewLine or TokenKind.Semi)
                     {
                         UngetToken(aliasToken);
                         ReportIncompleteInput(After(equalsToken),
@@ -5026,6 +5026,12 @@ private StatementAst UsingStatementRule(Token usingToken)
                         return new ErrorStatementAst(ExtentOf(usingToken, equalsToken));
                     }
 
+                    if (aliasToken.Kind == TokenKind.Comma)
+                    {
+                        ReportError(aliasToken.Extent, nameof(ParserStrings.UnexpectedUnaryOperator), ParserStrings.UnexpectedUnaryOperator, aliasToken.Text);
+                        return new ErrorStatementAst(ExtentOf(usingToken, aliasToken));
+                    }
+
                     var aliasAst = GetCommandArgument(CommandArgumentContext.CommandArgument, aliasToken);
                     if (kind == UsingStatementKind.Module && aliasAst is HashtableAst)
                     {
@@ -5033,7 +5039,19 @@ private StatementAst UsingStatementRule(Token usingToken)
                     }
                     else if (aliasAst is not StringConstantExpressionAst)
                     {
-                        return new ErrorStatementAst(ExtentOf(usingToken, aliasAst), new Ast[] { itemAst, aliasAst });
+                        var errorExtent = ExtentFromFirstOf(aliasAst, aliasToken);
+                        Ast[] nestedAsts;
+                        if (aliasAst is null)
+                        {
+                            nestedAsts = new Ast[] { itemAst };
+                        }
+                        else
+                        {
+                            nestedAsts = new Ast[] { itemAst, aliasAst };
+                        }
+
+                        ReportError(errorExtent, nameof(ParserStrings.InvalidValueForUsingItemName), ParserStrings.InvalidValueForUsingItemName, errorExtent.Text);
+                        return new ErrorStatementAst(ExtentOf(usingToken, errorExtent), nestedAsts);
                     }
 
                     RequireStatementTerminator();
diff --git a/test/powershell/Language/Parser/Parsing.Tests.ps1 b/test/powershell/Language/Parser/Parsing.Tests.ps1
index 70094eb5782..7b6cf0b69f8 100644
--- a/test/powershell/Language/Parser/Parsing.Tests.ps1
+++ b/test/powershell/Language/Parser/Parsing.Tests.ps1
@@ -644,3 +644,23 @@ Describe "Parsing array that has too many dimensions" -Tag CI {
         }
     }
 }
+
+Describe "Parsing using statement with alias and linebreak and comma" -Tag CI {
+    It "ParseError for '<Script>'" -TestCases @(
+        @{ Script = "using namespace x =`n"; ErrorId = @('MissingNamespaceAlias'); StartOffset = @(19); EndOffset = @(19) }
+        @{ Script = "using namespace x = `n"; ErrorId = @('MissingNamespaceAlias'); StartOffset = @(19); EndOffset = @(19) }
+        @{ Script = "using namespace x = ;"; ErrorId = @('MissingNamespaceAlias'); StartOffset = @(19); EndOffset = @(19) }
+        @{ Script = "using namespace x = ,"; ErrorId = @('UnexpectedUnaryOperator'); StartOffset = @(20); EndOffset = @(21) }
+        @{ Script = "using namespace x = &"; ErrorId = @('InvalidValueForUsingItemName','MissingExpression'); StartOffset = @(20, 20); EndOffset = @(21, 21) }
+    ) {
+        param($Script, $ErrorId, $StartOffset, $EndOffset)
+
+        $errs = Get-ParseResults -src $Script
+        $errs.Count | Should -Be $ErrorId.Count
+        for ($i = 0; $i -lt $errs.Count; $i++) {
+            $errs[$i].ErrorId | Should -BeExactly $ErrorId[$i]
+            $errs[$i].Extent.StartScriptPosition.Offset | Should -Be $StartOffset[$i]
+            $errs[$i].Extent.EndScriptPosition.Offset | Should -Be $EndOffset[$i]
+        }
+    }
+}

From 65b6f1abf049158e850c2b702741f1fb119c9fce Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 19 Jul 2022 20:30:38 -0700
Subject: [PATCH 472/645] Bump PackageManagement from 1.4.7 to 1.4.8.1 (#17709)

---
 assets/wix/files.wxs                | 8 --------
 src/Modules/PSGalleryModules.csproj | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 614eaa2f8b2..3bdd173e6e1 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1669,9 +1669,6 @@
               <File Id="fil28C672F884A14B9D8ACFB6534423CA51" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PackageManagement\DSCResources\PackageManagementDscUtilities.psm1" />
             </Component>
             <Directory Name="MSFT_PackageManagementSource" Id="dir467F7C8961D842AEBB4188D2F3004198">
-              <Component Id="cmp8C23BECAFDBB4039A255DE6246A30726">
-                <File Id="filB3CEF74508FF4DEDADF38F9046799EFB" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PackageManagement\DSCResources\MSFT_PackageManagementSource\MSFT_PackageManagementSource.schema.mfl" />
-              </Component>
               <Component Id="cmp09A46C31077C4BDCB8606FB4DD6CAE01">
                 <File Id="fil3127E5CBC6F84A86A649AEEC7F05EE4F" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PackageManagement\DSCResources\MSFT_PackageManagementSource\MSFT_PackageManagementSource.psm1" />
               </Component>
@@ -1686,9 +1683,6 @@
               <Component Id="cmpF297CB46D5944DC38C68B376140BDF5C">
                 <File Id="filFB1C81A053634DCFB01E3A3F7E9FE84F" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PackageManagement\DSCResources\MSFT_PackageManagement\MSFT_PackageManagement.strings.psd1" />
               </Component>
-              <Component Id="cmpA5CB9D3B3C794D2E9750BFF7C9709C83">
-                <File Id="fil27BF11C40A504DDB9CDAE9E293F5EAD8" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PackageManagement\DSCResources\MSFT_PackageManagement\MSFT_PackageManagement.schema.mfl" />
-              </Component>
               <Component Id="cmp98E30699A7504181B61707E99DCC0EC1">
                 <File Id="fil5C51CE77EF584ECDB345C613EB0EA4FE" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PackageManagement\DSCResources\MSFT_PackageManagement\MSFT_PackageManagement.psm1" />
               </Component>
@@ -3669,12 +3663,10 @@
       <ComponentRef Id="cmpF79A92F228AF5EA2BA60CC33BE9DC6A0" />
       <ComponentRef Id="cmp603C5B38651EE30C8E23FD7C8A4B828D" />
       <ComponentRef Id="cmpDDD9F623B3DC4A6DB15A013734FFFACB" />
-      <ComponentRef Id="cmp8C23BECAFDBB4039A255DE6246A30726" />
       <ComponentRef Id="cmp09A46C31077C4BDCB8606FB4DD6CAE01" />
       <ComponentRef Id="cmpC2EEED1CA2094DB1B760297F2374216A" />
       <ComponentRef Id="cmp8B763D3852654517B3E25C9CA5247D5F" />
       <ComponentRef Id="cmpF297CB46D5944DC38C68B376140BDF5C" />
-      <ComponentRef Id="cmpA5CB9D3B3C794D2E9750BFF7C9709C83" />
       <ComponentRef Id="cmp98E30699A7504181B61707E99DCC0EC1" />
       <ComponentRef Id="cmp61560691133844F886A1E72130659721" />
       <ComponentRef Id="cmpA83063651AF54638A78187CA67953118" />
diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj
index fe9a771f206..f2dfd6af95e 100644
--- a/src/Modules/PSGalleryModules.csproj
+++ b/src/Modules/PSGalleryModules.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="PowerShellGet" Version="2.2.5" />
-    <PackageReference Include="PackageManagement" Version="1.4.7" />
+    <PackageReference Include="PackageManagement" Version="1.4.8.1" />
     <PackageReference Include="Microsoft.PowerShell.Archive" Version="1.2.5" />
     <PackageReference Include="PSReadLine" Version="2.2.6" />
     <PackageReference Include="ThreadJob" Version="2.0.3" />

From 9ccaf107a078f7918737e6b38bc729825d222551 Mon Sep 17 00:00:00 2001
From: Frode Flaten <3436158+fflaten@users.noreply.github.com>
Date: Wed, 20 Jul 2022 05:50:18 +0200
Subject: [PATCH 473/645] Fix enum-ranges for ValidateRange in proxy commands
 (#17572)

---
 .../engine/TypeMetadata.cs                    |  8 ++++-
 .../engine/Basic/ProxyCommand.tests.ps1       | 36 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/TypeMetadata.cs b/src/System.Management.Automation/engine/TypeMetadata.cs
index 31a6adeab73..6981640a165 100644
--- a/src/System.Management.Automation/engine/TypeMetadata.cs
+++ b/src/System.Management.Automation/engine/TypeMetadata.cs
@@ -761,6 +761,7 @@ internal bool IsMatchingType(PSTypeName psTypeName)
         private const string AliasesFormat = @"{0}[Alias({1})]";
         private const string ValidateLengthFormat = @"{0}[ValidateLength({1}, {2})]";
         private const string ValidateRangeRangeKindFormat = @"{0}[ValidateRange([System.Management.Automation.ValidateRangeKind]::{1})]";
+        private const string ValidateRangeEnumFormat = @"{0}[ValidateRange([{3}]::{1}, [{3}]::{2})]";
         private const string ValidateRangeFloatFormat = @"{0}[ValidateRange({1:R}, {2:R})]";
         private const string ValidateRangeFormat = @"{0}[ValidateRange({1}, {2})]";
         private const string ValidatePatternFormat = "{0}[ValidatePattern('{1}')]";
@@ -931,6 +932,10 @@ private static string GetProxyAttributeData(Attribute attrib, string prefix)
                     {
                         format = ValidateRangeFloatFormat;
                     }
+                    else if (rangeType.IsEnum)
+                    {
+                        format = ValidateRangeEnumFormat;
+                    }
                     else
                     {
                         format = ValidateRangeFormat;
@@ -941,7 +946,8 @@ private static string GetProxyAttributeData(Attribute attrib, string prefix)
                         format,
                         prefix,
                         validRangeAttrib.MinRange,
-                        validRangeAttrib.MaxRange);
+                        validRangeAttrib.MaxRange,
+                        rangeType.FullName);
                     return result;
                 }
             }
diff --git a/test/powershell/engine/Basic/ProxyCommand.tests.ps1 b/test/powershell/engine/Basic/ProxyCommand.tests.ps1
index abb2cef459e..48055697811 100644
--- a/test/powershell/engine/Basic/ProxyCommand.tests.ps1
+++ b/test/powershell/engine/Basic/ProxyCommand.tests.ps1
@@ -17,6 +17,24 @@ Describe 'ProxyCommand Tests' -Tag 'CI' {
             @{ Name = 'ValidateSetAttribute with explicit set';          ParamBlock = '[ValidateSet(''1'',''10'')][int]${Parameter}' }
             @{ Name = 'PSTypeNameAttribute';                             ParamBlock = '[PSTypeName(''TypeName'')][int]${Parameter}' }
         )
+
+        $validateRangeEnumTestCases = @(
+            @{
+                Name       = 'Enum min and Enum max';
+                ParamBlock = '[ValidateRange([Microsoft.PowerShell.ExecutionPolicy]::Unrestricted, [Microsoft.PowerShell.ExecutionPolicy]::Undefined)][Microsoft.PowerShell.ExecutionPolicy]${Parameter}'
+                Expected   = '[ValidateRange([Microsoft.PowerShell.ExecutionPolicy]::Unrestricted, [Microsoft.PowerShell.ExecutionPolicy]::Undefined)][Microsoft.PowerShell.ExecutionPolicy]${Parameter}'
+            },
+            @{
+                Name       = 'Enum min and int max';
+                ParamBlock = '[ValidateRange([Microsoft.PowerShell.ExecutionPolicy]::Unrestricted, 5)][Microsoft.PowerShell.ExecutionPolicy]${Parameter}'
+                Expected   = '[ValidateRange(0, 5)][Microsoft.PowerShell.ExecutionPolicy]${Parameter}'
+            }
+            @{
+                Name       = 'int min and Enum max';
+                ParamBlock = '[ValidateRange(0, [Microsoft.PowerShell.ExecutionPolicy]::Undefined)][Microsoft.PowerShell.ExecutionPolicy]${Parameter}'
+                Expected   = '[ValidateRange(0, 5)][Microsoft.PowerShell.ExecutionPolicy]${Parameter}'
+            }
+        )
     }
 
     Context 'GetParamBlock method' {
@@ -41,6 +59,24 @@ Describe 'ProxyCommand Tests' -Tag 'CI' {
             $generatedParamBlock | Should -Be $ParamBlock
         }
 
+        It 'Generates a param block when ValidateRangeAttribute is used with <Name>' -TestCases $validateRangeEnumTestCases {
+            param (
+                $Name,
+                $ParamBlock,
+                $Expected
+            )
+
+            $functionDefinition = 'param ( {0} )' -f $ParamBlock
+            Set-Item -Path function:testProxyCommandFunction -Value $functionDefinition
+
+            $generatedParamBlock = [System.Management.Automation.ProxyCommand]::GetParamBlock(
+                (Get-Command testProxyCommandFunction)
+            )
+            $generatedParamBlock = $generatedParamBlock -split '\r?\n' -replace '^ *' -join ''
+
+            $generatedParamBlock | Should -Be $Expected
+        }
+
         It 'Generates a param block when ValidateScriptAttribute is used' {
             param (
                 $Name,

From 76c713d7e62ca219e3119216371b7421e623b46d Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Wed, 20 Jul 2022 05:56:35 +0200
Subject: [PATCH 474/645] Add completion for index expressions for dictionaries
 (#17619)

---
 .../CommandCompletion/CompletionAnalysis.cs   | 125 ++++++++++++------
 .../CommandCompletion/CompletionCompleters.cs |  50 ++++++-
 .../TabCompletion/TabCompletion.Tests.ps1     |  42 ++++++
 3 files changed, 173 insertions(+), 44 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index 6b32856c014..ed387b62a6d 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -503,6 +503,12 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                                 return completions;
                             }
                         }
+                        else if (lastAst.Parent is IndexExpressionAst indexExpressionAst)
+                        {
+                            // Handles quoted string inside index expression like: $PSVersionTable["<Tab>"]
+                            completionContext.WordToComplete = (tokenAtCursor as StringToken).Value;
+                            return CompletionCompleters.CompleteIndexExpression(completionContext, indexExpressionAst.Target);
+                        }
 
                         result = GetResultForString(completionContext, ref replacementIndex, ref replacementLength, isQuotedString);
                         break;
@@ -748,6 +754,19 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                         result = CompletionCompleters.CompleteOperator(tokenAtCursor.Text);
                         break;
 
+                    case TokenKind.LBracket:
+                        if (lastAst.Parent is IndexExpressionAst indexExpression)
+                        {
+                            // Handles index expression with cursor right after lbracket like: $PSVersionTable[<Tab>]
+                            completionContext.WordToComplete = string.Empty;
+                            result = CompletionCompleters.CompleteIndexExpression(completionContext, indexExpression.Target);
+                            if (result.Count > 0)
+                            {
+                                replacementIndex++;
+                                replacementLength--;
+                            }
+                        }
+                        break;
                     default:
                         if ((tokenAtCursor.TokenFlags & TokenFlags.Keyword) != 0)
                         {
@@ -896,6 +915,14 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                                         result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
                                     }
 
+                                    break;
+                                case TokenKind.LBracket:
+                                    if (lastAst.Parent is IndexExpressionAst indexExpression)
+                                    {
+                                        // Handles index expression where cursor is on a new line after the lbracket like: $PSVersionTable[\n<Tab>]
+                                        completionContext.WordToComplete = string.Empty;
+                                        result = CompletionCompleters.CompleteIndexExpression(completionContext, indexExpression.Target);
+                                    }
                                     break;
                                 default:
                                     break;
@@ -967,6 +994,14 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
                                         return result;
                                     }
                                     break;
+                                case TokenKind.LBracket:
+                                    if (lastAst.Parent is IndexExpressionAst indexExpression)
+                                    {
+                                        // Handles index expression with whitespace between lbracket and cursor like: $PSVersionTable[ <Tab>]
+                                        completionContext.WordToComplete = string.Empty;
+                                        result = CompletionCompleters.CompleteIndexExpression(completionContext, indexExpression.Target);
+                                    }
+                                    break;
                                 default:
                                     break;
                             }
@@ -1875,7 +1910,7 @@ private static List<CompletionResult> GetResultForIdentifierInConfiguration(
             return results;
         }
 
-        private List<CompletionResult> GetResultForIdentifier(CompletionContext completionContext, ref int replacementIndex, ref int replacementLength, bool isQuotedString)
+        private static List<CompletionResult> GetResultForIdentifier(CompletionContext completionContext, ref int replacementIndex, ref int replacementLength, bool isQuotedString)
         {
             var tokenAtCursor = completionContext.TokenAtCursor;
             var lastAst = completionContext.RelatedAsts.Last();
@@ -1957,61 +1992,65 @@ private List<CompletionResult> GetResultForIdentifier(CompletionContext completi
                 // Handle completion for a path with variable, such as: $PSHOME\ty<tab>
                 if (completionContext.RelatedAsts.Count > 0 && completionContext.RelatedAsts[0] is ScriptBlockAst)
                 {
-                    Ast cursorAst = null;
-                    var cursorPosition = (InternalScriptPosition)_cursorPosition;
-                    int offsetBeforeCmdName = cursorPosition.Offset - tokenAtCursorText.Length;
-                    if (offsetBeforeCmdName >= 0)
-                    {
-                        var cursorBeforeCmdName = cursorPosition.CloneWithNewOffset(offsetBeforeCmdName);
-                        var scriptBlockAst = (ScriptBlockAst)completionContext.RelatedAsts[0];
-                        cursorAst = GetLastAstAtCursor(scriptBlockAst, cursorBeforeCmdName);
-                    }
+                    Ast cursorAst = completionContext.RelatedAsts[0].FindAll(ast => ast.Extent.EndOffset <= tokenAtCursor.Extent.StartOffset, true).LastOrDefault();
 
-                    if (cursorAst != null &&
-                        cursorAst.Extent.EndLineNumber == tokenAtCursor.Extent.StartLineNumber &&
-                        cursorAst.Extent.EndColumnNumber == tokenAtCursor.Extent.StartColumnNumber)
+                    if (cursorAst is not null)
                     {
-                        if (tokenAtCursorText.IndexOfAny(Utils.Separators.Directory) == 0)
+                        if (cursorAst.Extent.EndOffset == tokenAtCursor.Extent.StartOffset)
                         {
-                            string wordToComplete =
-                                CompletionCompleters.ConcatenateStringPathArguments(cursorAst as CommandElementAst, tokenAtCursorText, completionContext);
-                            if (wordToComplete != null)
+                            if (tokenAtCursorText.IndexOfAny(Utils.Separators.Directory) == 0)
                             {
-                                completionContext.WordToComplete = wordToComplete;
-                                result = new List<CompletionResult>(CompletionCompleters.CompleteFilename(completionContext));
-                                if (result.Count > 0)
+                                string wordToComplete =
+                                    CompletionCompleters.ConcatenateStringPathArguments(cursorAst as CommandElementAst, tokenAtCursorText, completionContext);
+                                if (wordToComplete != null)
                                 {
+                                    completionContext.WordToComplete = wordToComplete;
+                                    result = new List<CompletionResult>(CompletionCompleters.CompleteFilename(completionContext));
+                                    if (result.Count > 0)
+                                    {
+                                        replacementIndex = cursorAst.Extent.StartScriptPosition.Offset;
+                                        replacementLength += cursorAst.Extent.Text.Length;
+                                    }
+
+                                    return result;
+                                }
+                                else
+                                {
+                                    var variableAst = cursorAst as VariableExpressionAst;
+                                    string fullPath = variableAst != null
+                                        ? CompletionCompleters.CombineVariableWithPartialPath(
+                                            variableAst: variableAst,
+                                            extraText: tokenAtCursorText,
+                                            executionContext: completionContext.ExecutionContext)
+                                        : null;
+
+                                    if (fullPath == null) { return result; }
+
+                                    // Continue trying the filename/commandname completion for scenarios like this: $aa\d<tab>
+                                    completionContext.WordToComplete = fullPath;
                                     replacementIndex = cursorAst.Extent.StartScriptPosition.Offset;
                                     replacementLength += cursorAst.Extent.Text.Length;
-                                }
 
-                                return result;
+                                    completionContext.ReplacementIndex = replacementIndex;
+                                    completionContext.ReplacementLength = replacementLength;
+                                }
                             }
-                            else
+                            // Continue trying the filename/commandname completion for scenarios like this: $aa[get-<tab>
+                            else if (cursorAst is not ErrorExpressionAst || cursorAst.Parent is not IndexExpressionAst)
                             {
-                                var variableAst = cursorAst as VariableExpressionAst;
-                                string fullPath = variableAst != null
-                                    ? CompletionCompleters.CombineVariableWithPartialPath(
-                                        variableAst: variableAst,
-                                        extraText: tokenAtCursorText,
-                                        executionContext: completionContext.ExecutionContext)
-                                    : null;
-
-                                if (fullPath == null) { return result; }
-
-                                // Continue trying the filename/commandname completion for scenarios like this: $aa\d<tab>
-                                completionContext.WordToComplete = fullPath;
-                                replacementIndex = cursorAst.Extent.StartScriptPosition.Offset;
-                                replacementLength += cursorAst.Extent.Text.Length;
-
-                                completionContext.ReplacementIndex = replacementIndex;
-                                completionContext.ReplacementLength = replacementLength;
+                                return result;
                             }
                         }
-                        // Continue trying the filename/commandname completion for scenarios like this: $aa[get-<tab>
-                        else if (cursorAst is not ErrorExpressionAst || cursorAst.Parent is not IndexExpressionAst)
+
+                        if (cursorAst.Parent is IndexExpressionAst indexExpression && indexExpression.Index is ErrorExpressionAst)
                         {
-                            return result;
+                            if (completionContext.WordToComplete.EndsWith(']'))
+                            {
+                                completionContext.WordToComplete = completionContext.WordToComplete.Remove(completionContext.WordToComplete.Length - 1);
+                            }
+
+                            // Handles index expression with unquoted word like: $PSVersionTable[psver<Tab>]
+                            return CompletionCompleters.CompleteIndexExpression(completionContext, indexExpression.Target);
                         }
                     }
                 }
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index 58d3254d8ec..679ad427e9d 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -5950,6 +5950,42 @@ private static bool IsInDscContext(ExpressionAst expression)
             return Ast.GetAncestorAst<ConfigurationDefinitionAst>(expression) != null;
         }
 
+        internal static List<CompletionResult> CompleteIndexExpression(CompletionContext context, ExpressionAst indexTarget)
+        {
+            var result = new List<CompletionResult>();
+            object value;
+            if (SafeExprEvaluator.TrySafeEval(indexTarget, context.ExecutionContext, out value)
+                && value is not null
+                && PSObject.Base(value) is IDictionary dictionary)
+            {
+                foreach (var key in dictionary.Keys)
+                {
+                    if (key is string keyAsString && keyAsString.StartsWith(context.WordToComplete, StringComparison.OrdinalIgnoreCase))
+                    {
+                        result.Add(new CompletionResult($"'{keyAsString}'", keyAsString, CompletionResultType.Property, keyAsString));
+                    }
+                }
+            }
+            else
+            {
+                var inferredTypes = AstTypeInference.InferTypeOf(indexTarget, context.TypeInferenceContext, TypeInferenceRuntimePermissions.AllowSafeEval);
+                foreach (var type in inferredTypes)
+                {
+                    if (type is PSSyntheticTypeName synthetic)
+                    {
+                        foreach (var member in synthetic.Members)
+                        {
+                            if (member.Name.StartsWith(context.WordToComplete, StringComparison.OrdinalIgnoreCase))
+                            {
+                                result.Add(new CompletionResult($"'{member.Name}'", member.Name, CompletionResultType.Property, member.Name));
+                            }
+                        }
+                    }
+                }
+            }
+            return result;
+        }
+
         private static void CompleteFormatViewByInferredType(CompletionContext context, string[] inferredTypeNames, List<CompletionResult> results, string commandName)
         {
             var typeInfoDB = context.TypeInferenceContext.ExecutionContext.FormatDBManager.GetTypeInfoDataBase();
@@ -6116,7 +6152,19 @@ private static void AddInferredMember(object member, WildcardPattern memberNameP
             }
 
             var completionResultType = isMethod ? CompletionResultType.Method : CompletionResultType.Property;
-            var completionText = isMethod ? memberName + "(" : memberName;
+            string completionText;
+            if (isMethod)
+            {
+                completionText = $"{memberName}(";
+            }
+            else if (memberName.IndexOfAny(s_charactersRequiringQuotes) != -1)
+            {
+                completionText = $"'{memberName}'";
+            }
+            else
+            {
+                completionText = memberName;
+            }
 
             results.Add(new CompletionResult(completionText, memberName, completionResultType, getToolTip()));
         }
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 250809bf448..790dbe9ecc8 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -82,6 +82,48 @@ Describe "TabCompletion" -Tags CI {
         }
     }
 
+    It 'should complete index expression for <Intent>' -TestCases @(
+        @{
+            Intent = 'Hashtable with no user input'
+            Expected = "'PSVersion'"
+            TestString = '$PSVersionTable[^'
+        }
+        @{
+            Intent = 'Hashtable with partial input'
+            Expected = "'PSVersion'"
+            TestString = '$PSVersionTable[ PSvers^'
+        }
+        @{
+            Intent = 'Hashtable with partial quoted input'
+            Expected = "'PSVersion'"
+            TestString = '$PSVersionTable["PSvers^'
+        }
+        @{
+            Intent = 'Hashtable from Ast'
+            Expected = "'Hello'"
+            TestString = '$Table = @{Hello = "World"};$Table[^'
+        }
+        @{
+            Intent = 'Hashtable with cursor on new line'
+            Expected = "'Hello'"
+            TestString = @'
+$Table = @{Hello = "World"}
+$Table[
+^
+'@
+        }
+    ) -Test {
+        param($Expected, $TestString)
+        $CursorIndex = $TestString.IndexOf('^')
+        $res = TabExpansion2 -cursorColumn $CursorIndex -inputScript $TestString.Remove($CursorIndex, 1)
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly $Expected
+    }
+
+    it 'should add quotes when completing hashtable key from Ast with member syntax' -Test {
+        $res = TabExpansion2 -inputScript '$Table = @{"Hello World" = "World"};$Table.'
+        $res.CompletionMatches.CompletionText | Where-Object {$_ -eq "'Hello World'"} | Should -BeExactly "'Hello World'"
+    }
+
     It '<Intent>' -TestCases @(
         @{
             Intent = 'Complete member with space between dot and cursor'

From 42d0e9928602d67f6f2bd4d276403cdfc6dec302 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Wed, 20 Jul 2022 14:17:53 +0900
Subject: [PATCH 475/645] Fix typo in ModuleCmdletBase.cs (#17714)

explictly -> explicitly
---
 .../engine/Modules/ModuleCmdletBase.cs                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index 1c94d557a83..57a98d9aff0 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -7390,7 +7390,7 @@ private static void ValidateCommandName(ModuleCmdletBase cmdlet,
         ///
         /// Note that module loading order is important with this check when the system is *locked down with DeviceGuard*.
         /// If a submodule that does not explicitly export any functions is imported from the command line, its useless
-        /// because no functions are exported (default fn export is explictly disallowed on locked down systems).
+        /// because no functions are exported (default fn export is explicitly disallowed on locked down systems).
         /// But if a parentmodule that imports the submodule is then imported, it will get the useless version of the
         /// module from the ModuleTable and the parent module will not work.
         ///   $mSub = import-module SubModule  # No functions exported, useless
@@ -7398,7 +7398,7 @@ private static void ValidateCommandName(ModuleCmdletBase cmdlet,
         ///   $mParent.DoSomething  # This will likely be broken because SubModule functions are not accessible
         /// But this is not a realistic scenario because SubModule is useless with DeviceGuard lock down and must explicitly
         /// export its functions to become useful, at which point this check is no longer in effect and there is no issue.
-        ///   $mSub = import-module SubModule  # Explictly exports functions, useful
+        ///   $mSub = import-module SubModule  # Explicitly exports functions, useful
         ///   $mParent = import-module ParentModule  # This internally imports SubModule
         ///   $mParent.DoSomething  # This works because SubModule functions are exported and accessible.
         /// </summary>

From 031fa93b4cf13e67f37241b151dacc70ec68e2ff Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Wed, 20 Jul 2022 14:47:50 -0700
Subject: [PATCH 476/645] Add `find.exe` to legacy argument binding behavior
 for Windows (#17715)

---
 .../engine/NativeCommandProcessor.cs          |  1 +
 .../NativeCommandArguments.Tests.ps1          | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index 5ebaccca2cd..0077e13d96a 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -248,6 +248,7 @@ internal class NativeCommandProcessor : CommandProcessorBase
             "cmd",
             "cscript",
             "wscript",
+            "find",
         };
 
         #region ctor/native command properties
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
index aead692cc69..191f7211f6a 100644
--- a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
+++ b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
@@ -171,6 +171,25 @@ Describe "Will error correctly if an attempt to set variable to improper value"
     }
 }
 
+Describe "find.exe uses legacy behavior on Windows" {
+    BeforeAll {
+        $currentSetting = $PSNativeCommandArgumentPassing
+        $PSNativeCommandArgumentPassing = "Windows"
+        $testCases = @{ pattern = "" },
+            @{ pattern = "blat" },
+            @{ pattern = "bl at" }
+    }
+    AfterAll {
+        $PSNativeCommandArgumentPassing = $currentSetting
+    }
+    It "The pattern '<pattern>' is used properly by find.exe" -skip:(! $IsWindows) -testCases $testCases {
+        param ($pattern)
+        $expr = "'foo' | find.exe --% /v ""$pattern"""
+        $result = Invoke-Expression $expr
+        $result | Should -Be 'foo'
+    }
+}
+
 foreach ( $argumentListValue in "Standard","Legacy","Windows" ) {
     $PSNativeCommandArgumentPassing = $argumentListValue
     Describe "Native Command Arguments (${PSNativeCommandArgumentPassing})" -tags "CI" {

From 3efa28162eb16ade832686c39ec0fb6b3b156da8 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Wed, 20 Jul 2022 21:39:11 -0700
Subject: [PATCH 477/645] Change `Get-ChildItem` to treat trailing slash in
 path as indicating a directory when used with `-Recurse` (#17704)

---
 .../engine/SessionStateContainer.cs                   |  4 ++--
 .../namespaces/FileSystemProvider.cs                  | 11 ++++++++---
 .../Get-ChildItem.Tests.ps1                           | 11 +++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/System.Management.Automation/engine/SessionStateContainer.cs b/src/System.Management.Automation/engine/SessionStateContainer.cs
index cf833a7643b..0d6f2a97fa2 100644
--- a/src/System.Management.Automation/engine/SessionStateContainer.cs
+++ b/src/System.Management.Automation/engine/SessionStateContainer.cs
@@ -1324,8 +1324,8 @@ internal void GetChildItems(
                 try
                 {
                     // If we're recursing, do some path fixups to match user
-                    // expectations:
-                    if (recurse)
+                    // expectations, but only if the last part is a file and not a directory:
+                    if (recurse && !path.EndsWith(Path.DirectorySeparatorChar) && !path.EndsWith(Path.AltDirectorySeparatorChar))
                     {
                         string childName = GetChildName(path, context);
 
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index 3f8c32a2fed..4e0d72765ce 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -1373,13 +1373,18 @@ private FileSystemInfo GetFileSystemItem(string path, ref bool isContainer, bool
             path = NormalizePath(path);
             FileInfo result = new FileInfo(path);
 
-            // FileInfo.Exists is always false for a directory path, so we check the attribute for existence.
             var attributes = result.Attributes;
-            if ((int)attributes == -1) { /* Path doesn't exist. */ return null; }
-
             bool hidden = attributes.HasFlag(FileAttributes.Hidden);
             isContainer = attributes.HasFlag(FileAttributes.Directory);
 
+            // FileInfo allows for a file path to end in a trailing slash, but the resulting object
+            // is incomplete.  A trailing slash should indicate a directory.  So if the path ends in a
+            // trailing slash and is not a directory, return null
+            if (!isContainer && path.EndsWith(Path.DirectorySeparatorChar))
+            {
+                return null;
+            }
+
             FlagsExpression<FileAttributes> evaluator = null;
             FlagsExpression<FileAttributes> switchEvaluator = null;
             GetChildDynamicParameters fspDynamicParam = DynamicParameters as GetChildDynamicParameters;
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
index 5059928f322..a5d06df0b46 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
@@ -217,6 +217,17 @@ Describe "Get-ChildItem" -Tags "CI" {
         It "Should list the folder present when path length equal to MAX_PATH" {
             (Get-ChildItem -Path TestDrive:\$item_I -Recurse -Force).Name.Length | Should -BeGreaterThan 0
         }
+
+        It 'Trailing slash for -Path should treat it as a folder only when used with -recurse' {
+            $foo = New-Item -ItemType Directory -Path TestDrive:\foo
+            $foo2 = New-Item -ItemType Directory -Path TestDrive:\foo\foo
+            $bar = New-Item -ItemType File -Path TestDrive:\foo\bar
+            $bar2 = New-Item -ItemType File -Path TestDrive:\foo\foo\bar
+
+            { Get-ChildItem -Path testdrive:/foo/bar/ -Recurse -ErrorAction Stop } | Should -Throw -ErrorId 'ItemNotFound,Microsoft.PowerShell.Commands.GetChildItemCommand'
+            $barFiles = Get-ChildItem -Path testdrive:/foo/bar -Recurse
+            $barFiles.Count | Should -Be 2
+        }
     }
 
     Context 'Env: Provider' {

From 38bf778b3779c58b0ca942f848abfbf62c9e04e6 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 21 Jul 2022 14:51:22 -0700
Subject: [PATCH 478/645] Re-enable the test `TestLoadNativeInMemoryAssembly`
 (#17738)

---
 test/xUnit/csharp/test_NativeInterop.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/xUnit/csharp/test_NativeInterop.cs b/test/xUnit/csharp/test_NativeInterop.cs
index b0c1c531e7f..685e8a23ce4 100644
--- a/test/xUnit/csharp/test_NativeInterop.cs
+++ b/test/xUnit/csharp/test_NativeInterop.cs
@@ -17,7 +17,7 @@ namespace PSTests.Sequential
 {
     public static class NativeInterop
     {
-        [Fact(Skip = "Have to skip this test due to https://github.com/dotnet/runtime/issues/66785")]
+        [Fact]
         public static void TestLoadNativeInMemoryAssembly()
         {
             string tempDir = Path.Combine(Path.GetTempPath(), "TestLoadNativeInMemoryAssembly");

From bff54ba38dd3c2dac6d2fe5ebbdfa87d79df312e Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 21 Jul 2022 14:53:55 -0700
Subject: [PATCH 479/645] Update dotnetmetadata.json to start consuming .NET 7
 preview 7 builds (#17736)

---
 DotnetRuntimeMetadata.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index fcc7f4b0f33..7b07dcc16c3 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "channel": "7.0.1xx-preview6",
+    "channel": "7.0.1xx-preview7",
     "quality": "daily",
     "qualityFallback": "preview",
-    "packageVersionPattern": "7.0.0-preview.6",
+    "packageVersionPattern": "7.0.0-preview.7",
     "sdkImageVersion": "7.0.100",
-    "nextChannel": "7.0.1xx-preview6",
+    "nextChannel": "7.0.1xx-preview7",
     "azureFeed": "",
     "sdkImageOverride": ""
   },

From a468fb1f499f5f6f1468571df76b50e85c9f4b39 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <mr.molkree@gmail.com>
Date: Fri, 22 Jul 2022 21:34:27 +0400
Subject: [PATCH 480/645] Use compound assignment in /Microsoft.Management
 (#17719)

---
 .../CimAsyncOperation.cs                                     | 5 +----
 .../CimCommandBase.cs                                        | 5 +----
 .../CimSessionProxy.cs                                       | 4 ++--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs
index 49f39c8c019..f8b83f57d9e 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs
@@ -206,10 +206,7 @@ protected void AddCimSessionProxy(CimSessionProxy sessionproxy)
         {
             lock (cimSessionProxyCacheLock)
             {
-                if (this.cimSessionProxyCache == null)
-                {
-                    this.cimSessionProxyCache = new List<CimSessionProxy>();
-                }
+                this.cimSessionProxyCache ??= new List<CimSessionProxy>();
 
                 if (!this.cimSessionProxyCache.Contains(sessionproxy))
                 {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs
index 4e9bf4f296e..26a450810ba 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs
@@ -390,10 +390,7 @@ internal string GetParameterSet()
             }
 
             // Looking for default parameter set
-            if (boundParameterSetName == null)
-            {
-                boundParameterSetName = defaultParameterSetName;
-            }
+            boundParameterSetName ??= defaultParameterSetName;
 
             // throw if still can not find the parameter set name
             if (boundParameterSetName == null)
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs
index f1e2c4ecfee..e40ebb40930 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs
@@ -686,9 +686,9 @@ private void InitOption(CimOperationOptions operOptions)
             {
                 this.OperationOptions = new CimOperationOptions(operOptions);
             }
-            else if (this.OperationOptions == null)
+            else
             {
-                this.OperationOptions = new CimOperationOptions();
+                this.OperationOptions ??= new CimOperationOptions();
             }
 
             this.EnableMethodResultStreaming = true;

From 8af18fa4eabca8c86551ea2f7c290786e07f1989 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <mr.molkree@gmail.com>
Date: Mon, 25 Jul 2022 20:37:32 +0400
Subject: [PATCH 481/645] Use compound assignment in /Microsoft.WSMan (#17721)

---
 src/Microsoft.WSMan.Management/WSManConnections.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Microsoft.WSMan.Management/WSManConnections.cs b/src/Microsoft.WSMan.Management/WSManConnections.cs
index c83ed7e9e10..cac5196740f 100644
--- a/src/Microsoft.WSMan.Management/WSManConnections.cs
+++ b/src/Microsoft.WSMan.Management/WSManConnections.cs
@@ -360,10 +360,7 @@ public string ComputerName
         protected override void BeginProcessing()
         {
             WSManHelper helper = new WSManHelper(this);
-            if (computername == null)
-            {
-                computername = "localhost";
-            }
+            computername ??= "localhost";
 
             if (this.SessionState.Path.CurrentProviderLocation(WSManStringLiterals.rootpath).Path.StartsWith(WSManStringLiterals.rootpath + ":" + WSManStringLiterals.DefaultPathSeparator + computername, StringComparison.OrdinalIgnoreCase))
             {

From c6e3ba841bc4fe46fbc8a718b04aaae452a07c11 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <mr.molkree@gmail.com>
Date: Mon, 25 Jul 2022 20:52:17 +0400
Subject: [PATCH 482/645] Use null-coalescing assignment in
 /System.Management.Automation.utils (#17725)

* Use compound assignment in /System.Management.Automation.utils

* Move comments to please style analyzer
---
 .../utils/CommandDiscoveryExceptions.cs       | 13 +--
 .../utils/ExecutionExceptions.cs              | 39 +++-----
 .../utils/MshArgumentException.cs             | 13 +--
 .../utils/MshArgumentNullException.cs         | 13 +--
 .../utils/MshArgumentOutOfRangeException.cs   | 13 +--
 .../utils/MshInvalidOperationException.cs     | 13 +--
 .../utils/MshNotImplementedException.cs       | 13 +--
 .../utils/MshNotSupportedException.cs         | 13 +--
 .../utils/MshObjectDisposedException.cs       | 13 +--
 .../utils/ObjectStream.cs                     | 92 +++++++------------
 .../utils/ParameterBinderExceptions.cs        |  5 +-
 .../utils/RuntimeException.cs                 | 13 +--
 .../utils/SessionStateExceptions.cs           | 26 ++----
 13 files changed, 102 insertions(+), 177 deletions(-)

diff --git a/src/System.Management.Automation/utils/CommandDiscoveryExceptions.cs b/src/System.Management.Automation/utils/CommandDiscoveryExceptions.cs
index e08d8e1a65c..4ce3568cf5a 100644
--- a/src/System.Management.Automation/utils/CommandDiscoveryExceptions.cs
+++ b/src/System.Management.Automation/utils/CommandDiscoveryExceptions.cs
@@ -121,14 +121,11 @@ public override ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        _errorId,
-                        _errorCategory,
-                        _commandName);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    _errorId,
+                    _errorCategory,
+                    _commandName);
 
                 return _errorRecord;
             }
diff --git a/src/System.Management.Automation/utils/ExecutionExceptions.cs b/src/System.Management.Automation/utils/ExecutionExceptions.cs
index 226a9cb8cdd..ed04086101e 100644
--- a/src/System.Management.Automation/utils/ExecutionExceptions.cs
+++ b/src/System.Management.Automation/utils/ExecutionExceptions.cs
@@ -161,14 +161,11 @@ public override ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        "CmdletInvocationException",
-                        ErrorCategory.NotSpecified,
-                        null);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    "CmdletInvocationException",
+                    ErrorCategory.NotSpecified,
+                    null);
 
                 return _errorRecord;
             }
@@ -891,14 +888,11 @@ public ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        "CallDepthOverflow",
-                        ErrorCategory.InvalidOperation,
-                        CallDepth);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    "CallDepthOverflow",
+                    ErrorCategory.InvalidOperation,
+                    CallDepth);
 
                 return _errorRecord;
             }
@@ -999,14 +993,11 @@ public ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        "CallDepthOverflow",
-                        ErrorCategory.InvalidOperation,
-                        CallDepth);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    "CallDepthOverflow",
+                    ErrorCategory.InvalidOperation,
+                    CallDepth);
 
                 return _errorRecord;
             }
diff --git a/src/System.Management.Automation/utils/MshArgumentException.cs b/src/System.Management.Automation/utils/MshArgumentException.cs
index d9c9ce725eb..8bc58e6c429 100644
--- a/src/System.Management.Automation/utils/MshArgumentException.cs
+++ b/src/System.Management.Automation/utils/MshArgumentException.cs
@@ -121,14 +121,11 @@ public ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        _errorId,
-                        ErrorCategory.InvalidArgument,
-                        null);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    _errorId,
+                    ErrorCategory.InvalidArgument,
+                    null);
 
                 return _errorRecord;
             }
diff --git a/src/System.Management.Automation/utils/MshArgumentNullException.cs b/src/System.Management.Automation/utils/MshArgumentNullException.cs
index be20163607b..294c91ea438 100644
--- a/src/System.Management.Automation/utils/MshArgumentNullException.cs
+++ b/src/System.Management.Automation/utils/MshArgumentNullException.cs
@@ -119,14 +119,11 @@ public ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        _errorId,
-                        ErrorCategory.InvalidArgument,
-                        null);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    _errorId,
+                    ErrorCategory.InvalidArgument,
+                    null);
 
                 return _errorRecord;
             }
diff --git a/src/System.Management.Automation/utils/MshArgumentOutOfRangeException.cs b/src/System.Management.Automation/utils/MshArgumentOutOfRangeException.cs
index 2bf48e9047f..b8db294e99c 100644
--- a/src/System.Management.Automation/utils/MshArgumentOutOfRangeException.cs
+++ b/src/System.Management.Automation/utils/MshArgumentOutOfRangeException.cs
@@ -117,14 +117,11 @@ public ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        _errorId,
-                        ErrorCategory.InvalidArgument,
-                        null);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    _errorId,
+                    ErrorCategory.InvalidArgument,
+                    null);
 
                 return _errorRecord;
             }
diff --git a/src/System.Management.Automation/utils/MshInvalidOperationException.cs b/src/System.Management.Automation/utils/MshInvalidOperationException.cs
index f9a65fcf8aa..ff238ef20ca 100644
--- a/src/System.Management.Automation/utils/MshInvalidOperationException.cs
+++ b/src/System.Management.Automation/utils/MshInvalidOperationException.cs
@@ -115,14 +115,11 @@ public ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        _errorId,
-                        _errorCategory,
-                        _target);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    _errorId,
+                    _errorCategory,
+                    _target);
 
                 return _errorRecord;
             }
diff --git a/src/System.Management.Automation/utils/MshNotImplementedException.cs b/src/System.Management.Automation/utils/MshNotImplementedException.cs
index 6c2dd504cf0..e6e1d1b54eb 100644
--- a/src/System.Management.Automation/utils/MshNotImplementedException.cs
+++ b/src/System.Management.Automation/utils/MshNotImplementedException.cs
@@ -98,14 +98,11 @@ public ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        _errorId,
-                        ErrorCategory.NotImplemented,
-                        null);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    _errorId,
+                    ErrorCategory.NotImplemented,
+                    null);
 
                 return _errorRecord;
             }
diff --git a/src/System.Management.Automation/utils/MshNotSupportedException.cs b/src/System.Management.Automation/utils/MshNotSupportedException.cs
index 7614080dcff..d7002f9111e 100644
--- a/src/System.Management.Automation/utils/MshNotSupportedException.cs
+++ b/src/System.Management.Automation/utils/MshNotSupportedException.cs
@@ -98,14 +98,11 @@ public ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        _errorId,
-                        ErrorCategory.NotImplemented,
-                        null);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    _errorId,
+                    ErrorCategory.NotImplemented,
+                    null);
 
                 return _errorRecord;
             }
diff --git a/src/System.Management.Automation/utils/MshObjectDisposedException.cs b/src/System.Management.Automation/utils/MshObjectDisposedException.cs
index b8d4ab421cc..8ceabb84227 100644
--- a/src/System.Management.Automation/utils/MshObjectDisposedException.cs
+++ b/src/System.Management.Automation/utils/MshObjectDisposedException.cs
@@ -104,14 +104,11 @@ public ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        _errorId,
-                        ErrorCategory.InvalidOperation,
-                        null);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    _errorId,
+                    ErrorCategory.InvalidOperation,
+                    null);
 
                 return _errorRecord;
             }
diff --git a/src/System.Management.Automation/utils/ObjectStream.cs b/src/System.Management.Automation/utils/ObjectStream.cs
index 2f4cbef8a08..c9aef1b928e 100644
--- a/src/System.Management.Automation/utils/ObjectStream.cs
+++ b/src/System.Management.Automation/utils/ObjectStream.cs
@@ -609,15 +609,12 @@ internal override WaitHandle ReadHandle
 
                 lock (_monitorObject)
                 {
-                    if (_readWaitHandle == null)
-                    {
-                        // Create the handle signaled if there are objects in the stream
-                        // or the stream has been closed.  The closed scenario addresses
-                        // Pipeline readers that execute asynchronously.  Since the pipeline
-                        // may complete with zero objects before the caller objects this
-                        // handle, it will block indefinitely unless it is set.
-                        _readWaitHandle = new ManualResetEvent(_objects.Count > 0 || !_isOpen);
-                    }
+                    // Create the handle signaled if there are objects in the stream
+                    // or the stream has been closed.  The closed scenario addresses
+                    // Pipeline readers that execute asynchronously.  Since the pipeline
+                    // may complete with zero objects before the caller objects this
+                    // handle, it will block indefinitely unless it is set.
+                    _readWaitHandle ??= new ManualResetEvent(_objects.Count > 0 || !_isOpen);
 
                     handle = _readWaitHandle;
                 }
@@ -642,10 +639,7 @@ internal override WaitHandle WriteHandle
 
                 lock (_monitorObject)
                 {
-                    if (_writeWaitHandle == null)
-                    {
-                        _writeWaitHandle = new ManualResetEvent(_objects.Count < _capacity || !_isOpen);
-                    }
+                    _writeWaitHandle ??= new ManualResetEvent(_objects.Count < _capacity || !_isOpen);
 
                     handle = _writeWaitHandle;
                 }
@@ -665,17 +659,14 @@ internal override PipelineReader<object> ObjectReader
 
                 lock (_monitorObject)
                 {
-                    if (_reader == null)
-                    {
-                        // Always return an object reader, even if the stream
-                        // is closed. This is to address requesting the object reader
-                        // after calling Pipeline.Execute(). NOTE: If Execute completes
-                        // without writing data to the output queue, the
-                        // stream will be in the EndOfPipeline state because the
-                        // stream is closed and has zero data.  Since this is a valid
-                        // and expected execution path, we don't want to throw an exception.
-                        _reader = new ObjectReader(this);
-                    }
+                    // Always return an object reader, even if the stream
+                    // is closed. This is to address requesting the object reader
+                    // after calling Pipeline.Execute(). NOTE: If Execute completes
+                    // without writing data to the output queue, the
+                    // stream will be in the EndOfPipeline state because the
+                    // stream is closed and has zero data.  Since this is a valid
+                    // and expected execution path, we don't want to throw an exception.
+                    _reader ??= new ObjectReader(this);
 
                     reader = _reader;
                 }
@@ -695,17 +686,14 @@ internal override PipelineReader<PSObject> PSObjectReader
 
                 lock (_monitorObject)
                 {
-                    if (_mshreader == null)
-                    {
-                        // Always return an object reader, even if the stream
-                        // is closed. This is to address requesting the object reader
-                        // after calling Pipeline.Execute(). NOTE: If Execute completes
-                        // without writing data to the output queue, the
-                        // stream will be in the EndOfPipeline state because the
-                        // stream is closed and has zero data.  Since this is a valid
-                        // and expected execution path, we don't want to throw an exception.
-                        _mshreader = new PSObjectReader(this);
-                    }
+                    // Always return an object reader, even if the stream
+                    // is closed. This is to address requesting the object reader
+                    // after calling Pipeline.Execute(). NOTE: If Execute completes
+                    // without writing data to the output queue, the
+                    // stream will be in the EndOfPipeline state because the
+                    // stream is closed and has zero data.  Since this is a valid
+                    // and expected execution path, we don't want to throw an exception.
+                    _mshreader ??= new PSObjectReader(this);
 
                     reader = _mshreader;
                 }
@@ -726,10 +714,7 @@ internal override PipelineWriter ObjectWriter
 
                 lock (_monitorObject)
                 {
-                    if (_writer == null)
-                    {
-                        _writer = new ObjectWriter(this) as PipelineWriter;
-                    }
+                    _writer ??= new ObjectWriter(this) as PipelineWriter;
 
                     writer = _writer;
                 }
@@ -1686,10 +1671,7 @@ internal override PipelineReader<object> ObjectReader
                 {
                     lock (_syncObject)
                     {
-                        if (_objectReader == null)
-                        {
-                            _objectReader = new PSDataCollectionReader<T, object>(this);
-                        }
+                        _objectReader ??= new PSDataCollectionReader<T, object>(this);
                     }
                 }
 
@@ -1711,11 +1693,8 @@ internal PipelineReader<object> GetObjectReaderForPipeline(string computerName,
             {
                 lock (_syncObject)
                 {
-                    if (_objectReaderForPipeline == null)
-                    {
-                        _objectReaderForPipeline =
-                            new PSDataCollectionPipelineReader<T, object>(this, computerName, runspaceId);
-                    }
+                    _objectReaderForPipeline ??=
+                        new PSDataCollectionPipelineReader<T, object>(this, computerName, runspaceId);
                 }
             }
 
@@ -1733,10 +1712,7 @@ internal override PipelineReader<PSObject> PSObjectReader
                 {
                     lock (_syncObject)
                     {
-                        if (_psobjectReader == null)
-                        {
-                            _psobjectReader = new PSDataCollectionReader<T, PSObject>(this);
-                        }
+                        _psobjectReader ??= new PSDataCollectionReader<T, PSObject>(this);
                     }
                 }
 
@@ -1758,11 +1734,8 @@ internal PipelineReader<PSObject> GetPSObjectReaderForPipeline(string computerNa
             {
                 lock (_syncObject)
                 {
-                    if (_psobjectReaderForPipeline == null)
-                    {
-                        _psobjectReaderForPipeline =
-                            new PSDataCollectionPipelineReader<T, PSObject>(this, computerName, runspaceId);
-                    }
+                    _psobjectReaderForPipeline ??=
+                        new PSDataCollectionPipelineReader<T, PSObject>(this, computerName, runspaceId);
                 }
             }
 
@@ -1784,10 +1757,7 @@ internal override PipelineWriter ObjectWriter
                 {
                     lock (_syncObject)
                     {
-                        if (_writer == null)
-                        {
-                            _writer = new PSDataCollectionWriter<T>(this) as PipelineWriter;
-                        }
+                        _writer ??= new PSDataCollectionWriter<T>(this) as PipelineWriter;
                     }
                 }
 
diff --git a/src/System.Management.Automation/utils/ParameterBinderExceptions.cs b/src/System.Management.Automation/utils/ParameterBinderExceptions.cs
index 841523f6bdb..fcb10737d35 100644
--- a/src/System.Management.Automation/utils/ParameterBinderExceptions.cs
+++ b/src/System.Management.Automation/utils/ParameterBinderExceptions.cs
@@ -212,10 +212,7 @@ internal ParameterBindingException(
             _parameterType = parameterType;
             _typeSpecified = typeSpecified;
 
-            if (errorPosition == null)
-            {
-                errorPosition = invocationInfo.ScriptPosition;
-            }
+            errorPosition ??= invocationInfo.ScriptPosition;
 
             if (errorPosition != null)
             {
diff --git a/src/System.Management.Automation/utils/RuntimeException.cs b/src/System.Management.Automation/utils/RuntimeException.cs
index 4ba776799e7..ec0efd4f063 100644
--- a/src/System.Management.Automation/utils/RuntimeException.cs
+++ b/src/System.Management.Automation/utils/RuntimeException.cs
@@ -151,14 +151,11 @@ public virtual ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        _errorId,
-                        _errorCategory,
-                        _targetObject);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    _errorId,
+                    _errorCategory,
+                    _targetObject);
 
                 return _errorRecord;
             }
diff --git a/src/System.Management.Automation/utils/SessionStateExceptions.cs b/src/System.Management.Automation/utils/SessionStateExceptions.cs
index a08e7615dc5..34ad5c7f4e0 100644
--- a/src/System.Management.Automation/utils/SessionStateExceptions.cs
+++ b/src/System.Management.Automation/utils/SessionStateExceptions.cs
@@ -234,14 +234,11 @@ public override ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        "ProviderInvocationException",
-                        ErrorCategory.NotSpecified,
-                        null);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    "ProviderInvocationException",
+                    ErrorCategory.NotSpecified,
+                    null);
 
                 return _errorRecord;
             }
@@ -497,14 +494,11 @@ public override ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        _errorId,
-                        _errorCategory,
-                        _itemName);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    _errorId,
+                    _errorCategory,
+                    _itemName);
 
                 return _errorRecord;
             }

From 223c6b890525308bd3c3bddca41bc6b9822614c9 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <mr.molkree@gmail.com>
Date: Mon, 25 Jul 2022 20:54:36 +0400
Subject: [PATCH 483/645] Use compound assignment in /parser and /debugger
 (#17726)

---
 .../engine/debugger/debugger.cs               | 21 ++--
 .../engine/parser/Compiler.cs                 | 46 +++------
 .../engine/parser/Parser.cs                   | 99 ++++---------------
 .../engine/parser/SafeValues.cs               |  5 +-
 .../engine/parser/TypeResolver.cs             | 10 +-
 .../engine/parser/tokenizer.cs                | 22 ++---
 6 files changed, 50 insertions(+), 153 deletions(-)

diff --git a/src/System.Management.Automation/engine/debugger/debugger.cs b/src/System.Management.Automation/engine/debugger/debugger.cs
index e8e8c849442..ced9b4ed6a6 100644
--- a/src/System.Management.Automation/engine/debugger/debugger.cs
+++ b/src/System.Management.Automation/engine/debugger/debugger.cs
@@ -1057,12 +1057,9 @@ private bool IsLocalSession
         {
             get
             {
-                if (_isLocalSession == null)
-                {
-                    // Remote debug sessions always have a ServerRemoteHost.  Otherwise it is a local session.
-                    _isLocalSession = !(((_context.InternalHost.ExternalHost != null) &&
-                                         (_context.InternalHost.ExternalHost is System.Management.Automation.Remoting.ServerRemoteHost)));
-                }
+                // Remote debug sessions always have a ServerRemoteHost.  Otherwise it is a local session.
+                _isLocalSession ??= !((_context.InternalHost.ExternalHost != null) &&
+                    (_context.InternalHost.ExternalHost is System.Management.Automation.Remoting.ServerRemoteHost));
 
                 return _isLocalSession.Value;
             }
@@ -1949,10 +1946,7 @@ private bool WaitForDebugStopSubscriber()
                 if (_preserveUnhandledDebugStopEvent)
                 {
                     // Lazily create the event object.
-                    if (_preserveDebugStopEvent == null)
-                    {
-                        _preserveDebugStopEvent = new ManualResetEventSlim(true);
-                    }
+                    _preserveDebugStopEvent ??= new ManualResetEventSlim(true);
 
                     // Set the event handle to non-signaled.
                     if (!_preserveDebugStopEvent.IsSet)
@@ -2152,11 +2146,8 @@ private bool IsSystemLockedDown
                 {
                     lock (_syncObject)
                     {
-                        if (_isSystemLockedDown == null)
-                        {
-                            _isSystemLockedDown = (System.Management.Automation.Security.SystemPolicy.GetSystemLockdownPolicy() ==
-                                System.Management.Automation.Security.SystemEnforcementMode.Enforce);
-                        }
+                        _isSystemLockedDown ??= (System.Management.Automation.Security.SystemPolicy.GetSystemLockdownPolicy() ==
+                            System.Management.Automation.Security.SystemEnforcementMode.Enforce);
                     }
                 }
 
diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index 19abc077b0d..dab439bd5aa 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -1110,10 +1110,7 @@ internal static Expression CallStringEquals(Expression left, Expression right, b
 
         internal static Expression IsStrictMode(int version, Expression executionContext = null)
         {
-            if (executionContext == null)
-            {
-                executionContext = ExpressionCache.NullExecutionContext;
-            }
+            executionContext ??= ExpressionCache.NullExecutionContext;
 
             return Expression.Call(
                 CachedReflectionInfo.ExecutionContext_IsStrictVersion,
@@ -1758,18 +1755,15 @@ internal static Attribute GetAttribute(AttributeAst attributeAst)
                 // Unwrap the wrapped exception
                 var innerException = tie.InnerException;
                 var rte = innerException as RuntimeException;
-                if (rte == null)
-                {
-                    rte = InterpreterError.NewInterpreterExceptionWithInnerException(
-                        null,
-                        typeof(RuntimeException),
-                        attributeAst.Extent,
-                        "ExceptionConstructingAttribute",
-                        ExtendedTypeSystem.ExceptionConstructingAttribute,
-                        innerException,
-                        innerException.Message,
-                        attributeAst.TypeName.FullName);
-                }
+                rte ??= InterpreterError.NewInterpreterExceptionWithInnerException(
+                    null,
+                    typeof(RuntimeException),
+                    attributeAst.Extent,
+                    "ExceptionConstructingAttribute",
+                    ExtendedTypeSystem.ExceptionConstructingAttribute,
+                    innerException,
+                    innerException.Message,
+                    attributeAst.TypeName.FullName);
 
                 InterpreterError.UpdateExceptionErrorRecordPosition(rte, attributeAst.Extent);
                 throw rte;
@@ -2054,10 +2048,7 @@ internal void Compile(CompiledScriptBlockData scriptBlock, bool optimize)
 
             // The sequence points are identical optimized or not.  Regardless, we want to ensure
             // that the list is unique no matter when the property is accessed, so make sure it is set just once.
-            if (scriptBlock.SequencePoints == null)
-            {
-                scriptBlock.SequencePoints = _sequencePoints.ToArray();
-            }
+            scriptBlock.SequencePoints ??= _sequencePoints.ToArray();
         }
 
         private static Action<FunctionContext> CompileTree(Expression<Action<FunctionContext>> lambda, CompileInterpretChoice compileInterpretChoice)
@@ -2126,10 +2117,7 @@ private static object GetExpressionValue(
 
             // Can't be exposed to untrusted input - invoking arbitrary code could result in remote code
             // execution.
-            if (lambda == null)
-            {
-                lambda = (new Compiler()).CompileSingleExpression(expressionAst, out sequencePoints, out localsTupleType);
-            }
+            lambda ??= (new Compiler()).CompileSingleExpression(expressionAst, out sequencePoints, out localsTupleType);
 
             SessionStateInternal oldSessionState = context.EngineSessionState;
             try
@@ -3946,10 +3934,7 @@ private Expression GetRedirectedExpression(CommandExpressionAst commandExpr, boo
                 // This will simply return a Linq.Expression representing the redirection.
                 var compiledRedirection = VisitFileRedirection(fileRedirectionAst);
 
-                if (extraFileRedirectExprs == null)
-                {
-                    extraFileRedirectExprs = new List<Expression>(commandExpr.Redirections.Count);
-                }
+                extraFileRedirectExprs ??= new List<Expression>(commandExpr.Redirections.Count);
 
                 // Hold the current 'FileRedirection' instance for later use
                 var redirectionExpr = NewTemp(typeof(FileRedirection), "fileRedirection");
@@ -6146,10 +6131,7 @@ public object VisitConvertExpression(ConvertExpressionAst convertExpressionAst)
                 }
             }
 
-            if (childExpr == null)
-            {
-                childExpr = Compile(convertExpressionAst.Child);
-            }
+            childExpr ??= Compile(convertExpressionAst.Child);
 
             if (typeName.FullName.Equals("PSCustomObject", StringComparison.OrdinalIgnoreCase))
             {
diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
index 75df984ad21..4a42dd262b7 100644
--- a/src/System.Management.Automation/engine/parser/Parser.cs
+++ b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -443,8 +443,7 @@ private Token NextToken()
         private Token PeekToken()
         {
             Token token = _ungotToken ?? _tokenizer.NextToken();
-            if (_ungotToken == null)
-                _ungotToken = token;
+            _ungotToken ??= token;
             return token;
         }
 
@@ -823,10 +822,7 @@ private List<UsingStatementAst> UsingStatementsRule()
                     SkipToken();
                     var statement = UsingStatementRule(token);
                     SkipNewlinesAndSemicolons();
-                    if (result == null)
-                    {
-                        result = new List<UsingStatementAst>();
-                    }
+                    result ??= new List<UsingStatementAst>();
 
                     var usingStatement = statement as UsingStatementAst;
                     // otherwise returned statement is ErrorStatementAst.
@@ -1790,10 +1786,7 @@ private ScriptBlockAst NamedBlockListRule(Token lCurly, List<UsingStatementAst>
                         break;
                 }
 
-                if (startExtent == null)
-                {
-                    startExtent = blockNameToken.Extent;
-                }
+                startExtent ??= blockNameToken.Extent;
 
                 endExtent = blockNameToken.Extent;
 
@@ -1934,10 +1927,7 @@ private IScriptExtent StatementListRule(List<StatementAst> statements, List<Trap
                 // Track the last statement inside our loop so we don't use the EmptyPipeline
                 // as our last statement.  The last statement is used to track the extent of
                 // this statement list.
-                if (firstStatement == null)
-                {
-                    firstStatement = statement;
-                }
+                firstStatement ??= statement;
 
                 lastStatement = statement;
 
@@ -3231,10 +3221,7 @@ private StatementAst ConfigurationStatementRule(IEnumerable<AttributeAst> custom
 
                     if (topLevel)
                     {
-                        if (_configurationKeywordsDefinedInThisFile == null)
-                        {
-                            _configurationKeywordsDefinedInThisFile = new Dictionary<string, DynamicKeyword>();
-                        }
+                        _configurationKeywordsDefinedInThisFile ??= new Dictionary<string, DynamicKeyword>();
 
                         _configurationKeywordsDefinedInThisFile[keywordToAddForThisConfigurationStatement.Keyword] = keywordToAddForThisConfigurationStatement;
                     }
@@ -3589,10 +3576,7 @@ private StatementAst ForStatementRule(LabelToken labelToken, Token forToken)
                 // ErrorRecovery: don't continue parsing the for statement.
 
                 UngetToken(rParen);
-                if (endErrorStatement == null)
-                {
-                    endErrorStatement = lParen.Extent;
-                }
+                endErrorStatement ??= lParen.Extent;
 
                 ReportIncompleteInput(After(endErrorStatement),
                     nameof(ParserStrings.MissingEndParenthesisAfterStatement),
@@ -3901,10 +3885,7 @@ private StatementAst DynamicKeywordStatementRule(Token functionName, DynamicKeyw
                 // we aren't expecting a name, we still do this so that the signature of the implementing function remains
                 // the same.
                 ExpressionAst originalInstanceName = instanceName;
-                if (instanceName == null)
-                {
-                    instanceName = new StringConstantExpressionAst(nameToken.Extent, elementName, StringConstantType.BareWord);
-                }
+                instanceName ??= new StringConstantExpressionAst(nameToken.Extent, elementName, StringConstantType.BareWord);
 
                 SkipNewlines();
 
@@ -4321,10 +4302,7 @@ private StatementAst ClassDefinitionRule(List<AttributeBaseAst> customAttributes
 
                     if (astsOnError != null && astsOnError.Count > 0)
                     {
-                        if (nestedAsts == null)
-                        {
-                            nestedAsts = new List<Ast>();
-                        }
+                        nestedAsts ??= new List<Ast>();
 
                         nestedAsts.AddRange(astsOnError);
                         lastExtent = astsOnError.Last().Extent;
@@ -4353,10 +4331,7 @@ private StatementAst ClassDefinitionRule(List<AttributeBaseAst> customAttributes
                 var classDefn = new TypeDefinitionAst(extent, name.Value, customAttributes?.OfType<AttributeAst>(), members, TypeAttributes.Class, superClassesList);
                 if (customAttributes != null && customAttributes.OfType<TypeConstraintAst>().Any())
                 {
-                    if (nestedAsts == null)
-                    {
-                        nestedAsts = new List<Ast>();
-                    }
+                    nestedAsts ??= new List<Ast>();
                     // no need to report error since the error is reported in method StatementRule
                     nestedAsts.AddRange(customAttributes.OfType<TypeConstraintAst>());
                     nestedAsts.Add(classDefn);
@@ -4420,10 +4395,7 @@ private MemberAst ClassMemberRule(string className, out List<Ast> astsOnError)
                 if (attribute != null)
                 {
                     lastAttribute = attribute;
-                    if (startExtent == null)
-                    {
-                        startExtent = attribute.Extent;
-                    }
+                    startExtent ??= attribute.Extent;
 
                     var attributeAst = attribute as AttributeAst;
                     if (attributeAst != null)
@@ -4443,10 +4415,7 @@ private MemberAst ClassMemberRule(string className, out List<Ast> astsOnError)
                 }
 
                 token = PeekToken();
-                if (startExtent == null)
-                {
-                    startExtent = token.Extent;
-                }
+                startExtent ??= token.Extent;
 
                 switch (token.Kind)
                 {
@@ -4661,10 +4630,7 @@ private static void RecordErrorAsts(Ast errAst, ref List<Ast> astsOnError)
                 return;
             }
 
-            if (astsOnError == null)
-            {
-                astsOnError = new List<Ast>();
-            }
+            astsOnError ??= new List<Ast>();
 
             astsOnError.Add(errAst);
         }
@@ -4676,10 +4642,7 @@ private static void RecordErrorAsts(IEnumerable<Ast> errAsts, ref List<Ast> asts
                 return;
             }
 
-            if (astsOnError == null)
-            {
-                astsOnError = new List<Ast>();
-            }
+            astsOnError ??= new List<Ast>();
 
             astsOnError.AddRange(errAsts);
         }
@@ -5268,11 +5231,9 @@ private StatementAst MethodDeclarationRule(Token functionNameToken, string class
                     SetTokenizerMode(oldTokenizerMode);
                 }
 
-                if (baseCtorCallParams == null)
-                {
+                baseCtorCallParams ??=
                     // Assuming implicit default ctor
-                    baseCtorCallParams = new List<ExpressionAst>();
-                }
+                    new List<ExpressionAst>();
             }
 
             Token lCurly = NextToken();
@@ -5561,10 +5522,7 @@ private CatchClauseAst CatchBlockRule(ref IScriptExtent endErrorStatement, ref L
                     break;
                 }
 
-                if (exceptionTypes == null)
-                {
-                    exceptionTypes = new List<TypeConstraintAst>();
-                }
+                exceptionTypes ??= new List<TypeConstraintAst>();
 
                 exceptionTypes.Add(typeConstraintAst);
 
@@ -6067,10 +6025,7 @@ private PipelineBaseAst PipelineRule(
                     {
                         SkipToken();
 
-                        if (redirections == null)
-                        {
-                            redirections = new RedirectionAst[CommandBaseAst.MaxRedirections];
-                        }
+                        redirections ??= new RedirectionAst[CommandBaseAst.MaxRedirections];
 
                         IScriptExtent unused = null;
                         lastRedirection = RedirectionRule(redirectionToken, redirections, ref unused);
@@ -6091,10 +6046,7 @@ private PipelineBaseAst PipelineRule(
 
                 if (commandAst != null)
                 {
-                    if (startExtent == null)
-                    {
-                        startExtent = commandAst.Extent;
-                    }
+                    startExtent ??= commandAst.Extent;
 
                     pipelineElements.Add(commandAst);
                 }
@@ -6447,10 +6399,7 @@ private ExpressionAst GetCommandArgument(CommandArgumentContext context, Token t
                 }
 
                 commaToken = token;
-                if (commandArgs == null)
-                {
-                    commandArgs = new List<ExpressionAst>();
-                }
+                commandArgs ??= new List<ExpressionAst>();
 
                 commandArgs.Add(exprAst);
 
@@ -6618,10 +6567,7 @@ internal Ast CommandRule(bool forDynamicKeyword)
                         case TokenKind.RedirectInStd:
                             if ((context & CommandArgumentContext.CommandName) == 0)
                             {
-                                if (redirections == null)
-                                {
-                                    redirections = new RedirectionAst[CommandBaseAst.MaxRedirections];
-                                }
+                                redirections ??= new RedirectionAst[CommandBaseAst.MaxRedirections];
 
                                 RedirectionRule((RedirectionToken)token, redirections, ref endExtent);
                             }
@@ -7223,10 +7169,7 @@ private ExpressionAst UnaryExpressionRule(bool endNumberOnTernaryOpChars = false
                         }
                     }
 
-                    if (expr == null)
-                    {
-                        expr = new TypeExpressionAst(lastAttribute.Extent, lastAttribute.TypeName);
-                    }
+                    expr ??= new TypeExpressionAst(lastAttribute.Extent, lastAttribute.TypeName);
                 }
 
                 for (int i = attributes.Count - 2; i >= 0; --i)
diff --git a/src/System.Management.Automation/engine/parser/SafeValues.cs b/src/System.Management.Automation/engine/parser/SafeValues.cs
index f76269a12d7..0e41f87a318 100644
--- a/src/System.Management.Automation/engine/parser/SafeValues.cs
+++ b/src/System.Management.Automation/engine/parser/SafeValues.cs
@@ -548,10 +548,7 @@ public object VisitExpandableStringExpression(ExpandableStringExpressionAst expa
                 ofs = t_context.SessionState.PSVariable.GetValue("OFS") as string;
             }
 
-            if (ofs == null)
-            {
-                ofs = " ";
-            }
+            ofs ??= " ";
 
             for (int offset = 0; offset < safeValues.Length; offset++)
             {
diff --git a/src/System.Management.Automation/engine/parser/TypeResolver.cs b/src/System.Management.Automation/engine/parser/TypeResolver.cs
index dd69985bd5f..acbf9bef2c1 100644
--- a/src/System.Management.Automation/engine/parser/TypeResolver.cs
+++ b/src/System.Management.Automation/engine/parser/TypeResolver.cs
@@ -370,10 +370,7 @@ internal static Type ResolveTypeNameWithContext(TypeName typeName, out Exception
                 return typeName._typeDefinitionAst.Type;
             }
 
-            if (context == null)
-            {
-                context = LocalPipeline.GetExecutionContextFromTLS();
-            }
+            context ??= LocalPipeline.GetExecutionContextFromTLS();
 
             // Use the explicitly passed-in assembly list when it's specified by the caller.
             // Otherwise, retrieve all currently loaded assemblies.
@@ -582,10 +579,7 @@ private TypeResolutionState(TypeResolutionState other, HashSet<string> typesDefi
 
         internal static TypeResolutionState GetDefaultUsingState(ExecutionContext context)
         {
-            if (context == null)
-            {
-                context = LocalPipeline.GetExecutionContextFromTLS();
-            }
+            context ??= LocalPipeline.GetExecutionContextFromTLS();
 
             if (context != null)
             {
diff --git a/src/System.Management.Automation/engine/parser/tokenizer.cs b/src/System.Management.Automation/engine/parser/tokenizer.cs
index 43046c9d29e..664dbe0ac77 100644
--- a/src/System.Management.Automation/engine/parser/tokenizer.cs
+++ b/src/System.Management.Automation/engine/parser/tokenizer.cs
@@ -1242,10 +1242,7 @@ private T SaveToken<T>(T token) where T : Token
                     // Don't remember these tokens, they aren't useful in $$ and $^.
                     break;
                 default:
-                    if (FirstToken == null)
-                    {
-                        FirstToken = token;
-                    }
+                    FirstToken ??= token;
 
                     LastToken = token;
                     break;
@@ -1815,8 +1812,7 @@ private void ScanLineComment()
             }
             else if (matchedRequires && _nestedTokensAdjustment == 0)
             {
-                if (RequiresTokens == null)
-                    RequiresTokens = new List<Token>();
+                RequiresTokens ??= new List<Token>();
                 RequiresTokens.Add(token);
             }
         }
@@ -1953,10 +1949,7 @@ internal ScriptRequirements GetScriptRequirements()
                             PSSnapinToken.StartsWith(parameter.ParameterName, StringComparison.OrdinalIgnoreCase))
                         {
                             snapinSpecified = true;
-                            if (requiredSnapins == null)
-                            {
-                                requiredSnapins = new List<PSSnapInSpecification>();
-                            }
+                            requiredSnapins ??= new List<PSSnapInSpecification>();
 
                             break;
                         }
@@ -2222,8 +2215,7 @@ private void HandleRequiresParameter(CommandParameterAst parameter,
                         return;
                     }
 
-                    if (requiredModules == null)
-                        requiredModules = new List<ModuleSpecification>();
+                    requiredModules ??= new List<ModuleSpecification>();
                     requiredModules.Add(moduleSpecification);
                 }
             }
@@ -2246,8 +2238,7 @@ private List<string> HandleRequiresAssemblyArgument(Ast argumentAst, object arg,
             }
             else
             {
-                if (requiredAssemblies == null)
-                    requiredAssemblies = new List<string>();
+                requiredAssemblies ??= new List<string>();
 
                 if (!requiredAssemblies.Contains((string)arg))
                 {
@@ -2269,8 +2260,7 @@ private List<string> HandleRequiresPSEditionArgument(Ast argumentAst, object arg
             }
             else
             {
-                if (requiredEditions == null)
-                    requiredEditions = new List<string>();
+                requiredEditions ??= new List<string>();
 
                 var edition = (string)arg;
                 if (!Utils.IsValidPSEditionValue(edition))

From 8f6b75826eae3263cca986f1d879652bfb2a4313 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <mr.molkree@gmail.com>
Date: Mon, 25 Jul 2022 21:07:33 +0400
Subject: [PATCH 484/645] Use compound assignment in
 /System.Management.Automation (#17724)

---
 .../DscSupport/CimDSCParser.cs                | 25 ++++---------------
 .../common/BaseOutputtingCommand.cs           |  5 +---
 .../DisplayDatabase/displayDescriptionData.cs |  4 +--
 .../displayDescriptionData_List.cs            |  3 +--
 .../displayDescriptionData_Wide.cs            |  3 +--
 .../common/FormatViewGenerator_Complex.cs     |  5 +---
 .../common/FormatViewGenerator_Table.cs       | 15 +++--------
 .../FormatAndOutput/common/ListWriter.cs      | 11 +++-----
 .../FormatAndOutput/common/StringDecorated.cs | 10 ++------
 .../common/Utilities/Mshexpression.cs         | 15 +++++------
 .../help/BaseCommandHelpInfo.cs               | 10 ++------
 .../help/ProviderHelpInfo.cs                  | 10 ++------
 .../namespaces/FileSystemProvider.cs          | 15 +++--------
 .../namespaces/NavigationProviderBase.cs      |  5 +---
 .../namespaces/RegistryProvider.cs            |  5 +---
 .../security/SecureStringHelper.cs            |  5 +---
 .../security/wldpNativeMethods.cs             |  5 +---
 .../singleshell/config/MshSnapinInfo.cs       | 20 +++------------
 18 files changed, 40 insertions(+), 131 deletions(-)

diff --git a/src/System.Management.Automation/DscSupport/CimDSCParser.cs b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
index a84cb474f3a..3d1b0d0d01b 100644
--- a/src/System.Management.Automation/DscSupport/CimDSCParser.cs
+++ b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
@@ -561,10 +561,7 @@ private static Dictionary<string, DscClassCacheEntry> ClassCache
         {
             get
             {
-                if (t_classCache == null)
-                {
-                    t_classCache = new Dictionary<string, DscClassCacheEntry>(StringComparer.OrdinalIgnoreCase);
-                }
+                t_classCache ??= new Dictionary<string, DscClassCacheEntry>(StringComparer.OrdinalIgnoreCase);
 
                 return t_classCache;
             }
@@ -580,10 +577,7 @@ private static Dictionary<string, Tuple<string, Version>> ByClassModuleCache
         {
             get
             {
-                if (t_byClassModuleCache == null)
-                {
-                    t_byClassModuleCache = new Dictionary<string, Tuple<string, Version>>(StringComparer.OrdinalIgnoreCase);
-                }
+                t_byClassModuleCache ??= new Dictionary<string, Tuple<string, Version>>(StringComparer.OrdinalIgnoreCase);
 
                 return t_byClassModuleCache;
             }
@@ -599,10 +593,7 @@ private static Dictionary<string, Tuple<string, Version>> ByClassModuleCache
         {
             get
             {
-                if (t_byFileClassCache == null)
-                {
-                    t_byFileClassCache = new Dictionary<string, List<Microsoft.Management.Infrastructure.CimClass>>(StringComparer.OrdinalIgnoreCase);
-                }
+                t_byFileClassCache ??= new Dictionary<string, List<Microsoft.Management.Infrastructure.CimClass>>(StringComparer.OrdinalIgnoreCase);
 
                 return t_byFileClassCache;
             }
@@ -618,10 +609,7 @@ private static HashSet<string> ScriptKeywordFileCache
         {
             get
             {
-                if (t_scriptKeywordFileCache == null)
-                {
-                    t_scriptKeywordFileCache = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-                }
+                t_scriptKeywordFileCache ??= new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
                 return t_scriptKeywordFileCache;
             }
@@ -1893,10 +1881,7 @@ private static ParseError[] ImportResourceCheckSemantics(DynamicKeywordStatement
             {
                 if (keywordAst.Keyword.Keyword.Equals("Node"))
                 {
-                    if (errorList == null)
-                    {
-                        errorList = new List<ParseError>();
-                    }
+                    errorList ??= new List<ParseError>();
 
                     errorList.Add(new ParseError(kwAst.Extent,
                                          "ImportDscResourceInsideNode",
diff --git a/src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs b/src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs
index 17cbae65894..3ab591a7af4 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs
@@ -128,10 +128,7 @@ private bool ProcessObject(PSObject so)
             }
 
             // instantiate the cache if not done yet
-            if (_cache == null)
-            {
-                _cache = new FormattedObjectsCache(this.LineOutput.RequiresBuffering);
-            }
+            _cache ??= new FormattedObjectsCache(this.LineOutput.RequiresBuffering);
 
             // no need for formatting, just process the object
             FormatStartData formatStart = o as FormatStartData;
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs
index 7c9d8241657..0190a31ddc9 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs
@@ -887,7 +887,7 @@ internal static EntrySelectedBy Get(List<TypeOrGroupReference> references)
                 {
                     if (tr.conditionToken != null)
                     {
-                        if (result.SelectionCondition == null) result.SelectionCondition = new List<DisplayEntry>();
+                        result.SelectionCondition ??= new List<DisplayEntry>();
 
                         result.SelectionCondition.Add(new DisplayEntry(tr.conditionToken));
                         continue;
@@ -896,7 +896,7 @@ internal static EntrySelectedBy Get(List<TypeOrGroupReference> references)
                     if (tr is TypeGroupReference)
                         continue;
 
-                    if (result.TypeNames == null) result.TypeNames = new List<string>();
+                    result.TypeNames ??= new List<string>();
 
                     result.TypeNames.Add(tr.name);
                 }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_List.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_List.cs
index 6025acfff44..4ac470d288c 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_List.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_List.cs
@@ -208,8 +208,7 @@ public List<string> SelectedBy
         {
             get
             {
-                if (EntrySelectedBy == null)
-                    EntrySelectedBy = new EntrySelectedBy { TypeNames = new List<string>() };
+                EntrySelectedBy ??= new EntrySelectedBy { TypeNames = new List<string>() };
                 return EntrySelectedBy.TypeNames;
             }
         }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Wide.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Wide.cs
index 4f87998fd1e..220446bfe17 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Wide.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Wide.cs
@@ -187,8 +187,7 @@ public List<string> SelectedBy
         {
             get
             {
-                if (EntrySelectedBy == null)
-                    EntrySelectedBy = new EntrySelectedBy { TypeNames = new List<string>() };
+                EntrySelectedBy ??= new EntrySelectedBy { TypeNames = new List<string>() };
                 return EntrySelectedBy.TypeNames;
             }
         }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Complex.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Complex.cs
index c1645b09ad5..77aa2da6e4d 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Complex.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Complex.cs
@@ -283,10 +283,7 @@ private void ExecuteFormatTokenList(TraversalInfo level,
                     {
                         // Since it is a leaf node we just consider it an empty string and go
                         // on with formatting
-                        if (val == null)
-                        {
-                            val = string.Empty;
-                        }
+                        val ??= string.Empty;
 
                         FieldFormattingDirective fieldFormattingDirective = null;
                         StringFormatError formatErrorObject = null;
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
index f4a6aa4e45f..b0efa32dc1f 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
@@ -233,10 +233,7 @@ private TableHeaderInfo GenerateTableHeaderInfoFromProperties(PSObject so)
                         ci.propertyName = (string)key;
                 }
 
-                if (ci.propertyName == null)
-                {
-                    ci.propertyName = this.activeAssociationList[k].ResolvedExpression.ToString();
-                }
+                ci.propertyName ??= this.activeAssociationList[k].ResolvedExpression.ToString();
 
                 // set the width of the table
                 if (a.OriginatingParameter != null)
@@ -391,10 +388,7 @@ private List<TableRowItemDefinition> GetActiveTableRowDefinition(TableControlBod
                 }
             }
 
-            if (matchingRowDefinition == null)
-            {
-                matchingRowDefinition = match.BestMatch as TableRowDefinition;
-            }
+            matchingRowDefinition ??= match.BestMatch as TableRowDefinition;
 
             if (matchingRowDefinition == null)
             {
@@ -412,10 +406,7 @@ private List<TableRowItemDefinition> GetActiveTableRowDefinition(TableControlBod
                         }
                     }
 
-                    if (matchingRowDefinition == null)
-                    {
-                        matchingRowDefinition = match.BestMatch as TableRowDefinition;
-                    }
+                    matchingRowDefinition ??= match.BestMatch as TableRowDefinition;
                 }
             }
 
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
index 165f042f70d..7598c6b2797 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs
@@ -177,8 +177,7 @@ internal void WriteProperties(string[] values, LineOutput lo)
         /// <param name="lo">LineOutput interface to write to.</param>
         private void WriteProperty(int k, string propertyValue, LineOutput lo)
         {
-            if (propertyValue == null)
-                propertyValue = string.Empty;
+            propertyValue ??= string.Empty;
 
             // make sure we honor embedded newlines
             List<string> lines = StringManipulationHelper.SplitLines(propertyValue);
@@ -194,8 +193,7 @@ private void WriteProperty(int k, string propertyValue, LineOutput lo)
                     prependString = _propertyLabels[k];
                 else
                 {
-                    if (padding == null)
-                        padding = StringUtil.Padding(_propertyLabelsDisplayLength);
+                    padding ??= StringUtil.Padding(_propertyLabelsDisplayLength);
 
                     prependString = padding;
                 }
@@ -213,10 +211,7 @@ private void WriteProperty(int k, string propertyValue, LineOutput lo)
         /// <param name="lo">LineOutput to write to.</param>
         private void WriteSingleLineHelper(string prependString, string line, LineOutput lo)
         {
-            if (line is null)
-            {
-                line = string.Empty;
-            }
+            line ??= string.Empty;
 
             // compute the width of the field for the value string (in screen cells)
             int fieldCellCount = _columnWidth - _propertyLabelsDisplayLength;
diff --git a/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs b/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
index 4e647387416..6fa725c574f 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
@@ -21,10 +21,7 @@ private string PlainText
         {
             get
             {
-                if (_plaintextcontent == null)
-                {
-                    _plaintextcontent = ValueStringDecorated.AnsiRegex.Replace(_text, string.Empty);
-                }
+                _plaintextcontent ??= ValueStringDecorated.AnsiRegex.Replace(_text, string.Empty);
 
                 return _plaintextcontent;
             }
@@ -94,10 +91,7 @@ private string PlainText
         {
             get
             {
-                if (_plaintextcontent == null)
-                {
-                    _plaintextcontent = AnsiRegex.Replace(_text, string.Empty);
-                }
+                _plaintextcontent ??= AnsiRegex.Replace(_text, string.Empty);
 
                 return _plaintextcontent;
             }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs b/src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs
index 68921ddb0e8..9a675824e59 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs
@@ -326,15 +326,12 @@ private PSPropertyExpressionResult GetValue(PSObject target, bool eatExceptions)
                 }
                 else
                 {
-                    if (_getValueDynamicSite == null)
-                    {
-                        _getValueDynamicSite =
-                            CallSite<Func<CallSite, object, object>>.Create(
-                                    PSGetMemberBinder.Get(
-                                        _stringValue,
-                                        classScope: (Type)null,
-                                        @static: false));
-                    }
+                    _getValueDynamicSite ??=
+                        CallSite<Func<CallSite, object, object>>.Create(
+                            PSGetMemberBinder.Get(
+                                _stringValue,
+                                classScope: (Type)null,
+                                @static: false));
 
                     result = _getValueDynamicSite.Target.Invoke(_getValueDynamicSite, target);
                 }
diff --git a/src/System.Management.Automation/help/BaseCommandHelpInfo.cs b/src/System.Management.Automation/help/BaseCommandHelpInfo.cs
index 58ecdf28d07..5c50094abf3 100644
--- a/src/System.Management.Automation/help/BaseCommandHelpInfo.cs
+++ b/src/System.Management.Automation/help/BaseCommandHelpInfo.cs
@@ -356,15 +356,9 @@ internal override bool MatchPatternInContent(WildcardPattern pattern)
             string synopsis = Synopsis;
             string detailedDescription = DetailedDescription;
 
-            if (synopsis == null)
-            {
-                synopsis = string.Empty;
-            }
+            synopsis ??= string.Empty;
 
-            if (detailedDescription == null)
-            {
-                detailedDescription = string.Empty;
-            }
+            detailedDescription ??= string.Empty;
 
             return pattern.IsMatch(synopsis) || pattern.IsMatch(detailedDescription);
         }
diff --git a/src/System.Management.Automation/help/ProviderHelpInfo.cs b/src/System.Management.Automation/help/ProviderHelpInfo.cs
index c55a1eaaa5f..80859a2ddf8 100644
--- a/src/System.Management.Automation/help/ProviderHelpInfo.cs
+++ b/src/System.Management.Automation/help/ProviderHelpInfo.cs
@@ -167,15 +167,9 @@ internal override bool MatchPatternInContent(WildcardPattern pattern)
             string synopsis = Synopsis;
             string detailedDescription = DetailedDescription;
 
-            if (synopsis == null)
-            {
-                synopsis = string.Empty;
-            }
+            synopsis ??= string.Empty;
 
-            if (detailedDescription == null)
-            {
-                detailedDescription = string.Empty;
-            }
+            detailedDescription ??= string.Empty;
 
             return pattern.IsMatch(synopsis) || pattern.IsMatch(detailedDescription);
         }
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index 4e0d72765ce..84cc0d47823 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -5116,10 +5116,7 @@ protected override string NormalizeRelativePath(
                 throw PSTraceSource.NewArgumentException(nameof(path));
             }
 
-            if (basePath == null)
-            {
-                basePath = string.Empty;
-            }
+            basePath ??= string.Empty;
 
             s_tracer.WriteLine("basePath = {0}", basePath);
 
@@ -5308,10 +5305,7 @@ private string NormalizeRelativePathHelper(string path, string basePath)
                 return string.Empty;
             }
 
-            if (basePath == null)
-            {
-                basePath = string.Empty;
-            }
+            basePath ??= string.Empty;
 
             s_tracer.WriteLine("basePath = {0}", basePath);
 
@@ -6248,10 +6242,7 @@ public void GetProperty(string path, Collection<string> providerSpecificPickList
                                     if (member != null)
                                     {
                                         value = member.Value;
-                                        if (result == null)
-                                        {
-                                            result = new PSObject();
-                                        }
+                                        result ??= new PSObject();
 
                                         result.Properties.Add(new PSNoteProperty(property, value));
                                     }
diff --git a/src/System.Management.Automation/namespaces/NavigationProviderBase.cs b/src/System.Management.Automation/namespaces/NavigationProviderBase.cs
index da8a16869d1..cf656e633a3 100644
--- a/src/System.Management.Automation/namespaces/NavigationProviderBase.cs
+++ b/src/System.Management.Automation/namespaces/NavigationProviderBase.cs
@@ -515,10 +515,7 @@ internal string ContractRelativePath(
                 return string.Empty;
             }
 
-            if (basePath == null)
-            {
-                basePath = string.Empty;
-            }
+            basePath ??= string.Empty;
 
             providerBaseTracer.WriteLine("basePath = {0}", basePath);
 
diff --git a/src/System.Management.Automation/namespaces/RegistryProvider.cs b/src/System.Management.Automation/namespaces/RegistryProvider.cs
index 51f768c0277..59a398ef1f6 100644
--- a/src/System.Management.Automation/namespaces/RegistryProvider.cs
+++ b/src/System.Management.Automation/namespaces/RegistryProvider.cs
@@ -2996,10 +2996,7 @@ private void GetFilteredRegistryKeyProperties(string path,
 
             // If properties were not specified, get all the values
 
-            if (propertyNames == null)
-            {
-                propertyNames = new Collection<string>();
-            }
+            propertyNames ??= new Collection<string>();
 
             if (propertyNames.Count == 0 && getAll)
             {
diff --git a/src/System.Management.Automation/security/SecureStringHelper.cs b/src/System.Management.Automation/security/SecureStringHelper.cs
index ddb94e52ee8..4eaab568050 100644
--- a/src/System.Management.Automation/security/SecureStringHelper.cs
+++ b/src/System.Management.Automation/security/SecureStringHelper.cs
@@ -258,10 +258,7 @@ internal static EncryptionResult Encrypt(SecureString input, byte[] key, byte[]
             //
             using (Aes aes = Aes.Create())
             {
-                if (iv is null)
-                {
-                    iv = aes.IV;
-                }
+                iv ??= aes.IV;
 
                 //
                 // get clear text data from the input SecureString
diff --git a/src/System.Management.Automation/security/wldpNativeMethods.cs b/src/System.Management.Automation/security/wldpNativeMethods.cs
index 8f8257f51cb..d3c24173b9b 100644
--- a/src/System.Management.Automation/security/wldpNativeMethods.cs
+++ b/src/System.Management.Automation/security/wldpNativeMethods.cs
@@ -77,10 +77,7 @@ public static SystemEnforcementMode GetSystemLockdownPolicy()
             {
                 lock (s_systemLockdownPolicyLock)
                 {
-                    if (s_systemLockdownPolicy == null)
-                    {
-                        s_systemLockdownPolicy = GetLockdownPolicy(path: null, handle: null);
-                    }
+                    s_systemLockdownPolicy ??= GetLockdownPolicy(path: null, handle: null);
                 }
             }
             else if (s_allowDebugOverridePolicy)
diff --git a/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs b/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
index b7e5d60f001..eb70579ee52 100644
--- a/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
+++ b/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
@@ -118,25 +118,13 @@ string vendorFallback
                 version = new Version("0.0");
             }
 
-            if (types == null)
-            {
-                types = new Collection<string>();
-            }
+            types ??= new Collection<string>();
 
-            if (formats == null)
-            {
-                formats = new Collection<string>();
-            }
+            formats ??= new Collection<string>();
 
-            if (descriptionFallback == null)
-            {
-                descriptionFallback = string.Empty;
-            }
+            descriptionFallback ??= string.Empty;
 
-            if (vendorFallback == null)
-            {
-                vendorFallback = string.Empty;
-            }
+            vendorFallback ??= string.Empty;
 
             Name = name;
             IsDefault = isDefault;

From 7af4679191ccdc1d95f382d375d807310a57ece4 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <mr.molkree@gmail.com>
Date: Mon, 25 Jul 2022 21:08:57 +0400
Subject: [PATCH 485/645] Use compound assignment in
 Microsoft.PowerShell.ConsoleHost/Security (#17723)

---
 .../host/msh/ConsoleControl.cs                |  5 +--
 .../host/msh/ConsoleHost.cs                   | 31 +++++++------------
 .../host/msh/Executor.cs                      |  5 +--
 .../host/msh/PendingProgress.cs               |  5 +--
 .../security/CertificateProvider.cs           |  5 +--
 .../security/SignatureCommands.cs             |  5 +--
 6 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
index 7efda924ce9..d5b81cf4dd9 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
@@ -1732,10 +1732,7 @@ internal static void ReadConsoleOutput
                 if (origin.X + (contentsRegion.Right - contentsRegion.Left) + 1 < bufferInfo.BufferSize.X &&
                     ShouldCheck(contentsRegion.Right, contents, contentsRegion))
                 {
-                    if (cellArray == null)
-                    {
-                        cellArray = new BufferCell[cellArrayRegion.Bottom + 1, 2];
-                    }
+                    cellArray ??= new BufferCell[cellArrayRegion.Bottom + 1, 2];
 
                     checkOrigin = new Coordinates(origin.X +
                         (contentsRegion.Right - contentsRegion.Left), origin.Y);
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
index 949684f487b..9016f84d713 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -1388,14 +1388,11 @@ internal WrappedSerializer OutputSerializer
         {
             get
             {
-                if (_outputSerializer == null)
-                {
-                    _outputSerializer =
-                        new WrappedSerializer(
-                            OutputFormat,
-                            "Output",
-                            Console.IsOutputRedirected ? Console.Out : ConsoleTextWriter);
-                }
+                _outputSerializer ??=
+                    new WrappedSerializer(
+                        OutputFormat,
+                        "Output",
+                        Console.IsOutputRedirected ? Console.Out : ConsoleTextWriter);
 
                 return _outputSerializer;
             }
@@ -1405,14 +1402,11 @@ internal WrappedSerializer ErrorSerializer
         {
             get
             {
-                if (_errorSerializer == null)
-                {
-                    _errorSerializer =
-                        new WrappedSerializer(
-                            ErrorFormat,
-                            "Error",
-                            Console.IsErrorRedirected ? Console.Error : ConsoleTextWriter);
-                }
+                _errorSerializer ??=
+                    new WrappedSerializer(
+                        ErrorFormat,
+                        "Error",
+                        Console.IsErrorRedirected ? Console.Error : ConsoleTextWriter);
 
                 return _errorSerializer;
             }
@@ -2533,10 +2527,7 @@ internal void Run(bool inputLoopIsNested)
                                     prompt = EvaluateDebugPrompt();
                                 }
 
-                                if (prompt == null)
-                                {
-                                    prompt = EvaluatePrompt();
-                                }
+                                prompt ??= EvaluatePrompt();
                             }
 
                             ui.Write(prompt);
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
index 8879b2660d3..601d4baab2d 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
@@ -116,10 +116,7 @@ private void AsyncPipelineFailureHandler(Exception ex)
                 er = new ErrorRecord(er, ex);
             }
 
-            if (er == null)
-            {
-                er = new ErrorRecord(ex, "ConsoleHostAsyncPipelineFailure", ErrorCategory.NotSpecified, null);
-            }
+            er ??= new ErrorRecord(ex, "ConsoleHostAsyncPipelineFailure", ErrorCategory.NotSpecified, null);
 
             _parent.ErrorSerializer.Serialize(er);
         }
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
index df120a2d0e5..88aa6d1ffc9 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
@@ -119,10 +119,7 @@ class PendingProgress
                     ProgressNode parentNode = FindNodeById(newNode.SourceId, newNode.ParentActivityId);
                     if (parentNode != null)
                     {
-                        if (parentNode.Children == null)
-                        {
-                            parentNode.Children = new ArrayList();
-                        }
+                        parentNode.Children ??= new ArrayList();
 
                         AddNode(parentNode.Children, newNode);
                         break;
diff --git a/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs b/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
index d6154a88857..3a367283828 100644
--- a/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
+++ b/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
@@ -2546,10 +2546,7 @@ private X509NativeStore GetStore(string storePath,
                 }
             }
 
-            if (s_storeCache == null)
-            {
-                s_storeCache = new X509NativeStore(storeLocation, storeName);
-            }
+            s_storeCache ??= new X509NativeStore(storeLocation, storeName);
 
             return s_storeCache;
         }
diff --git a/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs b/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
index d7c8dcbb78f..411c7952ea8 100644
--- a/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
+++ b/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
@@ -374,10 +374,7 @@ public string TimestampServer
 
             set
             {
-                if (value == null)
-                {
-                    value = string.Empty;
-                }
+                value ??= string.Empty;
 
                 _timestampServer = value;
             }

From dc2e682f3ad6db7096fd2ef58027d393d38ee6ae Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <mr.molkree@gmail.com>
Date: Mon, 25 Jul 2022 21:11:29 +0400
Subject: [PATCH 486/645] Use null-coalescing assignment in /engine (#17720)

---
 .../engine/CompiledCommandParameter.cs        |  6 ++--
 .../engine/CoreAdapter.cs                     | 10 ++----
 .../engine/ErrorPackage.cs                    |  5 +--
 .../engine/ExecutionContext.cs                | 19 +++-------
 .../engine/ExtendedTypeSystemException.cs     | 13 +++----
 .../engine/GetCommandCommand.cs               | 35 ++++---------------
 .../engine/InformationRecord.cs               | 10 +++---
 .../engine/LanguagePrimitives.cs              | 22 +++---------
 .../engine/MshCommandRuntime.cs               |  9 ++---
 .../engine/MshMemberInfo.cs                   | 10 ++----
 .../engine/MshObject.cs                       | 31 +++++-----------
 .../engine/MshObjectTypeDescriptor.cs         |  5 +--
 .../engine/MshSecurityException.cs            | 13 +++----
 .../engine/ParameterBinderBase.cs             |  5 +--
 .../engine/Pipe.cs                            | 20 +++--------
 .../engine/SessionStateContainer.cs           | 10 ++----
 .../engine/SessionStateLocationAPIs.cs        |  5 +--
 .../engine/SessionStateProviderAPIs.cs        |  5 +--
 .../engine/SessionStateScope.cs               |  5 +--
 .../engine/TypeTable.cs                       | 15 ++------
 .../engine/pipeline.cs                        |  5 +--
 21 files changed, 64 insertions(+), 194 deletions(-)

diff --git a/src/System.Management.Automation/engine/CompiledCommandParameter.cs b/src/System.Management.Automation/engine/CompiledCommandParameter.cs
index 2f17fca8fcd..d2ca1aedd91 100644
--- a/src/System.Management.Automation/engine/CompiledCommandParameter.cs
+++ b/src/System.Management.Automation/engine/CompiledCommandParameter.cs
@@ -440,8 +440,7 @@ private void ProcessAttribute(
             ValidateArgumentsAttribute validateAttr = attribute as ValidateArgumentsAttribute;
             if (validateAttr != null)
             {
-                if (validationAttributes == null)
-                    validationAttributes = new Collection<ValidateArgumentsAttribute>();
+                validationAttributes ??= new Collection<ValidateArgumentsAttribute>();
                 validationAttributes.Add(validateAttr);
                 if ((attribute is ValidateNotNullAttribute) || (attribute is ValidateNotNullOrEmptyAttribute))
                 {
@@ -473,8 +472,7 @@ private void ProcessAttribute(
             ArgumentTransformationAttribute argumentAttr = attribute as ArgumentTransformationAttribute;
             if (argumentAttr != null)
             {
-                if (argTransformationAttributes == null)
-                    argTransformationAttributes = new Collection<ArgumentTransformationAttribute>();
+                argTransformationAttributes ??= new Collection<ArgumentTransformationAttribute>();
                 argTransformationAttributes.Add(argumentAttr);
                 return;
             }
diff --git a/src/System.Management.Automation/engine/CoreAdapter.cs b/src/System.Management.Automation/engine/CoreAdapter.cs
index d8c2fec89a0..498cc261e29 100644
--- a/src/System.Management.Automation/engine/CoreAdapter.cs
+++ b/src/System.Management.Automation/engine/CoreAdapter.cs
@@ -2258,10 +2258,7 @@ internal object Invoke(object target, object[] arguments)
 
             if (!_useReflection)
             {
-                if (_methodInvoker == null)
-                {
-                    _methodInvoker = GetMethodInvoker(methodInfo);
-                }
+                _methodInvoker ??= GetMethodInvoker(methodInfo);
 
                 if (_methodInvoker != null)
                 {
@@ -3047,10 +3044,7 @@ internal override bool IsHidden
             {
                 get
                 {
-                    if (_isHidden == null)
-                    {
-                        _isHidden = member.GetCustomAttributes(typeof(HiddenAttribute), inherit: false).Length != 0;
-                    }
+                    _isHidden ??= member.GetCustomAttributes(typeof(HiddenAttribute), inherit: false).Length != 0;
 
                     return _isHidden.Value;
                 }
diff --git a/src/System.Management.Automation/engine/ErrorPackage.cs b/src/System.Management.Automation/engine/ErrorPackage.cs
index 1f17a501736..5ad138079f0 100644
--- a/src/System.Management.Automation/engine/ErrorPackage.cs
+++ b/src/System.Management.Automation/engine/ErrorPackage.cs
@@ -1026,10 +1026,7 @@ public ErrorRecord(
                 throw PSTraceSource.NewArgumentNullException(nameof(exception));
             }
 
-            if (errorId == null)
-            {
-                errorId = string.Empty;
-            }
+            errorId ??= string.Empty;
 
             // targetObject may be null
             _error = exception;
diff --git a/src/System.Management.Automation/engine/ExecutionContext.cs b/src/System.Management.Automation/engine/ExecutionContext.cs
index c835471e0ec..aa13b2aa7a6 100644
--- a/src/System.Management.Automation/engine/ExecutionContext.cs
+++ b/src/System.Management.Automation/engine/ExecutionContext.cs
@@ -114,10 +114,7 @@ internal bool PSDebugTraceStep
         // Helper for generated code to handle running w/ no execution context
         internal static bool IsStrictVersion(ExecutionContext context, int majorVersion)
         {
-            if (context == null)
-            {
-                context = LocalPipeline.GetExecutionContextFromTLS();
-            }
+            context ??= LocalPipeline.GetExecutionContextFromTLS();
 
             return (context != null) && context.IsStrictVersion(majorVersion);
         }
@@ -219,10 +216,7 @@ internal ProviderNames ProviderNames
         {
             get
             {
-                if (_providerNames == null)
-                {
-                    _providerNames = new SingleShellProviderNames();
-                }
+                _providerNames ??= new SingleShellProviderNames();
 
                 return _providerNames;
             }
@@ -1660,12 +1654,9 @@ private void InitializeCommon(AutomationEngine engine, PSHost hostInterface)
             // Initialize the fixed toplevel session state and the current session state
             TopLevelSessionState = EngineSessionState = new SessionStateInternal(this);
 
-            if (AuthorizationManager == null)
-            {
-                // if authorizationmanager==null, this means the configuration
-                // explicitly asked for dummy authorization manager.
-                AuthorizationManager = new AuthorizationManager(null);
-            }
+            // if authorizationmanager==null, this means the configuration
+            // explicitly asked for dummy authorization manager.
+            AuthorizationManager ??= new AuthorizationManager(null);
 
             // Set up the module intrinsics
             Modules = new ModuleIntrinsics(this);
diff --git a/src/System.Management.Automation/engine/ExtendedTypeSystemException.cs b/src/System.Management.Automation/engine/ExtendedTypeSystemException.cs
index ac99127ab29..9ed85accb4f 100644
--- a/src/System.Management.Automation/engine/ExtendedTypeSystemException.cs
+++ b/src/System.Management.Automation/engine/ExtendedTypeSystemException.cs
@@ -647,14 +647,11 @@ public ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        _errorId,
-                        ErrorCategory.InvalidArgument,
-                        null);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    _errorId,
+                    ErrorCategory.InvalidArgument,
+                    null);
 
                 return _errorRecord;
             }
diff --git a/src/System.Management.Automation/engine/GetCommandCommand.cs b/src/System.Management.Automation/engine/GetCommandCommand.cs
index a1e5fa768ba..e11b3c30f8c 100644
--- a/src/System.Management.Automation/engine/GetCommandCommand.cs
+++ b/src/System.Management.Automation/engine/GetCommandCommand.cs
@@ -80,10 +80,7 @@ public string[] Verb
 
             set
             {
-                if (value == null)
-                {
-                    value = Array.Empty<string>();
-                }
+                value ??= Array.Empty<string>();
 
                 _verbs = value;
                 _verbPatterns = null;
@@ -106,10 +103,7 @@ public string[] Noun
 
             set
             {
-                if (value == null)
-                {
-                    value = Array.Empty<string>();
-                }
+                value ??= Array.Empty<string>();
 
                 _nouns = value;
                 _nounPatterns = null;
@@ -132,10 +126,7 @@ public string[] Module
 
             set
             {
-                if (value == null)
-                {
-                    value = Array.Empty<string>();
-                }
+                value ??= Array.Empty<string>();
 
                 _modules = value;
                 _modulePatterns = null;
@@ -400,10 +391,7 @@ protected override void ProcessRecord()
             }
 
             // Initialize the module patterns
-            if (_modulePatterns == null)
-            {
-                _modulePatterns = SessionStateUtilities.CreateWildcardsFromStrings(Module, WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant);
-            }
+            _modulePatterns ??= SessionStateUtilities.CreateWildcardsFromStrings(Module, WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant);
 
             switch (ParameterSetName)
             {
@@ -686,15 +674,9 @@ private bool IsNounVerbMatch(CommandInfo command)
 
             do // false loop
             {
-                if (_verbPatterns == null)
-                {
-                    _verbPatterns = SessionStateUtilities.CreateWildcardsFromStrings(Verb, WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant);
-                }
+                _verbPatterns ??= SessionStateUtilities.CreateWildcardsFromStrings(Verb, WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant);
 
-                if (_nounPatterns == null)
-                {
-                    _nounPatterns = SessionStateUtilities.CreateWildcardsFromStrings(Noun, WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant);
-                }
+                _nounPatterns ??= SessionStateUtilities.CreateWildcardsFromStrings(Noun, WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant);
 
                 if (!string.IsNullOrEmpty(command.ModuleName))
                 {
@@ -1154,10 +1136,7 @@ private bool IsParameterMatch(CommandInfo commandInfo)
                 return true;
             }
 
-            if (_matchedParameterNames == null)
-            {
-                _matchedParameterNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-            }
+            _matchedParameterNames ??= new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
             IEnumerable<ParameterMetadata> commandParameters = null;
             try
diff --git a/src/System.Management.Automation/engine/InformationRecord.cs b/src/System.Management.Automation/engine/InformationRecord.cs
index 310c34a8809..d69ad1d14b4 100644
--- a/src/System.Management.Automation/engine/InformationRecord.cs
+++ b/src/System.Management.Automation/engine/InformationRecord.cs
@@ -96,15 +96,13 @@ public string User
         {
             get
             {
-                if (this._user == null)
-                {
-                    // domain\user on Windows, just user on Unix
+                // domain\user on Windows, just user on Unix
+                this._user ??=
 #if UNIX
-                    this._user = Environment.UserName;
+                    Environment.UserName;
 #else
-                    this._user = Environment.UserDomainName + "\\" + Environment.UserName;
+                    Environment.UserDomainName + "\\" + Environment.UserName;
 #endif
-                }
 
                 return _user;
             }
diff --git a/src/System.Management.Automation/engine/LanguagePrimitives.cs b/src/System.Management.Automation/engine/LanguagePrimitives.cs
index b697e8e750f..283ea28dd96 100644
--- a/src/System.Management.Automation/engine/LanguagePrimitives.cs
+++ b/src/System.Management.Automation/engine/LanguagePrimitives.cs
@@ -634,10 +634,7 @@ public static bool Equals(object first, object second, bool ignoreCase, IFormatP
             // If second can be converted to the type of the first, it does so and returns first.Equals(secondConverted)
             // Otherwise false is returned
 
-            if (formatProvider == null)
-            {
-                formatProvider = CultureInfo.InvariantCulture;
-            }
+            formatProvider ??= CultureInfo.InvariantCulture;
 
             if (!(formatProvider is CultureInfo culture))
             {
@@ -781,10 +778,7 @@ public static int Compare(object first, object second, bool ignoreCase)
         /// </exception>
         public static int Compare(object first, object second, bool ignoreCase, IFormatProvider formatProvider)
         {
-            if (formatProvider == null)
-            {
-                formatProvider = CultureInfo.InvariantCulture;
-            }
+            formatProvider ??= CultureInfo.InvariantCulture;
 
             if (!(formatProvider is CultureInfo culture))
             {
@@ -901,10 +895,7 @@ public static bool TryCompare(object first, object second, bool ignoreCase, out
         public static bool TryCompare(object first, object second, bool ignoreCase, IFormatProvider formatProvider, out int result)
         {
             result = 0;
-            if (formatProvider == null)
-            {
-                formatProvider = CultureInfo.InvariantCulture;
-            }
+            formatProvider ??= CultureInfo.InvariantCulture;
 
             if (formatProvider is not CultureInfo culture)
             {
@@ -4675,7 +4666,7 @@ internal static PSObject SetObjectProperties(object o, IDictionary properties, T
                                     Type propType;
                                     if (TypeResolver.TryResolveType(property.TypeNameOfValue, out propType))
                                     {
-                                        if (formatProvider == null) { formatProvider = CultureInfo.InvariantCulture; }
+                                        formatProvider ??= CultureInfo.InvariantCulture;
 
                                         try
                                         {
@@ -5743,10 +5734,7 @@ internal static IConversionData FigureConversion(Type fromType, Type toType)
                 }
             }
 
-            if (converter == null)
-            {
-                converter = FigurePropertyConversion(fromType, toType, ref rank);
-            }
+            converter ??= FigurePropertyConversion(fromType, toType, ref rank);
 
             if (TypeConverterPossiblyExists(fromType) || TypeConverterPossiblyExists(toType)
                 || (converter != null && valueDependentConversion != null))
diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
index 16fa8652bcc..2050f636e89 100644
--- a/src/System.Management.Automation/engine/MshCommandRuntime.cs
+++ b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -945,8 +945,7 @@ internal void SetupOutVariable()
             if (!OutVariable.StartsWith('+') &&
                 string.Equals("Out-Default", _commandInfo.Name, StringComparison.OrdinalIgnoreCase))
             {
-                if (_state == null)
-                    _state = new SessionState(Context.EngineSessionState);
+                _state ??= new SessionState(Context.EngineSessionState);
 
                 IList oldValue = null;
                 oldValue = PSObject.Base(_state.PSVariable.GetValue(this.OutVariable)) as IList;
@@ -978,8 +977,7 @@ internal void SetupPipelineVariable()
 
             EnsureVariableParameterAllowed();
 
-            if (_state == null)
-                _state = new SessionState(Context.EngineSessionState);
+            _state ??= new SessionState(Context.EngineSessionState);
 
             // Create the pipeline variable
             _pipelineVarReference = new PSVariable(PipelineVariable);
@@ -2562,8 +2560,7 @@ internal void SetupVariable(VariableStreamKind streamKind, string variableName,
 
             EnsureVariableParameterAllowed();
 
-            if (_state == null)
-                _state = new SessionState(Context.EngineSessionState);
+            _state ??= new SessionState(Context.EngineSessionState);
 
             if (variableName.StartsWith('+'))
             {
diff --git a/src/System.Management.Automation/engine/MshMemberInfo.cs b/src/System.Management.Automation/engine/MshMemberInfo.cs
index ce495f13423..4f0b4364bac 100644
--- a/src/System.Management.Automation/engine/MshMemberInfo.cs
+++ b/src/System.Management.Automation/engine/MshMemberInfo.cs
@@ -2276,10 +2276,7 @@ public override object Invoke(params object[] arguments)
                 newArguments[i + 1] = arguments[i];
             }
 
-            if (_codeReferenceMethodInformation == null)
-            {
-                _codeReferenceMethodInformation = DotNetAdapter.GetMethodInformationArray(new[] { CodeReference });
-            }
+            _codeReferenceMethodInformation ??= DotNetAdapter.GetMethodInformationArray(new[] { CodeReference });
 
             Adapter.GetBestMethodAndArguments(CodeReference.Name, _codeReferenceMethodInformation, newArguments, out object[] convertedArguments);
 
@@ -2632,10 +2629,7 @@ internal static PSMethod Create(string name, DotNetAdapter dotNetInstanceAdapter
                 return new PSMethod(name, dotNetInstanceAdapter, baseObject, method, isSpecial, isHidden);
             }
 
-            if (method.PSMethodCtor == null)
-            {
-                method.PSMethodCtor = CreatePSMethodConstructor(method.methodInformationStructures);
-            }
+            method.PSMethodCtor ??= CreatePSMethodConstructor(method.methodInformationStructures);
 
             return method.PSMethodCtor.Invoke(name, dotNetInstanceAdapter, baseObject, method, isSpecial, isHidden);
         }
diff --git a/src/System.Management.Automation/engine/MshObject.cs b/src/System.Management.Automation/engine/MshObject.cs
index 7ea7ef1bd72..aa103ea68f9 100644
--- a/src/System.Management.Automation/engine/MshObject.cs
+++ b/src/System.Management.Automation/engine/MshObject.cs
@@ -674,13 +674,10 @@ internal PSMemberInfoInternalCollection<PSMemberInfo> InstanceMembers
                 {
                     lock (_lockObject)
                     {
-                        if (_instanceMembers == null)
-                        {
-                            _instanceMembers =
-                                s_instanceMembersResurrectionTable.GetValue(
-                                    GetKeyForResurrectionTables(this),
-                                    _ => new PSMemberInfoInternalCollection<PSMemberInfo>());
-                        }
+                        _instanceMembers ??=
+                            s_instanceMembersResurrectionTable.GetValue(
+                                GetKeyForResurrectionTables(this),
+                                _ => new PSMemberInfoInternalCollection<PSMemberInfo>());
                     }
                 }
 
@@ -721,10 +718,7 @@ private AdapterSet InternalAdapterSet
                 {
                     lock (_lockObject)
                     {
-                        if (_adapterSet == null)
-                        {
-                            _adapterSet = GetMappedAdapter(_immediateBaseObject, GetTypeTable());
-                        }
+                        _adapterSet ??= GetMappedAdapter(_immediateBaseObject, GetTypeTable());
                     }
                 }
 
@@ -743,10 +737,7 @@ public PSMemberInfoCollection<PSMemberInfo> Members
                 {
                     lock (_lockObject)
                     {
-                        if (_members == null)
-                        {
-                            _members = new PSMemberInfoIntegratingCollection<PSMemberInfo>(this, s_memberCollection);
-                        }
+                        _members ??= new PSMemberInfoIntegratingCollection<PSMemberInfo>(this, s_memberCollection);
                     }
                 }
 
@@ -765,10 +756,7 @@ public PSMemberInfoCollection<PSPropertyInfo> Properties
                 {
                     lock (_lockObject)
                     {
-                        if (_properties == null)
-                        {
-                            _properties = new PSMemberInfoIntegratingCollection<PSPropertyInfo>(this, s_propertyCollection);
-                        }
+                        _properties ??= new PSMemberInfoIntegratingCollection<PSPropertyInfo>(this, s_propertyCollection);
                     }
                 }
 
@@ -787,10 +775,7 @@ public PSMemberInfoCollection<PSMethodInfo> Methods
                 {
                     lock (_lockObject)
                     {
-                        if (_methods == null)
-                        {
-                            _methods = new PSMemberInfoIntegratingCollection<PSMethodInfo>(this, s_methodCollection);
-                        }
+                        _methods ??= new PSMemberInfoIntegratingCollection<PSMethodInfo>(this, s_methodCollection);
                     }
                 }
 
diff --git a/src/System.Management.Automation/engine/MshObjectTypeDescriptor.cs b/src/System.Management.Automation/engine/MshObjectTypeDescriptor.cs
index 6e941b4c5f1..11955713c7e 100644
--- a/src/System.Management.Automation/engine/MshObjectTypeDescriptor.cs
+++ b/src/System.Management.Automation/engine/MshObjectTypeDescriptor.cs
@@ -410,10 +410,7 @@ private void CheckAndAddProperty(PSPropertyInfo propertyInfo, Attribute[] attrib
                     }
                 }
 
-                if (propertyAttributes == null)
-                {
-                    propertyAttributes = new AttributeCollection();
-                }
+                propertyAttributes ??= new AttributeCollection();
 
                 typeDescriptor.WriteLine("Adding property \"{0}\".", propertyInfo.Name);
 
diff --git a/src/System.Management.Automation/engine/MshSecurityException.cs b/src/System.Management.Automation/engine/MshSecurityException.cs
index 6ba04e4af7c..490de14be02 100644
--- a/src/System.Management.Automation/engine/MshSecurityException.cs
+++ b/src/System.Management.Automation/engine/MshSecurityException.cs
@@ -93,14 +93,11 @@ public override ErrorRecord ErrorRecord
         {
             get
             {
-                if (_errorRecord == null)
-                {
-                    _errorRecord = new ErrorRecord(
-                        new ParentContainsErrorRecordException(this),
-                        "UnauthorizedAccess",
-                        ErrorCategory.SecurityError,
-                        null);
-                }
+                _errorRecord ??= new ErrorRecord(
+                    new ParentContainsErrorRecordException(this),
+                    "UnauthorizedAccess",
+                    ErrorCategory.SecurityError,
+                    null);
 
                 return _errorRecord;
             }
diff --git a/src/System.Management.Automation/engine/ParameterBinderBase.cs b/src/System.Management.Automation/engine/ParameterBinderBase.cs
index ee7028c3865..4d72055b154 100644
--- a/src/System.Management.Automation/engine/ParameterBinderBase.cs
+++ b/src/System.Management.Automation/engine/ParameterBinderBase.cs
@@ -999,10 +999,7 @@ private object CoerceTypeAsNeeded(
 
             // Construct the collection type information if it wasn't passed in.
 
-            if (collectionTypeInfo == null)
-            {
-                collectionTypeInfo = new ParameterCollectionTypeInformation(toType);
-            }
+            collectionTypeInfo ??= new ParameterCollectionTypeInformation(toType);
 
             object originalValue = currentValue;
             object result = currentValue;
diff --git a/src/System.Management.Automation/engine/Pipe.cs b/src/System.Management.Automation/engine/Pipe.cs
index 2669e41ce31..c4050a2e8c0 100644
--- a/src/System.Management.Automation/engine/Pipe.cs
+++ b/src/System.Management.Automation/engine/Pipe.cs
@@ -233,34 +233,22 @@ internal void AddVariableList(VariableStreamKind kind, IList list)
             switch (kind)
             {
                 case VariableStreamKind.Error:
-                    if (_errorVariableList == null)
-                    {
-                        _errorVariableList = new List<IList>();
-                    }
+                    _errorVariableList ??= new List<IList>();
 
                     _errorVariableList.Add(list);
                     break;
                 case VariableStreamKind.Warning:
-                    if (_warningVariableList == null)
-                    {
-                        _warningVariableList = new List<IList>();
-                    }
+                    _warningVariableList ??= new List<IList>();
 
                     _warningVariableList.Add(list);
                     break;
                 case VariableStreamKind.Output:
-                    if (_outVariableList == null)
-                    {
-                        _outVariableList = new List<IList>();
-                    }
+                    _outVariableList ??= new List<IList>();
 
                     _outVariableList.Add(list);
                     break;
                 case VariableStreamKind.Information:
-                    if (_informationVariableList == null)
-                    {
-                        _informationVariableList = new List<IList>();
-                    }
+                    _informationVariableList ??= new List<IList>();
 
                     _informationVariableList.Add(list);
                     break;
diff --git a/src/System.Management.Automation/engine/SessionStateContainer.cs b/src/System.Management.Automation/engine/SessionStateContainer.cs
index 0d6f2a97fa2..8a070caec87 100644
--- a/src/System.Management.Automation/engine/SessionStateContainer.cs
+++ b/src/System.Management.Automation/engine/SessionStateContainer.cs
@@ -4087,10 +4087,7 @@ internal Collection<PSObject> CopyItem(string[] paths,
                 throw PSTraceSource.NewArgumentNullException(nameof(paths));
             }
 
-            if (copyPath == null)
-            {
-                copyPath = string.Empty;
-            }
+            copyPath ??= string.Empty;
 
             CmdletProviderContext context = new CmdletProviderContext(this.ExecutionContext);
             context.Force = force;
@@ -4153,10 +4150,7 @@ internal void CopyItem(
                 throw PSTraceSource.NewArgumentNullException(nameof(paths));
             }
 
-            if (copyPath == null)
-            {
-                copyPath = string.Empty;
-            }
+            copyPath ??= string.Empty;
 
             // Get the provider specific path for the destination
 
diff --git a/src/System.Management.Automation/engine/SessionStateLocationAPIs.cs b/src/System.Management.Automation/engine/SessionStateLocationAPIs.cs
index 6869f5071fb..56de07b8871 100644
--- a/src/System.Management.Automation/engine/SessionStateLocationAPIs.cs
+++ b/src/System.Management.Automation/engine/SessionStateLocationAPIs.cs
@@ -316,10 +316,7 @@ internal PathInfo SetLocation(string path, CmdletProviderContext context, bool l
                 }
             }
 
-            if (context == null)
-            {
-                context = new CmdletProviderContext(this.ExecutionContext);
-            }
+            context ??= new CmdletProviderContext(this.ExecutionContext);
 
             if (CurrentDrive != null)
             {
diff --git a/src/System.Management.Automation/engine/SessionStateProviderAPIs.cs b/src/System.Management.Automation/engine/SessionStateProviderAPIs.cs
index a6a7d2efc7f..0c94c9ea059 100644
--- a/src/System.Management.Automation/engine/SessionStateProviderAPIs.cs
+++ b/src/System.Management.Automation/engine/SessionStateProviderAPIs.cs
@@ -960,10 +960,7 @@ internal void InitializeProvider(
                 throw PSTraceSource.NewArgumentNullException(nameof(provider));
             }
 
-            if (context == null)
-            {
-                context = new CmdletProviderContext(this.ExecutionContext);
-            }
+            context ??= new CmdletProviderContext(this.ExecutionContext);
 
             // Initialize the provider so that it can add any drives
             // that it needs.
diff --git a/src/System.Management.Automation/engine/SessionStateScope.cs b/src/System.Management.Automation/engine/SessionStateScope.cs
index fc5dff00784..57c4c6388ba 100644
--- a/src/System.Management.Automation/engine/SessionStateScope.cs
+++ b/src/System.Management.Automation/engine/SessionStateScope.cs
@@ -1628,10 +1628,7 @@ internal Language.TypeResolutionState TypeResolutionState
 
         internal void AddType(string name, Type type)
         {
-            if (TypeTable == null)
-            {
-                TypeTable = new Dictionary<string, Type>(StringComparer.OrdinalIgnoreCase);
-            }
+            TypeTable ??= new Dictionary<string, Type>(StringComparer.OrdinalIgnoreCase);
 
             TypeTable[name] = type;
         }
diff --git a/src/System.Management.Automation/engine/TypeTable.cs b/src/System.Management.Automation/engine/TypeTable.cs
index 47238809c9f..5e41aec1eb6 100644
--- a/src/System.Management.Automation/engine/TypeTable.cs
+++ b/src/System.Management.Automation/engine/TypeTable.cs
@@ -771,10 +771,7 @@ private MemberSetData Read_MemberSet()
             }
 
             // Somewhat pointlessly (backcompat), we allow a missing Member node
-            if (members == null)
-            {
-                members = new Collection<TypeMemberData>();
-            }
+            members ??= new Collection<TypeMemberData>();
 
             if (_context.errors.Count != errorCount)
             {
@@ -841,10 +838,7 @@ private PropertySetData Read_PropertySet()
                                     {
                                         if ((object)_reader.LocalName == (object)_idName)
                                         {
-                                            if (referencedProperties == null)
-                                            {
-                                                referencedProperties = new List<string>(8);
-                                            }
+                                            referencedProperties ??= new List<string>(8);
 
                                             referencedProperties.Add(ReadElementString(_idName));
                                         }
@@ -3724,10 +3718,7 @@ private void ProcessTypeDataToAdd(ConcurrentBag<string> errors, TypeData typeDat
 
             if (hasStandardMembers)
             {
-                if (typeMembers == null)
-                {
-                    typeMembers = _extendedMembers.GetOrAdd(typeName, GetValueFactoryBasedOnInitCapacity(capacity: 1));
-                }
+                typeMembers ??= _extendedMembers.GetOrAdd(typeName, GetValueFactoryBasedOnInitCapacity(capacity: 1));
 
                 ProcessStandardMembers(errors, typeName, typeData.StandardMembers, propertySets, typeMembers, typeData.IsOverride);
             }
diff --git a/src/System.Management.Automation/engine/pipeline.cs b/src/System.Management.Automation/engine/pipeline.cs
index 152b3e771ed..7212b579339 100644
--- a/src/System.Management.Automation/engine/pipeline.cs
+++ b/src/System.Management.Automation/engine/pipeline.cs
@@ -1021,10 +1021,7 @@ private void Start(bool incomingStream)
             ValidateCommandProcessorNotNull(firstcommandProcessor, PipelineStrings.PipelineExecuteRequiresAtLeastOneCommand);
 
             // Set the execution scope using the current scope
-            if (_executionScope == null)
-            {
-                _executionScope = firstcommandProcessor.Context.EngineSessionState.CurrentScope;
-            }
+            _executionScope ??= firstcommandProcessor.Context.EngineSessionState.CurrentScope;
 
             // add ExternalSuccessOutput to the last command
             CommandProcessorBase LastCommandProcessor = _commands[_commands.Count - 1];

From 89cc6d1297040c0e1935067c6f3aab31c9101e20 Mon Sep 17 00:00:00 2001
From: Dominik Kaszewski <dakaszewski@gmail.com>
Date: Mon, 25 Jul 2022 19:43:48 +0200
Subject: [PATCH 487/645] Fix Test-Json not handling non-object types at root
 (#17741)

---
 .../commands/utility/TestJsonCommand.cs       |  3 +--
 .../Test-Json.Tests.ps1                       | 26 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
index 488cb4ab4ab..9d792b91233 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
@@ -136,12 +136,11 @@ e is SecurityException
         /// </summary>
         protected override void ProcessRecord()
         {
-            JObject parsedJson = null;
             bool result = true;
 
             try
             {
-                parsedJson = JObject.Parse(Json);
+                var parsedJson = JToken.Parse(Json);
 
                 if (_jschema != null)
                 {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Test-Json.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Test-Json.Tests.ps1
index d7653d7c1f3..2ea76f5826e 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Test-Json.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Test-Json.Tests.ps1
@@ -65,7 +65,7 @@ Describe "Test-Json" -Tags "CI" {
                 errorNode
             }
 "@
-}
+    }
 
     It "Missing JSON schema file doesn't exist" {
         Test-Path -LiteralPath $missingSchemaJsonPath | Should -BeFalse
@@ -152,4 +152,28 @@ Describe "Test-Json" -Tags "CI" {
         $errorVar[0].FullyQualifiedErrorId | Should -BeExactly "InvalidJsonAgainstSchema,Microsoft.PowerShell.Commands.TestJsonCommand"
         $errorVar[1].FullyQualifiedErrorId | Should -BeExactly "InvalidJsonAgainstSchema,Microsoft.PowerShell.Commands.TestJsonCommand"
     }
+
+    It 'Test-Json recognizes non-object types: <name>' -TestCases @(
+        @{ name = 'number'; value = 1; expected = 'number' }
+        @{ name = '"true"'; value = '"true"'; expected = 'string' }
+        @{ name = 'true'; value = 'true'; expected = 'boolean' }
+        @{ name = '"false"'; value = '"false"'; expected = 'string' }
+        @{ name = 'false'; value = 'false'; expected = 'boolean' }
+        @{ name = '"null"'; value = '"null"'; expected = 'string' }
+        @{ name = 'null'; value = 'null'; expected = 'null' }
+        @{ name = 'string'; value = '"abc"'; expected = 'string' }
+        @{ name = 'array'; value = '[ 1, 2 ]'; expected = 'array' }
+    ) {
+        param ($name, $value, $expected)
+
+        # All JSON valid
+        Test-Json -Json $value | Should -BeTrue
+
+        # Exactly one type should match
+        $types = 'string', 'number', 'boolean', 'null', 'array', 'object'
+        $types | Where-Object {
+            $schema = "{ 'type': '$_' }"
+            Test-Json -Json $value -Schema $schema -ErrorAction SilentlyContinue
+        } | Should -Be $expected
+    }
 }

From 5ccbb97ae3f575732b0a3ba3e9a61b2317c57005 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Mon, 25 Jul 2022 20:15:19 +0200
Subject: [PATCH 488/645] Fix type inference for `ICollection` (#17752)

---
 .../engine/parser/TypeInferenceVisitor.cs                   | 3 ++-
 test/powershell/engine/Api/TypeInference.Tests.ps1          | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs b/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
index 363ce3536d0..3ace7fb3a0a 100644
--- a/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
+++ b/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
@@ -2443,9 +2443,10 @@ public static IEnumerable<MethodInfo> GetGetterProperty(this Type type, string p
             foreach (var m in type.GetMethods(BindingFlags.Public | BindingFlags.Instance))
             {
                 var name = m.Name;
+                // Equals without string allocation
                 if (name.Length == propertyName.Length + 4
                     && name.StartsWith("get_")
-                    && propertyName.IndexOf(name, 4, StringComparison.Ordinal) == 4)
+                    && name.IndexOf(propertyName, 4, StringComparison.Ordinal) == 4)
                 {
                     res.Add(m);
                 }
diff --git a/test/powershell/engine/Api/TypeInference.Tests.ps1 b/test/powershell/engine/Api/TypeInference.Tests.ps1
index b5f2f645672..fbcc7845702 100644
--- a/test/powershell/engine/Api/TypeInference.Tests.ps1
+++ b/test/powershell/engine/Api/TypeInference.Tests.ps1
@@ -1251,6 +1251,12 @@ Describe "Type inference Tests" -tags "CI" {
         $res.Count | Should -Be 1
         $res.Name | Should -Be 'System.Int32[]'
     }
+
+    It 'Infers type of index item in an ICollection' -Skip:(!$IsWindows) {
+        $res = [AstTypeInference]::InferTypeOf( { (Get-Acl -Path C:\).Access[0] }.Ast)
+        $res.Count | Should -Be 1
+        $res.Name | Should -Be 'System.Security.AccessControl.AuthorizationRule'
+    }
 }
 
 Describe "AstTypeInference tests" -Tags CI {

From 8eb37cc44dc318bc1dfd42544a8751d53daa0c47 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Mon, 25 Jul 2022 20:17:26 +0200
Subject: [PATCH 489/645] Prevent braces from being removed when completing
 variables (#17751)

---
 .../engine/CommandCompletion/CompletionCompleters.cs  | 11 ++++++-----
 .../Host/TabCompletion/TabCompletion.Tests.ps1        |  8 +++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index 679ad427e9d..8c247de13b4 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -4789,6 +4789,7 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
             var lastAst = context.RelatedAsts?.Last();
             var variableAst = lastAst as VariableExpressionAst;
             var prefix = variableAst != null && variableAst.Splatted ? "@" : "$";
+            bool tokenAtCursorUsedBraces = context.TokenAtCursor is not null && context.TokenAtCursor.Text.StartsWith("${");
 
             // Look for variables in the input (e.g. parameters, etc.) before checking session state - these
             // variables might not exist in session state yet.
@@ -4934,7 +4935,7 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
                             }
                         }
 
-                        var completedName = (name.IndexOfAny(s_charactersRequiringQuotes) == -1)
+                        var completedName = (!tokenAtCursorUsedBraces && name.IndexOfAny(s_charactersRequiringQuotes) == -1)
                                                 ? prefix + provider + name
                                                 : prefix + "{" + provider + name + "}";
                         AddUniqueVariable(hashedResults, results, completedName, name, tooltip);
@@ -4957,7 +4958,7 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
                         if (!string.IsNullOrEmpty(name))
                         {
                             name = "env:" + name;
-                            var completedName = (name.IndexOfAny(s_charactersRequiringQuotes) == -1)
+                            var completedName = (!tokenAtCursorUsedBraces && name.IndexOfAny(s_charactersRequiringQuotes) == -1)
                                                     ? prefix + name
                                                     : prefix + "{" + name + "}";
                             AddUniqueVariable(hashedResults, results, completedName, name, "[string]" + name);
@@ -4972,7 +4973,7 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
             {
                 if (wildcardPattern.IsMatch(specialVariable))
                 {
-                    var completedName = (specialVariable.IndexOfAny(s_charactersRequiringQuotes) == -1)
+                    var completedName = (!tokenAtCursorUsedBraces && specialVariable.IndexOfAny(s_charactersRequiringQuotes) == -1)
                                             ? prefix + specialVariable
                                             : prefix + "{" + specialVariable + "}";
 
@@ -4998,7 +4999,7 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
                             var name = driveInfo.Name;
                             if (name != null && !string.IsNullOrWhiteSpace(name) && name.Length > 1)
                             {
-                                var completedName = (name.IndexOfAny(s_charactersRequiringQuotes) == -1)
+                                var completedName = (!tokenAtCursorUsedBraces && name.IndexOfAny(s_charactersRequiringQuotes) == -1)
                                                         ? prefix + name + ":"
                                                         : prefix + "{" + name + ":}";
 
@@ -5014,7 +5015,7 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
                 {
                     if (scopePattern.IsMatch(scope))
                     {
-                        var completedName = (scope.IndexOfAny(s_charactersRequiringQuotes) == -1)
+                        var completedName = (!tokenAtCursorUsedBraces && scope.IndexOfAny(s_charactersRequiringQuotes) == -1)
                                                 ? prefix + scope
                                                 : prefix + "{" + scope + "}";
                         AddUniqueVariable(hashedResults, results, completedName, scope, scope);
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 790dbe9ecc8..2134d64530a 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -358,6 +358,12 @@ switch ($x)
         $res.CompletionMatches[1].CompletionText | Should -BeExactly '-Functionality'
     }
 
+    It 'Should not remove braces when completing variable with braces' {
+        $Text = '"Hello${psversiont}World"'
+        $res = TabExpansion2 -inputScript $Text -cursorColumn $Text.IndexOf('p')
+        $res.CompletionMatches[0].CompletionText | Should -BeExactly '${PSVersionTable}'
+    }
+
     It 'Should work for variable assignment of enum type: <inputStr>' -TestCases @(
         @{ inputStr = '$ErrorActionPreference = '; filter = ''; doubleQuotes = $false }
         @{ inputStr = '$ErrorActionPreference='; filter = ''; doubleQuotes = $false }
@@ -1109,7 +1115,7 @@ ConstructorTestClass(int i, bool b)
                 @{ inputStr = '[System.Management.Automation.Runspaces.runspacef'; expected = 'System.Management.Automation.Runspaces.RunspaceFactory'; setup = $null }
                 @{ inputStr = '[specialfol'; expected = 'System.Environment+SpecialFolder'; setup = $null }
                 ## tab completion for variable names in '{}'
-                @{ inputStr = '${PSDefault'; expected = '$PSDefaultParameterValues'; setup = $null }
+                @{ inputStr = '${PSDefault'; expected = '${PSDefaultParameterValues}'; setup = $null }
             )
         }
 

From f1595c4b31870764372fd16a7add07a0a2f3feef Mon Sep 17 00:00:00 2001
From: Frode Flaten <3436158+fflaten@users.noreply.github.com>
Date: Mon, 25 Jul 2022 20:19:10 +0200
Subject: [PATCH 490/645] Fix test perf by stopping ongoing `write-progress`
 (#17749)

---
 .../Language/Scripting/ActionPreference.Tests.ps1           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/powershell/Language/Scripting/ActionPreference.Tests.ps1 b/test/powershell/Language/Scripting/ActionPreference.Tests.ps1
index 1188fe0d465..2f527652500 100644
--- a/test/powershell/Language/Scripting/ActionPreference.Tests.ps1
+++ b/test/powershell/Language/Scripting/ActionPreference.Tests.ps1
@@ -384,18 +384,18 @@ Describe 'ActionPreference.Break tests' -Tag 'CI' {
                     Write-Debug -Message 'This is a debug message'
                     Write-Information -MessageData 'This is an information message'
                     Write-Progress -Activity 'This shows progress'
+                    Write-Progress -Activity 'This shows progress' -Completed
                 }
                 Test-Break -WarningAction Break -InformationAction Break *>$null
                 $WarningPreference = $VerbosePreference = $DebugPreference = $InformationPreference = $ProgressPreference = [System.Management.Automation.ActionPreference]::Break
                 Test-Break *>$null
             }
-
             $results = @(Test-Debugger -Scriptblock $testScript)
         }
 
-        It 'Should show 7 debugger commands were invoked' {
+        It 'Should show 8 debugger commands were invoked' {
             # When no debugger commands are provided, 'c' is invoked every time a breakpoint is hit
-            $results.Count | Should -Be 7
+            $results.Count | Should -Be 8
         }
 
         It 'Write-Warning should trigger a breakpoint from -WarningAction Break' {

From e8c66a32822e5cd90384cdaa71def55d86900cd0 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <mr.molkree@gmail.com>
Date: Mon, 25 Jul 2022 22:26:01 +0400
Subject: [PATCH 491/645] Use null-coalescing assignment in `/remoting` and
 `/hostifaces` (#17728)

---
 .../engine/hostifaces/AsyncResult.cs          |  5 +----
 .../engine/hostifaces/LocalConnection.cs      | 10 ++--------
 .../engine/hostifaces/MshHostUserInterface.cs |  5 +----
 .../engine/hostifaces/PSDataCollection.cs     |  9 +++------
 .../engine/hostifaces/PSTask.cs               |  9 +++------
 .../engine/hostifaces/PowerShell.cs           | 20 ++++---------------
 .../engine/hostifaces/RunspacePoolInternal.cs |  5 +----
 .../engine/remoting/client/Job.cs             | 16 +++++----------
 .../engine/remoting/client/Job2.cs            |  3 +--
 .../engine/remoting/client/RunspaceRef.cs     |  9 +++------
 .../engine/remoting/client/remoterunspace.cs  |  5 +----
 .../remoting/commands/PSRemotingCmdlet.cs     |  5 +----
 .../engine/remoting/commands/ReceiveJob.cs    |  5 +----
 .../remoting/commands/getrunspacecommand.cs   |  5 +----
 .../remoting/commands/newrunspacecommand.cs   |  5 +----
 .../engine/remoting/common/psstreamobject.cs  |  2 +-
 .../remoting/fanin/BaseTransportManager.cs    |  5 +----
 .../fanin/InitialSessionStateProvider.cs      | 15 +++-----------
 .../fanin/PSSessionConfigurationData.cs       |  4 ++--
 .../server/OutOfProcServerMediator.cs         | 13 +++++-------
 .../server/ServerRunspacePoolDriver.cs        | 15 +++-----------
 21 files changed, 44 insertions(+), 126 deletions(-)

diff --git a/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs b/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs
index 09b042868f3..30e28d76576 100644
--- a/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs
+++ b/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs
@@ -85,10 +85,7 @@ public WaitHandle AsyncWaitHandle
                 {
                     lock (SyncObject)
                     {
-                        if (_completedWaitHandle == null)
-                        {
-                            _completedWaitHandle = new ManualResetEvent(IsCompleted);
-                        }
+                        _completedWaitHandle ??= new ManualResetEvent(IsCompleted);
                     }
                 }
 
diff --git a/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs b/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
index 647cc38f3c1..62ff66dff70 100644
--- a/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
@@ -84,10 +84,7 @@ public override PSPrimitiveDictionary GetApplicationPrivateData()
             {
                 lock (this.SyncRoot)
                 {
-                    if (_applicationPrivateData == null)
-                    {
-                        _applicationPrivateData = new PSPrimitiveDictionary();
-                    }
+                    _applicationPrivateData ??= new PSPrimitiveDictionary();
                 }
             }
 
@@ -768,10 +765,7 @@ internal void LogEngineHealthEvent(Exception exception,
         /// </remarks>
         internal PipelineThread GetPipelineThread()
         {
-            if (_pipelineThread == null)
-            {
-                _pipelineThread = new PipelineThread(this.ApartmentState);
-            }
+            _pipelineThread ??= new PipelineThread(this.ApartmentState);
 
             return _pipelineThread;
         }
diff --git a/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
index 636e888d475..0feeb73011f 100644
--- a/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
+++ b/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
@@ -1090,10 +1090,7 @@ internal static TranscriptionOption GetSystemTranscriptOption(TranscriptionOptio
                 // This way, multiple runspaces opened by the same process will share the same transcript.
                 lock (s_systemTranscriptLock)
                 {
-                    if (systemTranscript == null)
-                    {
-                        systemTranscript = PSHostUserInterface.GetTranscriptOptionFromSettings(transcription, currentTranscript);
-                    }
+                    systemTranscript ??= PSHostUserInterface.GetTranscriptOptionFromSettings(transcription, currentTranscript);
                 }
             }
 
diff --git a/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs b/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
index 2630a9b3448..516bc486970 100644
--- a/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
@@ -1322,12 +1322,9 @@ internal WaitHandle WaitHandle
                 {
                     lock (SyncObject)
                     {
-                        if (_readWaitHandle == null)
-                        {
-                            // Create the handle signaled if there are objects in the buffer
-                            // or the buffer has been closed.
-                            _readWaitHandle = new ManualResetEvent(_data.Count > 0 || !_isOpen);
-                        }
+                        // Create the handle signaled if there are objects in the buffer
+                        // or the buffer has been closed.
+                        _readWaitHandle ??= new ManualResetEvent(_data.Count > 0 || !_isOpen);
                     }
                 }
 
diff --git a/src/System.Management.Automation/engine/hostifaces/PSTask.cs b/src/System.Management.Automation/engine/hostifaces/PSTask.cs
index 6e08733cc2b..d7e50020310 100644
--- a/src/System.Management.Automation/engine/hostifaces/PSTask.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PSTask.cs
@@ -1536,12 +1536,9 @@ public Debugger Debugger
         {
             get
             {
-                if (_jobDebuggerWrapper == null)
-                {
-                    _jobDebuggerWrapper = new PSTaskChildDebugger(
-                        _task.Debugger,
-                        this.Name);
-                }
+                _jobDebuggerWrapper ??= new PSTaskChildDebugger(
+                    _task.Debugger,
+                    this.Name);
 
                 return _jobDebuggerWrapper;
             }
diff --git a/src/System.Management.Automation/engine/hostifaces/PowerShell.cs b/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
index 2f8c1564a93..91b657511f6 100644
--- a/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
@@ -762,10 +762,7 @@ internal void InitForRemotePipeline(CommandCollection command, ObjectStreamBase
 
             // create the client remote powershell for remoting
             // communications
-            if (RemotePowerShell == null)
-            {
-                RemotePowerShell = new ClientRemotePowerShell(this, ((RunspacePool)_rsConnection).RemoteRunspacePoolInternal);
-            }
+            RemotePowerShell ??= new ClientRemotePowerShell(this, ((RunspacePool)_rsConnection).RemoteRunspacePoolInternal);
 
             // If we get here, we don't call 'Invoke' or any of it's friends on 'this', instead we serialize 'this' in PowerShell.ToPSObjectForRemoting.
             // Without the following two steps, we'll be missing the 'ExtraCommands' on the serialized instance of 'this'.
@@ -804,10 +801,7 @@ internal void InitForRemotePipelineConnect(ObjectStreamBase inputstream, ObjectS
 
             RedirectShellErrorOutputPipe = redirectShellErrorOutputPipe;
 
-            if (RemotePowerShell == null)
-            {
-                RemotePowerShell = new ClientRemotePowerShell(this, ((RunspacePool)_rsConnection).RemoteRunspacePoolInternal);
-            }
+            RemotePowerShell ??= new ClientRemotePowerShell(this, ((RunspacePool)_rsConnection).RemoteRunspacePoolInternal);
 
             if (!RemotePowerShell.Initialized)
             {
@@ -2236,10 +2230,7 @@ internal void InvokeWithDebugger(
             {
                 if (addToHistory)
                 {
-                    if (settings == null)
-                    {
-                        settings = new PSInvocationSettings();
-                    }
+                    settings ??= new PSInvocationSettings();
 
                     settings.AddToHistory = true;
                 }
@@ -3544,10 +3535,7 @@ private void BatchInvocationCallback(IAsyncResult result)
                         break;
                 }
 
-                if (objs == null)
-                {
-                    objs = _batchAsyncResult.Output;
-                }
+                objs ??= _batchAsyncResult.Output;
 
                 DoRemainingBatchCommands(objs);
             }
diff --git a/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs b/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs
index dbfdeb1f34e..0fc328f0d5a 100644
--- a/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs
+++ b/src/System.Management.Automation/engine/hostifaces/RunspacePoolInternal.cs
@@ -231,10 +231,7 @@ internal virtual PSPrimitiveDictionary GetApplicationPrivateData()
             {
                 lock (this.syncObject)
                 {
-                    if (_applicationPrivateData == null)
-                    {
-                        _applicationPrivateData = new PSPrimitiveDictionary();
-                    }
+                    _applicationPrivateData ??= new PSPrimitiveDictionary();
                 }
             }
 
diff --git a/src/System.Management.Automation/engine/remoting/client/Job.cs b/src/System.Management.Automation/engine/remoting/client/Job.cs
index 517fda61113..99b7a2f6473 100644
--- a/src/System.Management.Automation/engine/remoting/client/Job.cs
+++ b/src/System.Management.Automation/engine/remoting/client/Job.cs
@@ -633,10 +633,7 @@ public IList<Job> ChildJobs
                 {
                     lock (syncObject)
                     {
-                        if (_childJobs == null)
-                        {
-                            _childJobs = new List<Job>();
-                        }
+                        _childJobs ??= new List<Job>();
                     }
                 }
 
@@ -3371,13 +3368,10 @@ protected void ProcessJobFailure(ExecutionCmdletHelper helper, out Exception fai
                     }
                 }
 
-                if (failureException == null)
-                {
-                    failureException = new RuntimeException(
-                        PSRemotingErrorInvariants.FormatResourceString(
-                            RemotingErrorIdStrings.RemoteRunspaceOpenUnknownState,
-                            runspace.RunspaceStateInfo.State));
-                }
+                failureException ??= new RuntimeException(
+                    PSRemotingErrorInvariants.FormatResourceString(
+                        RemotingErrorIdStrings.RemoteRunspaceOpenUnknownState,
+                        runspace.RunspaceStateInfo.State));
 
                 failureErrorRecord = new ErrorRecord(failureException, targetObject,
                                 fullyQualifiedErrorId, ErrorCategory.OpenError,
diff --git a/src/System.Management.Automation/engine/remoting/client/Job2.cs b/src/System.Management.Automation/engine/remoting/client/Job2.cs
index df60a2c17f5..074fa19afd9 100644
--- a/src/System.Management.Automation/engine/remoting/client/Job2.cs
+++ b/src/System.Management.Automation/engine/remoting/client/Job2.cs
@@ -93,8 +93,7 @@ public List<CommandParameterCollection> StartParameters
                 {
                     lock (_syncobject)
                     {
-                        if (_parameters == null)
-                            _parameters = new List<CommandParameterCollection>();
+                        _parameters ??= new List<CommandParameterCollection>();
                     }
                 }
 
diff --git a/src/System.Management.Automation/engine/remoting/client/RunspaceRef.cs b/src/System.Management.Automation/engine/remoting/client/RunspaceRef.cs
index dfd1cd3bf7f..b3bfbe9a0d9 100644
--- a/src/System.Management.Automation/engine/remoting/client/RunspaceRef.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RunspaceRef.cs
@@ -208,12 +208,9 @@ internal Pipeline CreatePipeline(string line, bool addToHistory, bool useNestedP
             }
 
             // If that didn't work out fall-back to the traditional approach.
-            if (pipeline == null)
-            {
-                pipeline = useNestedPipelines ?
-                    _runspaceRef.Value.CreateNestedPipeline(line, addToHistory) :
-                    _runspaceRef.Value.CreatePipeline(line, addToHistory);
-            }
+            pipeline ??= useNestedPipelines ?
+                _runspaceRef.Value.CreateNestedPipeline(line, addToHistory) :
+                _runspaceRef.Value.CreatePipeline(line, addToHistory);
 
             // Add robust connection callback if this is a pushed runspace.
             RemotePipeline remotePipeline = pipeline as RemotePipeline;
diff --git a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
index dc85e049838..6dcee34d76d 100644
--- a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
+++ b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
@@ -2911,10 +2911,7 @@ private T InvokeRemoteBreakpointFunction<T>(string functionName, Dictionary<stri
 
         private void CheckRemoteBreakpointManagementSupport(string breakpointCommandNameToCheck)
         {
-            if (_remoteBreakpointManagementIsSupported == null)
-            {
-                _remoteBreakpointManagementIsSupported = _remoteDebuggingCapability.IsCommandSupported(breakpointCommandNameToCheck);
-            }
+            _remoteBreakpointManagementIsSupported ??= _remoteDebuggingCapability.IsCommandSupported(breakpointCommandNameToCheck);
 
             if (!_remoteBreakpointManagementIsSupported.Value)
             {
diff --git a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
index a3475bf9465..66021f6e282 100644
--- a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
@@ -4233,10 +4233,7 @@ internal static TypeTable BuiltInTypesTable
                 {
                     lock (s_SyncObject)
                     {
-                        if (s_TypeTable == null)
-                        {
-                            s_TypeTable = TypeTable.LoadDefaultTypeFiles();
-                        }
+                        s_TypeTable ??= TypeTable.LoadDefaultTypeFiles();
                     }
                 }
 
diff --git a/src/System.Management.Automation/engine/remoting/commands/ReceiveJob.cs b/src/System.Management.Automation/engine/remoting/commands/ReceiveJob.cs
index 97585f1de1b..2b1436519cd 100644
--- a/src/System.Management.Automation/engine/remoting/commands/ReceiveJob.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/ReceiveJob.cs
@@ -1065,10 +1065,7 @@ private void AggregateResultsFromJob(Job job)
                 {
                     lock (_syncObject)
                     {
-                        if (_outputProcessingNotification == null)
-                        {
-                            _outputProcessingNotification = new OutputProcessingState();
-                        }
+                        _outputProcessingNotification ??= new OutputProcessingState();
                     }
                 }
 
diff --git a/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs b/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs
index d1fc8ef531a..080c05c9d63 100644
--- a/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs
@@ -343,10 +343,7 @@ protected override void BeginProcessing()
         {
             base.BeginProcessing();
 
-            if (ConfigurationName == null)
-            {
-                ConfigurationName = string.Empty;
-            }
+            ConfigurationName ??= string.Empty;
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
index 2df942f9e01..a3cfba96675 100644
--- a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
@@ -524,10 +524,7 @@ private void HandleRunspaceStateChanged(object sender, OperationStateEventArgs s
                             }
                         }
 
-                        if (reason == null)
-                        {
-                            reason = new RuntimeException(this.GetMessage(RemotingErrorIdStrings.RemoteRunspaceOpenUnknownState, state));
-                        }
+                        reason ??= new RuntimeException(this.GetMessage(RemotingErrorIdStrings.RemoteRunspaceOpenUnknownState, state));
 
                         string fullyQualifiedErrorId = WSManTransportManagerUtils.GetFQEIDFromTransportError(
                             transErrorCode,
diff --git a/src/System.Management.Automation/engine/remoting/common/psstreamobject.cs b/src/System.Management.Automation/engine/remoting/common/psstreamobject.cs
index 4e755893886..ee898c74006 100644
--- a/src/System.Management.Automation/engine/remoting/common/psstreamobject.cs
+++ b/src/System.Management.Automation/engine/remoting/common/psstreamobject.cs
@@ -499,7 +499,7 @@ internal static string CreateInformationalMessage(Guid instanceId, string messag
         internal static ErrorRecord AddSourceTagToError(ErrorRecord errorRecord, Guid sourceId)
         {
             if (errorRecord == null) return null;
-            if (errorRecord.ErrorDetails == null) errorRecord.ErrorDetails = new ErrorDetails(string.Empty);
+            errorRecord.ErrorDetails ??= new ErrorDetails(string.Empty);
             errorRecord.ErrorDetails.RecommendedAction = CreateInformationalMessage(sourceId, errorRecord.ErrorDetails.RecommendedAction);
             return errorRecord;
         }
diff --git a/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
index 780c71f2ee7..57268568165 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
@@ -1359,10 +1359,7 @@ internal void SendDataToClient<T>(RemoteDataObject<T> data, bool flush, bool rep
                                                                             data.Data);
                 if (_isSerializing)
                 {
-                    if (_dataToBeSentQueue == null)
-                    {
-                        _dataToBeSentQueue = new Queue<Tuple<RemoteDataObject, bool, bool>>();
-                    }
+                    _dataToBeSentQueue ??= new Queue<Tuple<RemoteDataObject, bool, bool>>();
 
                     _dataToBeSentQueue.Enqueue(new Tuple<RemoteDataObject, bool, bool>(dataToBeSent, flush, reportPending));
                     return;
diff --git a/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs b/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
index 744e8ff8e1c..088685c28e0 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
@@ -286,15 +286,9 @@ internal static ConfigurationDataFromXML Create(string initializationParameters)
             }
 
             // assign defaults after parsing the xml content.
-            if (result.MaxReceivedObjectSizeMB == null)
-            {
-                result.MaxReceivedObjectSizeMB = BaseTransportManager.MaximumReceivedObjectSize;
-            }
+            result.MaxReceivedObjectSizeMB ??= BaseTransportManager.MaximumReceivedObjectSize;
 
-            if (result.MaxReceivedCommandSizeMB == null)
-            {
-                result.MaxReceivedCommandSizeMB = BaseTransportManager.MaximumReceivedDataSize;
-            }
+            result.MaxReceivedCommandSizeMB ??= BaseTransportManager.MaximumReceivedDataSize;
 
             return result;
         }
@@ -1740,10 +1734,7 @@ internal DISCPowerShellConfiguration(
             bool validateFile = false)
         {
             _configFile = configFile;
-            if (roleVerifier == null)
-            {
-                roleVerifier = static (role) => false;
-            }
+            roleVerifier ??= static (role) => false;
 
             Runspace backupRunspace = Runspace.DefaultRunspace;
 
diff --git a/src/System.Management.Automation/engine/remoting/fanin/PSSessionConfigurationData.cs b/src/System.Management.Automation/engine/remoting/fanin/PSSessionConfigurationData.cs
index 6da557cca40..fbd2653c8a7 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/PSSessionConfigurationData.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/PSSessionConfigurationData.cs
@@ -224,8 +224,8 @@ private void Update(string optionName, string optionValue)
 
         private void CreateCollectionIfNecessary()
         {
-            if (_modulesToImport == null) _modulesToImport = new List<string>();
-            if (_modulesToImportInternal == null) _modulesToImportInternal = new List<object>();
+            _modulesToImport ??= new List<string>();
+            _modulesToImportInternal ??= new List<object>();
         }
 
         private const string SessionConfigToken = "SessionConfigurationData";
diff --git a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
index 6fd6ae59cd4..d61fee7147e 100644
--- a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
+++ b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
@@ -358,14 +358,11 @@ protected void Start(
                     string data = originalStdIn.ReadLine();
                     lock (_syncObject)
                     {
-                        if (sessionTM == null)
-                        {
-                            sessionTM = CreateSessionTransportManager(
-                                configurationName: configurationName,
-                                configurationFile: configurationFile,
-                                cryptoHelper: cryptoHelper,
-                                workingDirectory: workingDirectory);
-                        }
+                        sessionTM ??= CreateSessionTransportManager(
+                            configurationName: configurationName,
+                            configurationFile: configurationFile,
+                            cryptoHelper: cryptoHelper,
+                            workingDirectory: workingDirectory);
                     }
 
                     if (string.IsNullOrEmpty(data))
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs b/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
index 69866f2d4ee..e32658b7259 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
@@ -271,10 +271,7 @@ internal void Start()
         internal void SendApplicationPrivateDataToClient()
         {
             // Include Debug mode information.
-            if (_applicationPrivateData == null)
-            {
-                _applicationPrivateData = new PSPrimitiveDictionary();
-            }
+            _applicationPrivateData ??= new PSPrimitiveDictionary();
 
             if (_serverRemoteDebugger != null)
             {
@@ -2004,10 +2001,7 @@ public override DebuggerCommandResults ProcessCommand(PSCommand command, PSDataC
                     StringUtil.Format(DebuggerStrings.CannotProcessDebuggerCommandNotStopped));
             }
 
-            if (_processCommandCompleteEvent == null)
-            {
-                _processCommandCompleteEvent = new ManualResetEventSlim(false);
-            }
+            _processCommandCompleteEvent ??= new ManualResetEventSlim(false);
 
             _threadCommandProcessing = new ThreadCommandProcessing(command, output, _wrappedDebugger.Value, _processCommandCompleteEvent);
             try
@@ -2527,10 +2521,7 @@ private void EnterDebugMode(bool isNestedStop)
                 {
                     // Blocking call for nested debugger execution (Debug-Runspace) stop events.
                     // The root debugger never makes two EnterDebugMode calls without an ExitDebugMode.
-                    if (_nestedDebugStopCompleteEvent == null)
-                    {
-                        _nestedDebugStopCompleteEvent = new ManualResetEventSlim(false);
-                    }
+                    _nestedDebugStopCompleteEvent ??= new ManualResetEventSlim(false);
 
                     _nestedDebugging = true;
                     OnEnterDebugMode(_nestedDebugStopCompleteEvent);

From 3d4e294262d2f2d7472ebd5d849b1b68fd6ef524 Mon Sep 17 00:00:00 2001
From: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
Date: Mon, 25 Jul 2022 20:27:23 +0200
Subject: [PATCH 492/645] Improve type inference for `$_` (#17716)

---
 .../engine/parser/TypeInferenceVisitor.cs     | 123 ++++++++++--------
 .../engine/Api/TypeInference.Tests.ps1        |  85 ++++++++++++
 2 files changed, 156 insertions(+), 52 deletions(-)

diff --git a/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs b/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
index 3ace7fb3a0a..25bd7f999a5 100644
--- a/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
+++ b/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
@@ -1840,82 +1840,101 @@ private void InferTypeFrom(VariableExpressionAst variableExpressionAst, List<PST
                 (SpecialVariables.IsUnderbar(astVariablePath.UserPath)
                  || astVariablePath.UserPath.EqualsOrdinalIgnoreCase(SpecialVariables.PSItem)))
             {
-                // $_ is special, see if we're used in a script block in some pipeline.
-                while (parent != null)
-                {
-                    if (parent is ScriptBlockExpressionAst || parent is CatchClauseAst)
+                // The automatic variable $_ is assigned a value in scriptblocks, Switch loops and Catch/Trap statements
+                // This loop will find whichever Ast that determines the value of $_
+                // The value in scriptblocks is determined by the parents of that scriptblock, the only interesting scenarios are:
+                // 1: MemberInvocation like: $Collection.Where({$_})
+                // 2: Command pipelines like: dir | where {$_}
+                // The value in a Switch loop is whichever item is in the condition part of the statement.
+                // The value in Catch/Trap statements is always an error record.
+                bool hasSeenScriptBlock = false;
+                while (parent is not null)
+                {
+                    if (parent is CatchClauseAst or TrapStatementAst)
                     {
                         break;
                     }
-
-                    parent = parent.Parent;
-                }
-
-                if (parent != null)
-                {
-                    if (parent.Parent is CommandExpressionAst && parent.Parent.Parent is PipelineAst)
+                    else if (parent is SwitchStatementAst switchStatement)
                     {
-                        // Script block in a hash table, could be something like:
-                        //     dir | ft @{ Expression = { $_ } }
-
-                        if (parent.Parent.Parent.Parent is HashtableAst)
-                        {
-                            parent = parent.Parent.Parent.Parent;
-                        }
-                        else if (parent.Parent.Parent.Parent is ArrayLiteralAst && parent.Parent.Parent.Parent.Parent is HashtableAst)
+                        parent = switchStatement.Condition;
+                        break;
+                    }
+                    else if (parent is ErrorStatementAst switchErrorStatement && switchErrorStatement.Kind?.Kind == TokenKind.Switch)
+                    {
+                        if (switchErrorStatement.Conditions?.Count > 0)
                         {
-                            parent = parent.Parent.Parent.Parent.Parent;
+                            parent = switchErrorStatement.Conditions[0];
                         }
+                        break;
                     }
-
-                    if (parent.Parent is CommandParameterAst)
+                    else if (parent is ScriptBlockExpressionAst)
                     {
-                        parent = parent.Parent;
+                        hasSeenScriptBlock = true;
                     }
-
-                    if (parent is CatchClauseAst catchBlock)
+                    else if (hasSeenScriptBlock)
                     {
-                        if (catchBlock.CatchTypes.Count > 0)
+                        if (parent is InvokeMemberExpressionAst invokeMember)
                         {
-                            foreach (TypeConstraintAst catchType in catchBlock.CatchTypes)
+                            parent = invokeMember.Expression;
+                            break;
+                        }
+                        else if (parent is CommandAst cmdAst && cmdAst.Parent is PipelineAst pipeline && pipeline.PipelineElements.Count > 1)
+                        {
+                            // We've found a pipeline with multiple commands, now we need to determine what command came before the command with the scriptblock:
+                            // eg Get-Partition in this example: Get-Disk | Get-Partition | Where {$_}
+                            var indexOfPreviousCommand = pipeline.PipelineElements.IndexOf(cmdAst) - 1;
+                            if (indexOfPreviousCommand >= 0)
                             {
-                                Type exceptionType = catchType.TypeName.GetReflectionType();
-                                if (exceptionType != null && typeof(Exception).IsAssignableFrom(exceptionType))
-                                {
-                                    inferredTypes.Add(new PSTypeName(typeof(ErrorRecord<>).MakeGenericType(exceptionType)));
-                                }
+                                parent = pipeline.PipelineElements[indexOfPreviousCommand];
+                                break;
                             }
                         }
-                        else
+                    }
+
+                    parent = parent.Parent;
+                }
+
+                if (parent is CatchClauseAst catchBlock)
+                {
+                    if (catchBlock.CatchTypes.Count > 0)
+                    {
+                        foreach (TypeConstraintAst catchType in catchBlock.CatchTypes)
                         {
-                            inferredTypes.Add(new PSTypeName(typeof(ErrorRecord)));
+                            Type exceptionType = catchType.TypeName.GetReflectionType();
+                            if (typeof(Exception).IsAssignableFrom(exceptionType))
+                            {
+                                inferredTypes.Add(new PSTypeName(typeof(ErrorRecord<>).MakeGenericType(exceptionType)));
+                            }
                         }
-
-                        return;
                     }
 
-                    if (parent.Parent is CommandAst commandAst)
+                    // Either no type constraint was specified, or all the specified catch types were unavailable but we still know it's an error record.
+                    if (inferredTypes.Count == 0)
+                    {
+                        inferredTypes.Add(new PSTypeName(typeof(ErrorRecord)));
+                    }
+                }
+                else if (parent is TrapStatementAst trap)
+                {
+                    if (trap.TrapType is not null)
                     {
-                        // We found a command, see if there is a previous command in the pipeline.
-                        PipelineAst pipelineAst = (PipelineAst)commandAst.Parent;
-                        var previousCommandIndex = pipelineAst.PipelineElements.IndexOf(commandAst) - 1;
-                        if (previousCommandIndex < 0)
+                        Type exceptionType = trap.TrapType.TypeName.GetReflectionType();
+                        if (typeof(Exception).IsAssignableFrom(exceptionType))
                         {
-                            return;
+                            inferredTypes.Add(new PSTypeName(typeof(ErrorRecord<>).MakeGenericType(exceptionType)));
                         }
-
-                        AddInferredTypesForDollarUnderbar(pipelineAst.PipelineElements[0], inferredTypes);
-
-                        return;
                     }
-
-                    if (parent.Parent is InvokeMemberExpressionAst memberExpression)
+                    if (inferredTypes.Count == 0)
                     {
-                        AddInferredTypesForDollarUnderbar(memberExpression.Expression, inferredTypes);
-                        
-                        return;
+                        inferredTypes.Add(new PSTypeName(typeof(ErrorRecord)));
                     }
                 }
+                else if (parent is not null)
+                {
+                    AddInferredTypesForDollarUnderbar(parent, inferredTypes);
+                }
+
+                return;
             }
 
             // For certain variables, we always know their type, well at least we can assume we know.
@@ -2072,7 +2091,7 @@ private void AddInferredTypesForDollarUnderbar(Ast parentExpression, List<PSType
                         continue;
                     }
 
-                    if (typeof(IEnumerable).IsAssignableFrom(result.Type))
+                    if (result.Type != typeof(string) && typeof(IEnumerable).IsAssignableFrom(result.Type))
                     {
                         // We can't deduce much from IEnumerable, but we can if it's generic.
                         var enumerableInterfaces = result.Type.GetInterfaces();
diff --git a/test/powershell/engine/Api/TypeInference.Tests.ps1 b/test/powershell/engine/Api/TypeInference.Tests.ps1
index fbcc7845702..cd99abaf46e 100644
--- a/test/powershell/engine/Api/TypeInference.Tests.ps1
+++ b/test/powershell/engine/Api/TypeInference.Tests.ps1
@@ -1079,6 +1079,42 @@ Describe "Type inference Tests" -tags "CI" {
         $res.Name | Should -Be System.Exception
     }
 
+    It 'Infers type of variable $_ in pipeline with more than one element' {
+        $memberAst = { Get-Date | New-Guid | Select-Object -Property {$_} }.Ast.Find({ param($a) $a -is [System.Management.Automation.Language.VariableExpressionAst] }, $true)
+        $res = [AstTypeInference]::InferTypeOf($memberAst)
+
+        $res | Should -HaveCount 1
+        $res.Name | Should -Be System.Guid
+    }
+    It 'Infers type of variable $_ in array of calculated properties' {
+        $variableAst = { New-TimeSpan | Select-Object -Property Day,@{n="min";e={$_}} }.Ast.Find({ param($a) $a -is [System.Management.Automation.Language.VariableExpressionAst] }, $true)
+        $res = [AstTypeInference]::InferTypeOf($variableAst)
+
+        $res | Should -HaveCount 1
+        $res.Name | Should -Be System.TimeSpan
+    }
+
+    It 'Infers type of variable $_ in switch statement' {
+        $variableAst = {
+        switch ("Hello","World")
+        {
+            'Hello'
+            {
+                $_
+            }
+        } }.Ast.Find({ param($a) $a -is [System.Management.Automation.Language.VariableExpressionAst] }, $true)
+        $res = [AstTypeInference]::InferTypeOf($variableAst)
+
+        $res | Should -HaveCount 1
+        $res.Name | Should -Be System.String
+    }
+
+    It 'Does not infer string in pipeline as char' {
+        $variableAst = { "Hello" | Select-Object -Property @{n="min";e={$_}} }.Ast.Find({ param($a) $a -is [System.Management.Automation.Language.VariableExpressionAst] }, $true)
+        $res = [AstTypeInference]::InferTypeOf($variableAst)
+        $res.Name | Should -Be System.String
+    }
+
     $catchClauseTypes = @(
         @{ Type = 'System.ArgumentException' }
         @{ Type = 'System.ArgumentNullException' }
@@ -1147,6 +1183,55 @@ Describe "Type inference Tests" -tags "CI" {
         $res[1].Name | Should -Be System.Exception
     }
 
+    It 'falls back to a generic ErrorRecord if catch exception type is invalid' {
+        $VariableAst = {
+            try {}
+            catch [ThisTypeDoesNotExist] { $_ }
+        }.Ast.Find(
+            { param($a) $a -is [System.Management.Automation.Language.VariableExpressionAst] },
+            $true
+        )
+        $res = [AstTypeInference]::InferTypeOf($VariableAst)
+
+        $res.Name | Should -Be System.Management.Automation.ErrorRecord
+    }
+
+    It 'Infers type of trap statement' {
+        $VariableAst = {
+            trap { $_ }
+        }.Ast.Find(
+            { param($a) $a -is [System.Management.Automation.Language.VariableExpressionAst] },
+            $true
+        )
+        $res = [AstTypeInference]::InferTypeOf($VariableAst)
+
+        $res.Name | Should -Be System.Management.Automation.ErrorRecord
+    }
+
+    It 'Infers type of exception in typed trap statement' {
+        $memberAst = {
+            trap [System.DivideByZeroException] { $_.Exception }
+        }.Ast.Find(
+            { param($a) $a -is [System.Management.Automation.Language.MemberExpressionAst] },
+            $true
+        )
+        $res = [AstTypeInference]::InferTypeOf($memberAst)
+
+        $res.Name | Should -Be System.DivideByZeroException
+    }
+
+    It 'falls back to a generic ErrorRecord if trap exception type is invalid' {
+        $VariableAst = {
+            trap [ThisTypeDoesNotExist] { $_ }
+        }.Ast.Find(
+            { param($a) $a -is [System.Management.Automation.Language.VariableExpressionAst] },
+            $true
+        )
+        $res = [AstTypeInference]::InferTypeOf($VariableAst)
+
+        $res.Name | Should -Be System.Management.Automation.ErrorRecord
+    }
+
     It 'Infers type of function member' {
         $res = [AstTypeInference]::InferTypeOf( {
                 class X {

From ec0dba46055e02fd0d554fbc47f4ff18fca7eb9c Mon Sep 17 00:00:00 2001
From: William Easton <williamseaston@gmail.com>
Date: Mon, 25 Jul 2022 16:14:56 -0500
Subject: [PATCH 493/645] Remove pre-parse for array-based JSON (#15684)

---
 .../commands/utility/WebCmdlet/JsonObject.cs     | 16 ----------------
 .../ConvertFrom-Json.Tests.ps1                   | 10 +++++++++-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
index 3113dc40d85..8e156152020 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
@@ -160,22 +160,6 @@ public static object ConvertFromJson(string input, bool returnHashtable, int? ma
             error = null;
             try
             {
-                // JsonConvert.DeserializeObject does not throw an exception when an invalid Json array is passed.
-                // This issue is being tracked by https://github.com/JamesNK/Newtonsoft.Json/issues/1930.
-                // To work around this, we need to identify when input is a Json array, and then try to parse it via JArray.Parse().
-
-                // If input starts with '[' (ignoring white spaces).
-                if (Regex.Match(input, @"^\s*\[").Success)
-                {
-                    // JArray.Parse() will throw a JsonException if the array is invalid.
-                    // This will be caught by the catch block below, and then throw an
-                    // ArgumentException - this is done to have same behavior as the JavaScriptSerializer.
-                    JArray.Parse(input);
-
-                    // Please note that if the Json array is valid, we don't do anything,
-                    // we just continue the deserialization.
-                }
-
                 var obj = JsonConvert.DeserializeObject(
                     input,
                     new JsonSerializerSettings
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Json.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Json.Tests.ps1
index 135625db986..f03b29e4c82 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Json.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertFrom-Json.Tests.ps1
@@ -58,7 +58,15 @@ Describe 'ConvertFrom-Json Unit Tests' -tags "CI" {
             $json | Should -BeOfType Hashtable
         }
     }
-
+    
+	It 'Throws an ArgumentException with an incomplete array with AsHashtable switch set to <AsHashtable>' -TestCase $testCasesWithAndWithoutAsHashtableSwitch {
+        Param($AsHashtable)
+        { ConvertFrom-Json '["1",' -AsHashtable:$AsHashtable } |
+            Should -Throw -ErrorId "System.ArgumentException,Microsoft.PowerShell.Commands.ConvertFromJsonCommand"
+        { ConvertFrom-Json '[' -AsHashtable:$AsHashtable } |
+            Should -Throw -ErrorId "System.ArgumentException,Microsoft.PowerShell.Commands.ConvertFromJsonCommand"
+    }
+	
     It 'Can convert multi-line object with AsHashtable switch set to <AsHashtable>' -TestCases $testCasesWithAndWithoutAsHashtableSwitch {
         Param($AsHashtable)
         $json = @('{"a" :', '"x"}') | ConvertFrom-Json -AsHashtable:$AsHashtable

From 1a8d23f5781ca97a70c6e2717527810cb32b0f98 Mon Sep 17 00:00:00 2001
From: Ananya Vishnoi <71982267+ananya26-vishnoi@users.noreply.github.com>
Date: Tue, 26 Jul 2022 02:45:58 +0530
Subject: [PATCH 494/645] Update README.md with the current Fedora version
 (#15717)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d2fef66fb0b..518bf2ba212 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ You can download and install a PowerShell package for any of the following platf
 | [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]     |
+| [Fedora 35][corefx-linux]                  | [.rpm][lts-rh]          | [.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]      |
 | Docker                                     |                         |                         |                       | [Instructions][in-docker]     |

From d72cedd70bff63c6ced2f2ea2588f999fb5c1c94 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Mon, 25 Jul 2022 15:07:26 -0700
Subject: [PATCH 495/645] Fix `FileSystemProvider` to work with volume and pipe
 paths (#15873)

---
 .../engine/Utils.cs                             |  6 +++---
 .../namespaces/FileSystemProvider.cs            | 17 +++++++++--------
 .../Get-ChildItem.Tests.ps1                     | 12 ++++++++++++
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/System.Management.Automation/engine/Utils.cs b/src/System.Management.Automation/engine/Utils.cs
index 16ac72bfb12..eb6adb8b7a3 100644
--- a/src/System.Management.Automation/engine/Utils.cs
+++ b/src/System.Management.Automation/engine/Utils.cs
@@ -1281,7 +1281,7 @@ internal static bool IsReservedDeviceName(string destinationPath)
             return false;
         }
 
-        internal static bool PathIsUnc(string path)
+        internal static bool PathIsUnc(string path, bool networkOnly = false)
         {
 #if UNIX
             return false;
@@ -1291,8 +1291,8 @@ internal static bool PathIsUnc(string path)
                 return false;
             }
 
-            // handle special cases like \\wsl$\ubuntu which isn't a UNC path, but we can say it is so the filesystemprovider can use it
-            if (path.StartsWith(WslRootPath, StringComparison.OrdinalIgnoreCase))
+            // handle special cases like '\\wsl$\ubuntu', '\\?\', and '\\.\pipe\' which aren't a UNC path, but we can say it is so the filesystemprovider can use it
+            if (!networkOnly && (path.StartsWith(WslRootPath, StringComparison.OrdinalIgnoreCase) || path.StartsWith("\\\\?\\") || path.StartsWith("\\\\.\\")))
             {
                 return true;
             }
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index 84cc0d47823..3d28b5bb7c5 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -132,20 +132,21 @@ private static string GetCorrectCasedPath(string path)
                     itemsToSkip = 4;
                 }
 
-                foreach (string item in path.Split(StringLiterals.DefaultPathSeparator))
+                var items = path.Split(StringLiterals.DefaultPathSeparator);
+                for (int i = 0; i < items.Length; i++)
                 {
                     if (itemsToSkip-- > 0)
                     {
                         // This handles the UNC server and share and 8.3 short path syntax
-                        exactPath += item + StringLiterals.DefaultPathSeparator;
+                        exactPath += items[i] + StringLiterals.DefaultPathSeparator;
                         continue;
                     }
                     else if (string.IsNullOrEmpty(exactPath))
                     {
                         // This handles the drive letter or / root path start
-                        exactPath = item + StringLiterals.DefaultPathSeparator;
+                        exactPath = items[i] + StringLiterals.DefaultPathSeparator;
                     }
-                    else if (string.IsNullOrEmpty(item))
+                    else if (string.IsNullOrEmpty(items[i]) && i == items.Length - 1)
                     {
                         // This handles the trailing slash case
                         if (!exactPath.EndsWith(StringLiterals.DefaultPathSeparator))
@@ -155,17 +156,17 @@ private static string GetCorrectCasedPath(string path)
 
                         break;
                     }
-                    else if (item.Contains('~'))
+                    else if (items[i].Contains('~'))
                     {
                         // This handles short path names
-                        exactPath += StringLiterals.DefaultPathSeparator + item;
+                        exactPath += StringLiterals.DefaultPathSeparator + items[i];
                     }
                     else
                     {
                         // Use GetFileSystemEntries to get the correct casing of this element
                         try
                         {
-                            var entries = Directory.GetFileSystemEntries(exactPath, item);
+                            var entries = Directory.GetFileSystemEntries(exactPath, items[i]);
                             if (entries.Length > 0)
                             {
                                 exactPath = entries[0];
@@ -7257,7 +7258,7 @@ internal static bool PathIsNetworkPath(string path)
                     return false;
                 }
 
-                if (Utils.PathIsUnc(path))
+                if (Utils.PathIsUnc(path, networkOnly : true))
                 {
                     return true;
                 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
index a5d06df0b46..5ab0a043f01 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
@@ -228,6 +228,18 @@ Describe "Get-ChildItem" -Tags "CI" {
             $barFiles = Get-ChildItem -Path testdrive:/foo/bar -Recurse
             $barFiles.Count | Should -Be 2
         }
+
+        It 'Works with Windows volume paths' -Skip:(!$IsWindows) {
+            $volume = (Get-Volume -DriveLetter $env:SystemDrive[0]).Path
+            $items = Get-ChildItem -LiteralPath "${volume}Windows"
+            $items[0].Parent | Should -BeExactly "${volume}Windows"
+            $items | Should -HaveCount (Get-ChildItem $env:SystemRoot).Count
+        }
+
+        It 'Works with Windows pipes' -Skip:(!$IsWindows) {
+            $out = pwsh -noprofile -custompipename myTestPipe { Get-ChildItem \\.\pipe\myTestPipe }
+            $out.Name | Should -BeExactly 'myTestPipe'
+        }
     }
 
     Context 'Env: Provider' {

From 5f4ac678e357efe0255973f05bc884a01befb409 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 25 Jul 2022 16:26:14 -0700
Subject: [PATCH 496/645] Updated `ADOPTERS.md` for Power BI (#17766)

---
 .spelling   | 2 ++
 ADOPTERS.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.spelling b/.spelling
index 12dd9d1da96..d048e3261ac 100644
--- a/.spelling
+++ b/.spelling
@@ -1550,3 +1550,5 @@ vmImage
 ci.psm1
 jcotton42
 centos-7
+ - ADOPTERS.md
+MicrosoftPowerBIMgmt
diff --git a/ADOPTERS.md b/ADOPTERS.md
index 110f56d16e6..faef4252621 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -34,4 +34,6 @@ This is a list of adopters of using PowerShell in production or in their product
 * [GitHub Actions Virtual Environments for Hosted Runners](https://help.github.com/actions/reference/virtual-environments-for-github-hosted-runners) Windows, Ubuntu, and macOS virtual environments used by customers of GitHub Actions include PowerShell out of the box.
 * [GitHub Actions Python builds](https://github.com/actions/python-versions) GitHub Actions uses PowerShell to automate building Python from source for its runners.
 * [Microsoft HoloLens](https://www.microsoft.com/hololens) makes extensive use of PowerShell 7+ throughout the development cycle to automate tasks such as firmware assembly and automated testing.
+* [Power BI](https://powerbi.microsoft.com/) provides PowerShell users a set of cmdlets in [MicrosoftPowerBIMgmt](https://docs.microsoft.com/powershell/power-bi) module to manage and automate the Power BI service.
+  This is in addition to Power BI leveraging PowerShell internally for various engineering systems and infrastructure for its service.
 * [Windows 10 IoT Core](https://docs.microsoft.com/windows/iot-core/windows-iot-core) is a small form factor Windows edition for IoT devices and now you can easily include the [PowerShell package](https://github.com/ms-iot/iot-adk-addonkit/blob/master/Tools/IoTCoreImaging/Docs/Import-PSCoreRelease.md#Import-PSCoreRelease) in your imaging process.

From 9fe96f3c20bbfbab5c176f3361607c44faf9cfa7 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <mr.molkree@gmail.com>
Date: Tue, 26 Jul 2022 03:55:56 +0400
Subject: [PATCH 497/645] Use compound assignment in `/interpreter` and
 `/runtime` (#17727)

---
 .../engine/interpreter/BranchLabel.cs         |  5 +-
 .../interpreter/ControlFlowInstructions.cs    |  5 +-
 .../engine/interpreter/InstructionFactory.cs  |  5 +-
 .../engine/interpreter/InstructionList.cs     | 85 ++++---------------
 .../engine/interpreter/LabelInfo.cs           | 10 +--
 .../engine/interpreter/LightCompiler.cs       |  5 +-
 .../engine/interpreter/LocalVariables.cs      | 10 +--
 .../engine/interpreter/LoopCompiler.cs        |  5 +-
 .../engine/runtime/Binding/Binders.cs         | 43 +++-------
 .../engine/runtime/CompiledScriptBlock.cs     | 17 +---
 .../engine/runtime/ScriptBlockToPowerShell.cs |  5 +-
 11 files changed, 43 insertions(+), 152 deletions(-)

diff --git a/src/System.Management.Automation/engine/interpreter/BranchLabel.cs b/src/System.Management.Automation/engine/interpreter/BranchLabel.cs
index 08af974416c..1bae16783a9 100644
--- a/src/System.Management.Automation/engine/interpreter/BranchLabel.cs
+++ b/src/System.Management.Automation/engine/interpreter/BranchLabel.cs
@@ -110,10 +110,7 @@ internal void AddBranch(InstructionList instructions, int branchIndex)
 
             if (_targetIndex == UnknownIndex)
             {
-                if (_forwardBranchFixups == null)
-                {
-                    _forwardBranchFixups = new List<int>();
-                }
+                _forwardBranchFixups ??= new List<int>();
 
                 _forwardBranchFixups.Add(branchIndex);
             }
diff --git a/src/System.Management.Automation/engine/interpreter/ControlFlowInstructions.cs b/src/System.Management.Automation/engine/interpreter/ControlFlowInstructions.cs
index debe5284eb5..5d994d934c5 100644
--- a/src/System.Management.Automation/engine/interpreter/ControlFlowInstructions.cs
+++ b/src/System.Management.Automation/engine/interpreter/ControlFlowInstructions.cs
@@ -157,10 +157,7 @@ public override Instruction[] Cache
         {
             get
             {
-                if (s_caches == null)
-                {
-                    s_caches = new Instruction[2][][] { new Instruction[2][], new Instruction[2][] };
-                }
+                s_caches ??= new Instruction[2][][] { new Instruction[2][], new Instruction[2][] };
 
                 return s_caches[ConsumedStack][ProducedStack] ?? (s_caches[ConsumedStack][ProducedStack] = new Instruction[CacheSize]);
             }
diff --git a/src/System.Management.Automation/engine/interpreter/InstructionFactory.cs b/src/System.Management.Automation/engine/interpreter/InstructionFactory.cs
index 4a707201eb6..839ccd6f905 100644
--- a/src/System.Management.Automation/engine/interpreter/InstructionFactory.cs
+++ b/src/System.Management.Automation/engine/interpreter/InstructionFactory.cs
@@ -119,10 +119,7 @@ protected internal override Instruction NewArrayInit(int elementCount)
         {
             if (elementCount < MaxArrayInitElementCountCache)
             {
-                if (_newArrayInit == null)
-                {
-                    _newArrayInit = new Instruction[MaxArrayInitElementCountCache];
-                }
+                _newArrayInit ??= new Instruction[MaxArrayInitElementCountCache];
 
                 return _newArrayInit[elementCount] ?? (_newArrayInit[elementCount] = new NewArrayInitInstruction<T>(elementCount));
             }
diff --git a/src/System.Management.Automation/engine/interpreter/InstructionList.cs b/src/System.Management.Automation/engine/interpreter/InstructionList.cs
index cbf831f3377..93946bfd2c3 100644
--- a/src/System.Management.Automation/engine/interpreter/InstructionList.cs
+++ b/src/System.Management.Automation/engine/interpreter/InstructionList.cs
@@ -233,10 +233,7 @@ private void UpdateStackDepth(Instruction instruction)
         public void SetDebugCookie(object cookie)
         {
 #if DEBUG
-            if (_debugCookies == null)
-            {
-                _debugCookies = new List<KeyValuePair<int, object>>();
-            }
+            _debugCookies ??= new List<KeyValuePair<int, object>>();
 
             Debug.Assert(Count > 0);
             _debugCookies.Add(new KeyValuePair<int, object>(Count - 1, cookie));
@@ -372,10 +369,7 @@ public void EmitLoad(object value, Type type)
                     int i = (int)value;
                     if (i >= PushIntMinCachedValue && i <= PushIntMaxCachedValue)
                     {
-                        if (s_ints == null)
-                        {
-                            s_ints = new Instruction[PushIntMaxCachedValue - PushIntMinCachedValue + 1];
-                        }
+                        s_ints ??= new Instruction[PushIntMaxCachedValue - PushIntMinCachedValue + 1];
 
                         i -= PushIntMinCachedValue;
                         Emit(s_ints[i] ?? (s_ints[i] = new LoadObjectInstruction(value)));
@@ -387,10 +381,7 @@ public void EmitLoad(object value, Type type)
             if (_objects == null)
             {
                 _objects = new List<object>();
-                if (s_loadObjectCached == null)
-                {
-                    s_loadObjectCached = new Instruction[CachedObjectCount];
-                }
+                s_loadObjectCached ??= new Instruction[CachedObjectCount];
             }
 
             if (_objects.Count < s_loadObjectCached.Length)
@@ -451,10 +442,7 @@ internal void SwitchToBoxed(int index, int instructionIndex)
 
         public void EmitLoadLocal(int index)
         {
-            if (s_loadLocal == null)
-            {
-                s_loadLocal = new Instruction[LocalInstrCacheSize];
-            }
+            s_loadLocal ??= new Instruction[LocalInstrCacheSize];
 
             if (index < s_loadLocal.Length)
             {
@@ -473,10 +461,7 @@ public void EmitLoadLocalBoxed(int index)
 
         internal static Instruction LoadLocalBoxed(int index)
         {
-            if (s_loadLocalBoxed == null)
-            {
-                s_loadLocalBoxed = new Instruction[LocalInstrCacheSize];
-            }
+            s_loadLocalBoxed ??= new Instruction[LocalInstrCacheSize];
 
             if (index < s_loadLocalBoxed.Length)
             {
@@ -490,10 +475,7 @@ internal static Instruction LoadLocalBoxed(int index)
 
         public void EmitLoadLocalFromClosure(int index)
         {
-            if (s_loadLocalFromClosure == null)
-            {
-                s_loadLocalFromClosure = new Instruction[LocalInstrCacheSize];
-            }
+            s_loadLocalFromClosure ??= new Instruction[LocalInstrCacheSize];
 
             if (index < s_loadLocalFromClosure.Length)
             {
@@ -507,10 +489,7 @@ public void EmitLoadLocalFromClosure(int index)
 
         public void EmitLoadLocalFromClosureBoxed(int index)
         {
-            if (s_loadLocalFromClosureBoxed == null)
-            {
-                s_loadLocalFromClosureBoxed = new Instruction[LocalInstrCacheSize];
-            }
+            s_loadLocalFromClosureBoxed ??= new Instruction[LocalInstrCacheSize];
 
             if (index < s_loadLocalFromClosureBoxed.Length)
             {
@@ -524,10 +503,7 @@ public void EmitLoadLocalFromClosureBoxed(int index)
 
         public void EmitAssignLocal(int index)
         {
-            if (s_assignLocal == null)
-            {
-                s_assignLocal = new Instruction[LocalInstrCacheSize];
-            }
+            s_assignLocal ??= new Instruction[LocalInstrCacheSize];
 
             if (index < s_assignLocal.Length)
             {
@@ -541,10 +517,7 @@ public void EmitAssignLocal(int index)
 
         public void EmitStoreLocal(int index)
         {
-            if (s_storeLocal == null)
-            {
-                s_storeLocal = new Instruction[LocalInstrCacheSize];
-            }
+            s_storeLocal ??= new Instruction[LocalInstrCacheSize];
 
             if (index < s_storeLocal.Length)
             {
@@ -563,10 +536,7 @@ public void EmitAssignLocalBoxed(int index)
 
         internal static Instruction AssignLocalBoxed(int index)
         {
-            if (s_assignLocalBoxed == null)
-            {
-                s_assignLocalBoxed = new Instruction[LocalInstrCacheSize];
-            }
+            s_assignLocalBoxed ??= new Instruction[LocalInstrCacheSize];
 
             if (index < s_assignLocalBoxed.Length)
             {
@@ -585,10 +555,7 @@ public void EmitStoreLocalBoxed(int index)
 
         internal static Instruction StoreLocalBoxed(int index)
         {
-            if (s_storeLocalBoxed == null)
-            {
-                s_storeLocalBoxed = new Instruction[LocalInstrCacheSize];
-            }
+            s_storeLocalBoxed ??= new Instruction[LocalInstrCacheSize];
 
             if (index < s_storeLocalBoxed.Length)
             {
@@ -602,10 +569,7 @@ internal static Instruction StoreLocalBoxed(int index)
 
         public void EmitAssignLocalToClosure(int index)
         {
-            if (s_assignLocalToClosure == null)
-            {
-                s_assignLocalToClosure = new Instruction[LocalInstrCacheSize];
-            }
+            s_assignLocalToClosure ??= new Instruction[LocalInstrCacheSize];
 
             if (index < s_assignLocalToClosure.Length)
             {
@@ -647,10 +611,7 @@ internal void EmitInitializeParameter(int index)
 
         internal static Instruction Parameter(int index)
         {
-            if (s_parameter == null)
-            {
-                s_parameter = new Instruction[LocalInstrCacheSize];
-            }
+            s_parameter ??= new Instruction[LocalInstrCacheSize];
 
             if (index < s_parameter.Length)
             {
@@ -662,10 +623,7 @@ internal static Instruction Parameter(int index)
 
         internal static Instruction ParameterBox(int index)
         {
-            if (s_parameterBox == null)
-            {
-                s_parameterBox = new Instruction[LocalInstrCacheSize];
-            }
+            s_parameterBox ??= new Instruction[LocalInstrCacheSize];
 
             if (index < s_parameterBox.Length)
             {
@@ -677,10 +635,7 @@ internal static Instruction ParameterBox(int index)
 
         internal static Instruction InitReference(int index)
         {
-            if (s_initReference == null)
-            {
-                s_initReference = new Instruction[LocalInstrCacheSize];
-            }
+            s_initReference ??= new Instruction[LocalInstrCacheSize];
 
             if (index < s_initReference.Length)
             {
@@ -692,10 +647,7 @@ internal static Instruction InitReference(int index)
 
         internal static Instruction InitImmutableRefBox(int index)
         {
-            if (s_initImmutableRefBox == null)
-            {
-                s_initImmutableRefBox = new Instruction[LocalInstrCacheSize];
-            }
+            s_initImmutableRefBox ??= new Instruction[LocalInstrCacheSize];
 
             if (index < s_initImmutableRefBox.Length)
             {
@@ -1127,10 +1079,7 @@ private RuntimeLabel[] BuildRuntimeLabels()
 
         public BranchLabel MakeLabel()
         {
-            if (_labels == null)
-            {
-                _labels = new List<BranchLabel>();
-            }
+            _labels ??= new List<BranchLabel>();
 
             var label = new BranchLabel();
             _labels.Add(label);
diff --git a/src/System.Management.Automation/engine/interpreter/LabelInfo.cs b/src/System.Management.Automation/engine/interpreter/LabelInfo.cs
index 639be5204cc..80e5ca25157 100644
--- a/src/System.Management.Automation/engine/interpreter/LabelInfo.cs
+++ b/src/System.Management.Automation/engine/interpreter/LabelInfo.cs
@@ -176,10 +176,7 @@ internal void ValidateFinish()
 
         private void EnsureLabel(LightCompiler compiler)
         {
-            if (_label == null)
-            {
-                _label = compiler.Instructions.MakeLabel();
-            }
+            _label ??= compiler.Instructions.MakeLabel();
         }
 
         private bool DefinedIn(LabelScopeInfo scope)
@@ -359,10 +356,7 @@ internal void AddLabelInfo(LabelTarget target, LabelInfo info)
         {
             Debug.Assert(CanJumpInto);
 
-            if (_labels == null)
-            {
-                _labels = new HybridReferenceDictionary<LabelTarget, LabelInfo>();
-            }
+            _labels ??= new HybridReferenceDictionary<LabelTarget, LabelInfo>();
 
             _labels[target] = info;
         }
diff --git a/src/System.Management.Automation/engine/interpreter/LightCompiler.cs b/src/System.Management.Automation/engine/interpreter/LightCompiler.cs
index 279a36baac7..e88606fc2fe 100644
--- a/src/System.Management.Automation/engine/interpreter/LightCompiler.cs
+++ b/src/System.Management.Automation/engine/interpreter/LightCompiler.cs
@@ -1132,10 +1132,7 @@ private void CompileLabelExpression(Expression expr)
                 Debug.Assert(label != null);
             }
 
-            if (label == null)
-            {
-                label = DefineLabel(node.Target);
-            }
+            label ??= DefineLabel(node.Target);
 
             if (node.DefaultValue != null)
             {
diff --git a/src/System.Management.Automation/engine/interpreter/LocalVariables.cs b/src/System.Management.Automation/engine/interpreter/LocalVariables.cs
index d52f1fc6840..0c1f6416741 100644
--- a/src/System.Management.Automation/engine/interpreter/LocalVariables.cs
+++ b/src/System.Management.Automation/engine/interpreter/LocalVariables.cs
@@ -163,10 +163,7 @@ public LocalDefinition DefineLocal(ParameterExpression variable, int start)
             if (_variables.TryGetValue(variable, out existing))
             {
                 newScope = new VariableScope(result, start, existing);
-                if (existing.ChildScopes == null)
-                {
-                    existing.ChildScopes = new List<VariableScope>();
-                }
+                existing.ChildScopes ??= new List<VariableScope>();
 
                 existing.ChildScopes.Add(newScope);
             }
@@ -296,10 +293,7 @@ internal Dictionary<ParameterExpression, LocalVariable> ClosureVariables
 
         internal LocalVariable AddClosureVariable(ParameterExpression variable)
         {
-            if (_closureVariables == null)
-            {
-                _closureVariables = new Dictionary<ParameterExpression, LocalVariable>();
-            }
+            _closureVariables ??= new Dictionary<ParameterExpression, LocalVariable>();
 
             LocalVariable result = new LocalVariable(_closureVariables.Count, true, false);
             _closureVariables.Add(variable, result);
diff --git a/src/System.Management.Automation/engine/interpreter/LoopCompiler.cs b/src/System.Management.Automation/engine/interpreter/LoopCompiler.cs
index 6ff0e36f5c3..78c5534a132 100644
--- a/src/System.Management.Automation/engine/interpreter/LoopCompiler.cs
+++ b/src/System.Management.Automation/engine/interpreter/LoopCompiler.cs
@@ -374,10 +374,7 @@ private Expression VisitVariable(ParameterExpression node, ExpressionAccess acce
 
         private ParameterExpression AddTemp(ParameterExpression variable)
         {
-            if (_temps == null)
-            {
-                _temps = new List<ParameterExpression>();
-            }
+            _temps ??= new List<ParameterExpression>();
 
             _temps.Add(variable);
             return variable;
diff --git a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
index 9c715534432..31868425323 100644
--- a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
+++ b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
@@ -5343,13 +5343,9 @@ public override DynamicMetaObject FallbackGetMember(DynamicMetaObject target, Dy
                 if (!isGeneric || genericTypeArg != null)
                 {
                     var temp = Expression.Variable(typeof(object));
-                    if (expr == null)
-                    {
-                        // If expr is not null, it's the fallback when no member exists.  If it is null,
-                        // the fallback is the result from PropertyDoesntExist.
-
-                        expr = (errorSuggestion ?? PropertyDoesntExist(target, restrictions)).Expression;
-                    }
+                    // If expr is not null, it's the fallback when no member exists.  If it is null,
+                    // the fallback is the result from PropertyDoesntExist.
+                    expr ??= (errorSuggestion ?? PropertyDoesntExist(target, restrictions)).Expression;
 
                     var method = isGeneric
                         ? CachedReflectionInfo.PSGetMemberBinder_TryGetGenericDictionaryValue.MakeGenericMethod(genericTypeArg)
@@ -5691,10 +5687,7 @@ internal PSMemberInfo GetPSMemberInfo(DynamicMetaObject target,
             if (alias != null)
             {
                 aliasConversionType = alias.ConversionType;
-                if (aliasRestrictions == null)
-                {
-                    aliasRestrictions = new List<BindingRestrictions>();
-                }
+                aliasRestrictions ??= new List<BindingRestrictions>();
 
                 memberInfo = ResolveAlias(alias, target, aliases, aliasRestrictions);
                 if (memberInfo == null)
@@ -5745,10 +5738,7 @@ internal PSMemberInfo GetPSMemberInfo(DynamicMetaObject target,
                                 var methodInfo = member as MethodInfo;
                                 if (methodInfo != null && (methodInfo.IsPublic || methodInfo.IsFamily))
                                 {
-                                    if (candidateMethods == null)
-                                    {
-                                        candidateMethods = new List<MethodBase>();
-                                    }
+                                    candidateMethods ??= new List<MethodBase>();
 
                                     candidateMethods.Add(methodInfo);
                                 }
@@ -5841,10 +5831,7 @@ internal static object GetAdaptedValue(object obj, string member)
             }
 
             var adapterSet = PSObject.GetMappedAdapter(obj, context?.TypeTable);
-            if (memberInfo == null)
-            {
-                memberInfo = adapterSet.OriginalAdapter.BaseGetMember<PSMemberInfo>(obj, member);
-            }
+            memberInfo ??= adapterSet.OriginalAdapter.BaseGetMember<PSMemberInfo>(obj, member);
 
             if (memberInfo == null && adapterSet.DotNetAdapter != null)
             {
@@ -6445,10 +6432,7 @@ internal static object SetAdaptedValue(object obj, string member, object value)
                 }
 
                 var adapterSet = PSObject.GetMappedAdapter(obj, context?.TypeTable);
-                if (memberInfo == null)
-                {
-                    memberInfo = adapterSet.OriginalAdapter.BaseGetMember<PSMemberInfo>(obj, member);
-                }
+                memberInfo ??= adapterSet.OriginalAdapter.BaseGetMember<PSMemberInfo>(obj, member);
 
                 if (memberInfo == null && adapterSet.DotNetAdapter != null)
                 {
@@ -7260,14 +7244,11 @@ private DynamicMetaObject InvokeMemberOnCollection(DynamicMetaObject targetEnume
         private static DynamicMetaObject GetTargetAsEnumerable(DynamicMetaObject target)
         {
             var enumerableTarget = PSEnumerableBinder.IsEnumerable(target);
-            if (enumerableTarget == null)
-            {
-                // Wrap the target in an array.
-                enumerableTarget = PSEnumerableBinder.IsEnumerable(
-                    new DynamicMetaObject(
-                        Expression.NewArrayInit(typeof(object), target.Expression.Cast(typeof(object))),
-                        target.GetSimpleTypeRestriction()));
-            }
+            // If null wrap the target in an array.
+            enumerableTarget ??= PSEnumerableBinder.IsEnumerable(
+                new DynamicMetaObject(
+                    Expression.NewArrayInit(typeof(object), target.Expression.Cast(typeof(object))),
+                    target.GetSimpleTypeRestriction()));
 
             return enumerableTarget;
         }
diff --git a/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs b/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
index 79881796cad..8d4e60ae0a2 100644
--- a/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
+++ b/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
@@ -366,10 +366,7 @@ internal bool IsProductCode
         {
             get
             {
-                if (_isProductCode == null)
-                {
-                    _isProductCode = SecuritySupport.IsProductBinary(((Ast)_ast).Extent.File);
-                }
+                _isProductCode ??= SecuritySupport.IsProductBinary(((Ast)_ast).Extent.File);
 
                 return _isProductCode.Value;
             }
@@ -1015,10 +1012,7 @@ internal void InvokeWithPipeImpl(
                 createLocalScope || variablesToDefine == null,
                 "When calling ScriptBlock.InvokeWithContext(), if 'variablesToDefine' != null then 'createLocalScope' must be true");
 
-            if (args == null)
-            {
-                args = Array.Empty<object>();
-            }
+            args ??= Array.Empty<object>();
 
             bool runOptimized = context._debuggingMode <= 0 && createLocalScope;
             var codeToInvoke = GetCodeToInvoke(ref runOptimized, clauseToInvoke);
@@ -1027,11 +1021,8 @@ internal void InvokeWithPipeImpl(
                 return;
             }
 
-            if (outputPipe == null)
-            {
-                // If we don't have a pipe to write to, we need to discard all results.
-                outputPipe = new Pipe { NullPipe = true };
-            }
+            // If we don't have a pipe to write to, we need to discard all results.
+            outputPipe ??= new Pipe { NullPipe = true };
 
             var locals = MakeLocalsTuple(runOptimized);
 
diff --git a/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs b/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs
index efa604eb21e..a3185149ecd 100644
--- a/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs
+++ b/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs
@@ -230,10 +230,7 @@ internal static PowerShell Convert(ScriptBlockAst body,
         {
             ExecutionContext.CheckStackDepth();
 
-            if (args == null)
-            {
-                args = Array.Empty<object>();
-            }
+            args ??= Array.Empty<object>();
 
             // Perform validations on the ScriptBlock.  GetSimplePipeline can allow for more than one
             // pipeline if the first parameter is true, but Invoke-Command doesn't yet support multiple

From 7ce0df7187eea74c8303825d8ccb9d6f0858c4e7 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <mr.molkree@gmail.com>
Date: Tue, 26 Jul 2022 04:04:56 +0400
Subject: [PATCH 498/645] Use compound assignment in
 `/Microsoft.PowerShell.Commands` (#17722)

---
 .../cmdletization/cim/cimChildJobBase.cs      |  5 +--
 .../cmdletization/cim/cimWrapper.cs           | 15 +++----
 .../management/GetComputerInfoCommand.cs      |  7 +---
 .../management/MovePropertyCommand.cs         |  5 +--
 .../management/WriteContentCommandBase.cs     |  5 +--
 .../commands/utility/ConvertTo-Html.cs        |  5 +--
 .../EnableDisableRunspaceDebugCommand.cs      |  5 +--
 .../FormatAndOutput/OutGridView/TableView.cs  | 22 +++-------
 .../commands/utility/GetUnique.cs             | 16 +++----
 .../commands/utility/Group-Object.cs          |  5 +--
 .../utility/ImplicitRemotingCommands.cs       | 27 +++---------
 .../commands/utility/Measure-Object.cs        |  3 +-
 .../commands/utility/OrderObjectBase.cs       |  5 +--
 .../utility/PSBreakpointCommandBase.cs        |  5 +--
 .../commands/utility/Update-List.cs           |  5 +--
 .../commands/utility/Var.cs                   | 30 +++----------
 .../BasicHtmlWebResponseObject.Common.cs      | 42 ++++++-------------
 .../Common/WebRequestPSCmdlet.Common.cs       |  5 +--
 .../Common/WebResponseObject.Common.cs        |  5 +--
 .../utility/WebCmdlet/StreamHelper.cs         |  7 +---
 .../utility/WebCmdlet/WebRequestSession.cs    |  5 +--
 .../commands/utility/Write.cs                 | 10 +----
 22 files changed, 59 insertions(+), 180 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs
index cb4786f005e..7ef78d13a28 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs
@@ -1053,10 +1053,7 @@ internal override void WriteObject(object outputObject)
 
             if (this.JobContext.ShowComputerName)
             {
-                if (pso == null)
-                {
-                    pso = PSObject.AsPSObject(outputObject);
-                }
+                pso ??= PSObject.AsPSObject(outputObject);
 
                 AddShowComputerNameMarker(pso);
                 if (cimInstance == null)
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimWrapper.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimWrapper.cs
index 7052b16c768..c812778456a 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimWrapper.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimWrapper.cs
@@ -107,15 +107,12 @@ internal CimCmdletDefinitionContext CmdletDefinitionContext
         {
             get
             {
-                if (_cmdletDefinitionContext == null)
-                {
-                    _cmdletDefinitionContext = new CimCmdletDefinitionContext(
-                            this.ClassName,
-                            this.ClassVersion,
-                            this.ModuleVersion,
-                            this.Cmdlet.CommandInfo.CommandMetadata.SupportsShouldProcess,
-                            this.PrivateData);
-                }
+                _cmdletDefinitionContext ??= new CimCmdletDefinitionContext(
+                    this.ClassName,
+                    this.ClassVersion,
+                    this.ModuleVersion,
+                    this.Cmdlet.CommandInfo.CommandMetadata.SupportsShouldProcess,
+                    this.PrivateData);
 
                 return _cmdletDefinitionContext;
             }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
index 499358389f4..9379927b5a0 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
@@ -1130,11 +1130,8 @@ internal static string GetLocaleName(string locale)
                         culture = CultureInfo.GetCultureInfo((int)localeNum);
                     }
 
-                    if (culture == null)
-                    {
-                        // If TryParse failed we'll try using the original string as culture name
-                        culture = CultureInfo.GetCultureInfo(locale);
-                    }
+                    // If TryParse failed we'll try using the original string as culture name
+                    culture ??= CultureInfo.GetCultureInfo(locale);
                 }
                 catch (Exception)
                 {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/MovePropertyCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/MovePropertyCommand.cs
index fb90ec1c502..a40cae64b9f 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/MovePropertyCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/MovePropertyCommand.cs
@@ -61,10 +61,7 @@ public string[] Name
 
             set
             {
-                if (value == null)
-                {
-                    value = Array.Empty<string>();
-                }
+                value ??= Array.Empty<string>();
 
                 _property = value;
             }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/WriteContentCommandBase.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/WriteContentCommandBase.cs
index 25ecd672c4c..a2a6387e9da 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/WriteContentCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/WriteContentCommandBase.cs
@@ -95,10 +95,7 @@ protected override void ProcessRecord()
 
             // Initialize the content
 
-            if (_content == null)
-            {
-                _content = Array.Empty<object>();
-            }
+            _content ??= Array.Empty<object>();
 
             if (_pipingPaths)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs
index e74e86a9ded..2f1e5cca314 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs
@@ -344,10 +344,7 @@ private List<MshParameter> ProcessParameter(object[] properties)
             TerminatingErrorContext invocationContext = new(this);
             ParameterProcessor processor =
                 new(new ConvertHTMLExpressionParameterDefinition());
-            if (properties == null)
-            {
-                properties = new object[] { "*" };
-            }
+            properties ??= new object[] { "*" };
 
             return processor.ProcessParameters(properties, invocationContext);
         }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/EnableDisableRunspaceDebugCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/EnableDisableRunspaceDebugCommand.cs
index c37d83ecf84..e4d5b5d6b27 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/EnableDisableRunspaceDebugCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/EnableDisableRunspaceDebugCommand.cs
@@ -275,10 +275,7 @@ protected void SetDebugPreferenceHelper(string processName, string[] appDomainNa
                 {
                     if (!string.IsNullOrEmpty(currentAppDomainName))
                     {
-                        if (appDomainNames == null)
-                        {
-                            appDomainNames = new List<string>();
-                        }
+                        appDomainNames ??= new List<string>();
 
                         appDomainNames.Add(currentAppDomainName.ToLowerInvariant());
                     }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs
index 216d9121d54..25b18dfd80e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs
@@ -72,11 +72,8 @@ internal HeaderInfo GenerateHeaderInfo(PSObject input, TableControlBody tableBod
                         FieldPropertyToken fpt = token as FieldPropertyToken;
                         if (fpt != null)
                         {
-                            if (displayName == null)
-                            {
-                                // Database does not provide a label(DisplayName) for the current property, use the expression value instead.
-                                displayName = fpt.expression.expressionValue;
-                            }
+                            // If Database does not provide a label(DisplayName) for the current property, use the expression value instead.
+                            displayName ??= fpt.expression.expressionValue;
 
                             if (fpt.expression.isScriptBlock)
                             {
@@ -170,10 +167,7 @@ internal HeaderInfo GenerateHeaderInfo(PSObject input, OutGridViewCommand parent
                         propertyName = (string)key;
                 }
 
-                if (propertyName == null)
-                {
-                    propertyName = association.ResolvedExpression.ToString();
-                }
+                propertyName ??= association.ResolvedExpression.ToString();
 
                 ColumnInfo columnInfo = new OriginalColumnInfo(propertyName, propertyName, propertyName, parentCmdlet);
 
@@ -233,10 +227,7 @@ private List<TableRowItemDefinition> GetActiveTableRowDefinition(TableControlBod
                 }
             }
 
-            if (matchingRowDefinition == null)
-            {
-                matchingRowDefinition = match.BestMatch as TableRowDefinition;
-            }
+            matchingRowDefinition ??= match.BestMatch as TableRowDefinition;
 
             if (matchingRowDefinition == null)
             {
@@ -254,10 +245,7 @@ private List<TableRowItemDefinition> GetActiveTableRowDefinition(TableControlBod
                         }
                     }
 
-                    if (matchingRowDefinition == null)
-                    {
-                        matchingRowDefinition = match.BestMatch as TableRowDefinition;
-                    }
+                    matchingRowDefinition ??= match.BestMatch as TableRowDefinition;
                 }
             }
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUnique.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUnique.cs
index b43a870dccb..bcf7e31ccf1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUnique.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUnique.cs
@@ -72,10 +72,7 @@ protected override void ProcessRecord()
             else if (AsString)
             {
                 string inputString = InputObject.ToString();
-                if (_lastObjectAsString == null)
-                {
-                    _lastObjectAsString = _lastObject.ToString();
-                }
+                _lastObjectAsString ??= _lastObject.ToString();
 
                 if (string.Equals(
                     inputString,
@@ -91,13 +88,10 @@ protected override void ProcessRecord()
             }
             else // compare as objects
             {
-                if (_comparer == null)
-                {
-                    _comparer = new ObjectCommandComparer(
-                        true, // ascending (doesn't matter)
-                        CultureInfo.CurrentCulture,
-                        true); // case-sensitive
-                }
+                _comparer ??= new ObjectCommandComparer(
+                    true, // ascending (doesn't matter)
+                    CultureInfo.CurrentCulture,
+                    true); // case-sensitive
 
                 isUnique = (_comparer.Compare(InputObject, _lastObject) != 0);
             }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Group-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Group-Object.cs
index 961826b30fc..a15c3f87f01 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Group-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Group-Object.cs
@@ -392,10 +392,7 @@ protected override void ProcessRecord()
 
                 if (!_hasProcessedFirstInputObject)
                 {
-                    if (Property == null)
-                    {
-                        Property = OrderByProperty.GetDefaultKeyPropertySet(InputObject);
-                    }
+                    Property ??= OrderByProperty.GetDefaultKeyPropertySet(InputObject);
 
                     _orderByProperty.ProcessExpressionParameter(this, Property);
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
index 19bc5d44aec..7190c16cad7 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
@@ -443,10 +443,7 @@ public string[] Module
 
             set
             {
-                if (value == null)
-                {
-                    value = Array.Empty<string>();
-                }
+                value ??= Array.Empty<string>();
 
                 _PSSnapins = value;
                 _commandParameterSpecified = true;
@@ -1044,10 +1041,7 @@ private List<T> RehydrateList<T>(string commandName, PSObject deserializedObject
 
         private List<T> RehydrateList<T>(string commandName, object deserializedList, Func<PSObject, T> itemRehydrator)
         {
-            if (itemRehydrator == null)
-            {
-                itemRehydrator = (PSObject pso) => ConvertTo<T>(commandName, pso);
-            }
+            itemRehydrator ??= (PSObject pso) => ConvertTo<T>(commandName, pso);
 
             List<T> result = null;
 
@@ -1068,17 +1062,14 @@ private List<T> RehydrateList<T>(string commandName, object deserializedList, Fu
 
         private Dictionary<TKey, TValue> RehydrateDictionary<TKey, TValue>(
             string commandName,
-            PSObject deserializedObject, 
+            PSObject deserializedObject,
             string propertyName,
             Func<PSObject, TValue> valueRehydrator)
         {
             Dbg.Assert(deserializedObject != null, "deserializedObject parameter != null");
             Dbg.Assert(!string.IsNullOrEmpty(propertyName), "propertyName parameter != null");
 
-            if (valueRehydrator == null)
-            {
-                valueRehydrator = (PSObject pso) => ConvertTo<TValue>(commandName, pso);
-            }
+            valueRehydrator ??= (PSObject pso) => ConvertTo<TValue>(commandName, pso);
 
             Dictionary<TKey, TValue> result = new();
             PSPropertyInfo deserializedDictionaryProperty = deserializedObject.Properties[propertyName];
@@ -3058,10 +3049,7 @@ internal List<string> GenerateProxyModule(
                 FileShare.None);
             using (TextWriter writer = new StreamWriter(psm1, encoding))
             {
-                if (listOfCommandMetadata == null)
-                {
-                    listOfCommandMetadata = new List<CommandMetadata>();
-                }
+                listOfCommandMetadata ??= new List<CommandMetadata>();
 
                 GenerateModuleHeader(writer);
                 GenerateHelperFunctions(writer);
@@ -3079,10 +3067,7 @@ internal List<string> GenerateProxyModule(
                 FileShare.None);
             using (TextWriter writer = new StreamWriter(formatPs1xml, encoding))
             {
-                if (listOfFormatData == null)
-                {
-                    listOfFormatData = new List<ExtendedTypeDefinition>();
-                }
+                listOfFormatData ??= new List<ExtendedTypeDefinition>();
 
                 GenerateFormatFile(writer, listOfFormatData);
                 formatPs1xml.SetLength(formatPs1xml.Position);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
index d885d0a64f1..cf483b16a93 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
@@ -561,8 +561,7 @@ private void AnalyzeObjectProperties(PSObject inObj)
         /// <param name="objValue">The value to analyze.</param>
         private void AnalyzeValue(string propertyName, object objValue)
         {
-            if (propertyName == null)
-                propertyName = thisObject;
+            propertyName ??= thisObject;
 
             Statistics stat = _statistics.EnsureEntry(propertyName);
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
index 40f06e58eca..519b472620b 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
@@ -259,10 +259,7 @@ internal void ProcessExpressionParameter(
                         }
                         else
                         {
-                            if (_unExpandedParametersWithWildCardPattern == null)
-                            {
-                                _unExpandedParametersWithWildCardPattern = new List<MshParameter>();
-                            }
+                            _unExpandedParametersWithWildCardPattern ??= new List<MshParameter>();
 
                             _unExpandedParametersWithWildCardPattern.Add(unexpandedParameter);
                         }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointCommandBase.cs
index e3590e380d4..61d7236977d 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointCommandBase.cs
@@ -30,10 +30,7 @@ public abstract class PSBreakpointCommandBase : PSCmdlet
         /// </summary>
         protected override void BeginProcessing()
         {
-            if (Runspace == null)
-            {
-                Runspace = Context.CurrentRunspace;
-            }
+            Runspace ??= Context.CurrentRunspace;
         }
 
         #endregion overrides
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-List.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-List.cs
index 5850eaca7db..b5659f8e904 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-List.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-List.cs
@@ -83,10 +83,7 @@ protected override void ProcessRecord()
                 }
                 else
                 {
-                    if (_listModifier == null)
-                    {
-                        _listModifier = CreatePSListModifier();
-                    }
+                    _listModifier ??= CreatePSListModifier();
 
                     PSMemberInfo memberInfo = InputObject.Members[Property];
                     if (memberInfo != null)
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
index f89a5ed537c..6df552ab8e8 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
@@ -38,10 +38,7 @@ protected string[] IncludeFilters
 
             set
             {
-                if (value == null)
-                {
-                    value = Array.Empty<string>();
-                }
+                value ??= Array.Empty<string>();
 
                 _include = value;
             }
@@ -61,10 +58,7 @@ protected string[] ExcludeFilters
 
             set
             {
-                if (value == null)
-                {
-                    value = Array.Empty<string>();
-                }
+                value ??= Array.Empty<string>();
 
                 _exclude = value;
             }
@@ -258,10 +252,7 @@ public string[] Name
 
             set
             {
-                if (value == null)
-                {
-                    value = new string[] { "*" };
-                }
+                value ??= new string[] { "*" };
 
                 _name = value;
             }
@@ -741,10 +732,7 @@ protected override void ProcessRecord()
             {
                 if (Value != AutomationNull.Value)
                 {
-                    if (_valueList == null)
-                    {
-                        _valueList = new List<object>();
-                    }
+                    _valueList ??= new List<object>();
 
                     _valueList.Add(Value);
                 }
@@ -871,10 +859,7 @@ private void SetVariable(string[] varNames, object varValue)
                                 newVarValue,
                                 newOptions);
 
-                        if (Description == null)
-                        {
-                            Description = string.Empty;
-                        }
+                        Description ??= string.Empty;
 
                         varToSet.Description = Description;
 
@@ -1103,10 +1088,7 @@ protected override void ProcessRecord()
             // Removal of variables only happens in the local scope if the
             // scope wasn't explicitly specified by the user.
 
-            if (Scope == null)
-            {
-                Scope = "local";
-            }
+            Scope ??= "local";
 
             foreach (string varName in Name)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs
index 07982009a0c..7c922af0898 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs
@@ -199,41 +199,23 @@ private static PSObject CreateHtmlObject(string html, string tagName)
 
         private static void EnsureHtmlParser()
         {
-            if (s_tagRegex == null)
-            {
-                s_tagRegex = new Regex(@"<\w+((\s+[^""'>/=\s\p{Cc}]+(\s*=\s*(?:"".*?""|'.*?'|[^'"">\s]+))?)+\s*|\s*)/?>",
-                    RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
-            }
+            s_tagRegex ??= new Regex(@"<\w+((\s+[^""'>/=\s\p{Cc}]+(\s*=\s*(?:"".*?""|'.*?'|[^'"">\s]+))?)+\s*|\s*)/?>",
+                RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
-            if (s_attribsRegex == null)
-            {
-                s_attribsRegex = new Regex(@"(?<=\s+)([^""'>/=\s\p{Cc}]+(\s*=\s*(?:"".*?""|'.*?'|[^'"">\s]+))?)",
-                    RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
-            }
+            s_attribsRegex ??= new Regex(@"(?<=\s+)([^""'>/=\s\p{Cc}]+(\s*=\s*(?:"".*?""|'.*?'|[^'"">\s]+))?)",
+                RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
-            if (s_attribNameValueRegex == null)
-            {
-                s_attribNameValueRegex = new Regex(@"([^""'>/=\s\p{Cc}]+)(?:\s*=\s*(?:""(.*?)""|'(.*?)'|([^'"">\s]+)))?",
-                    RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
-            }
+            s_attribNameValueRegex ??= new Regex(@"([^""'>/=\s\p{Cc}]+)(?:\s*=\s*(?:""(.*?)""|'(.*?)'|([^'"">\s]+)))?",
+                RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
-            if (s_inputFieldRegex == null)
-            {
-                s_inputFieldRegex = new Regex(@"<input\s+[^>]*(/?>|>.*?</input>)",
-                    RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
-            }
+            s_inputFieldRegex ??= new Regex(@"<input\s+[^>]*(/?>|>.*?</input>)",
+                RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
-            if (s_linkRegex == null)
-            {
-                s_linkRegex = new Regex(@"<a\s+[^>]*(/>|>.*?</a>)",
-                    RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
-            }
+            s_linkRegex ??= new Regex(@"<a\s+[^>]*(/>|>.*?</a>)",
+                RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
-            if (s_imageRegex == null)
-            {
-                s_imageRegex = new Regex(@"<img\s[^>]*?>",
-                    RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
-            }
+            s_imageRegex ??= new Regex(@"<img\s[^>]*?>",
+                RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
         }
 
         private void InitializeRawContent(HttpResponseMessage baseResponse)
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
index 517a5960cc6..dbea8d20df4 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
@@ -583,10 +583,7 @@ internal virtual void ValidateParameters()
         internal virtual void PrepareSession()
         {
             // make sure we have a valid WebRequestSession object to work with
-            if (WebSession == null)
-            {
-                WebSession = new WebRequestSession();
-            }
+            WebSession ??= new WebRequestSession();
 
             if (SessionVariable != null)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs
index 98e7c397e45..1d80bcfdb2b 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs
@@ -123,10 +123,7 @@ public Dictionary<string, IEnumerable<string>> Headers
         {
             get
             {
-                if (_headers == null)
-                {
-                    _headers = WebResponseHelper.GetHeadersDictionary(BaseResponse);
-                }
+                _headers ??= WebResponseHelper.GetHeadersDictionary(BaseResponse);
 
                 return _headers;
             }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs
index 43b625311b9..43b42066cfa 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs
@@ -454,11 +454,8 @@ internal static string DecodeStream(Stream stream, ref Encoding encoding)
 
         internal static byte[] EncodeToBytes(string str, Encoding encoding)
         {
-            if (encoding == null)
-            {
-                // just use the default encoding if one wasn't provided
-                encoding = ContentHelper.GetDefaultEncoding();
-            }
+            // just use the default encoding if one wasn't provided
+            encoding ??= ContentHelper.GetDefaultEncoding();
 
             return encoding.GetBytes(str);
         }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
index ae08babe17f..c100f345a79 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
@@ -104,10 +104,7 @@ public WebRequestSession()
         /// <param name="certificate">The certificate to be added.</param>
         internal void AddCertificate(X509Certificate certificate)
         {
-            if (Certificates == null)
-            {
-                Certificates = new X509CertificateCollection();
-            }
+            Certificates ??= new X509CertificateCollection();
 
             Certificates.Add(certificate);
         }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write.cs
index 40c4ec63568..55e98260779 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write.cs
@@ -312,10 +312,7 @@ protected override void ProcessRecord()
             {
                 Exception e = this.Exception;
                 string msg = Message;
-                if (e == null)
-                {
-                    e = new WriteErrorException(msg);
-                }
+                e ??= new WriteErrorException(msg);
 
                 string errid = ErrorId;
                 if (string.IsNullOrEmpty(errid))
@@ -339,10 +336,7 @@ protected override void ProcessRecord()
             string recact = RecommendedAction;
             if (!string.IsNullOrEmpty(recact))
             {
-                if (errorRecord.ErrorDetails == null)
-                {
-                    errorRecord.ErrorDetails = new ErrorDetails(errorRecord.ToString());
-                }
+                errorRecord.ErrorDetails ??= new ErrorDetails(errorRecord.ToString());
 
                 errorRecord.ErrorDetails.RecommendedAction = recact;
             }

From 08e4596463a1fbd0fc136c89ca3e895d7516b776 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Tue, 26 Jul 2022 09:16:52 +0500
Subject: [PATCH 499/645] Move the type data definition of
 `System.Security.AccessControl.ObjectSecurity` to the
 `Microsoft.PowerShell.Security` module (#16355)

---
 .../Microsoft.PowerShell.Security.psd1        |   1 +
 .../Security.types.ps1xml                     | 124 +++++++++++++++
 .../engine/TypeTable_Types_Ps1Xml.cs          | 146 ------------------
 test/powershell/Host/Startup.Tests.ps1        |   1 -
 .../powershell/engine/ETS/TypeTable.Tests.ps1 |   4 +-
 5 files changed, 127 insertions(+), 149 deletions(-)
 create mode 100644 src/Modules/Windows/Microsoft.PowerShell.Security/Security.types.ps1xml

diff --git a/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 b/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
index b88bc92d2a2..6d47b2ce2cd 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
@@ -10,5 +10,6 @@ FunctionsToExport = @()
 CmdletsToExport="Get-Acl", "Set-Acl", "Get-PfxCertificate", "Get-Credential", "Get-ExecutionPolicy", "Set-ExecutionPolicy", "Get-AuthenticodeSignature", "Set-AuthenticodeSignature", "ConvertFrom-SecureString", "ConvertTo-SecureString", "Get-CmsMessage", "Unprotect-CmsMessage", "Protect-CmsMessage" , "New-FileCatalog" , "Test-FileCatalog"
 AliasesToExport = @()
 NestedModules="Microsoft.PowerShell.Security.dll"
+TypesToProcess="Security.types.ps1xml"
 HelpInfoURI = 'https://aka.ms/powershell73-help'
 }
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Security/Security.types.ps1xml b/src/Modules/Windows/Microsoft.PowerShell.Security/Security.types.ps1xml
new file mode 100644
index 00000000000..b1171c98e6a
--- /dev/null
+++ b/src/Modules/Windows/Microsoft.PowerShell.Security/Security.types.ps1xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- *******************************************************************
+These sample files contain type information used by the PowerShell engine.
+Do not edit or change the contents of this file directly.
+Please see the PowerShell documentation or type "Get-Help Update-TypeData"
+for more information.
+
+Copyright (c) Microsoft Corporation.
+
+THIS SAMPLE CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY
+OF ANY KIND,WHETHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR
+PURPOSE. IF THIS CODE AND INFORMATION IS MODIFIED, THE ENTIRE RISK OF USE
+OR RESULTS IN CONNECTION WITH THE USE OF THIS CODE AND INFORMATION
+REMAINS WITH THE USER.
+******************************************************************** -->
+
+<Types>
+  <Type>
+    <Name>System.Security.AccessControl.ObjectSecurity</Name>
+    <Members>
+      <CodeProperty>
+        <Name>Path</Name>
+        <GetCodeReference>
+          <TypeName>Microsoft.PowerShell.Commands.SecurityDescriptorCommandsBase</TypeName>
+          <MethodName>GetPath</MethodName>
+        </GetCodeReference>
+      </CodeProperty>
+      <CodeProperty>
+        <Name>Owner</Name>
+        <GetCodeReference>
+          <TypeName>Microsoft.PowerShell.Commands.SecurityDescriptorCommandsBase</TypeName>
+          <MethodName>GetOwner</MethodName>
+        </GetCodeReference>
+      </CodeProperty>
+      <CodeProperty>
+        <Name>Group</Name>
+        <GetCodeReference>
+          <TypeName>Microsoft.PowerShell.Commands.SecurityDescriptorCommandsBase</TypeName>
+          <MethodName>GetGroup</MethodName>
+        </GetCodeReference>
+      </CodeProperty>
+      <CodeProperty>
+        <Name>Access</Name>
+        <GetCodeReference>
+          <TypeName>Microsoft.PowerShell.Commands.SecurityDescriptorCommandsBase</TypeName>
+          <MethodName>GetAccess</MethodName>
+        </GetCodeReference>
+      </CodeProperty>
+      <CodeProperty>
+        <Name>Sddl</Name>
+        <GetCodeReference>
+          <TypeName>Microsoft.PowerShell.Commands.SecurityDescriptorCommandsBase</TypeName>
+          <MethodName>GetSddl</MethodName>
+        </GetCodeReference>
+      </CodeProperty>
+      <ScriptProperty>
+        <Name>AccessToString</Name>
+        <GetScriptBlock>
+          $toString = "";
+          $first = $true;
+          if ( ! $this.Access ) { return "" }
+          foreach($ace in $this.Access)
+          {
+          if($first)
+          {
+          $first = $false;
+          }
+          else
+          {
+          $tostring += "`n";
+          }
+          $toString += $ace.IdentityReference.ToString();
+          $toString += " ";
+          $toString += $ace.AccessControlType.ToString();
+          $toString += "  ";
+          if($ace -is [System.Security.AccessControl.FileSystemAccessRule])
+          {
+          $toString += $ace.FileSystemRights.ToString();
+          }
+          elseif($ace -is  [System.Security.AccessControl.RegistryAccessRule])
+          {
+          $toString += $ace.RegistryRights.ToString();
+          }
+          }
+          return $toString;
+        </GetScriptBlock>
+      </ScriptProperty>
+      <ScriptProperty>
+        <Name>AuditToString</Name>
+        <GetScriptBlock>
+          $toString = "";
+          $first = $true;
+          if ( ! (&amp; { Set-StrictMode -Version 1; $this.audit }) ) { return "" }
+          foreach($ace in (&amp; { Set-StrictMode -Version 1; $this.audit }))
+          {
+          if($first)
+          {
+          $first = $false;
+          }
+          else
+          {
+          $tostring += "`n";
+          }
+          $toString += $ace.IdentityReference.ToString();
+          $toString += " ";
+          $toString += $ace.AuditFlags.ToString();
+          $toString += "  ";
+          if($ace -is [System.Security.AccessControl.FileSystemAuditRule])
+          {
+          $toString += $ace.FileSystemRights.ToString();
+          }
+          elseif($ace -is [System.Security.AccessControl.RegistryAuditRule])
+          {
+          $toString += $ace.RegistryRights.ToString();
+          }
+          }
+          return $toString;
+        </GetScriptBlock>
+      </ScriptProperty>
+    </Members>
+  </Type>
+
+</Types>
diff --git a/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs b/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
index bb267267b31..5ecd5914904 100644
--- a/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
+++ b/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
@@ -4081,152 +4081,6 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag<string> errors)
 
             #endregion System.Management.ManagementObject
 
-            #region System.Security.AccessControl.ObjectSecurity
-
-            typeName = @"System.Security.AccessControl.ObjectSecurity";
-            typeMembers = _extendedMembers.GetOrAdd(typeName, static key => new PSMemberInfoInternalCollection<PSMemberInfo>(capacity: 7));
-            Type securityDescriptorCommandsBaseType = TypeResolver.ResolveType("Microsoft.PowerShell.Commands.SecurityDescriptorCommandsBase", exception: out _);
-
-            // Process regular members.
-            newMembers.Add(@"Path");
-            AddMember(
-                errors,
-                typeName,
-                new PSCodeProperty(
-                    @"Path",
-                    GetMethodInfo(securityDescriptorCommandsBaseType, @"GetPath"),
-                    setterCodeReference: null),
-                typeMembers,
-                isOverride: false);
-
-            newMembers.Add(@"Owner");
-            AddMember(
-                errors,
-                typeName,
-                new PSCodeProperty(
-                    @"Owner",
-                    GetMethodInfo(securityDescriptorCommandsBaseType, @"GetOwner"),
-                    setterCodeReference: null),
-                typeMembers,
-                isOverride: false);
-
-            newMembers.Add(@"Group");
-            AddMember(
-                errors,
-                typeName,
-                new PSCodeProperty(
-                    @"Group",
-                    GetMethodInfo(securityDescriptorCommandsBaseType, @"GetGroup"),
-                    setterCodeReference: null),
-                typeMembers,
-                isOverride: false);
-
-            newMembers.Add(@"Access");
-            AddMember(
-                errors,
-                typeName,
-                new PSCodeProperty(
-                    @"Access",
-                    GetMethodInfo(securityDescriptorCommandsBaseType, @"GetAccess"),
-                    setterCodeReference: null),
-                typeMembers,
-                isOverride: false);
-
-            newMembers.Add(@"Sddl");
-            AddMember(
-                errors,
-                typeName,
-                new PSCodeProperty(
-                    @"Sddl",
-                    GetMethodInfo(securityDescriptorCommandsBaseType, @"GetSddl"),
-                    setterCodeReference: null),
-                typeMembers,
-                isOverride: false);
-
-            newMembers.Add(@"AccessToString");
-            AddMember(
-                errors,
-                typeName,
-                new PSScriptProperty(
-                    @"AccessToString",
-                    GetScriptBlock(@"$toString = """";
-          $first = $true;
-          if ( ! $this.Access ) { return """" }
-
-          foreach($ace in $this.Access)
-          {
-          if($first)
-          {
-          $first = $false;
-          }
-          else
-          {
-          $tostring += ""`n"";
-          }
-
-          $toString += $ace.IdentityReference.ToString();
-          $toString += "" "";
-          $toString += $ace.AccessControlType.ToString();
-          $toString += ""  "";
-          if($ace -is [System.Security.AccessControl.FileSystemAccessRule])
-          {
-          $toString += $ace.FileSystemRights.ToString();
-          }
-          elseif($ace -is  [System.Security.AccessControl.RegistryAccessRule])
-          {
-          $toString += $ace.RegistryRights.ToString();
-          }
-          }
-
-          return $toString;"),
-                    setterScript: null,
-                    shouldCloneOnAccess: true),
-                typeMembers,
-                isOverride: false);
-
-            newMembers.Add(@"AuditToString");
-            AddMember(
-                errors,
-                typeName,
-                new PSScriptProperty(
-                    @"AuditToString",
-                    GetScriptBlock(@"$toString = """";
-          $first = $true;
-          if ( ! (& { Set-StrictMode -Version 1; $this.audit }) ) { return """" }
-
-          foreach($ace in (& { Set-StrictMode -Version 1; $this.audit }))
-          {
-          if($first)
-          {
-          $first = $false;
-          }
-          else
-          {
-          $tostring += ""`n"";
-          }
-
-          $toString += $ace.IdentityReference.ToString();
-          $toString += "" "";
-          $toString += $ace.AuditFlags.ToString();
-          $toString += ""  "";
-          if($ace -is [System.Security.AccessControl.FileSystemAuditRule])
-          {
-          $toString += $ace.FileSystemRights.ToString();
-          }
-          elseif($ace -is [System.Security.AccessControl.RegistryAuditRule])
-          {
-          $toString += $ace.RegistryRights.ToString();
-          }
-          }
-
-          return $toString;"),
-                    setterScript: null,
-                    shouldCloneOnAccess: true),
-                typeMembers,
-                isOverride: false);
-
-            #endregion System.Security.AccessControl.ObjectSecurity
-
             #region Microsoft.PowerShell.Commands.HistoryInfo
 
             typeName = @"Microsoft.PowerShell.Commands.HistoryInfo";
diff --git a/test/powershell/Host/Startup.Tests.ps1 b/test/powershell/Host/Startup.Tests.ps1
index d0d8662cc93..1e49d9a6a36 100644
--- a/test/powershell/Host/Startup.Tests.ps1
+++ b/test/powershell/Host/Startup.Tests.ps1
@@ -15,7 +15,6 @@ Describe "Validate start of console host" -Tag CI {
             'pwsh.dll'
             'System.Collections.Concurrent.dll'
             'System.Collections.dll'
-            'System.Collections.NonGeneric.dll'
             'System.Collections.Specialized.dll'
             'System.ComponentModel.dll'
             'System.ComponentModel.Primitives.dll'
diff --git a/test/powershell/engine/ETS/TypeTable.Tests.ps1 b/test/powershell/engine/ETS/TypeTable.Tests.ps1
index 55b909145a8..f523f9c1234 100644
--- a/test/powershell/engine/ETS/TypeTable.Tests.ps1
+++ b/test/powershell/engine/ETS/TypeTable.Tests.ps1
@@ -19,9 +19,9 @@ Describe "Built-in type information tests" -Tag "CI" {
 
     It "Should have correct number of built-in type items in type table" {
         $expected = if ($IsWindows) {
-            273
-        } else {
             272
+        } else {
+            271
         }
         $types.Count | Should -BeExactly $expected
     }

From e44fbff17b37fc3b29184558a391cda1d4bacb6e Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 25 Jul 2022 21:34:41 -0700
Subject: [PATCH 500/645] Disable the warning `IDE0031` to take .NET 7 Preview
 7 (#17770)

---
 .editorconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.editorconfig b/.editorconfig
index 031eb23e217..dd8d63862a4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -115,6 +115,7 @@ dotnet_style_prefer_conditional_expression_over_assignment = true:silent
 dotnet_style_prefer_auto_properties = true:suggestion
 csharp_prefer_simple_default_expression = true:suggestion
 dotnet_style_prefer_compound_assignment = false:silent
+dotnet_diagnostic.IDE0031.severity = none
 
 dotnet_code_quality_unused_parameters = non_public:suggestion
 

From 6bf8a98aeda2cbc8aa9a1d92b01b3b0200e621fd Mon Sep 17 00:00:00 2001
From: Matt Graeber <mattifestation@users.noreply.github.com>
Date: Tue, 26 Jul 2022 01:12:36 -0400
Subject: [PATCH 501/645] Adding Virtualization-Based Security feature names to
 Get-ComputerInfo (#16415)

---
 .../management/GetComputerInfoCommand.cs        | 17 ++++++++++++++++-
 .../Get-ComputerInfo.Tests.ps1                  |  3 ++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
index 9379927b5a0..a57756bbf75 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
@@ -3684,7 +3684,22 @@ public enum DeviceGuardHardwareSecure
         /// <summary>
         /// Secure Memory Overwrite.
         /// </summary>
-        SecureMemoryOverwrite = 4
+        SecureMemoryOverwrite = 4,
+        
+        /// <summary>
+        /// UEFI Code Readonly.
+        /// </summary>
+        UEFICodeReadonly = 5,
+
+        /// <summary>
+        /// SMM Security Mitigations 1.0.
+        /// </summary>
+        SMMSecurityMitigations = 6,
+
+        /// <summary>
+        /// Mode Based Execution Control.
+        /// </summary>
+        ModeBasedExecutionControl = 7
     }
 
     /// <summary>
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ComputerInfo.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ComputerInfo.Tests.ps1
index fd62292eb36..8962cdc6179 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ComputerInfo.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ComputerInfo.Tests.ps1
@@ -1304,7 +1304,8 @@ try {
                     "3" = "DMAProtection"
                     "4" = "SecureMemoryOverwrite"
                     "5" = "UEFICodeReadonly"
-                    "6" = "SMMSecurityMitigations1.0"
+                    "6" = "SMMSecurityMitigations"
+                    "7" = "ModeBasedExecutionControl"
                 }
                 $smartStatusValues = @{
                     "0" = "Off"

From 17791759356ffa6e2ae657d2ec19a147ce062957 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <mr.molkree@gmail.com>
Date: Tue, 26 Jul 2022 23:31:14 +0400
Subject: [PATCH 502/645] Use null-coalescing assignment in the rest of
 `/engine` (#17729)

---
 .../engine/CmdletInfo.cs                      |  7 +--
 .../engine/CmdletParameterBinderController.cs |  6 +--
 .../ComInterop/ComEventsSink.Extended.cs      |  5 +-
 .../engine/ComInterop/ComInvokeBinder.cs      | 10 +---
 .../engine/ComInterop/ComTypeClassDesc.cs     | 16 ++----
 .../engine/ComInterop/IDispatchComObject.cs   |  5 +-
 .../InteropServices/ComEventsMethod.cs        |  5 +-
 .../engine/ComInterop/SplatCallSite.cs        |  5 +-
 .../engine/ComInterop/TypeUtils.cs            |  8 ++-
 .../CommandCompletion/CompletionAnalysis.cs   | 10 +---
 .../CommandCompletion/CompletionCompleters.cs | 15 ++----
 .../engine/CommandDiscovery.cs                |  5 +-
 .../engine/CommandParameter.cs                |  5 +-
 .../engine/CommandPathSearch.cs               |  6 +--
 .../engine/CommandProcessorBase.cs            |  5 +-
 .../engine/CommandSearcher.cs                 |  5 +-
 .../engine/Modules/ImportModuleCommand.cs     | 17 ++-----
 .../engine/Modules/ModuleCmdletBase.cs        | 49 ++++---------------
 .../engine/Modules/ModuleIntrinsics.cs        | 17 ++-----
 .../Modules/NewModuleManifestCommand.cs       | 12 ++---
 20 files changed, 50 insertions(+), 163 deletions(-)

diff --git a/src/System.Management.Automation/engine/CmdletInfo.cs b/src/System.Management.Automation/engine/CmdletInfo.cs
index 05b7548f9fc..659ed59978a 100644
--- a/src/System.Management.Automation/engine/CmdletInfo.cs
+++ b/src/System.Management.Automation/engine/CmdletInfo.cs
@@ -380,11 +380,8 @@ public override ReadOnlyCollection<PSTypeName> OutputType
                         }
                     }
 
-                    if (provider == null)
-                    {
-                        // No path argument, so just use the current path to choose the provider.
-                        provider = Context.SessionState.Path.CurrentLocation.Provider;
-                    }
+                    // If no path argument, just use the current path to choose the provider.
+                    provider ??= Context.SessionState.Path.CurrentLocation.Provider;
 
                     provider.GetOutputTypes(Name, providerTypes);
                     if (providerTypes.Count > 0)
diff --git a/src/System.Management.Automation/engine/CmdletParameterBinderController.cs b/src/System.Management.Automation/engine/CmdletParameterBinderController.cs
index 8f853610447..c3de48a43c7 100644
--- a/src/System.Management.Automation/engine/CmdletParameterBinderController.cs
+++ b/src/System.Management.Automation/engine/CmdletParameterBinderController.cs
@@ -270,8 +270,7 @@ internal void BindCommandLineParametersNoValidation(Collection<CommandParameterI
 
             // If this generated an exception (but we didn't have one from the non-dynamic
             // parameters, report on this one.
-            if (reportedBindingException == null)
-                reportedBindingException = currentBindingException;
+            reportedBindingException ??= currentBindingException;
 
             // If the cmdlet implements a ValueFromRemainingArguments parameter (VarArgs)
             // bind the unbound arguments to that parameter.
@@ -1452,8 +1451,7 @@ private bool BindParameter(
 
                     BoundObsoleteParameterNames.Add(parameter.Parameter.Name);
 
-                    if (ObsoleteParameterWarningList == null)
-                        ObsoleteParameterWarningList = new List<WarningRecord>();
+                    ObsoleteParameterWarningList ??= new List<WarningRecord>();
 
                     ObsoleteParameterWarningList.Add(warningRecord);
                 }
diff --git a/src/System.Management.Automation/engine/ComInterop/ComEventsSink.Extended.cs b/src/System.Management.Automation/engine/ComInterop/ComEventsSink.Extended.cs
index f52ded959c2..0d63276a3ea 100644
--- a/src/System.Management.Automation/engine/ComInterop/ComEventsSink.Extended.cs
+++ b/src/System.Management.Automation/engine/ComInterop/ComEventsSink.Extended.cs
@@ -18,10 +18,7 @@ private void Initialize(object rcw, Guid iid)
         public void AddHandler(int dispid, object func)
         {
             ComEventsMethod method = FindMethod(dispid);
-            if (method == null)
-            {
-                method = AddMethod(dispid);
-            }
+            method ??= AddMethod(dispid);
 
             if (func is Delegate d)
             {
diff --git a/src/System.Management.Automation/engine/ComInterop/ComInvokeBinder.cs b/src/System.Management.Automation/engine/ComInterop/ComInvokeBinder.cs
index 6876425acf7..88e4114cd58 100644
--- a/src/System.Management.Automation/engine/ComInterop/ComInvokeBinder.cs
+++ b/src/System.Management.Automation/engine/ComInterop/ComInvokeBinder.cs
@@ -114,10 +114,7 @@ private ParameterExpression ParamVariantsVariable
         {
             get
             {
-                if (_paramVariants == null)
-                {
-                    _paramVariants = Expression.Variable(VariantArray.GetStructType(_args.Length), "paramVariants");
-                }
+                _paramVariants ??= Expression.Variable(VariantArray.GetStructType(_args.Length), "paramVariants");
                 return _paramVariants;
             }
         }
@@ -140,10 +137,7 @@ private static Type MarshalType(DynamicMetaObject mo, bool isByRef)
             if (isByRef)
             {
                 // Null just means that null was supplied.
-                if (marshalType == null)
-                {
-                    marshalType = mo.Expression.Type;
-                }
+                marshalType ??= mo.Expression.Type;
                 marshalType = marshalType.MakeByRefType();
             }
             return marshalType;
diff --git a/src/System.Management.Automation/engine/ComInterop/ComTypeClassDesc.cs b/src/System.Management.Automation/engine/ComInterop/ComTypeClassDesc.cs
index fdf0751d85c..2f2886d6555 100644
--- a/src/System.Management.Automation/engine/ComInterop/ComTypeClassDesc.cs
+++ b/src/System.Management.Automation/engine/ComInterop/ComTypeClassDesc.cs
@@ -17,10 +17,7 @@ internal class ComTypeClassDesc : ComTypeDesc, IDynamicMetaObjectProvider
 
         public object CreateInstance()
         {
-            if (_typeObj == null)
-            {
-                _typeObj = Type.GetTypeFromCLSID(Guid);
-            }
+            _typeObj ??= Type.GetTypeFromCLSID(Guid);
             return Activator.CreateInstance(Type.GetTypeFromCLSID(Guid));
         }
 
@@ -46,19 +43,12 @@ private void AddInterface(ComTypes.ITypeInfo itfTypeInfo, bool isSourceItf)
 
             if (isSourceItf)
             {
-                if (_sourceItfs == null)
-                {
-                    _sourceItfs = new LinkedList<string>();
-                }
+                _sourceItfs ??= new LinkedList<string>();
                 _sourceItfs.AddLast(itfName);
             }
             else
             {
-                if (_itfs == null)
-                {
-                    _itfs = new LinkedList<string>();
-                }
-
+                _itfs ??= new LinkedList<string>();
                 _itfs.AddLast(itfName);
             }
         }
diff --git a/src/System.Management.Automation/engine/ComInterop/IDispatchComObject.cs b/src/System.Management.Automation/engine/ComInterop/IDispatchComObject.cs
index c3a16639b62..5335a18c6de 100644
--- a/src/System.Management.Automation/engine/ComInterop/IDispatchComObject.cs
+++ b/src/System.Management.Automation/engine/ComInterop/IDispatchComObject.cs
@@ -271,10 +271,7 @@ internal override IList<string> GetMemberNames(bool dataOnly)
 
         internal override IList<KeyValuePair<string, object>> GetMembers(IEnumerable<string> names)
         {
-            if (names == null)
-            {
-                names = GetMemberNames(true);
-            }
+            names ??= GetMemberNames(true);
 
             Type comType = RuntimeCallableWrapper.GetType();
 
diff --git a/src/System.Management.Automation/engine/ComInterop/InteropServices/ComEventsMethod.cs b/src/System.Management.Automation/engine/ComInterop/InteropServices/ComEventsMethod.cs
index d31ca0299c9..f8ff1e09855 100644
--- a/src/System.Management.Automation/engine/ComInterop/InteropServices/ComEventsMethod.cs
+++ b/src/System.Management.Automation/engine/ComInterop/InteropServices/ComEventsMethod.cs
@@ -83,10 +83,7 @@ private void PreProcessSignature()
                         && pi.ParameterType.HasElementType
                         && pi.ParameterType.GetElementType()!.IsEnum)
                     {
-                        if (targetTypes == null)
-                        {
-                            targetTypes = new Type?[_expectedParamsCount];
-                        }
+                        targetTypes ??= new Type?[_expectedParamsCount];
 
                         targetTypes[i] = pi.ParameterType.GetElementType();
                     }
diff --git a/src/System.Management.Automation/engine/ComInterop/SplatCallSite.cs b/src/System.Management.Automation/engine/ComInterop/SplatCallSite.cs
index ecbff91a36c..926bb460a09 100644
--- a/src/System.Management.Automation/engine/ComInterop/SplatCallSite.cs
+++ b/src/System.Management.Automation/engine/ComInterop/SplatCallSite.cs
@@ -30,10 +30,7 @@ internal object Invoke(object[] args)
             Debug.Assert(args != null);
 
             // Create a CallSite and invoke it.
-            if (_site == null)
-            {
-                _site = CallSite<Func<CallSite, object, object[], object>>.Create(SplatInvokeBinder.Instance);
-            }
+            _site ??= CallSite<Func<CallSite, object, object[], object>>.Create(SplatInvokeBinder.Instance);
 
             return _site.Target(_site, _callable, args);
         }
diff --git a/src/System.Management.Automation/engine/ComInterop/TypeUtils.cs b/src/System.Management.Automation/engine/ComInterop/TypeUtils.cs
index 041d7ccfd07..04217bd0bb6 100644
--- a/src/System.Management.Automation/engine/ComInterop/TypeUtils.cs
+++ b/src/System.Management.Automation/engine/ComInterop/TypeUtils.cs
@@ -102,11 +102,9 @@ internal static MethodInfo GetUserDefinedCoercionMethod(Type convertFrom, Type c
             // try lifted conversion
             if (nnExprType != convertFrom || nnConvType != convertToType)
             {
-                method = FindConversionOperator(eMethods, nnExprType, nnConvType, implicitOnly);
-                if (method == null)
-                {
-                    method = FindConversionOperator(cMethods, nnExprType, nnConvType, implicitOnly);
-                }
+                method =
+                    FindConversionOperator(eMethods, nnExprType, nnConvType, implicitOnly) ??
+                    FindConversionOperator(cMethods, nnExprType, nnConvType, implicitOnly);
                 if (method != null)
                 {
                     return method;
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index ed387b62a6d..53ca1f46f3a 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -183,10 +183,7 @@ private CompletionContext InitializeCompletionContext(TypeInferenceContext typeI
         {
             var astContext = ExtractAstContext(_ast, _tokens, _cursorPosition);
 
-            if (typeInferenceContext.CurrentTypeDefinitionAst == null)
-            {
-                typeInferenceContext.CurrentTypeDefinitionAst = Ast.GetAncestorTypeDefinitionAst(astContext.RelatedAsts.Last());
-            }
+            typeInferenceContext.CurrentTypeDefinitionAst ??= Ast.GetAncestorTypeDefinitionAst(astContext.RelatedAsts.Last());
 
             ExecutionContext executionContext = typeInferenceContext.ExecutionContext;
 
@@ -1894,10 +1891,7 @@ private static List<CompletionResult> GetResultForIdentifierInConfiguration(
                         usageString = Microsoft.PowerShell.DesiredStateConfiguration.Internal.DscClassCache.GetDSCResourceUsageString(keyword);
                     }
 
-                    if (results == null)
-                    {
-                        results = new List<CompletionResult>();
-                    }
+                    results ??= new List<CompletionResult>();
 
                     results.Add(new CompletionResult(
                         keyword.Keyword,
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index 8c247de13b4..2ddb472f2dd 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -333,10 +333,7 @@ internal static List<CompletionResult> MakeCommandsUnique(IEnumerable<PSObject>
                 var commandList = keyValuePair.Value as List<object>;
                 if (commandList != null)
                 {
-                    if (endResults == null)
-                    {
-                        endResults = new List<CompletionResult>();
-                    }
+                    endResults ??= new List<CompletionResult>();
 
                     // The first command might be an un-prefixed commandInfo that we get by importing a module with the -Prefix parameter,
                     // in that case, we should add the module name qualification because if the module is not in the module path, calling
@@ -495,8 +492,7 @@ internal static List<CompletionResult> CompleteCommandParameter(CompletionContex
             DynamicKeywordStatementAst keywordAst = null;
             for (int i = context.RelatedAsts.Count - 1; i >= 0; i--)
             {
-                if (keywordAst == null)
-                    keywordAst = context.RelatedAsts[i] as DynamicKeywordStatementAst;
+                keywordAst ??= context.RelatedAsts[i] as DynamicKeywordStatementAst;
                 parameterAst = (context.RelatedAsts[i] as CommandParameterAst);
                 if (parameterAst != null) break;
             }
@@ -1624,8 +1620,7 @@ private static void CompletePositionalArgument(
                         }
                         else
                         {
-                            if (positionalParam == null)
-                                positionalParam = param;
+                            positionalParam ??= param;
                         }
                     }
                     else
@@ -5762,9 +5757,9 @@ internal static List<CompletionResult> CompleteMember(CompletionContext context,
                 // a MemberExpressionAst '$xml.$xml', whose parent is still a MemberExpressionAst '$xml.$xml.Save'.
                 // But here we DO NOT want to re-assign 'targetExpr' to be '$xml.$xml'. 'targetExpr' in this case
                 // should be '$xml'.
-                else if (targetExpr is null)
+                else
                 {
-                    targetExpr = parentAsMemberExpression.Expression;
+                    targetExpr ??= parentAsMemberExpression.Expression;
                 }
             }
             else if (lastAst.Parent is BinaryExpressionAst binaryExpression && context.TokenAtCursor.Kind.Equals(TokenKind.Multiply))
diff --git a/src/System.Management.Automation/engine/CommandDiscovery.cs b/src/System.Management.Automation/engine/CommandDiscovery.cs
index 1b000d0ec3d..e9de849a4cc 100644
--- a/src/System.Management.Automation/engine/CommandDiscovery.cs
+++ b/src/System.Management.Automation/engine/CommandDiscovery.cs
@@ -809,10 +809,7 @@ internal static CommandInfo LookupCommandInfo(
                     }
 
                     // Otherwise, invoke the CommandNotFound handler
-                    if (result == null)
-                    {
-                        result = InvokeCommandNotFoundHandler(commandName, context, originalCommandName, commandOrigin);
-                    }
+                    result ??= InvokeCommandNotFoundHandler(commandName, context, originalCommandName, commandOrigin);
                 } while (false);
             }
             else
diff --git a/src/System.Management.Automation/engine/CommandParameter.cs b/src/System.Management.Automation/engine/CommandParameter.cs
index 227795cf1d6..1c58bb87e29 100644
--- a/src/System.Management.Automation/engine/CommandParameter.cs
+++ b/src/System.Management.Automation/engine/CommandParameter.cs
@@ -124,10 +124,7 @@ internal bool ArgumentToBeSplatted
         /// </summary>
         internal void SetArgumentValue(Ast ast, object value)
         {
-            if (_argument == null)
-            {
-                _argument = new Argument();
-            }
+            _argument ??= new Argument();
 
             _argument.value = value;
             _argument.ast = ast;
diff --git a/src/System.Management.Automation/engine/CommandPathSearch.cs b/src/System.Management.Automation/engine/CommandPathSearch.cs
index a761aa638cb..d455273cacd 100644
--- a/src/System.Management.Automation/engine/CommandPathSearch.cs
+++ b/src/System.Management.Automation/engine/CommandPathSearch.cs
@@ -493,8 +493,7 @@ private void GetNewDirectoryResults(string pattern, string directory)
                         if (name.Equals(baseNames[i], StringComparison.OrdinalIgnoreCase)
                             || (!Platform.IsWindows && Platform.NonWindowsIsExecutable(name)))
                         {
-                            if (result == null)
-                                result = new Collection<string>();
+                            result ??= new Collection<string>();
                             result.Add(fileNames[i]);
                             break;
                         }
@@ -520,8 +519,7 @@ private void GetNewDirectoryResults(string pattern, string directory)
                     if (fileName.EndsWith(allowedExt, StringComparison.OrdinalIgnoreCase)
                         || (!Platform.IsWindows && Platform.NonWindowsIsExecutable(fileName)))
                     {
-                        if (result == null)
-                            result = new Collection<string>();
+                        result ??= new Collection<string>();
                         result.Add(fileName);
                     }
                 }
diff --git a/src/System.Management.Automation/engine/CommandProcessorBase.cs b/src/System.Management.Automation/engine/CommandProcessorBase.cs
index 8033e2b3677..1d0128a8b38 100644
--- a/src/System.Management.Automation/engine/CommandProcessorBase.cs
+++ b/src/System.Management.Automation/engine/CommandProcessorBase.cs
@@ -352,10 +352,7 @@ internal void SetCurrentScopeToExecutionScope()
             // Make sure we have a session state instance for this command.
             // If one hasn't been explicitly set, then use the session state
             // available on the engine execution context...
-            if (CommandSessionState == null)
-            {
-                CommandSessionState = Context.EngineSessionState;
-            }
+            CommandSessionState ??= Context.EngineSessionState;
 
             // Store off the current scope
             _previousScope = CommandSessionState.CurrentScope;
diff --git a/src/System.Management.Automation/engine/CommandSearcher.cs b/src/System.Management.Automation/engine/CommandSearcher.cs
index 434c36dfecf..cf798ddabbd 100644
--- a/src/System.Management.Automation/engine/CommandSearcher.cs
+++ b/src/System.Management.Automation/engine/CommandSearcher.cs
@@ -928,10 +928,7 @@ private static bool ShouldSkipCommandResolutionForConstrainedLanguage(CommandInf
                     }
                 }
 
-                if (module == null)
-                {
-                    module = modules[0];
-                }
+                module ??= modules[0];
             }
 
             return module;
diff --git a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
index 8e178c0cb10..48836d6cc96 100644
--- a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
@@ -661,11 +661,8 @@ private PSModuleInfo ImportModule_LocallyViaName(ImportModuleOptions importModul
                     }
                 }
 
-                if (rootedPath == null)
-                {
-                    // Check for full-qualified paths - either absolute or relative
-                    rootedPath = ResolveRootedFilePath(name, this.Context);
-                }
+                // If null check for full-qualified paths - either absolute or relative
+                rootedPath ??= ResolveRootedFilePath(name, this.Context);
 
                 bool alreadyLoaded = false;
                 var manifestProcessingFlags = ManifestProcessingFlags.LoadElements | ManifestProcessingFlags.NullOnFirstError;
@@ -1413,10 +1410,7 @@ private bool IsPs1xmlFileHelper(RemoteDiscoveryHelper.CimModuleFile cimModuleFil
                 goodEntries = new List<string>();
             }
 
-            if (goodEntries == null)
-            {
-                goodEntries = new List<string>();
-            }
+            goodEntries ??= new List<string>();
 
             List<string> badEntries;
             if (!this.GetListOfStringsFromData(manifestData, null, badKey, 0, out badEntries))
@@ -1424,10 +1418,7 @@ private bool IsPs1xmlFileHelper(RemoteDiscoveryHelper.CimModuleFile cimModuleFil
                 badEntries = new List<string>();
             }
 
-            if (badEntries == null)
-            {
-                badEntries = new List<string>();
-            }
+            badEntries ??= new List<string>();
 
             bool presentInGoodEntries = IsPs1xmlFileHelper_IsPresentInEntries(cimModuleFile, goodEntries);
             bool presentInBadEntries = IsPs1xmlFileHelper_IsPresentInEntries(cimModuleFile, badEntries);
diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index 57a98d9aff0..eaa4fe4fb15 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -2564,30 +2564,11 @@ internal PSModuleInfo LoadModuleManifest(
 
                 // without ModuleToProcess a manifest will export everything by default
                 // (otherwise we want to honour exports from ModuleToProcess)
-                if (exportedFunctions == null)
-                {
-                    exportedFunctions = MatchAll;
-                }
-
-                if (exportedCmdlets == null)
-                {
-                    exportedCmdlets = MatchAll;
-                }
-
-                if (exportedVariables == null)
-                {
-                    exportedVariables = MatchAll;
-                }
-
-                if (exportedAliases == null)
-                {
-                    exportedAliases = MatchAll;
-                }
-
-                if (exportedDscResources == null)
-                {
-                    exportedDscResources = MatchAll;
-                }
+                exportedAliases ??= MatchAll;
+                exportedCmdlets ??= MatchAll;
+                exportedDscResources ??= MatchAll;
+                exportedFunctions ??= MatchAll;
+                exportedVariables ??= MatchAll;
             }
 
             manifestInfo.Description = description;
@@ -3218,16 +3199,10 @@ internal PSModuleInfo LoadModuleManifest(
                     }
                 }
 
-                if (newManifestInfo.RootModule == null)
-                {
-                    newManifestInfo.RootModule = manifestInfo.RootModule;
-                }
+                newManifestInfo.RootModule ??= manifestInfo.RootModule;
                 // If may be the case that a script has already set the PrivateData field in the module
                 // info object, in which case we won't overwrite it.
-                if (newManifestInfo.PrivateData == null)
-                {
-                    newManifestInfo.PrivateData = manifestInfo.PrivateData;
-                }
+                newManifestInfo.PrivateData ??= manifestInfo.PrivateData;
 
                 // Assign the PowerShellGet related properties from the module manifest
                 foreach (var tag in manifestInfo.Tags)
@@ -3352,10 +3327,7 @@ internal PSModuleInfo LoadModuleManifest(
                     }
                 }
 
-                if (newManifestInfo.RootModuleForManifest == null)
-                {
-                    newManifestInfo.RootModuleForManifest = manifestInfo.RootModuleForManifest;
-                }
+                newManifestInfo.RootModuleForManifest ??= manifestInfo.RootModuleForManifest;
 
                 if (newManifestInfo.DeclaredCmdletExports == null || newManifestInfo.DeclaredCmdletExports.Count == 0)
                 {
@@ -6591,10 +6563,7 @@ internal PSModuleInfo LoadBinaryModule(
             {
                 string binaryPath = fileName;
                 modulePath = fileName;
-                if (binaryPath == null)
-                {
-                    binaryPath = System.IO.Path.Combine(moduleBase, moduleName);
-                }
+                binaryPath ??= System.IO.Path.Combine(moduleBase, moduleName);
 
                 BinaryAnalysisResult analysisResult = GetCmdletsFromBinaryModuleImplementation(binaryPath, manifestProcessingFlags, out assemblyVersion);
                 detectedCmdlets = analysisResult.DetectedCmdlets;
diff --git a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
index e0241f726c6..6c5eae34968 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
@@ -141,10 +141,7 @@ private PSModuleInfo CreateModuleImplementation(string name, string path, object
             // script scope for the ss.
 
             // Allocate the session state instance for this module.
-            if (ss == null)
-            {
-                ss = new SessionState(_context, true, true);
-            }
+            ss ??= new SessionState(_context, true, true);
 
             // Now set up the module's session state to be the current session state
             SessionStateInternal oldSessionState = _context.EngineSessionState;
@@ -270,7 +267,7 @@ internal List<PSModuleInfo> GetModules(string[] patterns, bool all)
 
         internal List<PSModuleInfo> GetExactMatchModules(string moduleName, bool all, bool exactMatch)
         {
-            if (moduleName == null) { moduleName = string.Empty; }
+            moduleName ??= string.Empty;
 
             return GetModuleCore(new string[] { moduleName }, all, exactMatch);
         }
@@ -287,10 +284,7 @@ private List<PSModuleInfo> GetModuleCore(string[] patterns, bool all, bool exact
             }
             else
             {
-                if (patterns == null)
-                {
-                    patterns = new string[] { "*" };
-                }
+                patterns ??= new string[] { "*" };
 
                 foreach (string pattern in patterns)
                 {
@@ -1192,10 +1186,7 @@ public static string GetModulePath(string currentProcessModulePath, string hklmM
 
                 if (string.IsNullOrEmpty(currentProcessModulePath))
                 {
-                    if (currentProcessModulePath is null)
-                    {
-                        currentProcessModulePath = string.Empty;
-                    }
+                    currentProcessModulePath ??= string.Empty;
                 }
                 else
                 {
diff --git a/src/System.Management.Automation/engine/Modules/NewModuleManifestCommand.cs b/src/System.Management.Automation/engine/Modules/NewModuleManifestCommand.cs
index e7cb2f846b3..1035b36e0e6 100644
--- a/src/System.Management.Automation/engine/Modules/NewModuleManifestCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/NewModuleManifestCommand.cs
@@ -948,12 +948,9 @@ protected override void EndProcessing()
             // wildcards for exported commands that weren't specified on the command line.
             if (_rootModule != null || _nestedModules != null || _requiredModules != null)
             {
-                if (_exportedFunctions == null)
-                    _exportedFunctions = new string[] { "*" };
-                if (_exportedAliases == null)
-                    _exportedAliases = new string[] { "*" };
-                if (_exportedCmdlets == null)
-                    _exportedCmdlets = new string[] { "*" };
+                _exportedAliases ??= new string[] { "*" };
+                _exportedCmdlets ??= new string[] { "*" };
+                _exportedFunctions ??= new string[] { "*" };
             }
 
             ValidateUriParameterValue(ProjectUri, "ProjectUri");
@@ -1030,8 +1027,7 @@ protected override void EndProcessing()
                     result.Append(streamWriter.NewLine);
                     result.Append(streamWriter.NewLine);
 
-                    if (_rootModule == null)
-                        _rootModule = string.Empty;
+                    _rootModule ??= string.Empty;
 
                     BuildModuleManifest(result, nameof(RootModule), Modules.RootModule, !string.IsNullOrEmpty(_rootModule), () => QuoteName(_rootModule), streamWriter);
 

From b780a34ad1a8b0fb4aa02c5a486d1e9a995615ab Mon Sep 17 00:00:00 2001
From: Patrick Meinecke <SeeminglyScience@users.noreply.github.com>
Date: Wed, 27 Jul 2022 16:36:39 -0400
Subject: [PATCH 503/645] Fix the definition of the `PDH_COUNTER_INFO` struct
 (#17779)

* Correct the struct `PDH_COUNTER_INFO`
Fixes #13829

* Make code factor happy
---
 .../PdhHelper.cs                              | 83 ++++++++++++++-----
 1 file changed, 60 insertions(+), 23 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs
index 97eff22db0d..b761aa6e30b 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs
@@ -267,28 +267,65 @@ private struct PDH_TIME_INFO
         // We only need dwType and lDefaultScale fields from this structure.
         // We access those fields directly. The struct is here for reference only.
         //
-        [StructLayout(LayoutKind.Explicit, CharSet = CharSet.Unicode)]
-        private struct PDH_COUNTER_INFO
+        [StructLayout(LayoutKind.Sequential)]
+        private unsafe struct PDH_COUNTER_INFO
         {
-            [FieldOffset(0)] public UInt32 dwLength;
-            [FieldOffset(4)] public UInt32 dwType;
-            [FieldOffset(8)] public UInt32 CVersion;
-            [FieldOffset(12)] public UInt32 CStatus;
-            [FieldOffset(16)] public UInt32 lScale;
-            [FieldOffset(20)] public UInt32 lDefaultScale;
-            [FieldOffset(24)] public IntPtr dwUserData;
-            [FieldOffset(32)] public IntPtr dwQueryUserData;
-            [FieldOffset(40)] public string szFullPath;
-
-            [FieldOffset(48)] public string szMachineName;
-            [FieldOffset(56)] public string szObjectName;
-            [FieldOffset(64)] public string szInstanceName;
-            [FieldOffset(72)] public string szParentInstance;
-            [FieldOffset(80)] public UInt32 dwInstanceIndex;
-            [FieldOffset(88)] public string szCounterName;
-
-            [FieldOffset(96)] public string szExplainText;
-            [FieldOffset(104)] public IntPtr DataBuffer;
+            public uint Length;
+            public uint Type;
+            public uint CVersion;
+            public uint CStatus;
+            public int Scale;
+            public int DefaultScale;
+            public ulong UserData;
+            public ulong QueryUserData;
+            public ushort* FullPath;
+            public _Anonymous_e__Union Anonymous;
+            public ushort* ExplainText;
+            public fixed uint DataBuffer[1];
+
+            [StructLayout(LayoutKind.Explicit)]
+            internal struct _Anonymous_e__Union
+            {
+                [FieldOffset(0)]
+                public PDH_DATA_ITEM_PATH_ELEMENTS_blittable DataItemPath;
+
+                [FieldOffset(0)]
+                public PDH_COUNTER_PATH_ELEMENTS_blittable CounterPath;
+
+                [FieldOffset(0)]
+                public _Anonymous_e__Struct Anonymous;
+
+                [StructLayout(LayoutKind.Sequential)]
+                internal struct PDH_DATA_ITEM_PATH_ELEMENTS_blittable
+                {
+                    public ushort* MachineName;
+                    public Guid ObjectGUID;
+                    public uint ItemId;
+                    public ushort* InstanceName;
+                }
+
+                [StructLayout(LayoutKind.Sequential)]
+                internal struct PDH_COUNTER_PATH_ELEMENTS_blittable
+                {
+                    public ushort* MachineName;
+                    public ushort* ObjectName;
+                    public ushort* InstanceName;
+                    public ushort* ParentInstance;
+                    public uint InstanceIndex;
+                    public ushort* CounterName;
+                }
+
+                [StructLayout(LayoutKind.Sequential)]
+                internal struct _Anonymous_e__Struct
+                {
+                    public ushort* MachineName;
+                    public ushort* ObjectName;
+                    public ushort* InstanceName;
+                    public ushort* ParentInstance;
+                    public uint InstanceIndex;
+                    public ushort* CounterName;
+                }
+            }
         }
 
         [DllImport("pdh.dll", CharSet = CharSet.Unicode)]
@@ -476,8 +513,8 @@ private static uint GetCounterInfoPlus(IntPtr hCounter, out UInt32 counterType,
                 if (res == PdhResults.PDH_CSTATUS_VALID_DATA && bufCounterInfo != IntPtr.Zero)
                 {
                     PDH_COUNTER_INFO pdhCounterInfo = (PDH_COUNTER_INFO)Marshal.PtrToStructure(bufCounterInfo, typeof(PDH_COUNTER_INFO));
-                    counterType = pdhCounterInfo.dwType;
-                    defaultScale = pdhCounterInfo.lDefaultScale;
+                    counterType = pdhCounterInfo.Type;
+                    defaultScale = (uint)pdhCounterInfo.DefaultScale;
                 }
             }
             finally

From bf9b4dbef1211d89ccc35db0ec9e602d6db689a7 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 28 Jul 2022 14:17:32 -0700
Subject: [PATCH 504/645] Don't run link check on forks (#17797)

---
 .github/workflows/markdownLinkDaily.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/markdownLinkDaily.yml b/.github/workflows/markdownLinkDaily.yml
index 70c28ace9fc..4e20ec9473a 100644
--- a/.github/workflows/markdownLinkDaily.yml
+++ b/.github/workflows/markdownLinkDaily.yml
@@ -12,6 +12,7 @@ on:
 jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
+    if: github.repository == 'PowerShell/PowerShell'
     steps:
     - name: Checkout
       uses: actions/checkout@master

From 5eb91360bb62046d5aa4d4bb5432af7d77a0d3a2 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 28 Jul 2022 14:46:51 -0700
Subject: [PATCH 505/645] Update how to update homebrew (#17798)

---
 docs/maintainers/releasing.md | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/docs/maintainers/releasing.md b/docs/maintainers/releasing.md
index e3ac1998f77..a44ae5ee604 100644
--- a/docs/maintainers/releasing.md
+++ b/docs/maintainers/releasing.md
@@ -215,30 +215,10 @@ There are 2 homebrew formulas: main and preview.
 
 Update it on stable releases.
 
-1. Make sure that you have [homebrew cask](https://caskroom.github.io/).
-1. `brew update`
-1. `cd /usr/local/Homebrew/Library/Taps/caskroom/homebrew-cask/Casks`
-1. Edit `./powershell.rb`, reference [file history](https://github.com/vors/homebrew-cask/commits/master/Casks/powershell.rb) for the guidelines:
-    1. Update `version`
-    1. Update `sha256` to the checksum of produced `.pkg` (note lower-case string for the consistent style)
-    1. Update `checkpoint` value. To do that run `brew cask _appcast_checkpoint --calculate 'https://github.com/PowerShell/PowerShell/releases.atom'`
-1. `brew cask style --fix ./powershell.rb`, make sure there are no errors
-1. `brew cask audit --download ./powershell.rb`, make sure there are no errors
-1. `brew cask upgrade powershell`, make sure that powershell was updates successfully
-1. Commit your changes, send a PR to [homebrew-cask](https://github.com/caskroom/homebrew-cask)
+1. Wait for a PR to show up in https://github.com/powershell/homebrew-tap, review and merge it.
 
 ### Preview
 
 Update it on preview releases.
 
-1. Add [homebrew cask versions](https://github.com/Homebrew/homebrew-cask-versions): `brew tap homebrew/cask-versions`
-1. `brew update`
-1. `cd /usr/local/Homebrew/Library/Taps/homebrew/homebrew-cask-versions/Casks`
-1. Edit `./powershell-preview.rb`:
-    1. Update `version`
-    1. Update `sha256` to the checksum of produced `.pkg` (note lower-case string for the consistent style)
-    1. Update `checkpoint` value. To do that run `brew cask _appcast_checkpoint --calculate 'https://github.com/PowerShell/PowerShell/releases.atom'`
-1. `brew cask style --fix ./powershell-preview.rb`, make sure there are no errors
-1. `brew cask audit --download ./powershell-preview.rb`, make sure there are no errors
-1. `brew cask upgrade powershell-preview`, make sure that powershell was updates successfully
-1. Commit your changes, send a PR to [homebrew-cask-versions](https://github.com/Homebrew/homebrew-cask-versions)
+1. Wait for a PR to show up in https://github.com/powershell/homebrew-tap, review and merge it.

From 4b4f1d144ff3ff863098a7c61d09d22b3dac313e Mon Sep 17 00:00:00 2001
From: Frode Flaten <3436158+fflaten@users.noreply.github.com>
Date: Fri, 29 Jul 2022 06:06:07 +0200
Subject: [PATCH 506/645] Use null propagation operator in /engine (#17789)

---
 .../engine/COM/ComTypeInfo.cs                 | 10 +--
 .../engine/CmdletParameterBinderController.cs | 10 +--
 .../PseudoParameterBinder.cs                  |  5 +-
 .../engine/CommandInfo.cs                     |  7 +-
 .../engine/EventManager.cs                    | 10 +--
 .../engine/ExecutionContext.cs                | 32 ++-------
 .../engine/InternalCommands.cs                | 19 +++--
 .../engine/Modules/ModuleCmdletBase.cs        | 24 +++----
 .../engine/MshCmdlet.cs                       |  9 +--
 .../engine/MshCommandRuntime.cs               |  5 +-
 .../engine/NativeCommand.cs                   |  3 +-
 .../engine/NativeCommandProcessor.cs          |  5 +-
 .../engine/ParameterBinderBase.cs             | 16 ++---
 .../engine/Pipe.cs                            |  6 +-
 .../engine/SessionStateVariableAPIs.cs        |  5 +-
 .../engine/Utils.cs                           | 20 ++----
 .../engine/debugger/debugger.cs               | 63 +++++-----------
 .../engine/hostifaces/AsyncResult.cs          |  5 +-
 .../hostifaces/InternalHostUserInterface.cs   | 37 ++--------
 .../engine/hostifaces/LocalConnection.cs      | 13 +---
 .../engine/hostifaces/LocalPipeline.cs        |  5 +-
 .../engine/hostifaces/PSCommand.cs            | 45 +++---------
 .../engine/hostifaces/PSDataCollection.cs     | 62 +++-------------
 .../engine/hostifaces/PSTask.cs               |  8 +--
 .../engine/hostifaces/PowerShell.cs           | 72 ++++---------------
 .../engine/lang/scriptblock.cs                |  5 +-
 .../engine/parser/Compiler.cs                 |  5 +-
 .../engine/parser/Parser.cs                   |  5 +-
 .../engine/parser/PreOrderVisitor.cs          |  5 +-
 .../engine/parser/SymbolResolver.cs           |  7 +-
 .../engine/parser/TypeResolver.cs             |  5 +-
 .../engine/parser/VariableAnalysis.cs         | 16 +----
 .../engine/parser/tokenizer.cs                |  5 +-
 .../engine/pipeline.cs                        |  5 +-
 .../engine/runtime/Binding/Binders.cs         |  5 +-
 .../engine/runtime/Operations/MiscOps.cs      | 57 ++++-----------
 36 files changed, 137 insertions(+), 479 deletions(-)

diff --git a/src/System.Management.Automation/engine/COM/ComTypeInfo.cs b/src/System.Management.Automation/engine/COM/ComTypeInfo.cs
index 851325e82ec..eab301db3ca 100644
--- a/src/System.Management.Automation/engine/COM/ComTypeInfo.cs
+++ b/src/System.Management.Automation/engine/COM/ComTypeInfo.cs
@@ -183,10 +183,7 @@ private void AddProperty(string strName, COM.FUNCDESC funcdesc, int index)
                 _properties[strName] = prop;
             }
 
-            if (prop != null)
-            {
-                prop.UpdateFuncDesc(funcdesc, index);
-            }
+            prop?.UpdateFuncDesc(funcdesc, index);
         }
 
         private void AddMethod(string strName, int index)
@@ -198,10 +195,7 @@ private void AddMethod(string strName, int index)
                 _methods[strName] = method;
             }
 
-            if (method != null)
-            {
-                method.AddFuncDesc(index);
-            }
+            method?.AddFuncDesc(index);
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/CmdletParameterBinderController.cs b/src/System.Management.Automation/engine/CmdletParameterBinderController.cs
index c3de48a43c7..ee2fec058cf 100644
--- a/src/System.Management.Automation/engine/CmdletParameterBinderController.cs
+++ b/src/System.Management.Automation/engine/CmdletParameterBinderController.cs
@@ -202,10 +202,7 @@ internal void BindCommandLineParameters(Collection<CommandParameterInternal> arg
         internal void BindCommandLineParametersNoValidation(Collection<CommandParameterInternal> arguments)
         {
             var psCompiledScriptCmdlet = this.Command as PSScriptCmdlet;
-            if (psCompiledScriptCmdlet != null)
-            {
-                psCompiledScriptCmdlet.PrepareForBinding(this.CommandLineParameters);
-            }
+            psCompiledScriptCmdlet?.PrepareForBinding(this.CommandLineParameters);
 
             InitUnboundArguments(arguments);
             CommandMetadata cmdletMetadata = _commandMetadata;
@@ -1044,10 +1041,7 @@ private bool RestoreParameter(CommandParameterInternal argumentToBind, MergedCom
                         _commandMetadata.ImplementsDynamicParameters,
                         "The metadata for the dynamic parameters should only be available if the command supports IDynamicParameters");
 
-                    if (_dynamicParameterBinder != null)
-                    {
-                        _dynamicParameterBinder.BindParameter(argumentToBind.ParameterName, argumentToBind.ArgumentValue, parameter.Parameter);
-                    }
+                    _dynamicParameterBinder?.BindParameter(argumentToBind.ParameterName, argumentToBind.ArgumentValue, parameter.Parameter);
 
                     break;
             }
diff --git a/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs b/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
index 44f18d7c695..97b39cf39f5 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
@@ -1222,10 +1222,7 @@ private bool PrepareCommandElements(ExecutionContext context)
                     var parameter = _commandElements[commandIndex] as CommandParameterAst;
                     if (parameter != null)
                     {
-                        if (argumentsToGetDynamicParameters != null)
-                        {
-                            argumentsToGetDynamicParameters.Add(parameter.Extent.Text);
-                        }
+                        argumentsToGetDynamicParameters?.Add(parameter.Extent.Text);
 
                         AstPair parameterArg = parameter.Argument != null
                             ? new AstPair(parameter)
diff --git a/src/System.Management.Automation/engine/CommandInfo.cs b/src/System.Management.Automation/engine/CommandInfo.cs
index 1acca145ff9..eb2e7163469 100644
--- a/src/System.Management.Automation/engine/CommandInfo.cs
+++ b/src/System.Management.Automation/engine/CommandInfo.cs
@@ -467,11 +467,8 @@ private MergedCommandParameterMetadata GetMergedCommandParameterMetadataSafely()
                         processInCurrentThread: true,
                         waitForCompletionInCurrentThread: true);
 
-                    if (eventArgs.Exception != null)
-                    {
-                        // An exception happened on a different thread, rethrow it here on the correct thread.
-                        eventArgs.Exception.Throw();
-                    }
+                    // An exception happened on a different thread, rethrow it here on the correct thread.
+                    eventArgs.Exception?.Throw();
 
                     return eventArgs.Result;
                 }
diff --git a/src/System.Management.Automation/engine/EventManager.cs b/src/System.Management.Automation/engine/EventManager.cs
index 3df9153f4e7..78304819289 100644
--- a/src/System.Management.Automation/engine/EventManager.cs
+++ b/src/System.Management.Automation/engine/EventManager.cs
@@ -862,10 +862,7 @@ private void UnsubscribeEvent(PSEventSubscriber subscriber, bool skipDraining)
             }
 
             // Stop the job
-            if (subscriber.Action != null)
-            {
-                subscriber.Action.NotifyJobStopped();
-            }
+            subscriber.Action?.NotifyJobStopped();
 
             lock (_eventSubscribers)
             {
@@ -1532,10 +1529,7 @@ public void Dispose(bool disposing)
             {
                 lock (_eventSubscribers)
                 {
-                    if (_timer != null)
-                    {
-                        _timer.Dispose();
-                    }
+                    _timer?.Dispose();
 
                     foreach (PSEventSubscriber currentSubscriber in _eventSubscribers.Keys.ToArray())
                     {
diff --git a/src/System.Management.Automation/engine/ExecutionContext.cs b/src/System.Management.Automation/engine/ExecutionContext.cs
index aa13b2aa7a6..0f2fb0822b5 100644
--- a/src/System.Management.Automation/engine/ExecutionContext.cs
+++ b/src/System.Management.Automation/engine/ExecutionContext.cs
@@ -53,22 +53,12 @@ internal ScriptDebugger Debugger
         /// </summary>
         internal void ResetManagers()
         {
-            if (_debugger != null)
-            {
-                _debugger.ResetDebugger();
-            }
-
-            if (Events != null)
-            {
-                Events.Dispose();
-            }
+            _debugger?.ResetDebugger();
 
+            Events?.Dispose();
             Events = new PSLocalEventManager(this);
-            if (this.transactionManager != null)
-            {
-                this.transactionManager.Dispose();
-            }
 
+            this.transactionManager?.Dispose();
             this.transactionManager = new PSTransactionManager();
         }
         /// <summary>
@@ -1155,22 +1145,12 @@ internal void RunspaceClosingNotification()
         {
             EngineSessionState.RunspaceClosingNotification();
 
-            if (_debugger != null)
-            {
-                _debugger.Dispose();
-            }
-
-            if (Events != null)
-            {
-                Events.Dispose();
-            }
+            _debugger?.Dispose();
 
+            Events?.Dispose();
             Events = null;
-            if (this.transactionManager != null)
-            {
-                this.transactionManager.Dispose();
-            }
 
+            this.transactionManager?.Dispose();
             this.transactionManager = null;
         }
 
diff --git a/src/System.Management.Automation/engine/InternalCommands.cs b/src/System.Management.Automation/engine/InternalCommands.cs
index f86478e7450..f1c5f57c88f 100644
--- a/src/System.Management.Automation/engine/InternalCommands.cs
+++ b/src/System.Management.Automation/engine/InternalCommands.cs
@@ -919,17 +919,14 @@ private void ProcessScriptBlockParameterSet()
                 // because it allows you to parameterize a command - for example you might allow
                 // for actions before and after the main processing script. They could be null
                 // by default and therefore ignored then filled in later...
-                if (_scripts[i] != null)
-                {
-                    _scripts[i].InvokeUsingCmdlet(
-                        contextCmdlet: this,
-                        useLocalScope: false,
-                        errorHandlingBehavior: ScriptBlock.ErrorHandlingBehavior.WriteToCurrentErrorPipe,
-                        dollarUnder: InputObject,
-                        input: new object[] { InputObject },
-                        scriptThis: AutomationNull.Value,
-                        args: Array.Empty<object>());
-                }
+                _scripts[i]?.InvokeUsingCmdlet(
+                    contextCmdlet: this,
+                    useLocalScope: false,
+                    errorHandlingBehavior: ScriptBlock.ErrorHandlingBehavior.WriteToCurrentErrorPipe,
+                    dollarUnder: InputObject,
+                    input: new object[] { InputObject },
+                    scriptThis: AutomationNull.Value,
+                    args: Array.Empty<object>());
             }
         }
 
diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index eaa4fe4fb15..dc5f500f59b 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -5013,17 +5013,14 @@ internal void RemoveModule(PSModuleInfo module, string moduleNameInRemoveModuleC
                 if (Context.Modules.ModuleTable.ContainsKey(module.Path))
                 {
                     // We should try to run OnRemove as the very first thing
-                    if (module.OnRemove != null)
-                    {
-                        module.OnRemove.InvokeUsingCmdlet(
-                            contextCmdlet: this,
-                            useLocalScope: true,
-                            errorHandlingBehavior: ScriptBlock.ErrorHandlingBehavior.WriteToCurrentErrorPipe,
-                            dollarUnder: AutomationNull.Value,
-                            input: AutomationNull.Value,
-                            scriptThis: AutomationNull.Value,
-                            args: new object[] { module });
-                    }
+                    module.OnRemove?.InvokeUsingCmdlet(
+                        contextCmdlet: this,
+                        useLocalScope: true,
+                        errorHandlingBehavior: ScriptBlock.ErrorHandlingBehavior.WriteToCurrentErrorPipe,
+                        dollarUnder: AutomationNull.Value,
+                        input: AutomationNull.Value,
+                        scriptThis: AutomationNull.Value,
+                        args: new object[] { module });
 
                     if (module.ImplementingAssembly != null && !module.ImplementingAssembly.IsDynamic)
                     {
@@ -6893,10 +6890,7 @@ internal static void AddModuleToModuleTables(ExecutionContext context, SessionSt
                 targetSessionState.ModuleTableKeys.Add(moduleTableKey);
             }
 
-            if (targetSessionState.Module != null)
-            {
-                targetSessionState.Module.AddNestedModule(module);
-            }
+            targetSessionState.Module?.AddNestedModule(module);
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/MshCmdlet.cs b/src/System.Management.Automation/engine/MshCmdlet.cs
index c11e674660c..232140d57c5 100644
--- a/src/System.Management.Automation/engine/MshCmdlet.cs
+++ b/src/System.Management.Automation/engine/MshCmdlet.cs
@@ -283,8 +283,7 @@ public bool HasErrors
         /// </exception>
         public string ExpandString(string source)
         {
-            if (_cmdlet != null)
-                _cmdlet.ThrowIfStopping();
+            _cmdlet?.ThrowIfStopping();
             return _context.Engine.Expand(source);
         }
 
@@ -818,8 +817,7 @@ private Collection<PSObject> InvokeScript(
             IList input,
             params object[] args)
         {
-            if (_cmdlet != null)
-                _cmdlet.ThrowIfStopping();
+            _cmdlet?.ThrowIfStopping();
 
             Cmdlet cmdletToUse = null;
             ScriptBlock.ErrorHandlingBehavior errorHandlingBehavior = ScriptBlock.ErrorHandlingBehavior.WriteToExternalErrorPipe;
@@ -910,8 +908,7 @@ private Collection<PSObject> InvokeScript(
         /// <exception cref="ParseException"></exception>
         public ScriptBlock NewScriptBlock(string scriptText)
         {
-            if (_commandRuntime != null)
-                _commandRuntime.ThrowIfStopping();
+            _commandRuntime?.ThrowIfStopping();
 
             ScriptBlock result = ScriptBlock.Create(_context, scriptText);
             return result;
diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
index 2050f636e89..64202018904 100644
--- a/src/System.Management.Automation/engine/MshCommandRuntime.cs
+++ b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -2395,10 +2395,7 @@ public Exception ManageException(Exception e)
             if (e == null)
                 throw PSTraceSource.NewArgumentNullException(nameof(e));
 
-            if (PipelineProcessor != null)
-            {
-                PipelineProcessor.RecordFailure(e, _thisCommand);
-            }
+            PipelineProcessor?.RecordFailure(e, _thisCommand);
 
             // 1021203-2005/05/09-JonN
             // HaltCommandException will cause the command
diff --git a/src/System.Management.Automation/engine/NativeCommand.cs b/src/System.Management.Automation/engine/NativeCommand.cs
index 822d4cf82d9..80748605a98 100644
--- a/src/System.Management.Automation/engine/NativeCommand.cs
+++ b/src/System.Management.Automation/engine/NativeCommand.cs
@@ -26,8 +26,7 @@ internal override void DoStopProcessing()
         {
             try
             {
-                if (_myCommandProcessor != null)
-                    _myCommandProcessor.StopProcessing();
+                _myCommandProcessor?.StopProcessing();
             }
             catch (Exception)
             {
diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index 0077e13d96a..1538da81302 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -2126,10 +2126,7 @@ internal void Done()
         {
             if (_inputFormat == NativeCommandIOFormat.Xml)
             {
-                if (_xmlSerializer != null)
-                {
-                    _xmlSerializer.Done();
-                }
+                _xmlSerializer?.Done();
             }
             else // Text
             {
diff --git a/src/System.Management.Automation/engine/ParameterBinderBase.cs b/src/System.Management.Automation/engine/ParameterBinderBase.cs
index 4d72055b154..e190c4aaca3 100644
--- a/src/System.Management.Automation/engine/ParameterBinderBase.cs
+++ b/src/System.Management.Automation/engine/ParameterBinderBase.cs
@@ -559,15 +559,13 @@ internal virtual bool BindParameter(
                             parameterMetadata.ObsoleteAttribute.Message);
 
                         var mshCommandRuntime = this.Command.commandRuntime as MshCommandRuntime;
-                        if (mshCommandRuntime != null)
-                        {
-                            // Write out warning only if we are in the context of MshCommandRuntime.
-                            // This is because
-                            //  1. The overload method WriteWarning(WarningRecord) is only available in MshCommandRuntime;
-                            //  2. We write out warnings for obsolete commands and obsolete cmdlet parameters only when in
-                            //     the context of MshCommandRuntime. So we do it here to keep consistency.
-                            mshCommandRuntime.WriteWarning(new WarningRecord(FQIDParameterObsolete, obsoleteWarning));
-                        }
+
+                        // Write out warning only if we are in the context of MshCommandRuntime.
+                        // This is because
+                        //  1. The overload method WriteWarning(WarningRecord) is only available in MshCommandRuntime;
+                        //  2. We write out warnings for obsolete commands and obsolete cmdlet parameters only when in
+                        //     the context of MshCommandRuntime. So we do it here to keep consistency.
+                        mshCommandRuntime?.WriteWarning(new WarningRecord(FQIDParameterObsolete, obsoleteWarning));
                     }
 
                     // Finally bind the argument to the parameter
diff --git a/src/System.Management.Automation/engine/Pipe.cs b/src/System.Management.Automation/engine/Pipe.cs
index c4050a2e8c0..d43a0f96a5d 100644
--- a/src/System.Management.Automation/engine/Pipe.cs
+++ b/src/System.Management.Automation/engine/Pipe.cs
@@ -603,11 +603,7 @@ internal object Retrieve()
         /// <summary>
         /// Removes all the objects from the Pipe.
         /// </summary>
-        internal void Clear()
-        {
-            if (ObjectQueue != null)
-                ObjectQueue.Clear();
-        }
+        internal void Clear() => ObjectQueue?.Clear();
 
         /// <summary>
         /// Returns the currently queued items in the pipe.  Note that this will
diff --git a/src/System.Management.Automation/engine/SessionStateVariableAPIs.cs b/src/System.Management.Automation/engine/SessionStateVariableAPIs.cs
index 45d8db28015..336c2b77952 100644
--- a/src/System.Management.Automation/engine/SessionStateVariableAPIs.cs
+++ b/src/System.Management.Automation/engine/SessionStateVariableAPIs.cs
@@ -1827,10 +1827,7 @@ private static void GetScopeVariableTable(SessionStateScope scope, Dictionary<st
                 dottedScope.GetVariableTable(result, includePrivate);
             }
 
-            if (scope.LocalsTuple != null)
-            {
-                scope.LocalsTuple.GetVariableTable(result, includePrivate);
-            }
+            scope.LocalsTuple?.GetVariableTable(result, includePrivate);
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/Utils.cs b/src/System.Management.Automation/engine/Utils.cs
index eb6adb8b7a3..a252f1c24dc 100644
--- a/src/System.Management.Automation/engine/Utils.cs
+++ b/src/System.Management.Automation/engine/Utils.cs
@@ -1067,10 +1067,7 @@ internal static void EnsureModuleLoaded(string module, ExecutionContext context)
                     finally
                     {
                         context.AutoLoadingModuleInProgress.Remove(module);
-                        if (ps != null)
-                        {
-                            ps.Dispose();
-                        }
+                        ps?.Dispose();
                     }
                 }
             }
@@ -1127,10 +1124,7 @@ internal static List<PSModuleInfo> GetModules(string module, ExecutionContext co
             }
             finally
             {
-                if (ps != null)
-                {
-                    ps.Dispose();
-                }
+                ps?.Dispose();
             }
 
             return result;
@@ -1188,10 +1182,7 @@ internal static List<PSModuleInfo> GetModules(ModuleSpecification fullyQualified
             }
             finally
             {
-                if (ps != null)
-                {
-                    ps.Dispose();
-                }
+                ps?.Dispose();
             }
 
             return result;
@@ -1617,10 +1608,7 @@ public static class InternalTestHooks
         public static void SetTestHook(string property, object value)
         {
             var fieldInfo = typeof(InternalTestHooks).GetField(property, BindingFlags.Static | BindingFlags.NonPublic);
-            if (fieldInfo != null)
-            {
-                fieldInfo.SetValue(null, value);
-            }
+            fieldInfo?.SetValue(null, value);
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/debugger/debugger.cs b/src/System.Management.Automation/engine/debugger/debugger.cs
index ced9b4ed6a6..149fca2a632 100644
--- a/src/System.Management.Automation/engine/debugger/debugger.cs
+++ b/src/System.Management.Automation/engine/debugger/debugger.cs
@@ -2386,10 +2386,7 @@ public override void StopProcessCommand()
             }
 
             PowerShell ps = _psDebuggerCommand;
-            if (ps != null)
-            {
-                ps.BeginStop(null, null);
-            }
+            ps?.BeginStop(null, null);
         }
 
         /// <summary>
@@ -3240,11 +3237,7 @@ private void SetRunspaceListToStep(bool enableStepping)
                 try
                 {
                     Debugger nestedDebugger = item.NestedDebugger;
-
-                    if (nestedDebugger != null)
-                    {
-                        nestedDebugger.SetDebuggerStepMode(enableStepping);
-                    }
+                    nestedDebugger?.SetDebuggerStepMode(enableStepping);
                 }
                 catch (PSNotImplementedException) { }
             }
@@ -4536,10 +4529,7 @@ internal void CheckStateAndRaiseStopEvent()
                 // If this is a remote server debugger then we want to convert the pending remote
                 // debugger stop to a local debugger stop event for this Debug-Runspace to handle.
                 ServerRemoteDebugger serverRemoteDebugger = this._wrappedDebugger as ServerRemoteDebugger;
-                if (serverRemoteDebugger != null)
-                {
-                    serverRemoteDebugger.ReleaseAndRaiseDebugStopLocal();
-                }
+                serverRemoteDebugger?.ReleaseAndRaiseDebugStopLocal();
             }
         }
 
@@ -4951,10 +4941,7 @@ private static void RestoreRemoteOutput(object runningCmd)
             else
             {
                 Pipeline pipelineCommand = runningCmd as Pipeline;
-                if (pipelineCommand != null)
-                {
-                    pipelineCommand.ResumeIncomingData();
-                }
+                pipelineCommand?.ResumeIncomingData();
             }
         }
 
@@ -5329,47 +5316,29 @@ private void DisplayScript(PSHost host, IList<PSObject> output, InvocationInfo i
 
         private static void WriteLine(string line, PSHost host, IList<PSObject> output)
         {
-            if (host != null)
-            {
-                host.UI.WriteLine(line);
-            }
+            host?.UI.WriteLine(line);
 
-            if (output != null)
-            {
-                output.Add(new PSObject(line));
-            }
+            output?.Add(new PSObject(line));
         }
 
         private static void WriteCR(PSHost host, IList<PSObject> output)
         {
-            if (host != null)
-            {
-                host.UI.WriteLine();
-            }
+            host?.UI.WriteLine();
 
-            if (output != null)
-            {
-                output.Add(new PSObject(Crlf));
-            }
+            output?.Add(new PSObject(Crlf));
         }
 
         private static void WriteErrorLine(string error, PSHost host, IList<PSObject> output)
         {
-            if (host != null)
-            {
-                host.UI.WriteErrorLine(error);
-            }
+            host?.UI.WriteErrorLine(error);
 
-            if (output != null)
-            {
-                output.Add(
-                    new PSObject(
-                        new ErrorRecord(
-                            new RuntimeException(error),
-                            "DebuggerError",
-                            ErrorCategory.InvalidOperation,
-                            null)));
-            }
+            output?.Add(
+                new PSObject(
+                    new ErrorRecord(
+                        new RuntimeException(error),
+                        "DebuggerError",
+                        ErrorCategory.InvalidOperation,
+                        null)));
         }
     }
 
diff --git a/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs b/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs
index 30e28d76576..74bcefae2a8 100644
--- a/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs
+++ b/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs
@@ -175,10 +175,7 @@ internal void SignalWaitHandle()
         {
             lock (SyncObject)
             {
-                if (_completedWaitHandle != null)
-                {
-                    _completedWaitHandle.Set();
-                }
+                _completedWaitHandle?.Set();
             }
         }
 
diff --git a/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs
index 57f3f675ffc..1e820196ca9 100644
--- a/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs
+++ b/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs
@@ -338,13 +338,7 @@ internal void WriteDebugRecord(DebugRecord record)
         /// Writes the DebugRecord to informational buffers.
         /// </summary>
         /// <param name="record">DebugRecord.</param>
-        internal void WriteDebugInfoBuffers(DebugRecord record)
-        {
-            if (_informationalBuffers != null)
-            {
-                _informationalBuffers.AddDebug(record);
-            }
-        }
+        internal void WriteDebugInfoBuffers(DebugRecord record) => _informationalBuffers?.AddDebug(record);
 
         /// <summary>
         /// Helper function for WriteDebugLine.
@@ -538,10 +532,7 @@ public override
             }
 
             // Write to Information Buffers
-            if (_informationalBuffers != null)
-            {
-                _informationalBuffers.AddProgress(record);
-            }
+            _informationalBuffers?.AddProgress(record);
 
             if (_externalUI == null)
             {
@@ -588,13 +579,7 @@ internal void WriteVerboseRecord(VerboseRecord record)
         /// Writes the VerboseRecord to informational buffers.
         /// </summary>
         /// <param name="record">VerboseRecord.</param>
-        internal void WriteVerboseInfoBuffers(VerboseRecord record)
-        {
-            if (_informationalBuffers != null)
-            {
-                _informationalBuffers.AddVerbose(record);
-            }
-        }
+        internal void WriteVerboseInfoBuffers(VerboseRecord record) => _informationalBuffers?.AddVerbose(record);
 
         /// <summary>
         /// See base class.
@@ -631,13 +616,7 @@ internal void WriteWarningRecord(WarningRecord record)
         /// Writes the WarningRecord to informational buffers.
         /// </summary>
         /// <param name="record">WarningRecord.</param>
-        internal void WriteWarningInfoBuffers(WarningRecord record)
-        {
-            if (_informationalBuffers != null)
-            {
-                _informationalBuffers.AddWarning(record);
-            }
-        }
+        internal void WriteWarningInfoBuffers(WarningRecord record) => _informationalBuffers?.AddWarning(record);
 
         /// <summary>
         /// </summary>
@@ -657,13 +636,7 @@ internal void WriteInformationRecord(InformationRecord record)
         /// Writes the InformationRecord to informational buffers.
         /// </summary>
         /// <param name="record">WarningRecord.</param>
-        internal void WriteInformationInfoBuffers(InformationRecord record)
-        {
-            if (_informationalBuffers != null)
-            {
-                _informationalBuffers.AddInformation(record);
-            }
-        }
+        internal void WriteInformationInfoBuffers(InformationRecord record) => _informationalBuffers?.AddInformation(record);
 
         internal static Type GetFieldType(FieldDescription field)
         {
diff --git a/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs b/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
index 62ff66dff70..e640e6f112a 100644
--- a/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
@@ -834,18 +834,14 @@ private void DoCloseHelper()
                 if (executionContext != null)
                 {
                     PSHostUserInterface hostUI = executionContext.EngineHostInterface.UI;
-                    if (hostUI != null)
-                    {
-                        hostUI.StopAllTranscribing();
-                    }
+                    hostUI?.StopAllTranscribing();
                 }
 
                 AmsiUtils.Uninitialize();
             }
 
             // Generate the shutdown event
-            if (Events != null)
-                Events.GenerateEvent(PSEngineEvent.Exiting, null, Array.Empty<object>(), null, true, false);
+            Events?.GenerateEvent(PSEngineEvent.Exiting, null, Array.Empty<object>(), null, true, false);
 
             // Stop all running pipelines
             // Note:Do not perform the Cancel in lock. Reason is
@@ -1266,10 +1262,7 @@ public override void Close()
 
             base.Close(); // call base.Close() first to make it stop the pipeline
 
-            if (_pipelineThread != null)
-            {
-                _pipelineThread.Close();
-            }
+            _pipelineThread?.Close();
         }
 
         #endregion IDisposable Members
diff --git a/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs b/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs
index 5392c1781e1..f77fda65f1f 100644
--- a/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs
+++ b/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs
@@ -487,10 +487,7 @@ private FlowControlException InvokeHelper()
                     }
 
                     PSLocalEventManager eventManager = LocalRunspace.Events as PSLocalEventManager;
-                    if (eventManager != null)
-                    {
-                        eventManager.ProcessPendingActions();
-                    }
+                    eventManager?.ProcessPendingActions();
 
                     // restore the trap state...
                     this.LocalRunspace.ExecutionContext.PropagateExceptionsToEnclosingStatementBlock = oldTrapState;
diff --git a/src/System.Management.Automation/engine/hostifaces/PSCommand.cs b/src/System.Management.Automation/engine/hostifaces/PSCommand.cs
index 32ec57e0899..6db40850381 100644
--- a/src/System.Management.Automation/engine/hostifaces/PSCommand.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PSCommand.cs
@@ -92,10 +92,7 @@ public PSCommand AddCommand(string command)
                 throw PSTraceSource.NewArgumentNullException(nameof(command));
             }
 
-            if (_owner != null)
-            {
-                _owner.AssertChangesAreAccepted();
-            }
+            _owner?.AssertChangesAreAccepted();
 
             _currentCommand = new Command(command, false);
             _commands.Add(_currentCommand);
@@ -136,10 +133,7 @@ public PSCommand AddCommand(string cmdlet, bool useLocalScope)
                 throw PSTraceSource.NewArgumentNullException(nameof(cmdlet));
             }
 
-            if (_owner != null)
-            {
-                _owner.AssertChangesAreAccepted();
-            }
+            _owner?.AssertChangesAreAccepted();
 
             _currentCommand = new Command(cmdlet, false, useLocalScope);
             _commands.Add(_currentCommand);
@@ -178,10 +172,7 @@ public PSCommand AddScript(string script)
                 throw PSTraceSource.NewArgumentNullException(nameof(script));
             }
 
-            if (_owner != null)
-            {
-                _owner.AssertChangesAreAccepted();
-            }
+            _owner?.AssertChangesAreAccepted();
 
             _currentCommand = new Command(script, true);
             _commands.Add(_currentCommand);
@@ -223,10 +214,7 @@ public PSCommand AddScript(string script, bool useLocalScope)
                 throw PSTraceSource.NewArgumentNullException(nameof(script));
             }
 
-            if (_owner != null)
-            {
-                _owner.AssertChangesAreAccepted();
-            }
+            _owner?.AssertChangesAreAccepted();
 
             _currentCommand = new Command(script, true, useLocalScope);
             _commands.Add(_currentCommand);
@@ -261,10 +249,7 @@ public PSCommand AddCommand(Command command)
                 throw PSTraceSource.NewArgumentNullException(nameof(command));
             }
 
-            if (_owner != null)
-            {
-                _owner.AssertChangesAreAccepted();
-            }
+            _owner?.AssertChangesAreAccepted();
 
             _currentCommand = command;
             _commands.Add(_currentCommand);
@@ -309,10 +294,7 @@ public PSCommand AddParameter(string parameterName, object value)
                                                                  new object[] { "PSCommand" });
             }
 
-            if (_owner != null)
-            {
-                _owner.AssertChangesAreAccepted();
-            }
+            _owner?.AssertChangesAreAccepted();
 
             _currentCommand.Parameters.Add(parameterName, value);
             return this;
@@ -352,10 +334,7 @@ public PSCommand AddParameter(string parameterName)
                                                                  new object[] { "PSCommand" });
             }
 
-            if (_owner != null)
-            {
-                _owner.AssertChangesAreAccepted();
-            }
+            _owner?.AssertChangesAreAccepted();
 
             _currentCommand.Parameters.Add(parameterName, true);
             return this;
@@ -372,10 +351,7 @@ internal PSCommand AddParameter(CommandParameter parameter)
                                                                  new object[] { "PSCommand" });
             }
 
-            if (_owner != null)
-            {
-                _owner.AssertChangesAreAccepted();
-            }
+            _owner?.AssertChangesAreAccepted();
 
             _currentCommand.Parameters.Add(parameter);
             return this;
@@ -415,10 +391,7 @@ public PSCommand AddArgument(object value)
                                                                  new object[] { "PSCommand" });
             }
 
-            if (_owner != null)
-            {
-                _owner.AssertChangesAreAccepted();
-            }
+            _owner?.AssertChangesAreAccepted();
 
             _currentCommand.Parameters.Add(null, value);
             return this;
diff --git a/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs b/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
index 516bc486970..9f928eca21d 100644
--- a/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
@@ -553,11 +553,8 @@ public void Complete()
                 // raise the events outside of the lock.
                 if (raiseEvents)
                 {
-                    if (_readWaitHandle != null)
-                    {
-                        // unblock any readers waiting on the handle
-                        _readWaitHandle.Set();
-                    }
+                    // unblock any readers waiting on the handle
+                    _readWaitHandle?.Set();
 
                     // A temporary variable is used as the Completed may
                     // reach null (because of -='s) after the null check
@@ -798,10 +795,7 @@ public void Clear()
         {
             lock (SyncObject)
             {
-                if (_data != null)
-                {
-                    _data.Clear();
-                }
+                _data?.Clear();
             }
         }
 
@@ -1557,10 +1551,7 @@ internal void DecrementRef()
                 if (_refCount != 0 && (!_blockingEnumerator || _refCount != 1)) return;
 
                 // release threads blocked on waithandle
-                if (_readWaitHandle != null)
-                {
-                    _readWaitHandle.Set();
-                }
+                _readWaitHandle?.Set();
 
                 // release any threads to notify refCount is 0. Enumerator
                 // blocks on this syncObject and it needs to be notified
@@ -1792,10 +1783,7 @@ protected void Dispose(bool disposing)
                         _readWaitHandle = null;
                     }
 
-                    if (_data != null)
-                    {
-                        _data.Clear();
-                    }
+                    _data?.Clear();
                 }
             }
         }
@@ -2096,65 +2084,35 @@ internal PSDataCollection<DebugRecord> Debug
         /// The item is added to the buffer along with PowerShell InstanceId.
         /// </summary>
         /// <param name="item"></param>
-        internal void AddProgress(ProgressRecord item)
-        {
-            if (progress != null)
-            {
-                progress.InternalAdd(_psInstanceId, item);
-            }
-        }
+        internal void AddProgress(ProgressRecord item) => progress?.InternalAdd(_psInstanceId, item);
 
         /// <summary>
         /// Adds item to the verbose buffer.
         /// The item is added to the buffer along with PowerShell InstanceId.
         /// </summary>
         /// <param name="item"></param>
-        internal void AddVerbose(VerboseRecord item)
-        {
-            if (verbose != null)
-            {
-                verbose.InternalAdd(_psInstanceId, item);
-            }
-        }
+        internal void AddVerbose(VerboseRecord item) => verbose?.InternalAdd(_psInstanceId, item);
 
         /// <summary>
         /// Adds item to the debug buffer.
         /// The item is added to the buffer along with PowerShell InstanceId.
         /// </summary>
         /// <param name="item"></param>
-        internal void AddDebug(DebugRecord item)
-        {
-            if (debug != null)
-            {
-                debug.InternalAdd(_psInstanceId, item);
-            }
-        }
+        internal void AddDebug(DebugRecord item) => debug?.InternalAdd(_psInstanceId, item);
 
         /// <summary>
         /// Adds item to the warning buffer.
         /// The item is added to the buffer along with PowerShell InstanceId.
         /// </summary>
         /// <param name="item"></param>
-        internal void AddWarning(WarningRecord item)
-        {
-            if (Warning != null)
-            {
-                Warning.InternalAdd(_psInstanceId, item);
-            }
-        }
+        internal void AddWarning(WarningRecord item) => Warning?.InternalAdd(_psInstanceId, item);
 
         /// <summary>
         /// Adds item to the information buffer.
         /// The item is added to the buffer along with PowerShell InstanceId.
         /// </summary>
         /// <param name="item"></param>
-        internal void AddInformation(InformationRecord item)
-        {
-            if (Information != null)
-            {
-                Information.InternalAdd(_psInstanceId, item);
-            }
-        }
+        internal void AddInformation(InformationRecord item) => Information?.InternalAdd(_psInstanceId, item);
 
         #endregion
     }
diff --git a/src/System.Management.Automation/engine/hostifaces/PSTask.cs b/src/System.Management.Automation/engine/hostifaces/PSTask.cs
index d7e50020310..fb492706ad1 100644
--- a/src/System.Management.Automation/engine/hostifaces/PSTask.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PSTask.cs
@@ -496,13 +496,7 @@ public void Start(Runspace runspace)
         /// <summary>
         /// Signals the running task to stop.
         /// </summary>
-        public void SignalStop()
-        {
-            if (_powershell != null)
-            {
-                _powershell.BeginStop(null, null);
-            }
-        }
+        public void SignalStop() => _powershell?.BeginStop(null, null);
 
         #endregion
     }
diff --git a/src/System.Management.Automation/engine/hostifaces/PowerShell.cs b/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
index 91b657511f6..07d17589c3b 100644
--- a/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
@@ -4161,10 +4161,7 @@ private void Dispose(bool disposing)
                     _runspace.Dispose();
                 }
 
-                if (RemotePowerShell != null)
-                {
-                    RemotePowerShell.Dispose();
-                }
+                RemotePowerShell?.Dispose();
 
                 _invokeAsyncResult = null;
                 _stopAsyncResult = null;
@@ -4178,10 +4175,7 @@ private void InternalClearSuppressExceptions()
         {
             lock (_syncObject)
             {
-                if (_worker != null)
-                {
-                    _worker.InternalClearSuppressExceptions();
-                }
+                _worker?.InternalClearSuppressExceptions();
             }
         }
 
@@ -4307,10 +4301,7 @@ internal void SetStateChanged(PSInvocationStateInfo stateInfo)
                     {
                         if (RunningExtraCommands)
                         {
-                            if (tempInvokeAsyncResult != null)
-                            {
-                                tempInvokeAsyncResult.SetAsCompleted(InvocationStateInfo.Reason);
-                            }
+                            tempInvokeAsyncResult?.SetAsCompleted(InvocationStateInfo.Reason);
 
                             RaiseStateChangeEvent(InvocationStateInfo.Clone());
                         }
@@ -4318,16 +4309,10 @@ internal void SetStateChanged(PSInvocationStateInfo stateInfo)
                         {
                             RaiseStateChangeEvent(InvocationStateInfo.Clone());
 
-                            if (tempInvokeAsyncResult != null)
-                            {
-                                tempInvokeAsyncResult.SetAsCompleted(InvocationStateInfo.Reason);
-                            }
+                            tempInvokeAsyncResult?.SetAsCompleted(InvocationStateInfo.Reason);
                         }
 
-                        if (tempStopAsyncResult != null)
-                        {
-                            tempStopAsyncResult.SetAsCompleted(null);
-                        }
+                        tempStopAsyncResult?.SetAsCompleted(null);
                     }
                     catch (Exception)
                     {
@@ -4366,10 +4351,7 @@ internal void SetStateChanged(PSInvocationStateInfo stateInfo)
                         // This object can be disconnected even if "BeginStop" was called if it is a remote object
                         // and robust connections is retrying a failed network connection.
                         // In this case release the stop wait handle to prevent not responding.
-                        if (tempStopAsyncResult != null)
-                        {
-                            tempStopAsyncResult.SetAsCompleted(null);
-                        }
+                        tempStopAsyncResult?.SetAsCompleted(null);
 
                         // Only raise the Disconnected state changed event if the PowerShell state
                         // actually transitions to Disconnected from some other state.  This condition
@@ -4435,10 +4417,7 @@ internal void ClearRemotePowerShell()
         {
             lock (_syncObject)
             {
-                if (RemotePowerShell != null)
-                {
-                    RemotePowerShell.Clear();
-                }
+                RemotePowerShell?.Clear();
             }
         }
 
@@ -5152,11 +5131,8 @@ private IAsyncResult CoreStop(bool isSyncCall, AsyncCallback callback, object st
             // cannot complete with this object.
             if (isDisconnected)
             {
-                if (_invokeAsyncResult != null)
-                {
-                    // Since object is stopped, allow result wait to end.
-                    _invokeAsyncResult.SetAsCompleted(null);
-                }
+                // Since object is stopped, allow result wait to end.
+                _invokeAsyncResult?.SetAsCompleted(null);
 
                 _stopAsyncResult.SetAsCompleted(null);
 
@@ -5217,10 +5193,7 @@ private IAsyncResult CoreStop(bool isSyncCall, AsyncCallback callback, object st
         private void ReleaseDebugger()
         {
             LocalRunspace localRunspace = _runspace as LocalRunspace;
-            if (localRunspace != null)
-            {
-                localRunspace.ReleaseDebugger();
-            }
+            localRunspace?.ReleaseDebugger();
         }
 
         /// <summary>
@@ -5321,10 +5294,7 @@ private void AddToRemoteRunspaceRunningList()
             else
             {
                 RemoteRunspacePoolInternal remoteRunspacePoolInternal = GetRemoteRunspacePoolInternal();
-                if (remoteRunspacePoolInternal != null)
-                {
-                    remoteRunspacePoolInternal.PushRunningPowerShell(this);
-                }
+                remoteRunspacePoolInternal?.PushRunningPowerShell(this);
             }
         }
 
@@ -5340,10 +5310,7 @@ private void RemoveFromRemoteRunspaceRunningList()
             else
             {
                 RemoteRunspacePoolInternal remoteRunspacePoolInternal = GetRemoteRunspacePoolInternal();
-                if (remoteRunspacePoolInternal != null)
-                {
-                    remoteRunspacePoolInternal.PopRunningPowerShell();
-                }
+                remoteRunspacePoolInternal?.PopRunningPowerShell();
             }
         }
 
@@ -5712,10 +5679,7 @@ internal void InternalClearSuppressExceptions()
                     else
                     {
                         RunspacePool pool = _shell._rsConnection as RunspacePool;
-                        if (pool != null)
-                        {
-                            pool.ReleaseRunspace(CurrentlyRunningPipeline.Runspace);
-                        }
+                        pool?.ReleaseRunspace(CurrentlyRunningPipeline.Runspace);
                     }
 
                     CurrentlyRunningPipeline.Dispose();
@@ -5886,10 +5850,7 @@ internal void SuspendIncomingData()
                 throw new PSNotSupportedException();
             }
 
-            if (RemotePowerShell.DataStructureHandler != null)
-            {
-                RemotePowerShell.DataStructureHandler.TransportManager.SuspendQueue(true);
-            }
+            RemotePowerShell.DataStructureHandler?.TransportManager.SuspendQueue(true);
         }
 
         /// <summary>
@@ -5902,10 +5863,7 @@ internal void ResumeIncomingData()
                 throw new PSNotSupportedException();
             }
 
-            if (RemotePowerShell.DataStructureHandler != null)
-            {
-                RemotePowerShell.DataStructureHandler.TransportManager.ResumeQueue();
-            }
+            RemotePowerShell.DataStructureHandler?.TransportManager.ResumeQueue();
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/lang/scriptblock.cs b/src/System.Management.Automation/engine/lang/scriptblock.cs
index 1ce9c9a4267..451d015fdcc 100644
--- a/src/System.Management.Automation/engine/lang/scriptblock.cs
+++ b/src/System.Management.Automation/engine/lang/scriptblock.cs
@@ -1035,10 +1035,7 @@ internal void InvokeWithPipe(
                     processInCurrentThread: true,
                     waitForCompletionInCurrentThread: true);
 
-                if (scriptBlockInvocationEventArgs.Exception != null)
-                {
-                    scriptBlockInvocationEventArgs.Exception.Throw();
-                }
+                scriptBlockInvocationEventArgs.Exception?.Throw();
             }
         }
 
diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index dab439bd5aa..cdf053dcb2e 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -6965,10 +6965,7 @@ public void AddInstructions(LightCompiler compiler)
             compiler.PopLabelBlock(LabelScopeKind.Statement);
 
             // If enterLoop is null, we will never JIT compile the loop.
-            if (enterLoop != null)
-            {
-                enterLoop.FinishLoop(compiler.Instructions.Count);
-            }
+            enterLoop?.FinishLoop(compiler.Instructions.Count);
         }
     }
 
diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
index 4a42dd262b7..31e7618a32f 100644
--- a/src/System.Management.Automation/engine/parser/Parser.cs
+++ b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -3080,10 +3080,7 @@ private StatementAst ConfigurationStatementRule(IEnumerable<AttributeAst> custom
                 }
                 finally
                 {
-                    if (p != null)
-                    {
-                        p.Dispose();
-                    }
+                    p?.Dispose();
 
                     //
                     // Put the parser back...
diff --git a/src/System.Management.Automation/engine/parser/PreOrderVisitor.cs b/src/System.Management.Automation/engine/parser/PreOrderVisitor.cs
index 33b2fadec64..91c0c6247e9 100644
--- a/src/System.Management.Automation/engine/parser/PreOrderVisitor.cs
+++ b/src/System.Management.Automation/engine/parser/PreOrderVisitor.cs
@@ -37,10 +37,7 @@ public abstract class AstVisitor
         internal AstVisitAction CheckForPostAction(Ast ast, AstVisitAction action)
         {
             var postActionHandler = this as IAstPostVisitHandler;
-            if (postActionHandler != null)
-            {
-                postActionHandler.PostVisit(ast);
-            }
+            postActionHandler?.PostVisit(ast);
 
             return action;
         }
diff --git a/src/System.Management.Automation/engine/parser/SymbolResolver.cs b/src/System.Management.Automation/engine/parser/SymbolResolver.cs
index b97496dcc0f..18f694bf727 100644
--- a/src/System.Management.Automation/engine/parser/SymbolResolver.cs
+++ b/src/System.Management.Automation/engine/parser/SymbolResolver.cs
@@ -111,11 +111,8 @@ internal void AddTypeFromUsingModule(Parser parser, TypeDefinitionAst typeDefini
             TypeLookupResult result;
             if (_typeTable.TryGetValue(typeDefinitionAst.Name, out result))
             {
-                if (result.ExternalNamespaces != null)
-                {
-                    // override external type by the type defined in the current namespace
-                    result.ExternalNamespaces.Add(moduleInfo.Name);
-                }
+                // override external type by the type defined in the current namespace
+                result.ExternalNamespaces?.Add(moduleInfo.Name);
             }
             else
             {
diff --git a/src/System.Management.Automation/engine/parser/TypeResolver.cs b/src/System.Management.Automation/engine/parser/TypeResolver.cs
index acbf9bef2c1..83d031686fa 100644
--- a/src/System.Management.Automation/engine/parser/TypeResolver.cs
+++ b/src/System.Management.Automation/engine/parser/TypeResolver.cs
@@ -927,10 +927,7 @@ public static void Add(string typeName, Type type)
         public static bool Remove(string typeName)
         {
             userTypeAccelerators.Remove(typeName);
-            if (s_allTypeAccelerators != null)
-            {
-                s_allTypeAccelerators.Remove(typeName);
-            }
+            s_allTypeAccelerators?.Remove(typeName);
 
             return true;
         }
diff --git a/src/System.Management.Automation/engine/parser/VariableAnalysis.cs b/src/System.Management.Automation/engine/parser/VariableAnalysis.cs
index e07329c9975..8bf14d79aac 100644
--- a/src/System.Management.Automation/engine/parser/VariableAnalysis.cs
+++ b/src/System.Management.Automation/engine/parser/VariableAnalysis.cs
@@ -1302,10 +1302,7 @@ public object VisitDoUntilStatement(DoUntilStatementAst doUntilStatementAst)
 
         public object VisitForStatement(ForStatementAst forStatementAst)
         {
-            if (forStatementAst.Initializer != null)
-            {
-                forStatementAst.Initializer.Accept(this);
-            }
+            forStatementAst.Initializer?.Accept(this);
 
             var generateCondition = forStatementAst.Condition != null
                 ? () => forStatementAst.Condition.Accept(this)
@@ -1453,10 +1450,7 @@ public object VisitContinueStatement(ContinueStatementAst continueStatementAst)
 
         private Block ControlFlowStatement(PipelineBaseAst pipelineAst)
         {
-            if (pipelineAst != null)
-            {
-                pipelineAst.Accept(this);
-            }
+            pipelineAst?.Accept(this);
 
             _currentBlock.FlowsTo(_exitBlock);
             var lastBlockInStatement = _currentBlock;
@@ -1627,11 +1621,7 @@ public object VisitCommandExpression(CommandExpressionAst commandExpressionAst)
 
         public object VisitCommandParameter(CommandParameterAst commandParameterAst)
         {
-            if (commandParameterAst.Argument != null)
-            {
-                commandParameterAst.Argument.Accept(this);
-            }
-
+            commandParameterAst.Argument?.Accept(this);
             return null;
         }
 
diff --git a/src/System.Management.Automation/engine/parser/tokenizer.cs b/src/System.Management.Automation/engine/parser/tokenizer.cs
index 664dbe0ac77..1c5654b34c4 100644
--- a/src/System.Management.Automation/engine/parser/tokenizer.cs
+++ b/src/System.Management.Automation/engine/parser/tokenizer.cs
@@ -1226,10 +1226,7 @@ private Token NewCommentToken()
 
         private T SaveToken<T>(T token) where T : Token
         {
-            if (TokenList != null)
-            {
-                TokenList.Add(token);
-            }
+            TokenList?.Add(token);
 
             // Keep track of the first and last token even if we're not saving tokens
             // for the special variables $$ and $^.
diff --git a/src/System.Management.Automation/engine/pipeline.cs b/src/System.Management.Automation/engine/pipeline.cs
index 7212b579339..3373b5e56f0 100644
--- a/src/System.Management.Automation/engine/pipeline.cs
+++ b/src/System.Management.Automation/engine/pipeline.cs
@@ -213,10 +213,7 @@ private void Log(string logElement, InvocationInfo invocation, PipelineExecution
             // Log the cmdlet invocation execution details if we didn't have an associated script line with it.
             if ((invocation == null) || string.IsNullOrEmpty(invocation.Line))
             {
-                if (hostInterface != null)
-                {
-                    hostInterface.TranscribeCommand(logElement, invocation);
-                }
+                hostInterface?.TranscribeCommand(logElement, invocation);
             }
 
             if (_needToLog && !string.IsNullOrEmpty(logElement))
diff --git a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
index 31868425323..e6f7eee438e 100644
--- a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
+++ b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
@@ -5678,10 +5678,7 @@ internal PSMemberInfo GetPSMemberInfo(DynamicMetaObject target,
             restrictions = versionRestriction;
 
             // When returning aliasRestrictions always include the version restriction
-            if (aliasRestrictions != null)
-            {
-                aliasRestrictions.Add(versionRestriction);
-            }
+            aliasRestrictions?.Add(versionRestriction);
 
             var alias = memberInfo as PSAliasProperty;
             if (alias != null)
diff --git a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
index fdcbaf98f56..a85bc8a8e78 100644
--- a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
+++ b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
@@ -426,10 +426,7 @@ internal static void InvokePipeline(object input,
 
             try
             {
-                if (context.Events != null)
-                {
-                    context.Events.ProcessPendingActions();
-                }
+                context.Events?.ProcessPendingActions();
 
                 if (input == AutomationNull.Value && !ignoreInput)
                 {
@@ -519,10 +516,7 @@ internal static void InvokePipelineInBackground(
 
             try
             {
-                if (context.Events != null)
-                {
-                    context.Events.ProcessPendingActions();
-                }
+                context.Events?.ProcessPendingActions();
 
                 CommandProcessorBase commandProcessor = null;
 
@@ -841,10 +835,7 @@ internal static ExitException GetExitException(object exitCodeObj)
 
         internal static void CheckForInterrupts(ExecutionContext context)
         {
-            if (context.Events != null)
-            {
-                context.Events.ProcessPendingActions();
-            }
+            context.Events?.ProcessPendingActions();
 
             if (context.CurrentPipelineStopping)
             {
@@ -1065,10 +1056,7 @@ internal override void Bind(PipelineProcessor pipelineProcessor, CommandProcesso
                     // Normally, context.CurrentCommandProcessor will not be null. But in legacy DRTs from ParserTest.cs,
                     // a scriptblock may be invoked through 'DoInvokeReturnAsIs' using .NET reflection. In that case,
                     // context.CurrentCommandProcessor will be null. We don't try passing along variable lists in such case.
-                    if (context.CurrentCommandProcessor != null)
-                    {
-                        context.CurrentCommandProcessor.CommandRuntime.OutputPipe.SetVariableListForTemporaryPipe(pipe);
-                    }
+                    context.CurrentCommandProcessor?.CommandRuntime.OutputPipe.SetVariableListForTemporaryPipe(pipe);
 
                     commandProcessor.CommandRuntime.OutputPipe = pipe;
                     commandProcessor.CommandRuntime.ErrorOutputPipe = pipe;
@@ -1079,10 +1067,7 @@ internal override void Bind(PipelineProcessor pipelineProcessor, CommandProcesso
                     break;
                 case RedirectionStream.Output:
                     // Since a temp output pipe is going to be used, we should pass along the error and warning variable list.
-                    if (context.CurrentCommandProcessor != null)
-                    {
-                        context.CurrentCommandProcessor.CommandRuntime.OutputPipe.SetVariableListForTemporaryPipe(pipe);
-                    }
+                    context.CurrentCommandProcessor?.CommandRuntime.OutputPipe.SetVariableListForTemporaryPipe(pipe);
 
                     commandProcessor.CommandRuntime.OutputPipe = pipe;
                     break;
@@ -1214,11 +1199,8 @@ internal Pipe GetRedirectionPipe(ExecutionContext context, PipelineProcessor par
                 throw;
             }
 
-            if (parentPipelineProcessor != null)
-            {
-                // I think this is only necessary for calling Dispose on the commands in the redirection pipe.
-                parentPipelineProcessor.AddRedirectionPipe(PipelineProcessor);
-            }
+            // I think this is only necessary for calling Dispose on the commands in the redirection pipe.
+            parentPipelineProcessor?.AddRedirectionPipe(PipelineProcessor);
 
             return new Pipe(context, PipelineProcessor);
         }
@@ -1234,10 +1216,7 @@ internal Pipe GetRedirectionPipe(ExecutionContext context, PipelineProcessor par
         internal void CallDoCompleteForExpression()
         {
             // The pipe returned from 'GetRedirectionPipe' could be a NullPipe
-            if (PipelineProcessor != null)
-            {
-                PipelineProcessor.DoComplete();
-            }
+            PipelineProcessor?.DoComplete();
         }
 
         private bool _disposed;
@@ -1255,10 +1234,7 @@ private void Dispose(bool disposing)
 
             if (disposing)
             {
-                if (PipelineProcessor != null)
-                {
-                    PipelineProcessor.Dispose();
-                }
+                PipelineProcessor?.Dispose();
             }
 
             _disposed = true;
@@ -1754,10 +1730,7 @@ private static ActionPreference ProcessTraps(FunctionContext funcContext,
                     ErrorRecord err = rte.ErrorRecord;
                     // CurrentCommandProcessor is normally not null, but it is null
                     // when executing some unit tests through reflection.
-                    if (context.CurrentCommandProcessor != null)
-                    {
-                        context.CurrentCommandProcessor.ForgetScriptException();
-                    }
+                    context.CurrentCommandProcessor?.ForgetScriptException();
 
                     try
                     {
@@ -1951,10 +1924,7 @@ internal static void SetErrorVariables(IScriptExtent extent, RuntimeException rt
 
             if (rte is not PipelineStoppedException)
             {
-                if (outputPipe != null)
-                {
-                    outputPipe.AppendVariableList(VariableStreamKind.Error, errRec);
-                }
+                outputPipe?.AppendVariableList(VariableStreamKind.Error, errRec);
 
                 context.AppendDollarError(errRec);
             }
@@ -3530,10 +3500,7 @@ internal static void WriteEnumerableToPipe(IEnumerator enumerator, Pipe pipe, Ex
                 if (dispose)
                 {
                     var disposable = enumerator as IDisposable;
-                    if (disposable != null)
-                    {
-                        disposable.Dispose();
-                    }
+                    disposable?.Dispose();
                 }
             }
         }

From 5f4e1004569443fbe76d23b54caac96b6fb20a40 Mon Sep 17 00:00:00 2001
From: Frode Flaten <3436158+fflaten@users.noreply.github.com>
Date: Fri, 29 Jul 2022 19:34:09 +0200
Subject: [PATCH 507/645] Use null propagation operator for windows build
 (#17795)

* Use null propagation in CimCmdlets

* Use null propagation in Diagnostics and Management

* ignore IDE0031 rule in ConsoleHost

* Use null propagation in WSMan.Management

* Use null propagation in SMA

* ignore IDE0031 for securityDescHandle

* cleanup after review
---
 .../CimAsyncOperation.cs                      |  5 +--
 .../CimBaseAction.cs                          |  5 +--
 .../CimCommandBase.cs                         | 10 +----
 .../GetCimAssociatedInstanceCommand.cs        |  3 +-
 .../GetCimClassCommand.cs                     |  5 +--
 .../GetCimInstanceCommand.cs                  |  5 +--
 .../InvokeCimMethodCommand.cs                 |  5 +--
 .../NewCimInstanceCommand.cs                  |  5 +--
 .../NewCimSessionCommand.cs                   |  5 +--
 .../RegisterCimIndicationCommand.cs           | 10 +----
 .../RemoveCimInstanceCommand.cs               |  5 +--
 .../SetCimInstanceCommand.cs                  |  5 +--
 .../NewWinEventCommand.cs                     |  3 +-
 .../commands/management/Computer.cs           | 16 ++------
 .../commands/management/Hotfix.cs             | 10 +----
 .../host/msh/ConsoleHost.cs                   |  2 +
 src/Microsoft.WSMan.Management/WsManHelper.cs | 13 +------
 .../engine/NativeCommandProcessor.cs          | 27 ++++++-------
 .../engine/Utils.cs                           |  5 +--
 .../remoting/commands/ConnectPSSession.cs     |  5 +--
 .../remoting/commands/ReceivePSSession.cs     | 30 ++++----------
 .../remoting/common/RemoteSessionNamedPipe.cs |  5 +--
 .../remoting/common/RunspaceConnectionInfo.cs | 39 +++++++------------
 .../utils/tracing/EtwActivity.cs              |  5 +--
 24 files changed, 60 insertions(+), 168 deletions(-)

diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs
index f8b83f57d9e..e5f31f385fc 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs
@@ -528,10 +528,7 @@ private void Cleanup()
             }
 
             this.moreActionEvent.Dispose();
-            if (this.ackedEvent != null)
-            {
-                this.ackedEvent.Dispose();
-            }
+            this.ackedEvent?.Dispose();
 
             DebugHelper.WriteLog("Cleanup complete.", 2);
         }
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs
index e3e487a9533..4702e47e2f2 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs
@@ -168,10 +168,7 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     // Dispose managed resources.
-                    if (this.completeEvent != null)
-                    {
-                        this.completeEvent.Dispose();
-                    }
+                    this.completeEvent?.Dispose();
                 }
 
                 // Call the appropriate methods to clean up
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs
index 26a450810ba..89f7478b513 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs
@@ -470,10 +470,7 @@ internal void SetParameter(object value, string parameterName)
                 return;
             }
 
-            if (this.parameterBinder != null)
-            {
-                this.parameterBinder.SetParameter(parameterName, this.AtBeginProcess);
-            }
+            this.parameterBinder?.SetParameter(parameterName, this.AtBeginProcess);
         }
         #endregion
 
@@ -576,10 +573,7 @@ protected void Dispose(bool disposing)
         protected virtual void DisposeInternal()
         {
             // Dispose managed resources.
-            if (this.operation != null)
-            {
-                this.operation.Dispose();
-            }
+            this.operation?.Dispose();
         }
         #endregion
 
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs
index 90acd1c6c0e..6c4d0c94d2b 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs
@@ -232,8 +232,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimGetAssociatedInstance operation = this.GetOperationAgent();
-            if (operation != null)
-                operation.ProcessRemainActions(this.CmdletOperation);
+            operation?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs
index baf55bb186c..1bededc485f 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs
@@ -202,10 +202,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimGetCimClass cimGetCimClass = this.GetOperationAgent();
-            if (cimGetCimClass != null)
-            {
-                cimGetCimClass.ProcessRemainActions(this.CmdletOperation);
-            }
+            cimGetCimClass?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs
index d61a9363922..65eeae8e450 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs
@@ -491,10 +491,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimGetInstance cimGetInstance = this.GetOperationAgent();
-            if (cimGetInstance != null)
-            {
-                cimGetInstance.ProcessRemainActions(this.CmdletOperation);
-            }
+            cimGetInstance?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs
index 26e1d8eaf5f..e3bc6f293b6 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs
@@ -408,10 +408,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimInvokeCimMethod cimInvokeMethod = this.GetOperationAgent();
-            if (cimInvokeMethod != null)
-            {
-                cimInvokeMethod.ProcessRemainActions(this.CmdletOperation);
-            }
+            cimInvokeMethod?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs
index 53d7c28b924..5843f25a26b 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs
@@ -377,10 +377,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimNewCimInstance cimNewCimInstance = this.GetOperationAgent();
-            if (cimNewCimInstance != null)
-            {
-                cimNewCimInstance.ProcessRemainActions(this.CmdletOperation);
-            }
+            cimNewCimInstance?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs
index 9957372d592..f048a22a9f6 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs
@@ -334,10 +334,7 @@ protected override void DisposeInternal()
             base.DisposeInternal();
 
             // Dispose managed resources.
-            if (this.cimNewSession != null)
-            {
-                this.cimNewSession.Dispose();
-            }
+            this.cimNewSession?.Dispose();
         }
         #endregion
     }
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs
index d22644ececd..d5dc44a31d4 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs
@@ -227,10 +227,7 @@ protected override object GetSourceObject()
                     break;
             }
 
-            if (watcher != null)
-            {
-                watcher.SetCmdlet(this);
-            }
+            watcher?.SetCmdlet(this);
 
             return watcher;
         }
@@ -275,10 +272,7 @@ private static void newSubscriber_Unsubscribed(
             DebugHelper.WriteLogEx();
 
             CimIndicationWatcher watcher = sender as CimIndicationWatcher;
-            if (watcher != null)
-            {
-                watcher.Stop();
-            }
+            watcher?.Stop();
         }
 
         #region private members
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs
index 273311485ce..5ac8d129367 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs
@@ -276,10 +276,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimRemoveCimInstance cimRemoveInstance = this.GetOperationAgent();
-            if (cimRemoveInstance != null)
-            {
-                cimRemoveInstance.ProcessRemainActions(this.CmdletOperation);
-            }
+            cimRemoveInstance?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs
index de6857db5eb..d190e5fafba 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs
@@ -325,10 +325,7 @@ protected override void ProcessRecord()
         protected override void EndProcessing()
         {
             CimSetCimInstance cimSetCimInstance = this.GetOperationAgent();
-            if (cimSetCimInstance != null)
-            {
-                cimSetCimInstance.ProcessRemainActions(this.CmdletOperation);
-            }
+            cimSetCimInstance?.ProcessRemainActions(this.CmdletOperation);
         }
 
         #endregion
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs
index cb74c292a3e..b0b102870c4 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs
@@ -317,8 +317,7 @@ protected override void ProcessRecord()
         /// </summary>
         protected override void EndProcessing()
         {
-            if (_providerMetadata != null)
-                _providerMetadata.Dispose();
+            _providerMetadata?.Dispose();
 
             base.EndProcessing();
         }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
index 120537d0cea..e7e185ff8fb 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
@@ -393,17 +393,10 @@ public void Dispose(bool disposing)
         {
             if (disposing)
             {
-                if (_timer != null)
-                {
-                    _timer.Dispose();
-                }
-
+                _timer?.Dispose();
                 _waitHandler.Dispose();
                 _cancel.Dispose();
-                if (_powershell != null)
-                {
-                    _powershell.Dispose();
-                }
+                _powershell?.Dispose();
             }
         }
 
@@ -1098,10 +1091,7 @@ protected override void StopProcessing()
             _cancel.Cancel();
             _waitHandler.Set();
 
-            if (_timer != null)
-            {
-                _timer.Change(System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
-            }
+            _timer?.Change(System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
 
             if (_powershell != null)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs
index d6768a1315e..1aa94509469 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs
@@ -169,10 +169,7 @@ protected override void ProcessRecord()
         /// </summary>
         protected override void StopProcessing()
         {
-            if (_searchProcess != null)
-            {
-                _searchProcess.Dispose();
-            }
+            _searchProcess?.Dispose();
         }
         #endregion Overrides
 
@@ -227,10 +224,7 @@ public void Dispose(bool disposing)
         {
             if (disposing)
             {
-                if (_searchProcess != null)
-                {
-                    _searchProcess.Dispose();
-                }
+                _searchProcess?.Dispose();
             }
         }
 
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
index 9016f84d713..672bcfabb07 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -277,6 +277,7 @@ internal static int Start(
             }
             finally
             {
+#pragma warning disable IDE0031
                 if (s_theConsoleHost != null)
                 {
 #if LEGACYTELEMETRY
@@ -292,6 +293,7 @@ internal static int Start(
 #endif
                     s_theConsoleHost.Dispose();
                 }
+#pragma warning restore IDE0031
             }
 
             unchecked
diff --git a/src/Microsoft.WSMan.Management/WsManHelper.cs b/src/Microsoft.WSMan.Management/WsManHelper.cs
index 000cb871abb..a4917ee461e 100644
--- a/src/Microsoft.WSMan.Management/WsManHelper.cs
+++ b/src/Microsoft.WSMan.Management/WsManHelper.cs
@@ -370,17 +370,8 @@ internal string ReadFile(string path)
             }
             finally
             {
-                if (_sr != null)
-                {
-                    // _sr.Close();
-                    _sr.Dispose();
-                }
-
-                if (_fs != null)
-                {
-                    // _fs.Close();
-                    _fs.Dispose();
-                }
+                _sr?.Dispose();
+                _fs?.Dispose();
             }
 
             return strOut;
diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index 1538da81302..d1cf56034c8 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -1171,23 +1171,20 @@ private void CleanUp()
 
             try
             {
-                if (_nativeProcess != null)
-                {
-                    // on Unix, we need to kill the process to ensure it terminates as Dispose() merely
-                    // closes the redirected streams and the processs does not exit on macOS.  However,
-                    // on Windows, a winexe like notepad should continue running so we don't want to kill it.
+                // on Unix, we need to kill the process to ensure it terminates as Dispose() merely
+                // closes the redirected streams and the processs does not exit on macOS.  However,
+                // on Windows, a winexe like notepad should continue running so we don't want to kill it.
 #if UNIX
-                    try
-                    {
-                        _nativeProcess.Kill();
-                    }
-                    catch
-                    {
-                        // Ignore all exception since it is cleanup.
-                    }
-#endif
-                    _nativeProcess.Dispose();
+                try
+                {
+                    _nativeProcess?.Kill();
                 }
+                catch
+                {
+                    // Ignore all exception since it is cleanup.
+                }
+#endif
+                _nativeProcess?.Dispose();
             }
             catch (Exception)
             {
diff --git a/src/System.Management.Automation/engine/Utils.cs b/src/System.Management.Automation/engine/Utils.cs
index a252f1c24dc..331949d2f0f 100644
--- a/src/System.Management.Automation/engine/Utils.cs
+++ b/src/System.Management.Automation/engine/Utils.cs
@@ -574,10 +574,7 @@ internal static bool IsWinPEHost()
             catch (ObjectDisposedException) { }
             finally
             {
-                if (winPEKey != null)
-                {
-                    winPEKey.Dispose();
-                }
+                winPEKey?.Dispose();
             }
 #endif
             return false;
diff --git a/src/System.Management.Automation/engine/remoting/commands/ConnectPSSession.cs b/src/System.Management.Automation/engine/remoting/commands/ConnectPSSession.cs
index 8dfdacd1226..b84b36e727e 100644
--- a/src/System.Management.Automation/engine/remoting/commands/ConnectPSSession.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/ConnectPSSession.cs
@@ -569,10 +569,7 @@ internal override void StartOperation()
 
             internal override void StopOperation()
             {
-                if (_queryRunspaces != null)
-                {
-                    _queryRunspaces.StopAllOperations();
-                }
+                _queryRunspaces?.StopAllOperations();
 
                 _session.Runspace.StateChanged -= StateCallBackHandler;
                 SendStopComplete();
diff --git a/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs b/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs
index 0cab5f02a7a..9704216e053 100644
--- a/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs
@@ -404,15 +404,8 @@ protected override void StopProcessing()
                 tmpJob = _job;
             }
 
-            if (tmpPipeline != null)
-            {
-                tmpPipeline.StopAsync();
-            }
-
-            if (tmpJob != null)
-            {
-                tmpJob.StopJob();
-            }
+            tmpPipeline?.StopAsync();
+            tmpJob?.StopJob();
         }
 
         #endregion
@@ -818,19 +811,13 @@ private void DisconnectAndStopRunningCmds(RemoteRunspace remoteRunspace)
 
                 remoteRunspace.Disconnect();
 
-                if (stopPipelineReceive != null)
+                try
                 {
-                    try
-                    {
-                        stopPipelineReceive.Set();
-                    }
-                    catch (ObjectDisposedException) { }
+                    stopPipelineReceive?.Set();
                 }
+                catch (ObjectDisposedException) { }
 
-                if (job != null)
-                {
-                    job.StopJob();
-                }
+                job?.StopJob();
             }
         }
 
@@ -876,10 +863,7 @@ private void ConnectSessionToHost(PSSession session, PSRemotingJob job = null)
 
                         foreach (var result in childJob.ReadAll())
                         {
-                            if (result != null)
-                            {
-                                result.WriteStreamObject(this);
-                            }
+                            result?.WriteStreamObject(this);
                         }
 
                         if (index == 0)
diff --git a/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs b/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
index 7d53cbfc4b2..50171953faf 100644
--- a/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
@@ -504,10 +504,7 @@ private static NamedPipeServerStream CreateNamedPipe(
                 securityAttributes);
 
             int lastError = Marshal.GetLastWin32Error();
-            if (securityDescHandle != null)
-            {
-                securityDescHandle.Value.Free();
-            }
+            securityDescHandle?.Free();
 
             if (pipeHandle.IsInvalid)
             {
diff --git a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
index ad4625c3762..088bdddcb32 100644
--- a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
@@ -2713,17 +2713,12 @@ private static Process CreateProcessWithRedirectedStd(
             }
             catch (Exception)
             {
-                if (stdInPipeServer != null) { stdInPipeServer.Dispose(); }
-
-                if (stdInPipeClient != null) { stdInPipeClient.Dispose(); }
-
-                if (stdOutPipeServer != null) { stdOutPipeServer.Dispose(); }
-
-                if (stdOutPipeClient != null) { stdOutPipeClient.Dispose(); }
-
-                if (stdErrPipeServer != null) { stdErrPipeServer.Dispose(); }
-
-                if (stdErrPipeClient != null) { stdErrPipeClient.Dispose(); }
+                stdInPipeServer?.Dispose();
+                stdInPipeClient?.Dispose();
+                stdOutPipeServer?.Dispose();
+                stdOutPipeClient?.Dispose();
+                stdErrPipeServer?.Dispose();
+                stdErrPipeClient?.Dispose();
 
                 throw;
             }
@@ -2789,17 +2784,12 @@ private static Process CreateProcessWithRedirectedStd(
             }
             catch (Exception)
             {
-                if (stdInPipeServer != null) { stdInPipeServer.Dispose(); }
-
-                if (stdInPipeClient != null) { stdInPipeClient.Dispose(); }
-
-                if (stdOutPipeServer != null) { stdOutPipeServer.Dispose(); }
-
-                if (stdOutPipeClient != null) { stdOutPipeClient.Dispose(); }
-
-                if (stdErrPipeServer != null) { stdErrPipeServer.Dispose(); }
-
-                if (stdErrPipeClient != null) { stdErrPipeClient.Dispose(); }
+                stdInPipeServer?.Dispose();
+                stdInPipeClient?.Dispose();
+                stdOutPipeServer?.Dispose();
+                stdOutPipeClient?.Dispose();
+                stdErrPipeServer?.Dispose();
+                stdErrPipeClient?.Dispose();
 
                 throw;
             }
@@ -2857,10 +2847,7 @@ private static SafePipeHandle CreateNamedPipe(
                 securityAttributes);
 
             int lastError = Marshal.GetLastWin32Error();
-            if (securityDescHandle != null)
-            {
-                securityDescHandle.Value.Free();
-            }
+            securityDescHandle?.Free();
 
             if (pipeHandle.IsInvalid)
             {
diff --git a/src/System.Management.Automation/utils/tracing/EtwActivity.cs b/src/System.Management.Automation/utils/tracing/EtwActivity.cs
index b8b4ac330f9..dfe642ee840 100644
--- a/src/System.Management.Automation/utils/tracing/EtwActivity.cs
+++ b/src/System.Management.Automation/utils/tracing/EtwActivity.cs
@@ -474,10 +474,7 @@ protected void WriteEvent(EventDescriptor ed, params object[] payload)
             }
 
             bool success = provider.WriteEvent(in ed, payload);
-            if (EventWritten != null)
-            {
-                EventWritten.Invoke(this, new EtwEventArgs(ed, success, payload));
-            }
+            EventWritten?.Invoke(this, new EtwEventArgs(ed, success, payload));
         }
 
         private EventProvider GetProvider()

From 7f69d74e4ac0f1f99e462f49d45d783393d00e12 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <mr.molkree@gmail.com>
Date: Sun, 31 Jul 2022 16:57:49 +0400
Subject: [PATCH 508/645] Reenable compound assignment preference (#17784)

---
 .editorconfig                                        |  1 -
 .../singleshell/config/MshSnapinInfo.cs              |  2 ++
 .../utils/tracing/PSSysLogProvider.cs                |  7 ++-----
 .../utils/tracing/SysLogProvider.cs                  | 12 +++---------
 .../tools/WebListener/Controllers/RetryController.cs |  5 +----
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index dd8d63862a4..0fc10f74c13 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -114,7 +114,6 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
 dotnet_style_prefer_conditional_expression_over_assignment = true:silent
 dotnet_style_prefer_auto_properties = true:suggestion
 csharp_prefer_simple_default_expression = true:suggestion
-dotnet_style_prefer_compound_assignment = false:silent
 dotnet_diagnostic.IDE0031.severity = none
 
 dotnet_code_quality_unused_parameters = non_public:suggestion
diff --git a/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs b/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
index eb70579ee52..e3ce3a406d1 100644
--- a/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
+++ b/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
@@ -1284,7 +1284,9 @@ private static IList<DefaultPSSnapInInformation> DefaultMshSnapins
                 {
                     lock (s_syncObject)
                     {
+#pragma warning disable IDE0074 // Disabling the rule because it can't be applied on non Unix
                         if (s_defaultMshSnapins == null)
+#pragma warning restore IDE0074
                         {
                             s_defaultMshSnapins = new List<DefaultPSSnapInInformation>()
                             {
diff --git a/src/System.Management.Automation/utils/tracing/PSSysLogProvider.cs b/src/System.Management.Automation/utils/tracing/PSSysLogProvider.cs
index 011d7577239..5a55d2f4cc1 100755
--- a/src/System.Management.Automation/utils/tracing/PSSysLogProvider.cs
+++ b/src/System.Management.Automation/utils/tracing/PSSysLogProvider.cs
@@ -49,11 +49,8 @@ private static StringBuilder PayloadBuilder
         {
             get
             {
-                if (t_payloadBuilder == null)
-                {
-                    // NOTE: Thread static fields must be explicitly initialized for each thread.
-                    t_payloadBuilder = new StringBuilder(200);
-                }
+                // NOTE: Thread static fields must be explicitly initialized for each thread.
+                t_payloadBuilder ??= new StringBuilder(200);
 
                 return t_payloadBuilder;
             }
diff --git a/src/System.Management.Automation/utils/tracing/SysLogProvider.cs b/src/System.Management.Automation/utils/tracing/SysLogProvider.cs
index 93e959fff20..4b084504718 100755
--- a/src/System.Management.Automation/utils/tracing/SysLogProvider.cs
+++ b/src/System.Management.Automation/utils/tracing/SysLogProvider.cs
@@ -130,11 +130,8 @@ private static StringBuilder MessageBuilder
         {
             get
             {
-                if (t_messageBuilder == null)
-                {
-                    // NOTE: Thread static fields must be explicitly initialized for each thread.
-                    t_messageBuilder = new StringBuilder(200);
-                }
+                // NOTE: Thread static fields must be explicitly initialized for each thread.
+                t_messageBuilder ??= new StringBuilder(200);
 
                 return t_messageBuilder;
             }
@@ -201,10 +198,7 @@ private bool ShouldLog(PSLevel level, PSKeyword keywords, PSChannel channel)
         {
             get
             {
-                if (_resourceManager is null)
-                {
-                    _resourceManager = new global::System.Resources.ResourceManager("System.Management.Automation.resources.EventResource", typeof(EventResource).Assembly);
-                }
+                _resourceManager ??= new global::System.Resources.ResourceManager("System.Management.Automation.resources.EventResource", typeof(EventResource).Assembly);
 
                 return _resourceManager;
             }
diff --git a/test/tools/WebListener/Controllers/RetryController.cs b/test/tools/WebListener/Controllers/RetryController.cs
index 00a0bcd9901..f9f93bae4c0 100644
--- a/test/tools/WebListener/Controllers/RetryController.cs
+++ b/test/tools/WebListener/Controllers/RetryController.cs
@@ -23,10 +23,7 @@ public class RetryController : Controller
 
         public JsonResult Retry(string sessionId, int failureCode, int failureCount)
         {
-            if (retryInfo == null)
-            {
-                retryInfo = new Dictionary<string, Tuple<int, int, int>>();
-            }
+            retryInfo ??= new Dictionary<string, Tuple<int, int, int>>();
 
             if (retryInfo.TryGetValue(sessionId, out Tuple<int, int, int> retry))
             {

From 0d52375adcd541c17eaa2d13e9f0881f8eb2159b Mon Sep 17 00:00:00 2001
From: Frode Flaten <3436158+fflaten@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:15:14 +0200
Subject: [PATCH 509/645] Add type accelerator `ordered` for
 `OrderedDictionary` (#17804)

---
 .../engine/parser/TypeResolver.cs                      |  2 ++
 .../Language/Parser/TypeAccelerator.Tests.ps1          | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/System.Management.Automation/engine/parser/TypeResolver.cs b/src/System.Management.Automation/engine/parser/TypeResolver.cs
index 83d031686fa..e93719a3fb4 100644
--- a/src/System.Management.Automation/engine/parser/TypeResolver.cs
+++ b/src/System.Management.Automation/engine/parser/TypeResolver.cs
@@ -4,6 +4,7 @@
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 #if !UNIX
 using System.DirectoryServices;
 #endif
@@ -753,6 +754,7 @@ internal static class CoreTypes
                     { typeof(OutputTypeAttribute),                         new[] { "OutputType" } },
                     { typeof(object[]),                                    null },
                     { typeof(ObjectSecurity),                              new[] { "ObjectSecurity" } },
+                    { typeof(OrderedDictionary),                           new[] { "ordered" } },
                     { typeof(ParameterAttribute),                          new[] { "Parameter" } },
                     { typeof(PhysicalAddress),                             new[] { "PhysicalAddress" } },
                     { typeof(PSCredential),                                new[] { "pscredential" } },
diff --git a/test/powershell/Language/Parser/TypeAccelerator.Tests.ps1 b/test/powershell/Language/Parser/TypeAccelerator.Tests.ps1
index ee32d4f74ad..26bc8d430a6 100644
--- a/test/powershell/Language/Parser/TypeAccelerator.Tests.ps1
+++ b/test/powershell/Language/Parser/TypeAccelerator.Tests.ps1
@@ -400,17 +400,21 @@ Describe "Type accelerators" -Tags "CI" {
                 }
                 @{
                     Accelerator = 'pspropertyexpression'
-                    Type = [Microsoft.PowerShell.Commands.PSPropertyExpression]
+                    Type        = [Microsoft.PowerShell.Commands.PSPropertyExpression]
+                }
+                @{
+                    Accelerator = 'ordered'
+                    Type        = [System.Collections.Specialized.OrderedDictionary]
                 }
             )
 
             if ( !$IsWindows )
             {
-                $totalAccelerators = 99
+                $totalAccelerators = 100
             }
             else
             {
-                $totalAccelerators = 104
+                $totalAccelerators = 105
 
                 $extraFullPSAcceleratorTestCases = @(
                     @{

From d204d29035abcca15393c2dca11c102faa3c3732 Mon Sep 17 00:00:00 2001
From: Frode Flaten <3436158+fflaten@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:20:09 +0200
Subject: [PATCH 510/645] Use null propagation operator in
 `System.Management.Automation` (#17792)

---
 .../DscSupport/CimDSCParser.cs                | 10 +--
 .../FormatAndOutput/common/ComplexWriter.cs   |  5 +-
 .../common/FormattingObjectsDeserializer.cs   |  4 +-
 .../FormatAndOutput/common/OutputManager.cs   |  9 +--
 .../cmdletization/ObjectModelWrapper.cs       |  5 +-
 .../help/CabinetNativeApi.cs                  |  5 +-
 .../help/SaveHelpCommand.cs                   | 10 +--
 .../help/UpdateHelpCommand.cs                 |  5 +-
 .../namespaces/AliasProvider.cs               |  6 +-
 .../namespaces/CoreCommandContext.cs          | 69 ++++---------------
 .../namespaces/FileSystemContentStream.cs     | 27 +++-----
 .../namespaces/FileSystemProvider.cs          | 10 +--
 .../utils/CryptoUtils.cs                      | 17 +----
 .../utils/ObjectStream.cs                     | 12 +---
 .../utils/RuntimeException.cs                 |  3 +-
 15 files changed, 42 insertions(+), 155 deletions(-)

diff --git a/src/System.Management.Automation/DscSupport/CimDSCParser.cs b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
index 3d1b0d0d01b..ccefa7e24bb 100644
--- a/src/System.Management.Automation/DscSupport/CimDSCParser.cs
+++ b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
@@ -970,10 +970,7 @@ public static List<CimClass> ImportClasses(string path, Tuple<string, Version> m
             {
                 // Ignore modules with invalid schemas.
                 s_tracer.WriteLine("DSC ClassCache: Error importing file '{0}', with error '{1}'.  Skipping file.", path, e);
-                if (errors != null)
-                {
-                    errors.Add(e);
-                }
+                errors?.Add(e);
             }
 
             if (classes != null)
@@ -1000,10 +997,7 @@ public static List<CimClass> ImportClasses(string path, Tuple<string, Version> m
                                 ParserStrings.DuplicateCimClassDefinition, className, path, files);
 
                             e.SetErrorId("DuplicateCimClassDefinition");
-                            if (errors != null)
-                            {
-                                errors.Add(e);
-                            }
+                            errors?.Add(e);
                         }
                     }
 
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
index 0982a8e198e..0ffc713cb92 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
@@ -239,10 +239,7 @@ internal IndentationStackFrame(IndentationManager mgr)
 
             public void Dispose()
             {
-                if (_mgr != null)
-                {
-                    _mgr.RemoveStackFrame();
-                }
+                _mgr?.RemoveStackFrame();
             }
 
             private readonly IndentationManager _mgr;
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs b/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs
index 962cf6f5ff1..f26a20ae6a9 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs
@@ -325,9 +325,7 @@ internal WriteStreamType DeserializeWriteStreamTypeMemberVariable(PSObject so)
         internal FormatInfoData DeserializeObject(PSObject so)
         {
             FormatInfoData fid = FormatInfoDataClassFactory.CreateInstance(so, this);
-
-            if (fid != null)
-                fid.Deserialize(so, this);
+            fid?.Deserialize(so, this);
             return fid;
         }
 
diff --git a/src/System.Management.Automation/FormatAndOutput/common/OutputManager.cs b/src/System.Management.Automation/FormatAndOutput/common/OutputManager.cs
index 41ea611f198..a551ef89bed 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/OutputManager.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/OutputManager.cs
@@ -92,19 +92,14 @@ internal override void ProcessRecord()
         internal override void EndProcessing()
         {
             // shut down only if we ever processed a pipeline object
-            if (_mgr != null)
-                _mgr.ShutDown();
+            _mgr?.ShutDown();
         }
 
         internal override void StopProcessing()
         {
             lock (_syncRoot)
             {
-                if (_lo != null)
-                {
-                    _lo.StopProcessing();
-                }
-
+                _lo?.StopProcessing();
                 _isStopped = true;
             }
         }
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/ObjectModelWrapper.cs b/src/System.Management.Automation/cimSupport/cmdletization/ObjectModelWrapper.cs
index a840ca527fd..ab6b741280e 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/ObjectModelWrapper.cs
+++ b/src/System.Management.Automation/cimSupport/cmdletization/ObjectModelWrapper.cs
@@ -50,10 +50,7 @@ internal void Initialize(PSCmdlet cmdlet, string className, string classVersion,
                         delegate
                         {
                             var disposable = this as IDisposable;
-                            if (disposable != null)
-                            {
-                                disposable.Dispose();
-                            }
+                            disposable?.Dispose();
                         };
             }
         }
diff --git a/src/System.Management.Automation/help/CabinetNativeApi.cs b/src/System.Management.Automation/help/CabinetNativeApi.cs
index 76e8fe853a4..9abe5a894b4 100644
--- a/src/System.Management.Automation/help/CabinetNativeApi.cs
+++ b/src/System.Management.Automation/help/CabinetNativeApi.cs
@@ -70,10 +70,7 @@ protected override void Dispose(bool disposing)
             }
 
             // Free managed objects within 'if (disposing)' if needed
-            if (fdiContext != null)
-            {
-                fdiContext.Dispose();
-            }
+            fdiContext?.Dispose();
             // Free unmanaged objects here
             this.CleanUpDelegates();
 
diff --git a/src/System.Management.Automation/help/SaveHelpCommand.cs b/src/System.Management.Automation/help/SaveHelpCommand.cs
index 94803728c99..7f42a25a99a 100644
--- a/src/System.Management.Automation/help/SaveHelpCommand.cs
+++ b/src/System.Management.Automation/help/SaveHelpCommand.cs
@@ -260,10 +260,7 @@ internal override bool ProcessModuleWithCulture(UpdatableHelpModuleInfo module,
                 }
                 finally
                 {
-                    if (helpInfoDrive != null)
-                    {
-                        helpInfoDrive.Dispose();
-                    }
+                    helpInfoDrive?.Dispose();
                 }
             }
 
@@ -407,10 +404,7 @@ internal override bool ProcessModuleWithCulture(UpdatableHelpModuleInfo module,
                         }
                         finally
                         {
-                            if (helpContentDrive != null)
-                            {
-                                helpContentDrive.Dispose();
-                            }
+                            helpContentDrive?.Dispose();
                         }
                     }
                 }
diff --git a/src/System.Management.Automation/help/UpdateHelpCommand.cs b/src/System.Management.Automation/help/UpdateHelpCommand.cs
index 01b17cbad7e..371a7321492 100644
--- a/src/System.Management.Automation/help/UpdateHelpCommand.cs
+++ b/src/System.Management.Automation/help/UpdateHelpCommand.cs
@@ -322,10 +322,7 @@ internal override bool ProcessModuleWithCulture(UpdatableHelpModuleInfo module,
                 }
                 finally
                 {
-                    if (helpInfoDrive != null)
-                    {
-                        helpInfoDrive.Dispose();
-                    }
+                    helpInfoDrive?.Dispose();
                 }
             }
             else
diff --git a/src/System.Management.Automation/namespaces/AliasProvider.cs b/src/System.Management.Automation/namespaces/AliasProvider.cs
index 8782a0d9bb5..c51d8e35128 100644
--- a/src/System.Management.Automation/namespaces/AliasProvider.cs
+++ b/src/System.Management.Automation/namespaces/AliasProvider.cs
@@ -194,11 +194,7 @@ internal override void SetSessionStateItem(string name, object value, bool write
                 if (dynamicParametersSpecified)
                 {
                     item = (AliasInfo)GetSessionStateItem(name);
-
-                    if (item != null)
-                    {
-                        item.SetOptions(dynamicParameters.Options, Force);
-                    }
+                    item?.SetOptions(dynamicParameters.Options, Force);
                 }
                 else
                 {
diff --git a/src/System.Management.Automation/namespaces/CoreCommandContext.cs b/src/System.Management.Automation/namespaces/CoreCommandContext.cs
index 5446b6b71cb..5c62ed6fa98 100644
--- a/src/System.Management.Automation/namespaces/CoreCommandContext.cs
+++ b/src/System.Management.Automation/namespaces/CoreCommandContext.cs
@@ -390,13 +390,8 @@ private void CopyFilters(CmdletProviderContext context)
             Filter = context.Filter;
         }
 
-        internal void RemoveStopReferral()
-        {
-            if (_copiedContext != null)
-            {
-                _copiedContext.StopReferrals.Remove(this);
-            }
-        }
+        internal void RemoveStopReferral() => _copiedContext?.StopReferrals.Remove(this);
+
         #endregion Internal properties
 
         #region Public properties
@@ -774,13 +769,7 @@ internal bool ShouldContinue(
         /// <param name="text">
         /// The string that needs to be written.
         /// </param>
-        internal void WriteVerbose(string text)
-        {
-            if (_command != null)
-            {
-                _command.WriteVerbose(text);
-            }
-        }
+        internal void WriteVerbose(string text) => _command?.WriteVerbose(text);
 
         /// <summary>
         /// Writes the object to the Warning pipe.
@@ -788,21 +777,9 @@ internal void WriteVerbose(string text)
         /// <param name="text">
         /// The string that needs to be written.
         /// </param>
-        internal void WriteWarning(string text)
-        {
-            if (_command != null)
-            {
-                _command.WriteWarning(text);
-            }
-        }
+        internal void WriteWarning(string text) => _command?.WriteWarning(text);
 
-        internal void WriteProgress(ProgressRecord record)
-        {
-            if (_command != null)
-            {
-                _command.WriteProgress(record);
-            }
-        }
+        internal void WriteProgress(ProgressRecord record) => _command?.WriteProgress(record);
 
         /// <summary>
         /// Writes a debug string.
@@ -810,29 +787,11 @@ internal void WriteProgress(ProgressRecord record)
         /// <param name="text">
         /// The String that needs to be written.
         /// </param>
-        internal void WriteDebug(string text)
-        {
-            if (_command != null)
-            {
-                _command.WriteDebug(text);
-            }
-        }
+        internal void WriteDebug(string text) => _command?.WriteDebug(text);
 
-        internal void WriteInformation(InformationRecord record)
-        {
-            if (_command != null)
-            {
-                _command.WriteInformation(record);
-            }
-        }
+        internal void WriteInformation(InformationRecord record) => _command?.WriteInformation(record);
 
-        internal void WriteInformation(object messageData, string[] tags)
-        {
-            if (_command != null)
-            {
-                _command.WriteInformation(messageData, tags);
-            }
-        }
+        internal void WriteInformation(object messageData, string[] tags) => _command?.WriteInformation(messageData, tags);
 
         #endregion User feedback mechanisms
 
@@ -1154,14 +1113,10 @@ internal void StopProcessing()
         {
             Stopping = true;
 
-            if (_providerInstance != null)
-            {
-                // We don't need to catch any of the exceptions here because
-                // we are terminating the pipeline and any exception will
-                // be caught by the engine.
-
-                _providerInstance.StopProcessing();
-            }
+            // We don't need to catch any of the exceptions here because
+            // we are terminating the pipeline and any exception will
+            // be caught by the engine.
+            _providerInstance?.StopProcessing();
 
             // Call the stop referrals if any
 
diff --git a/src/System.Management.Automation/namespaces/FileSystemContentStream.cs b/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
index 83309319549..352298107d5 100644
--- a/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
@@ -987,9 +987,8 @@ private void WaitForChanges(string filePath, FileMode fileMode, FileAccess fileA
 
             // Seek to the place we last left off.
             _stream.Seek(_fileOffset, SeekOrigin.Begin);
-            if (_reader != null) { _reader.DiscardBufferedData(); }
-
-            if (_backReader != null) { _backReader.DiscardBufferedData(); }
+            _reader?.DiscardBufferedData();
+            _backReader?.DiscardBufferedData();
         }
 
         /// <summary>
@@ -1003,15 +1002,13 @@ private void WaitForChanges(string filePath, FileMode fileMode, FileAccess fileA
         /// </param>
         public void Seek(long offset, SeekOrigin origin)
         {
-            if (_writer != null) { _writer.Flush(); }
+            _writer?.Flush();
 
             _stream.Seek(offset, origin);
 
-            if (_writer != null) { _writer.Flush(); }
-
-            if (_reader != null) { _reader.DiscardBufferedData(); }
-
-            if (_backReader != null) { _backReader.DiscardBufferedData(); }
+            _writer?.Flush();
+            _reader?.DiscardBufferedData();
+            _backReader?.DiscardBufferedData();
         }
 
         /// <summary>
@@ -1135,14 +1132,10 @@ internal void Dispose(bool isDisposing)
         {
             if (isDisposing)
             {
-                if (_stream != null)
-                    _stream.Dispose();
-                if (_reader != null)
-                    _reader.Dispose();
-                if (_backReader != null)
-                    _backReader.Dispose();
-                if (_writer != null)
-                    _writer.Dispose();
+                _stream?.Dispose();
+                _reader?.Dispose();
+                _backReader?.Dispose();
+                _writer?.Dispose();
             }
         }
     }
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index 3d28b5bb7c5..3c0aeaddc7b 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -4520,10 +4520,7 @@ private bool PerformCopyFileFromRemoteSession(string sourceFileFullName, FileInf
             }
             finally
             {
-                if (wStream != null)
-                {
-                    wStream.Dispose();
-                }
+                wStream?.Dispose();
 
                 // If copying the file from the remote session failed, then remove it.
                 if (errorWhileCopyRemoteFile && File.Exists(destinationFile.FullName))
@@ -4803,10 +4800,7 @@ private bool CopyFileStreamToRemoteSession(FileInfo file, string destinationPath
             }
             finally
             {
-                if (fStream != null)
-                {
-                    fStream.Dispose();
-                }
+                fStream?.Dispose();
             }
 
             return success;
diff --git a/src/System.Management.Automation/utils/CryptoUtils.cs b/src/System.Management.Automation/utils/CryptoUtils.cs
index 5aa321fcb72..26d1fd7d177 100644
--- a/src/System.Management.Automation/utils/CryptoUtils.cs
+++ b/src/System.Management.Automation/utils/CryptoUtils.cs
@@ -616,15 +616,8 @@ private void Dispose(bool disposing)
         {
             if (disposing)
             {
-                if (_rsa != null)
-                {
-                    _rsa.Dispose();
-                }
-
-                if (_aes != null)
-                {
-                    _aes.Dispose();
-                }
+                _rsa?.Dispose();
+                _aes?.Dispose();
             }
         }
 
@@ -851,11 +844,7 @@ public void Dispose(bool disposing)
         {
             if (disposing)
             {
-                if (_rsaCryptoProvider != null)
-                {
-                    _rsaCryptoProvider.Dispose();
-                }
-
+                _rsaCryptoProvider?.Dispose();
                 _rsaCryptoProvider = null;
 
                 _keyExchangeCompleted.Dispose();
diff --git a/src/System.Management.Automation/utils/ObjectStream.cs b/src/System.Management.Automation/utils/ObjectStream.cs
index c9aef1b928e..8bf4adc03b4 100644
--- a/src/System.Management.Automation/utils/ObjectStream.cs
+++ b/src/System.Management.Automation/utils/ObjectStream.cs
@@ -1496,16 +1496,8 @@ protected override void Dispose(bool disposing)
                 _writeHandle.Dispose();
                 _writeClosedHandle.Dispose();
                 _readClosedHandle.Dispose();
-
-                if (_readWaitHandle != null)
-                {
-                    _readWaitHandle.Dispose();
-                }
-
-                if (_writeWaitHandle != null)
-                {
-                    _writeWaitHandle.Dispose();
-                }
+                _readWaitHandle?.Dispose();
+                _writeWaitHandle?.Dispose();
 
                 if (_reader != null)
                 {
diff --git a/src/System.Management.Automation/utils/RuntimeException.cs b/src/System.Management.Automation/utils/RuntimeException.cs
index ec0efd4f063..d3e204f450c 100644
--- a/src/System.Management.Automation/utils/RuntimeException.cs
+++ b/src/System.Management.Automation/utils/RuntimeException.cs
@@ -211,8 +211,7 @@ internal void SetErrorCategory(ErrorCategory errorCategory)
         internal void SetTargetObject(object targetObject)
         {
             _targetObject = targetObject;
-            if (_errorRecord != null)
-                _errorRecord.SetTargetObject(targetObject);
+            _errorRecord?.SetTargetObject(targetObject);
         }
         #endregion ErrorRecord
 

From 2d4a6bf47530d4492af3c35525f7db3cde2af18f Mon Sep 17 00:00:00 2001
From: Frode Flaten <3436158+fflaten@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:20:44 +0200
Subject: [PATCH 511/645] Use null propagation operator in `Management` and
 `ConsoleHost` (#17791)

---
 .../cmdletization/SessionBasedWrapper.cs      |  5 +--
 .../cmdletization/cim/cimChildJobBase.cs      | 10 +----
 .../commands/management/ContentCommandBase.cs | 10 +----
 .../commands/management/Process.cs            | 41 ++++---------------
 .../host/msh/ConsoleHost.cs                   | 36 ++++------------
 .../msh/ConsoleHostUserInterfaceProgress.cs   | 20 ++-------
 .../host/msh/Executor.cs                      | 13 ++----
 7 files changed, 27 insertions(+), 108 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs
index 0ec77a18d26..cca50c4bb91 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs
@@ -683,10 +683,7 @@ public override void EndProcessing()
         public override void StopProcessing()
         {
             Job jobToStop = _parentJob;
-            if (jobToStop != null)
-            {
-                jobToStop.StopJob();
-            }
+            jobToStop?.StopJob();
 
             base.StopProcessing();
         }
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs
index 7ef78d13a28..8a973c7af64 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs
@@ -315,10 +315,7 @@ internal override void StartJob()
                 this.ExceptionSafeWrapper(delegate
                 {
                     IObservable<T> observable = this.GetCimOperation();
-                    if (observable != null)
-                    {
-                        observable.Subscribe(this);
-                    }
+                    observable?.Subscribe(this);
                 });
             });
         }
@@ -522,10 +519,7 @@ internal CimOperationOptions CreateOperationOptions()
             }
 
             CimCustomOptionsDictionary jobSpecificCustomOptions = this.GetJobSpecificCustomOptions();
-            if (jobSpecificCustomOptions != null)
-            {
-                jobSpecificCustomOptions.Apply(operationOptions, CimSensitiveValueConverter);
-            }
+            jobSpecificCustomOptions?.Apply(operationOptions, CimSensitiveValueConverter);
 
             return operationOptions;
         }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs
index 0c990292b58..87c7731ed70 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs
@@ -377,10 +377,7 @@ internal void CloseContent(List<ContentHolder> contentHolders, bool disposing)
             {
                 try
                 {
-                    if (holder.Writer != null)
-                    {
-                        holder.Writer.Close();
-                    }
+                    holder.Writer?.Close();
                 }
                 catch (Exception e) // Catch-all OK. 3rd party callout
                 {
@@ -414,10 +411,7 @@ internal void CloseContent(List<ContentHolder> contentHolders, bool disposing)
 
                 try
                 {
-                    if (holder.Reader != null)
-                    {
-                        holder.Reader.Close();
-                    }
+                    holder.Reader?.Close();
                 }
                 catch (Exception e) // Catch-all OK. 3rd party callout
                 {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
index ef4f5b1a7b4..5aa97eaeb5d 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
@@ -938,10 +938,7 @@ private void myProcess_Exited(object sender, System.EventArgs e)
         {
             if (System.Threading.Interlocked.Decrement(ref _numberOfProcessesToWaitFor) == 0)
             {
-                if (_waitHandle != null)
-                {
-                    _waitHandle.Set();
-                }
+                _waitHandle?.Set();
             }
         }
 
@@ -1040,13 +1037,8 @@ protected override void EndProcessing()
         /// <summary>
         /// StopProcessing.
         /// </summary>
-        protected override void StopProcessing()
-        {
-            if (_waitHandle != null)
-            {
-                _waitHandle.Set();
-            }
-        }
+        protected override void StopProcessing() => _waitHandle?.Set();
+
         #endregion Overrides
 
     }
@@ -2079,13 +2071,7 @@ protected override void BeginProcessing()
         /// <summary>
         /// Implements ^c, after creating a process.
         /// </summary>
-        protected override void StopProcessing()
-        {
-            if (_waithandle != null)
-            {
-                _waithandle.Set();
-            }
-        }
+        protected override void StopProcessing() => _waithandle?.Set();
 
         #endregion
 
@@ -2116,13 +2102,7 @@ private void Dispose(bool isDisposing)
         /// <summary>
         /// When Process exits the wait handle is set.
         /// </summary>
-        private void myProcess_Exited(object sender, System.EventArgs e)
-        {
-            if (_waithandle != null)
-            {
-                _waithandle.Set();
-            }
-        }
+        private void myProcess_Exited(object sender, System.EventArgs e) => _waithandle?.Set();
 
         private string ResolveFilePath(string path)
         {
@@ -2221,15 +2201,8 @@ private void StreamClosing()
         {
             Thread.Sleep(1000);
 
-            if (_outputWriter != null)
-            {
-                _outputWriter.Dispose();
-            }
-
-            if (_errorWriter != null)
-            {
-                _errorWriter.Dispose();
-            }
+            _outputWriter?.Dispose();
+            _errorWriter?.Dispose();
         }
 
         private void SetupInputOutputRedirection(Process p)
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
index 672bcfabb07..0d647a2ded1 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -189,10 +189,7 @@ internal static int Start(
                 if ((s_cpp.ServerMode && s_cpp.NamedPipeServerMode) || (s_cpp.ServerMode && s_cpp.SocketServerMode) || (s_cpp.NamedPipeServerMode && s_cpp.SocketServerMode))
                 {
                     s_tracer.TraceError("Conflicting server mode parameters, parameters must be used exclusively.");
-                    if (s_theConsoleHost != null)
-                    {
-                        s_theConsoleHost.ui.WriteErrorLine(ConsoleHostStrings.ConflictingServerModeParameters);
-                    }
+                    s_theConsoleHost?.ui.WriteErrorLine(ConsoleHostStrings.ConflictingServerModeParameters);
 
                     return ExitCodeBadCommandLineParameter;
                 }
@@ -501,10 +498,7 @@ private static void HandleBreak()
                     if (runspaceRef != null)
                     {
                         var runspace = runspaceRef.Runspace;
-                        if (runspace != null)
-                        {
-                            runspace.Close();
-                        }
+                        runspace?.Close();
                     }
                 }
             }
@@ -1266,15 +1260,8 @@ private void Dispose(bool isDisposingNotFinalizing)
                         StopTranscribing();
                     }
 
-                    if (_outputSerializer != null)
-                    {
-                        _outputSerializer.End();
-                    }
-
-                    if (_errorSerializer != null)
-                    {
-                        _errorSerializer.End();
-                    }
+                    _outputSerializer?.End();
+                    _errorSerializer?.End();
 
                     if (_runspaceRef != null)
                     {
@@ -2233,10 +2220,7 @@ private void OnExecutionSuspended(object sender, DebuggerStopEventArgs e)
                     // For remote debugging block data coming from the main (not-nested)
                     // running command.
                     baseLoop = InputLoop.GetNonNestedLoop();
-                    if (baseLoop != null)
-                    {
-                        baseLoop.BlockCommandOutput();
-                    }
+                    baseLoop?.BlockCommandOutput();
                 }
 
                 //
@@ -2281,10 +2265,7 @@ private void OnExecutionSuspended(object sender, DebuggerStopEventArgs e)
             finally
             {
                 _debuggerStopEventArgs = null;
-                if (baseLoop != null)
-                {
-                    baseLoop.ResumeCommandOutput();
-                }
+                baseLoop?.ResumeCommandOutput();
             }
         }
 
@@ -2670,10 +2651,7 @@ e is RemoteException ||
                                 bht = _parent._breakHandlerThread;
                             }
 
-                            if (bht != null)
-                            {
-                                bht.Join();
-                            }
+                            bht?.Join();
 
                             // Once the pipeline has been executed, we toss any outstanding progress data and
                             // take down the display.
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs
index a36bc096d10..1c9d37ea9fb 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs
@@ -139,20 +139,14 @@ class ConsoleHostUserInterface : PSHostUserInterface
         void
         PreWrite()
         {
-            if (_progPane != null)
-            {
-                _progPane.Hide();
-            }
+            _progPane?.Hide();
         }
 
         private
         void
         PostWrite()
         {
-            if (_progPane != null)
-            {
-                _progPane.Show();
-            }
+            _progPane?.Show();
         }
 
         private
@@ -178,20 +172,14 @@ class ConsoleHostUserInterface : PSHostUserInterface
         void
         PreRead()
         {
-            if (_progPane != null)
-            {
-                _progPane.Hide();
-            }
+            _progPane?.Hide();
         }
 
         private
         void
         PostRead()
         {
-            if (_progPane != null)
-            {
-                _progPane.Show();
-            }
+            _progPane?.Show();
         }
 
         private
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
index 601d4baab2d..013281d2209 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
@@ -599,11 +599,9 @@ internal void BlockCommandOutput()
         internal void ResumeCommandOutput()
         {
             RemotePipeline remotePipeline = _pipeline as RemotePipeline;
-            if (remotePipeline != null)
-            {
-                // Resumes data flow.
-                remotePipeline.ResumeIncomingData();
-            }
+
+            // Resumes data flow.
+            remotePipeline?.ResumeIncomingData();
         }
 
         /// <summary>
@@ -697,10 +695,7 @@ internal static void CancelCurrentExecutor()
                 temp = s_currentExecutor;
             }
 
-            if (temp != null)
-            {
-                temp.Cancel();
-            }
+            temp?.Cancel();
         }
 
         // These statics are threadsafe, as there can be only one instance of ConsoleHost in a process at a time, and access

From 7c624902e1dbb165b1fa0700df498a22c567b9f8 Mon Sep 17 00:00:00 2001
From: Frode Flaten <3436158+fflaten@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:21:16 +0200
Subject: [PATCH 512/645] Use null propagation operator in `remoting` code
 (#17790)

---
 .../remoting/client/ClientMethodExecutor.cs   |  5 +-
 .../remoting/client/ClientRemotePowerShell.cs |  5 +-
 .../engine/remoting/client/Job.cs             | 18 +----
 .../engine/remoting/client/Job2.cs            |  7 +-
 .../client/RemoteRunspacePoolInternal.cs      | 10 +--
 .../remoting/client/RemotingProtocol2.cs      |  5 +-
 .../engine/remoting/client/ThrottlingJob.cs   | 16 +----
 ...clientremotesessionprotocolstatemachine.cs | 10 +--
 .../engine/remoting/client/remoterunspace.cs  | 12 +---
 .../remoting/client/remoterunspaceinfo.cs     |  5 +-
 .../engine/remoting/commands/DebugJob.cs      | 10 +--
 .../commands/EnterPSHostProcessCommand.cs     |  5 +-
 .../remoting/commands/InvokeCommandCommand.cs | 17 ++---
 .../remoting/commands/PSRemotingCmdlet.cs     | 17 +----
 .../engine/remoting/commands/ReceiveJob.cs    | 25 ++-----
 .../remoting/commands/newrunspacecommand.cs   |  6 +-
 .../remoting/common/RemoteSessionNamedPipe.cs |  8 +--
 .../common/WireDataFormat/RemoteHost.cs       |  5 +-
 .../engine/remoting/common/psstreamobject.cs  | 70 ++++---------------
 .../engine/remoting/common/throttlemanager.cs |  5 +-
 .../fanin/OutOfProcTransportManager.cs        | 57 +++++----------
 .../remoting/fanin/PriorityCollection.cs      |  5 +-
 .../remoting/fanin/WSManPluginFacade.cs       |  6 +-
 .../remoting/fanin/WSManTransportManager.cs   | 17 +----
 .../server/OutOfProcServerMediator.cs         | 19 ++---
 .../remoting/server/ServerPowerShellDriver.cs |  8 +--
 .../remoting/server/ServerRemoteHost.cs       |  5 +-
 .../server/ServerRemotingProtocol2.cs         |  5 +-
 .../server/ServerRunspacePoolDriver.cs        | 44 +++---------
 .../server/ServerSteppablePipelineDriver.cs   | 25 ++-----
 .../ServerSteppablePipelineSubscriber.cs      | 14 ++--
 .../remoting/server/serverremotesession.cs    | 13 +---
 .../server/serverremotesessionstatemachine.cs | 10 +--
 33 files changed, 106 insertions(+), 383 deletions(-)

diff --git a/src/System.Management.Automation/engine/remoting/client/ClientMethodExecutor.cs b/src/System.Management.Automation/engine/remoting/client/ClientMethodExecutor.cs
index 8d8ba3f7e64..e779b132f4d 100644
--- a/src/System.Management.Automation/engine/remoting/client/ClientMethodExecutor.cs
+++ b/src/System.Management.Automation/engine/remoting/client/ClientMethodExecutor.cs
@@ -159,10 +159,7 @@ internal void Execute(PSDataCollectionStream<ErrorRecord> errorStream)
                 {
                     try
                     {
-                        if (_clientHost.UI != null)
-                        {
-                            _clientHost.UI.WriteErrorLine(errorRecord.ToString());
-                        }
+                        _clientHost.UI?.WriteErrorLine(errorRecord.ToString());
                     }
                     catch (Exception)
                     {
diff --git a/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs b/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
index b464028d851..bee284f0704 100644
--- a/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
+++ b/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
@@ -166,10 +166,7 @@ internal void UnblockCollections()
 
             outputstream.Close();
             errorstream.Close();
-            if (inputstream != null)
-            {
-                inputstream.Close();
-            }
+            inputstream?.Close();
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/client/Job.cs b/src/System.Management.Automation/engine/remoting/client/Job.cs
index 99b7a2f6473..05ed6dfe1f1 100644
--- a/src/System.Management.Automation/engine/remoting/client/Job.cs
+++ b/src/System.Management.Automation/engine/remoting/client/Job.cs
@@ -1448,10 +1448,7 @@ internal void SetJobState(JobState state, Exception reason)
                 {
                     lock (syncObject)
                     {
-                        if (_finished != null)
-                        {
-                            _finished.Set();
-                        }
+                        _finished?.Set();
                     }
                 }
 #pragma warning restore 56500
@@ -4074,10 +4071,7 @@ public override void SetDebuggerStepMode(bool enabled)
         internal void CheckStateAndRaiseStopEvent()
         {
             RemoteDebugger remoteDebugger = _wrappedDebugger as RemoteDebugger;
-            if (remoteDebugger != null)
-            {
-                remoteDebugger.CheckStateAndRaiseStopEvent();
-            }
+            remoteDebugger?.CheckStateAndRaiseStopEvent();
         }
 
         /// <summary>
@@ -4125,13 +4119,7 @@ private Pipeline DrainAndBlockRemoteOutput()
             return null;
         }
 
-        private static void RestoreRemoteOutput(Pipeline runningCmd)
-        {
-            if (runningCmd != null)
-            {
-                runningCmd.ResumeIncomingData();
-            }
-        }
+        private static void RestoreRemoteOutput(Pipeline runningCmd) => runningCmd?.ResumeIncomingData();
 
         private void HandleBreakpointUpdated(object sender, BreakpointUpdatedEventArgs e)
         {
diff --git a/src/System.Management.Automation/engine/remoting/client/Job2.cs b/src/System.Management.Automation/engine/remoting/client/Job2.cs
index 074fa19afd9..d5f122159ed 100644
--- a/src/System.Management.Automation/engine/remoting/client/Job2.cs
+++ b/src/System.Management.Automation/engine/remoting/client/Job2.cs
@@ -2021,11 +2021,8 @@ protected override void Dispose(bool disposing)
                     job.Dispose();
                 }
 
-                if (_jobRunning != null)
-                    _jobRunning.Dispose();
-
-                if (_jobSuspendedOrAborted != null)
-                    _jobSuspendedOrAborted.Dispose();
+                _jobRunning?.Dispose();
+                _jobSuspendedOrAborted?.Dispose();
             }
             finally
             {
diff --git a/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs b/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs
index 8a572529971..6d19c053e90 100644
--- a/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs
@@ -1826,20 +1826,14 @@ private void ResetDisconnectedOnExpiresOn()
         {
             // Reset DisconnectedOn/ExpiresOn
             WSManConnectionInfo wsManConnectionInfo = _connectionInfo as WSManConnectionInfo;
-            if (wsManConnectionInfo != null)
-            {
-                wsManConnectionInfo.NullDisconnectedExpiresOn();
-            }
+            wsManConnectionInfo?.NullDisconnectedExpiresOn();
         }
 
         private void UpdateDisconnectedExpiresOn()
         {
             // Set DisconnectedOn/ExpiresOn for disconnected session.
             WSManConnectionInfo wsManConnectionInfo = _connectionInfo as WSManConnectionInfo;
-            if (wsManConnectionInfo != null)
-            {
-                wsManConnectionInfo.SetDisconnectedExpiresOnToNow();
-            }
+            wsManConnectionInfo?.SetDisconnectedExpiresOnToNow();
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs b/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
index 07446d45fc3..ecc3d6cfd9f 100644
--- a/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
@@ -275,10 +275,7 @@ internal void DispatchMessageToPowerShell(RemoteDataObject<PSObject> rcvdData)
             // if a data structure handler does not exist it means
             // the association has been removed -
             // discard messages
-            if (dsHandler != null)
-            {
-                dsHandler.ProcessReceivedData(rcvdData);
-            }
+            dsHandler?.ProcessReceivedData(rcvdData);
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/client/ThrottlingJob.cs b/src/System.Management.Automation/engine/remoting/client/ThrottlingJob.cs
index db2f5403dfd..000e544fd57 100644
--- a/src/System.Management.Automation/engine/remoting/client/ThrottlingJob.cs
+++ b/src/System.Management.Automation/engine/remoting/client/ThrottlingJob.cs
@@ -53,11 +53,7 @@ protected override void Dispose(bool disposing)
                         childJob.Dispose();
                     }
 
-                    if (_jobResultsThrottlingSemaphore != null)
-                    {
-                        _jobResultsThrottlingSemaphore.Dispose();
-                    }
-
+                    _jobResultsThrottlingSemaphore?.Dispose();
                     _cancellationTokenSource.Dispose();
                 }
             }
@@ -541,10 +537,7 @@ private void StartChildJobIfPossible()
                 } while (false);
             }
 
-            if (readyToRunChildJob != null)
-            {
-                readyToRunChildJob.StartJob();
-            }
+            readyToRunChildJob?.StartJob();
         }
 
         private void EnqueueReadyToRunChildJob(StartableJob childJob)
@@ -1227,10 +1220,7 @@ public static void ForwardAllResultsToCmdlet(ThrottlingJob throttlingJob, Cmdlet
                             }
                             finally
                             {
-                                if (cancellationTokenRegistration != null)
-                                {
-                                    cancellationTokenRegistration.Dispose();
-                                }
+                                cancellationTokenRegistration?.Dispose();
                             }
                         }
                         finally
diff --git a/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs b/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs
index a0dbd5bbc9a..da63b846543 100644
--- a/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs
+++ b/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs
@@ -254,10 +254,7 @@ private void SetStateHandler(object sender, RemoteSessionStateMachineEventArgs e
                         if (_state == RemoteSessionState.EstablishedAndKeySent)
                         {
                             Timer tmp = Interlocked.Exchange(ref _keyExchangeTimer, null);
-                            if (tmp != null)
-                            {
-                                tmp.Dispose();
-                            }
+                            tmp?.Dispose();
 
                             _keyExchanged = true;
                             SetState(RemoteSessionState.Established, eventArgs.Reason);
@@ -339,10 +336,7 @@ private void HandleKeyExchangeTimeout(object sender)
             Dbg.Assert(_state == RemoteSessionState.EstablishedAndKeySent, "timeout should only happen when waiting for a key");
 
             Timer tmp = Interlocked.Exchange(ref _keyExchangeTimer, null);
-            if (tmp != null)
-            {
-                tmp.Dispose();
-            }
+            tmp?.Dispose();
 
             PSRemotingDataStructureException exception =
                 new PSRemotingDataStructureException(RemotingErrorIdStrings.ClientKeyExchangeFailed);
diff --git a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
index 6dcee34d76d..ca6d8f7d517 100644
--- a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
+++ b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
@@ -634,11 +634,8 @@ protected override void Dispose(bool disposing)
                         //
                     }
 
-                    if (_remoteDebugger != null)
-                    {
-                        // Release RunspacePool event forwarding handlers.
-                        _remoteDebugger.Dispose();
-                    }
+                    // Release RunspacePool event forwarding handlers.
+                    _remoteDebugger?.Dispose();
 
                     try
                     {
@@ -1732,10 +1729,7 @@ internal void AbortOpen()
             System.Management.Automation.Remoting.Client.NamedPipeClientSessionTransportManager transportManager =
                 RunspacePool.RemoteRunspacePoolInternal.DataStructureHandler.TransportManager as System.Management.Automation.Remoting.Client.NamedPipeClientSessionTransportManager;
 
-            if (transportManager != null)
-            {
-                transportManager.AbortConnect();
-            }
+            transportManager?.AbortConnect();
         }
 
         #endregion Internal Methods
diff --git a/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs b/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs
index 8bfc34d48e0..55c2b23db75 100644
--- a/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs
+++ b/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs
@@ -384,10 +384,7 @@ public static PSSession Create(
                 _transportName = transportName
             };
 
-            if (psCmdlet != null)
-            {
-                psCmdlet.RunspaceRepository.Add(psSession);
-            }
+            psCmdlet?.RunspaceRepository.Add(psSession);
 
             return psSession;
         }
diff --git a/src/System.Management.Automation/engine/remoting/commands/DebugJob.cs b/src/System.Management.Automation/engine/remoting/commands/DebugJob.cs
index 8e5732304e9..7494f902fb7 100644
--- a/src/System.Management.Automation/engine/remoting/commands/DebugJob.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/DebugJob.cs
@@ -203,10 +203,7 @@ protected override void StopProcessing()
 
             // Unblock the data collection.
             PSDataCollection<PSStreamObject> debugCollection = _debugCollection;
-            if (debugCollection != null)
-            {
-                debugCollection.Complete();
-            }
+            debugCollection?.Complete();
         }
 
         #endregion
@@ -260,10 +257,7 @@ private void WaitAndReceiveJobOutput()
                 // or this command is cancelled.
                 foreach (var streamItem in _debugCollection)
                 {
-                    if (streamItem != null)
-                    {
-                        streamItem.WriteStreamObject(this);
-                    }
+                    streamItem?.WriteStreamObject(this);
                 }
             }
             catch (Exception)
diff --git a/src/System.Management.Automation/engine/remoting/commands/EnterPSHostProcessCommand.cs b/src/System.Management.Automation/engine/remoting/commands/EnterPSHostProcessCommand.cs
index c3ad65b0506..b6906bc7008 100644
--- a/src/System.Management.Automation/engine/remoting/commands/EnterPSHostProcessCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/EnterPSHostProcessCommand.cs
@@ -212,10 +212,7 @@ protected override void EndProcessing()
         protected override void StopProcessing()
         {
             RemoteRunspace connectingRunspace = _connectingRemoteRunspace;
-            if (connectingRunspace != null)
-            {
-                connectingRunspace.AbortOpen();
-            }
+            connectingRunspace?.AbortOpen();
         }
 
         #endregion
diff --git a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
index c194706151d..804355d2e8d 100644
--- a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
@@ -1559,10 +1559,7 @@ private void HandleRunspaceDebugStop(object sender, StartRunspaceDebugProcessing
             operation.RunspaceDebugStop -= HandleRunspaceDebugStop;
 
             var hostDebugger = GetHostDebugger();
-            if (hostDebugger != null)
-            {
-                hostDebugger.QueueRunspaceForDebug(args.Runspace);
-            }
+            hostDebugger?.QueueRunspaceForDebug(args.Runspace);
         }
 
         private void HandleJobStateChanged(object sender, JobStateEventArgs e)
@@ -1579,10 +1576,7 @@ private void HandleJobStateChanged(object sender, JobStateEventArgs e)
                 // Signal that this job has been disconnected, or has ended.
                 lock (_jobSyncObject)
                 {
-                    if (_disconnectComplete != null)
-                    {
-                        _disconnectComplete.Set();
-                    }
+                    _disconnectComplete?.Set();
                 }
             }
         }
@@ -2186,11 +2180,8 @@ private void Dispose(bool disposing)
 
                 if (!_asjob)
                 {
-                    if (_job != null)
-                    {
-                        // job will be null in the "InProcess" case
-                        _job.Dispose();
-                    }
+                    // job will be null in the "InProcess" case
+                    _job?.Dispose();
 
                     _throttleManager.ThrottleComplete -= HandleThrottleComplete;
                     _throttleManager.Dispose();
diff --git a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
index 66021f6e282..23e86e9669a 100644
--- a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
@@ -1960,11 +1960,7 @@ private static string GetRemoteServerPsVersion(RemoteRunspace remoteRunspace)
         /// <summary>
         /// Adds forwarded events to the local queue.
         /// </summary>
-        internal void OnRunspacePSEventReceived(object sender, PSEventArgs e)
-        {
-            if (this.Events != null)
-                this.Events.AddForwardedEvent(e);
-        }
+        internal void OnRunspacePSEventReceived(object sender, PSEventArgs e) => this.Events?.AddForwardedEvent(e);
 
         #endregion Private Methods
 
@@ -3481,10 +3477,7 @@ private void RaiseOperationCompleteEvent(EventArgs baseEventArgs)
                     OperationState.StopComplete;
             operationStateEventArgs.BaseEvent = baseEventArgs;
 
-            if (OperationComplete != null)
-            {
-                OperationComplete.SafeInvoke(this, operationStateEventArgs);
-            }
+            OperationComplete?.SafeInvoke(this, operationStateEventArgs);
         }
     }
 
@@ -3679,11 +3672,7 @@ private void HandlePipelineStateChanged(object sender,
                 case PipelineState.Completed:
                 case PipelineState.Stopped:
                 case PipelineState.Failed:
-                    if (RemoteRunspace != null)
-                    {
-                        RemoteRunspace.CloseAsync();
-                    }
-
+                    RemoteRunspace?.CloseAsync();
                     break;
             }
         }
diff --git a/src/System.Management.Automation/engine/remoting/commands/ReceiveJob.cs b/src/System.Management.Automation/engine/remoting/commands/ReceiveJob.cs
index 2b1436519cd..a62cef7d5d4 100644
--- a/src/System.Management.Automation/engine/remoting/commands/ReceiveJob.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/ReceiveJob.cs
@@ -823,10 +823,7 @@ private void WriteJobResults(Job job)
                 {
                     if (v == null) continue;
                     MshCommandRuntime mshCommandRuntime = CommandRuntime as MshCommandRuntime;
-                    if (mshCommandRuntime != null)
-                    {
-                        mshCommandRuntime.WriteVerbose(v, true);
-                    }
+                    mshCommandRuntime?.WriteVerbose(v, true);
                 }
 
                 Collection<DebugRecord> debugRecords = ReadAll(job.Debug);
@@ -835,10 +832,7 @@ private void WriteJobResults(Job job)
                 {
                     if (d == null) continue;
                     MshCommandRuntime mshCommandRuntime = CommandRuntime as MshCommandRuntime;
-                    if (mshCommandRuntime != null)
-                    {
-                        mshCommandRuntime.WriteDebug(d, true);
-                    }
+                    mshCommandRuntime?.WriteDebug(d, true);
                 }
 
                 Collection<WarningRecord> warningRecords = ReadAll(job.Warning);
@@ -847,10 +841,7 @@ private void WriteJobResults(Job job)
                 {
                     if (w == null) continue;
                     MshCommandRuntime mshCommandRuntime = CommandRuntime as MshCommandRuntime;
-                    if (mshCommandRuntime != null)
-                    {
-                        mshCommandRuntime.WriteWarning(w, true);
-                    }
+                    mshCommandRuntime?.WriteWarning(w, true);
                 }
 
                 Collection<ProgressRecord> progressRecords = ReadAll(job.Progress);
@@ -859,10 +850,7 @@ private void WriteJobResults(Job job)
                 {
                     if (p == null) continue;
                     MshCommandRuntime mshCommandRuntime = CommandRuntime as MshCommandRuntime;
-                    if (mshCommandRuntime != null)
-                    {
-                        mshCommandRuntime.WriteProgress(p, true);
-                    }
+                    mshCommandRuntime?.WriteProgress(p, true);
                 }
 
                 Collection<InformationRecord> informationRecords = ReadAll(job.Information);
@@ -871,10 +859,7 @@ private void WriteJobResults(Job job)
                 {
                     if (p == null) continue;
                     MshCommandRuntime mshCommandRuntime = CommandRuntime as MshCommandRuntime;
-                    if (mshCommandRuntime != null)
-                    {
-                        mshCommandRuntime.WriteInformation(p, true);
-                    }
+                    mshCommandRuntime?.WriteInformation(p, true);
                 }
             }
 
diff --git a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
index a3cfba96675..3ea381d6a1c 100644
--- a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
@@ -385,11 +385,7 @@ public void Dispose()
         /// <summary>
         /// Adds forwarded events to the local queue.
         /// </summary>
-        private void OnRunspacePSEventReceived(object sender, PSEventArgs e)
-        {
-            if (this.Events != null)
-                this.Events.AddForwardedEvent(e);
-        }
+        private void OnRunspacePSEventReceived(object sender, PSEventArgs e) => this.Events?.AddForwardedEvent(e);
 
         /// <summary>
         /// When the client remote session reports a URI redirection, this method will report the
diff --git a/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs b/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
index 50171953faf..2c8b6a33ce7 100644
--- a/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
@@ -1099,13 +1099,7 @@ public void Connect(
         /// <summary>
         /// Closes the named pipe.
         /// </summary>
-        public void Close()
-        {
-            if (_clientPipeStream != null)
-            {
-                _clientPipeStream.Dispose();
-            }
-        }
+        public void Close() => _clientPipeStream?.Dispose();
 
         /// <summary>
         /// Abort connection attempt.
diff --git a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteHost.cs b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteHost.cs
index c29be13487b..79b920c22b5 100644
--- a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteHost.cs
+++ b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteHost.cs
@@ -188,10 +188,7 @@ internal void ExecuteVoidMethod(PSHost clientHost)
             }
             finally
             {
-                if (remoteRunspaceToClose != null)
-                {
-                    remoteRunspaceToClose.Close();
-                }
+                remoteRunspaceToClose?.Close();
             }
         }
 
diff --git a/src/System.Management.Automation/engine/remoting/common/psstreamobject.cs b/src/System.Management.Automation/engine/remoting/common/psstreamobject.cs
index ee898c74006..c0052b3df29 100644
--- a/src/System.Management.Automation/engine/remoting/common/psstreamobject.cs
+++ b/src/System.Management.Automation/engine/remoting/common/psstreamobject.cs
@@ -120,10 +120,7 @@ public void WriteStreamObject(Cmdlet cmdlet, bool overrideInquire = false)
                             ErrorRecord errorRecord = (ErrorRecord)this.Value;
                             errorRecord.PreserveInvocationInfoOnce = true;
                             MshCommandRuntime mshCommandRuntime = cmdlet.CommandRuntime as MshCommandRuntime;
-                            if (mshCommandRuntime != null)
-                            {
-                                mshCommandRuntime.WriteError(errorRecord, overrideInquire);
-                            }
+                            mshCommandRuntime?.WriteError(errorRecord, overrideInquire);
                         }
 
                         break;
@@ -133,10 +130,7 @@ public void WriteStreamObject(Cmdlet cmdlet, bool overrideInquire = false)
                             string debug = (string)Value;
                             DebugRecord debugRecord = new DebugRecord(debug);
                             MshCommandRuntime mshCommandRuntime = cmdlet.CommandRuntime as MshCommandRuntime;
-                            if (mshCommandRuntime != null)
-                            {
-                                mshCommandRuntime.WriteDebug(debugRecord, overrideInquire);
-                            }
+                            mshCommandRuntime?.WriteDebug(debugRecord, overrideInquire);
                         }
 
                         break;
@@ -146,10 +140,7 @@ public void WriteStreamObject(Cmdlet cmdlet, bool overrideInquire = false)
                             string warning = (string)Value;
                             WarningRecord warningRecord = new WarningRecord(warning);
                             MshCommandRuntime mshCommandRuntime = cmdlet.CommandRuntime as MshCommandRuntime;
-                            if (mshCommandRuntime != null)
-                            {
-                                mshCommandRuntime.WriteWarning(warningRecord, overrideInquire);
-                            }
+                            mshCommandRuntime?.WriteWarning(warningRecord, overrideInquire);
                         }
 
                         break;
@@ -159,10 +150,7 @@ public void WriteStreamObject(Cmdlet cmdlet, bool overrideInquire = false)
                             string verbose = (string)Value;
                             VerboseRecord verboseRecord = new VerboseRecord(verbose);
                             MshCommandRuntime mshCommandRuntime = cmdlet.CommandRuntime as MshCommandRuntime;
-                            if (mshCommandRuntime != null)
-                            {
-                                mshCommandRuntime.WriteVerbose(verboseRecord, overrideInquire);
-                            }
+                            mshCommandRuntime?.WriteVerbose(verboseRecord, overrideInquire);
                         }
 
                         break;
@@ -170,10 +158,7 @@ public void WriteStreamObject(Cmdlet cmdlet, bool overrideInquire = false)
                     case PSStreamObjectType.Progress:
                         {
                             MshCommandRuntime mshCommandRuntime = cmdlet.CommandRuntime as MshCommandRuntime;
-                            if (mshCommandRuntime != null)
-                            {
-                                mshCommandRuntime.WriteProgress((ProgressRecord)Value, overrideInquire);
-                            }
+                            mshCommandRuntime?.WriteProgress((ProgressRecord)Value, overrideInquire);
                         }
 
                         break;
@@ -181,10 +166,7 @@ public void WriteStreamObject(Cmdlet cmdlet, bool overrideInquire = false)
                     case PSStreamObjectType.Information:
                         {
                             MshCommandRuntime mshCommandRuntime = cmdlet.CommandRuntime as MshCommandRuntime;
-                            if (mshCommandRuntime != null)
-                            {
-                                mshCommandRuntime.WriteInformation((InformationRecord)Value, overrideInquire);
-                            }
+                            mshCommandRuntime?.WriteInformation((InformationRecord)Value, overrideInquire);
                         }
 
                         break;
@@ -193,10 +175,7 @@ public void WriteStreamObject(Cmdlet cmdlet, bool overrideInquire = false)
                         {
                             WarningRecord warningRecord = (WarningRecord)Value;
                             MshCommandRuntime mshCommandRuntime = cmdlet.CommandRuntime as MshCommandRuntime;
-                            if (mshCommandRuntime != null)
-                            {
-                                mshCommandRuntime.AppendWarningVarList(warningRecord);
-                            }
+                            mshCommandRuntime?.AppendWarningVarList(warningRecord);
                         }
 
                         break;
@@ -311,10 +290,7 @@ internal void WriteStreamObject(Cmdlet cmdlet, Guid instanceId, bool overrideInq
 
                         errorRecord.PreserveInvocationInfoOnce = true;
                         MshCommandRuntime mshCommandRuntime = cmdlet.CommandRuntime as MshCommandRuntime;
-                        if (mshCommandRuntime != null)
-                        {
-                            mshCommandRuntime.WriteError(errorRecord, overrideInquire);
-                        }
+                        mshCommandRuntime?.WriteError(errorRecord, overrideInquire);
                     }
 
                     break;
@@ -324,10 +300,7 @@ internal void WriteStreamObject(Cmdlet cmdlet, Guid instanceId, bool overrideInq
                         string warning = (string)Value;
                         WarningRecord warningRecord = new WarningRecord(warning);
                         MshCommandRuntime mshCommandRuntime = cmdlet.CommandRuntime as MshCommandRuntime;
-                        if (mshCommandRuntime != null)
-                        {
-                            mshCommandRuntime.WriteWarning(warningRecord, overrideInquire);
-                        }
+                        mshCommandRuntime?.WriteWarning(warningRecord, overrideInquire);
                     }
 
                     break;
@@ -337,10 +310,7 @@ internal void WriteStreamObject(Cmdlet cmdlet, Guid instanceId, bool overrideInq
                         string verbose = (string)Value;
                         VerboseRecord verboseRecord = new VerboseRecord(verbose);
                         MshCommandRuntime mshCommandRuntime = cmdlet.CommandRuntime as MshCommandRuntime;
-                        if (mshCommandRuntime != null)
-                        {
-                            mshCommandRuntime.WriteVerbose(verboseRecord, overrideInquire);
-                        }
+                        mshCommandRuntime?.WriteVerbose(verboseRecord, overrideInquire);
                     }
 
                     break;
@@ -365,10 +335,7 @@ internal void WriteStreamObject(Cmdlet cmdlet, Guid instanceId, bool overrideInq
                         }
 
                         MshCommandRuntime mshCommandRuntime = cmdlet.CommandRuntime as MshCommandRuntime;
-                        if (mshCommandRuntime != null)
-                        {
-                            mshCommandRuntime.WriteProgress(progressRecord, overrideInquire);
-                        }
+                        mshCommandRuntime?.WriteProgress(progressRecord, overrideInquire);
                     }
 
                     break;
@@ -378,10 +345,7 @@ internal void WriteStreamObject(Cmdlet cmdlet, Guid instanceId, bool overrideInq
                         string debug = (string)Value;
                         DebugRecord debugRecord = new DebugRecord(debug);
                         MshCommandRuntime mshCommandRuntime = cmdlet.CommandRuntime as MshCommandRuntime;
-                        if (mshCommandRuntime != null)
-                        {
-                            mshCommandRuntime.WriteDebug(debugRecord, overrideInquire);
-                        }
+                        mshCommandRuntime?.WriteDebug(debugRecord, overrideInquire);
                     }
 
                     break;
@@ -411,10 +375,7 @@ internal void WriteStreamObject(Cmdlet cmdlet, Guid instanceId, bool overrideInq
                         }
 
                         MshCommandRuntime mshCommandRuntime = cmdlet.CommandRuntime as MshCommandRuntime;
-                        if (mshCommandRuntime != null)
-                        {
-                            mshCommandRuntime.WriteInformation(informationRecord, overrideInquire);
-                        }
+                        mshCommandRuntime?.WriteInformation(informationRecord, overrideInquire);
                     }
 
                     break;
@@ -470,10 +431,7 @@ private static void InvokeCmdletMethodAndWaitForResults<T>(CmdletMethodInvoker<T
             }
             finally
             {
-                if (cmdletMethodInvoker.Finished != null)
-                {
-                    cmdletMethodInvoker.Finished.Set();
-                }
+                cmdletMethodInvoker.Finished?.Set();
             }
         }
 
diff --git a/src/System.Management.Automation/engine/remoting/common/throttlemanager.cs b/src/System.Management.Automation/engine/remoting/common/throttlemanager.cs
index afccc28362a..fca2bf15c1b 100644
--- a/src/System.Management.Automation/engine/remoting/common/throttlemanager.cs
+++ b/src/System.Management.Automation/engine/remoting/common/throttlemanager.cs
@@ -532,10 +532,7 @@ private void StartOneOperationFromQueue()
                 }
             }
 
-            if (operation != null)
-            {
-                operation.StartOperation();
-            }
+            operation?.StartOperation();
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
index 5636835e198..9a1e4ff47e3 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
@@ -895,13 +895,11 @@ private void OnDataPacketReceived(byte[] rawData, string stream, Guid psGuid)
             {
                 // this is for a command
                 OutOfProcessClientCommandTransportManager cmdTM = GetCommandTransportManager(psGuid);
-                if (cmdTM != null)
-                {
-                    // not throwing the exception in null case as the command might have already
-                    // closed. The RS data structure handler does not wait for the close ack before
-                    // it clears the command transport manager..so this might happen.
-                    cmdTM.OnRemoteCmdDataReceived(rawData, streamTemp);
-                }
+
+                // not throwing the exception in null case as the command might have already
+                // closed. The RS data structure handler does not wait for the close ack before
+                // it clears the command transport manager..so this might happen.
+                cmdTM?.OnRemoteCmdDataReceived(rawData, streamTemp);
             }
         }
 
@@ -916,13 +914,11 @@ private void OnDataAckPacketReceived(Guid psGuid)
             {
                 // this is for a command
                 OutOfProcessClientCommandTransportManager cmdTM = GetCommandTransportManager(psGuid);
-                if (cmdTM != null)
-                {
-                    // not throwing the exception in null case as the command might have already
-                    // closed. The RS data structure handler does not wait for the close ack before
-                    // it clears the command transport manager..so this might happen.
-                    cmdTM.OnRemoteCmdSendCompleted();
-                }
+
+                // not throwing the exception in null case as the command might have already
+                // closed. The RS data structure handler does not wait for the close ack before
+                // it clears the command transport manager..so this might happen.
+                cmdTM?.OnRemoteCmdSendCompleted();
             }
         }
 
@@ -968,10 +964,7 @@ private void OnSignalAckPacketReceived(Guid psGuid)
             else
             {
                 OutOfProcessClientCommandTransportManager cmdTM = GetCommandTransportManager(psGuid);
-                if (cmdTM != null)
-                {
-                    cmdTM.OnRemoteCmdSignalCompleted();
-                }
+                cmdTM?.OnRemoteCmdSignalCompleted();
             }
         }
 
@@ -1001,12 +994,10 @@ private void OnCloseAckReceived(Guid psGuid)
                 _tracer.WriteMessage("OutOfProcessClientSessionTransportManager.OnCloseAckReceived, in progress command count should be greater than zero: " + commandCount + ", RunSpacePool Id : " + this.RunspacePoolInstanceId + ", psGuid : " + psGuid.ToString());
 
                 OutOfProcessClientCommandTransportManager cmdTM = GetCommandTransportManager(psGuid);
-                if (cmdTM != null)
-                {
-                    // this might legitimately happen if cmd is already closed before we get an
-                    // ACK back from server.
-                    cmdTM.OnCloseCmdCompleted();
-                }
+
+                // this might legitimately happen if cmd is already closed before we get an
+                // ACK back from server.
+                cmdTM?.OnCloseCmdCompleted();
             }
         }
 
@@ -1414,10 +1405,7 @@ protected override void Dispose(bool isDisposing)
 
             if (isDisposing)
             {
-                if (_client != null)
-                {
-                    _client.Dispose();
-                }
+                _client?.Dispose();
             }
         }
 
@@ -2055,10 +2043,7 @@ protected override void Dispose(bool isDisposing)
 
             if (isDisposing)
             {
-                if (_clientPipe != null)
-                {
-                    _clientPipe.Dispose();
-                }
+                _clientPipe?.Dispose();
             }
         }
 
@@ -2190,13 +2175,7 @@ public override void CreateAsync()
         /// <summary>
         /// Aborts an existing connection attempt.
         /// </summary>
-        public void AbortConnect()
-        {
-            if (_clientPipe != null)
-            {
-                _clientPipe.AbortConnect();
-            }
-        }
+        public void AbortConnect() => _clientPipe?.AbortConnect();
 
         #endregion
     }
diff --git a/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs b/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
index a29a202b5ae..ce9b2fe09cb 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
@@ -684,10 +684,7 @@ internal void ProcessRawData(byte[] data, OnDataAvailableCallback callback)
         private void ResetReceiveData()
         {
             // reset resources used to store incoming data (for a single object)
-            if (_dataToProcessStream != null)
-            {
-                _dataToProcessStream.Dispose();
-            }
+            _dataToProcessStream?.Dispose();
 
             _currentObjectId = 0;
             _currentFrgId = 0;
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
index f01797fd760..7fbc236a4dd 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
@@ -446,11 +446,7 @@ public static void ShutdownPlugin(
             IntPtr pluginContext)
         {
             WSManPluginInstance.PerformShutdown(pluginContext);
-
-            if (workerPtrs != null)
-            {
-                workerPtrs.Dispose();
-            }
+            workerPtrs?.Dispose();
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
index 2c447b8787b..bc8244673b2 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
@@ -1492,20 +1492,9 @@ private void Initialize(Uri connectionUri, WSManConnectionInfo connectionInfo)
             finally
             {
                 // release resources
-                if (proxyAuthCredentials != null)
-                {
-                    proxyAuthCredentials.Dispose();
-                }
-
-                if (proxyInfo != null)
-                {
-                    proxyInfo.Dispose();
-                }
-
-                if (authCredentials != null)
-                {
-                    authCredentials.Dispose();
-                }
+                proxyAuthCredentials?.Dispose();
+                proxyInfo?.Dispose();
+                authCredentials?.Dispose();
             }
 
             if (result != 0)
diff --git a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
index d61fee7147e..14b0240858b 100644
--- a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
+++ b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
@@ -200,10 +200,7 @@ protected void OnSignalPacketReceived(Guid psGuid)
                     }
 
                     // dont throw if there is no cmdTM as it might have legitimately closed
-                    if (cmdTM != null)
-                    {
-                        cmdTM.Close(null);
-                    }
+                    cmdTM?.Close(null);
                 }
                 finally
                 {
@@ -244,12 +241,9 @@ protected void OnClosePacketReceived(Guid psGuid)
                 {
                     tracer.WriteMessage("OnClosePacketReceived, in progress commands count should be zero : " + _inProgressCommandsCount + ", psGuid : " + psGuid.ToString());
 
-                    if (sessionTM != null)
-                    {
-                        // it appears that when closing PowerShell ISE, therefore closing OutOfProcServerMediator, there are 2 Close command requests
-                        // changing PSRP/IPC at this point is too risky, therefore protecting about this duplication
-                        sessionTM.Close(null);
-                    }
+                    // it appears that when closing PowerShell ISE, therefore closing OutOfProcServerMediator, there are 2 Close command requests
+                    // changing PSRP/IPC at this point is too risky, therefore protecting about this duplication
+                    sessionTM?.Close(null);
 
                     tracer.WriteMessage("END calling close on session transport manager");
                     sessionTM = null;
@@ -268,10 +262,7 @@ protected void OnClosePacketReceived(Guid psGuid)
                 }
 
                 // dont throw if there is no cmdTM as it might have legitimately closed
-                if (cmdTM != null)
-                {
-                    cmdTM.Close(null);
-                }
+                cmdTM?.Close(null);
 
                 lock (_syncObject)
                 {
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerPowerShellDriver.cs b/src/System.Management.Automation/engine/remoting/server/ServerPowerShellDriver.cs
index 6a49d6f3a4a..871f4f21c4b 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerPowerShellDriver.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerPowerShellDriver.cs
@@ -798,11 +798,9 @@ private void HandleSessionConnected(object sender, EventArgs eventArgs)
         {
             // Close input if its active. no need to synchronize as input stream would have already been processed
             // when connect call came into PS plugin
-            if (InputCollection != null)
-            {
-                // TODO: Post an ETW event
-                InputCollection.Complete();
-            }
+
+            // TODO: Post an ETW event
+            InputCollection?.Complete();
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerRemoteHost.cs b/src/System.Management.Automation/engine/remoting/server/ServerRemoteHost.cs
index ca7ff805c02..eaed49ef40a 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerRemoteHost.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerRemoteHost.cs
@@ -352,10 +352,7 @@ public override void PopRunspace()
         {
             if (_pushedRunspace != null)
             {
-                if (_debugger != null)
-                {
-                    _debugger.PopDebugger();
-                }
+                _debugger?.PopDebugger();
 
                 if (_hostSupportsPSEdit)
                 {
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerRemotingProtocol2.cs b/src/System.Management.Automation/engine/remoting/server/ServerRemotingProtocol2.cs
index f87f89b5bac..f45a67583a9 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerRemotingProtocol2.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerRemotingProtocol2.cs
@@ -266,10 +266,7 @@ internal void DispatchMessageToPowerShell(RemoteDataObject<PSObject> rcvdData)
 
             // if data structure handler is not found, then association has already been
             // removed, discard message
-            if (dsHandler != null)
-            {
-                dsHandler.ProcessReceivedData(rcvdData);
-            }
+            dsHandler?.ProcessReceivedData(rcvdData);
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs b/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
index e32658b7259..11c2d6c4d24 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
@@ -347,10 +347,7 @@ internal void Close()
                 {
                     Runspace runspaceToDispose = _remoteHost.PushedRunspace;
                     _remoteHost.PopRunspace();
-                    if (runspaceToDispose != null)
-                    {
-                        runspaceToDispose.Dispose();
-                    }
+                    runspaceToDispose?.Dispose();
                 }
 
                 DisposeRemoteDebugger();
@@ -483,13 +480,7 @@ private void SetupRemoteDebugger(Runspace runspace)
             }
         }
 
-        private void DisposeRemoteDebugger()
-        {
-            if (_serverRemoteDebugger != null)
-            {
-                _serverRemoteDebugger.Dispose();
-            }
-        }
+        private void DisposeRemoteDebugger() => _serverRemoteDebugger?.Dispose();
 
         /// <summary>
         /// Invokes a script.
@@ -809,10 +800,7 @@ private void HandleCreateAndInvokePowerShell(object _, RemoteDataEventArgs<Remot
             {
                 // If we have a pushed runspace then execute there.
                 // Ensure debugger is enabled to the original mode it was set to.
-                if (_serverRemoteDebugger != null)
-                {
-                    _serverRemoteDebugger.CheckDebuggerState();
-                }
+                _serverRemoteDebugger?.CheckDebuggerState();
 
                 StartPowerShellCommandOnPushedRunspace(
                     powershell,
@@ -920,10 +908,7 @@ private void HandleCreateAndInvokePowerShell(object _, RemoteDataEventArgs<Remot
 
             // Invoke command normally.  Ensure debugger is enabled to the
             // original mode it was set to.
-            if (_serverRemoteDebugger != null)
-            {
-                _serverRemoteDebugger.CheckDebuggerState();
-            }
+            _serverRemoteDebugger?.CheckDebuggerState();
 
             // Invoke PowerShell on driver runspace pool.
             ServerPowerShellDriver driver = new ServerPowerShellDriver(
@@ -2025,10 +2010,7 @@ public override void StopProcessCommand()
             }
 
             ThreadCommandProcessing threadCommandProcessing = _threadCommandProcessing;
-            if (threadCommandProcessing != null)
-            {
-                threadCommandProcessing.Stop();
-            }
+            threadCommandProcessing?.Stop();
         }
 
         /// <summary>
@@ -2226,15 +2208,8 @@ public void Dispose()
                 ExitDebugMode(DebuggerResumeAction.Stop);
             }
 
-            if (_nestedDebugStopCompleteEvent != null)
-            {
-                _nestedDebugStopCompleteEvent.Dispose();
-            }
-
-            if (_processCommandCompleteEvent != null)
-            {
-                _processCommandCompleteEvent.Dispose();
-            }
+            _nestedDebugStopCompleteEvent?.Dispose();
+            _processCommandCompleteEvent?.Dispose();
         }
 
         #endregion
@@ -2306,10 +2281,7 @@ public DebuggerCommandResults Invoke(ManualResetEventSlim startInvokeEvent)
             public void Stop()
             {
                 Debugger debugger = _wrappedDebugger;
-                if (debugger != null)
-                {
-                    debugger.StopProcessCommand();
-                }
+                debugger?.StopProcessCommand();
             }
 
             internal void DoInvoke()
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineDriver.cs b/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineDriver.cs
index 57df27e2d4b..3a9388625e6 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineDriver.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineDriver.cs
@@ -241,10 +241,7 @@ internal void Start()
 
             _eventSubscriber.FireStartSteppablePipeline(this);
 
-            if (_powershellInput != null)
-            {
-                _powershellInput.Pulse();
-            }
+            _powershellInput?.Pulse();
         }
 
         #endregion Internal Methods
@@ -262,20 +259,14 @@ internal void HandleInputEndReceived(object sender, EventArgs eventArgs)
 
             CheckAndPulseForProcessing(true);
 
-            if (_powershellInput != null)
-            {
-                _powershellInput.Pulse();
-            }
+            _powershellInput?.Pulse();
         }
 
         private void HandleSessionConnected(object sender, EventArgs eventArgs)
         {
             // Close input if its active. no need to synchronize as input stream would have already been processed
             // when connect call came into PS plugin
-            if (Input != null)
-            {
-                Input.Complete();
-            }
+            Input?.Complete();
         }
 
         /// <summary>
@@ -302,10 +293,7 @@ private void HandleStopReceived(object sender, EventArgs eventArgs)
 
             PerformStop();
 
-            if (_powershellInput != null)
-            {
-                _powershellInput.Pulse();
-            }
+            _powershellInput?.Pulse();
         }
 
         /// <summary>
@@ -326,10 +314,7 @@ private void HandleInputReceived(object sender, RemoteDataEventArgs<object> even
 
                 CheckAndPulseForProcessing(false);
 
-                if (_powershellInput != null)
-                {
-                    _powershellInput.Pulse();
-                }
+                _powershellInput?.Pulse();
             }
         }
 
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineSubscriber.cs b/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineSubscriber.cs
index 068849ec1b3..cce8b0bbcd3 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineSubscriber.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineSubscriber.cs
@@ -274,11 +274,8 @@ internal void FireStartSteppablePipeline(ServerSteppablePipelineDriver driver)
         {
             lock (_syncObject)
             {
-                if (_eventManager != null)
-                {
-                    _eventManager.GenerateEvent(_startSubscriber.SourceIdentifier, this,
-                        new object[1] { new ServerSteppablePipelineDriverEventArg(driver) }, null, true, false);
-                }
+                _eventManager?.GenerateEvent(_startSubscriber.SourceIdentifier, this,
+                    new object[1] { new ServerSteppablePipelineDriverEventArg(driver) }, null, true, false);
             }
         }
 
@@ -290,11 +287,8 @@ internal void FireHandleProcessRecord(ServerSteppablePipelineDriver driver)
         {
             lock (_syncObject)
             {
-                if (_eventManager != null)
-                {
-                    _eventManager.GenerateEvent(_processSubscriber.SourceIdentifier, this,
-                        new object[1] { new ServerSteppablePipelineDriverEventArg(driver) }, null, true, false);
-                }
+                _eventManager?.GenerateEvent(_processSubscriber.SourceIdentifier, this,
+                    new object[1] { new ServerSteppablePipelineDriverEventArg(driver) }, null, true, false);
             }
         }
 
diff --git a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
index 8bfc137f35c..96aedc03ac3 100644
--- a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
+++ b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
@@ -706,13 +706,7 @@ internal void ExecuteConnect(byte[] connectData, out byte[] connectResponseData)
         }
 
         // pass on application private data when session is connected from new client
-        internal void HandlePostConnect()
-        {
-            if (_runspacePoolDriver != null)
-            {
-                _runspacePoolDriver.SendApplicationPrivateDataToClient();
-            }
-        }
+        internal void HandlePostConnect() => _runspacePoolDriver?.SendApplicationPrivateDataToClient();
 
         /// <summary>
         /// </summary>
@@ -945,10 +939,7 @@ private void HandleNegotiationReceived(object sender, RemoteSessionNegotiationEv
         /// <param name="eventArgs"></param>
         private void HandleSessionDSHandlerClosing(object sender, EventArgs eventArgs)
         {
-            if (_runspacePoolDriver != null)
-            {
-                _runspacePoolDriver.Close();
-            }
+            _runspacePoolDriver?.Close();
 
             // dispose the session configuration object..this will let them
             // clean their resources.
diff --git a/src/System.Management.Automation/engine/remoting/server/serverremotesessionstatemachine.cs b/src/System.Management.Automation/engine/remoting/server/serverremotesessionstatemachine.cs
index 732e5a836ab..3a6bb4c1f53 100644
--- a/src/System.Management.Automation/engine/remoting/server/serverremotesessionstatemachine.cs
+++ b/src/System.Management.Automation/engine/remoting/server/serverremotesessionstatemachine.cs
@@ -913,10 +913,7 @@ private void DoKeyExchange(object sender, RemoteSessionStateMachineEventArgs eve
                         {
                             // reset the timer
                             Timer tmp = Interlocked.Exchange(ref _keyExchangeTimer, null);
-                            if (tmp != null)
-                            {
-                                tmp.Dispose();
-                            }
+                            tmp?.Dispose();
                         }
 
                         // the key import would have been done
@@ -984,10 +981,7 @@ private void HandleKeyExchangeTimeout(object sender)
             Dbg.Assert(_state == RemoteSessionState.EstablishedAndKeyRequested, "timeout should only happen when waiting for a key");
 
             Timer tmp = Interlocked.Exchange(ref _keyExchangeTimer, null);
-            if (tmp != null)
-            {
-                tmp.Dispose();
-            }
+            tmp?.Dispose();
 
             PSRemotingDataStructureException exception =
                 new PSRemotingDataStructureException(RemotingErrorIdStrings.ServerKeyExchangeFailed);

From ebfb62b5eca8e4b1cb8bcf8d3fca46862a9e47dd Mon Sep 17 00:00:00 2001
From: Frode Flaten <3436158+fflaten@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:21:42 +0200
Subject: [PATCH 513/645] Use null propagation in the `Utility` module (#17787)

---
 .../commands/utility/CsvCommands.cs                |  5 +----
 .../commands/utility/CustomSerialization.cs        |  5 +----
 .../commands/utility/DebugRunspaceCommand.cs       | 10 +++-------
 .../commands/utility/ExportAliasCommand.cs         |  6 ++----
 .../FormatAndOutput/OutGridView/OutWindowProxy.cs  |  8 +-------
 .../commands/utility/ShowMarkdownCommand.cs        |  5 +----
 .../commands/utility/StartSleepCommand.cs          | 10 ++--------
 .../commands/utility/Update-TypeData.cs            |  5 +----
 .../WebCmdlet/Common/WebRequestPSCmdlet.Common.cs  | 13 ++-----------
 .../commands/utility/XmlCommands.cs                | 14 +++-----------
 .../utility/trace/TraceExpressionCommand.cs        |  8 +-------
 11 files changed, 18 insertions(+), 71 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
index 19ac076deaf..eb3ebacff4a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
@@ -429,10 +429,7 @@ private void CleanUp()
                     _readOnlyFileInfo.Attributes |= FileAttributes.ReadOnly;
             }
 
-            if (_helper != null)
-            {
-                _helper.Dispose();
-            }
+            _helper?.Dispose();
         }
 
         private void ReconcilePreexistingPropertyNames()
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs
index 6ad8b02a558..5f810201e71 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs
@@ -170,10 +170,7 @@ internal void DoneAsStream()
         internal void Stop()
         {
             CustomInternalSerializer serializer = _serializer;
-            if (serializer != null)
-            {
-                serializer.Stop();
-            }
+            serializer?.Stop();
         }
 
         #endregion
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs
index f6ba764662f..fc257810d55 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs
@@ -236,10 +236,7 @@ protected override void StopProcessing()
 
             // Unblock the data collection.
             PSDataCollection<PSStreamObject> debugCollection = _debugBlockingCollection;
-            if (debugCollection != null)
-            {
-                debugCollection.Complete();
-            }
+            debugCollection?.Complete();
 
             // Unblock any new command wait.
             _newRunningScriptEvent.Set();
@@ -334,9 +331,8 @@ private void HostWriteLine(string line)
         private void AddDataEventHandlers()
         {
             // Create new collection objects.
-            if (_debugBlockingCollection != null) { _debugBlockingCollection.Dispose(); }
-
-            if (_debugAccumulateCollection != null) { _debugAccumulateCollection.Dispose(); }
+            _debugBlockingCollection?.Dispose();
+            _debugAccumulateCollection?.Dispose();
 
             _debugBlockingCollection = new PSDataCollection<PSStreamObject>();
             _debugBlockingCollection.BlockingEnumerator = true;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
index e01d8c28e0c..fcf282d09c8 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
@@ -291,8 +291,7 @@ protected override void EndProcessing()
                         line = GetAliasLine(alias, "set-alias -Name:\"{0}\" -Value:\"{1}\" -Description:\"{2}\" -Option:\"{3}\"");
                     }
 
-                    if (writer != null)
-                        writer.WriteLine(line);
+                    writer?.WriteLine(line);
 
                     if (PassThru)
                     {
@@ -302,8 +301,7 @@ protected override void EndProcessing()
             }
             finally
             {
-                if (writer != null)
-                    writer.Dispose();
+                writer?.Dispose();
                 // reset the read-only attribute
                 if (readOnlyFileInfo != null)
                     readOnlyFileInfo.Attributes |= FileAttributes.ReadOnly;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs
index 5ca41608a70..c7f2c622c08 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs
@@ -230,13 +230,7 @@ internal void ShowWindow()
             }
         }
 
-        internal void BlockUntilClosed()
-        {
-            if (_closedEvent != null)
-            {
-                _closedEvent.WaitOne();
-            }
-        }
+        internal void BlockUntilClosed() => _closedEvent?.WaitOne();
 
         /// <summary>
         /// Implements IDisposable logic.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowMarkdownCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowMarkdownCommand.cs
index 63ee15f6f59..3f40ec3439e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowMarkdownCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowMarkdownCommand.cs
@@ -224,10 +224,7 @@ private void ProcessMarkdownInfo(MarkdownInfo markdownInfo)
         /// </summary>
         protected override void EndProcessing()
         {
-            if (_powerShell != null)
-            {
-                _powerShell.Dispose();
-            }
+            _powerShell?.Dispose();
         }
     }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
index a1524e5ed4f..36849814375 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
@@ -91,10 +91,7 @@ private void Sleep(int milliSecondsToSleep)
                 }
             }
 
-            if (_waitHandle != null)
-            {
-                _waitHandle.WaitOne(milliSecondsToSleep, true);
-            }
+            _waitHandle?.WaitOne(milliSecondsToSleep, true);
         }
 
         /// <summary>
@@ -150,10 +147,7 @@ protected override void StopProcessing()
             lock (_syncObject)
             {
                 _stopping = true;
-                if (_waitHandle != null)
-                {
-                    _waitHandle.Set();
-                }
+                _waitHandle?.Set();
             }
         }
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
index cc8c7cebbc1..8e07a80384d 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
@@ -1160,10 +1160,7 @@ protected override void ProcessRecord()
                     indicesToRemove.Sort();
                     for (int i = indicesToRemove.Count - 1; i >= 0; i--)
                     {
-                        if (Context.InitialSessionState != null)
-                        {
-                            Context.InitialSessionState.Types.RemoveItem(indicesToRemove[i]);
-                        }
+                        Context.InitialSessionState?.Types.RemoveItem(indicesToRemove[i]);
                     }
 
                     try
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
index dbea8d20df4..692c895d211 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
@@ -1578,10 +1578,7 @@ protected override void ProcessRecord()
                                     }
                                     finally
                                     {
-                                        if (reader != null)
-                                        {
-                                            reader.Dispose();
-                                        }
+                                        reader?.Dispose();
                                     }
 
                                     if (!string.IsNullOrEmpty(detailMsg))
@@ -1657,13 +1654,7 @@ protected override void ProcessRecord()
         /// <summary>
         /// Implementing ^C, after start the BeginGetResponse.
         /// </summary>
-        protected override void StopProcessing()
-        {
-            if (_cancelToken != null)
-            {
-                _cancelToken.Cancel();
-            }
-        }
+        protected override void StopProcessing() => _cancelToken?.Cancel();
 
         #endregion Overrides
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
index 8db56196a68..74a8ee1b7c9 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
@@ -453,8 +453,7 @@ protected override void ProcessRecord()
             {
                 CreateMemoryStream();
 
-                if (_serializer != null)
-                    _serializer.SerializeAsStream(InputObject);
+                _serializer?.SerializeAsStream(InputObject);
 
                 if (_serializer != null)
                 {
@@ -472,8 +471,7 @@ protected override void ProcessRecord()
             }
             else
             {
-                if (_serializer != null)
-                    _serializer.Serialize(InputObject);
+                _serializer?.Serialize(InputObject);
             }
         }
 
@@ -801,13 +799,7 @@ internal void Import()
             }
         }
 
-        internal void Stop()
-        {
-            if (_deserializer != null)
-            {
-                _deserializer.Stop();
-            }
-        }
+        internal void Stop() => _deserializer?.Stop();
     }
 
     #region Select-Xml
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
index 412f4a2d150..7ae437525dd 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
@@ -249,13 +249,7 @@ protected override void EndProcessing()
         /// <summary>
         /// Ensures that the sub-pipeline we created gets stopped as well.
         /// </summary>
-        protected override void StopProcessing()
-        {
-            if (_pipeline != null)
-            {
-                _pipeline.Stop();
-            }
-        }
+        protected override void StopProcessing() => _pipeline?.Stop();
 
         #endregion Cmdlet code
 

From f2204a08b863b84c0ea0cb47591232f7d54a622a Mon Sep 17 00:00:00 2001
From: Ryan Hutchison <84087908+Ryan-Hutchison-USAF@users.noreply.github.com>
Date: Mon, 1 Aug 2022 11:57:03 -0500
Subject: [PATCH 514/645] Authenticode https fix issue #12827 (#16134)

* Added https:// as valid prefix for TSA url

* fixed typo

* Format matching

* Added proper logic

* Appended https to error message

* Update src/System.Management.Automation/security/Authenticode.cs

I agree.

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 .../resources/SignatureCommands.resx                       | 2 +-
 .../resources/Authenticode.resx                            | 2 +-
 src/System.Management.Automation/security/Authenticode.cs  | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.PowerShell.Security/resources/SignatureCommands.resx b/src/Microsoft.PowerShell.Security/resources/SignatureCommands.resx
index 53f5371fc4c..cbbbd5e5712 100644
--- a/src/Microsoft.PowerShell.Security/resources/SignatureCommands.resx
+++ b/src/Microsoft.PowerShell.Security/resources/SignatureCommands.resx
@@ -121,7 +121,7 @@
     <value>Cannot sign code. The specified certificate is not suitable for code signing.</value>
   </data>
   <data name="TimeStampUrlRequired" xml:space="preserve">
-    <value>Cannot sign code.  The TimeStamp server URL must be fully qualified in the form of http://&lt;server url&gt;</value>
+    <value>Cannot sign code.  The TimeStamp server URL must be fully qualified in the form of http://&lt;server url&gt; or https://&lt;server url&gt;.</value>
   </data>
   <data name="CannotRetrieveFromContainer" xml:space="preserve">
     <value>The Get-AuthenticodeSignature cmdlet does not support directories. Supply a path to a file and retry.</value>
diff --git a/src/System.Management.Automation/resources/Authenticode.resx b/src/System.Management.Automation/resources/Authenticode.resx
index c196f2b0d65..d180743c34d 100644
--- a/src/System.Management.Automation/resources/Authenticode.resx
+++ b/src/System.Management.Automation/resources/Authenticode.resx
@@ -142,7 +142,7 @@
     <value>Cannot sign code. The specified certificate is not suitable for code signing.</value>
   </data>
   <data name="TimeStampUrlRequired" xml:space="preserve">
-    <value>Cannot sign code. The TimeStamp server URL must be fully qualified, and in the format http://&lt;server url&gt;.</value>
+    <value>Cannot sign code. The TimeStamp server URL must be fully qualified, and in the format http://&lt;server url&gt; or https://&lt;server url&gt;.</value>
   </data>
   <data name="InvalidHashAlgorithm" xml:space="preserve">
     <value>Cannot sign code. The hash algorithm is not supported.</value>
diff --git a/src/System.Management.Automation/security/Authenticode.cs b/src/System.Management.Automation/security/Authenticode.cs
index a2e7c07ab94..1906d18bf6b 100644
--- a/src/System.Management.Automation/security/Authenticode.cs
+++ b/src/System.Management.Automation/security/Authenticode.cs
@@ -109,11 +109,12 @@ internal static Signature SignFile(SigningOption option,
             Utils.CheckArgForNullOrEmpty(fileName, "fileName");
             Utils.CheckArgForNull(certificate, "certificate");
 
-            // If given, TimeStamp server URLs must begin with http://
+            // If given, TimeStamp server URLs must begin with http:// or https://
             if (!string.IsNullOrEmpty(timeStampServerUrl))
             {
-                if ((timeStampServerUrl.Length <= 7) ||
-                    (timeStampServerUrl.IndexOf("http://", StringComparison.OrdinalIgnoreCase) != 0))
+                if ((timeStampServerUrl.Length <= 7) || (
+                    (timeStampServerUrl.IndexOf("http://", StringComparison.OrdinalIgnoreCase) != 0) && 
+                    (timeStampServerUrl.IndexOf("https://", StringComparison.OrdinalIgnoreCase) != 0)))
                 {
                     throw PSTraceSource.NewArgumentException(
                         nameof(certificate),

From 2051c5f72bf53ec4d049c30c19dd1d69d4d847cc Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 1 Aug 2022 10:10:59 -0700
Subject: [PATCH 515/645] Stop referencing `Microsoft.PowerShell.Security` when
 the core snapin is used (#17771)

---
 .../Microsoft.PowerShell.Security.psd1        | 16 +++++++-------
 .../Microsoft.PowerShell.Security.psd1        | 21 +++++++++++--------
 .../engine/InitialSessionState.cs             |  7 -------
 test/powershell/Host/Startup.Tests.ps1        |  1 -
 4 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 b/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
index 440153be545..8268326aa74 100644
--- a/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
+++ b/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
@@ -1,14 +1,14 @@
 @{
-GUID="A94C8C7E-9810-47C0-B8AF-65089C13A35A"
-Author="PowerShell"
-CompanyName="Microsoft Corporation"
-Copyright="Copyright (c) Microsoft Corporation."
-ModuleVersion="7.0.0.0"
+GUID = "A94C8C7E-9810-47C0-B8AF-65089C13A35A"
+Author = "PowerShell"
+CompanyName = "Microsoft Corporation"
+Copyright = "Copyright (c) Microsoft Corporation."
+ModuleVersion = "7.0.0.0"
 CompatiblePSEditions = @("Core")
-PowerShellVersion="3.0"
+PowerShellVersion = "3.0"
 FunctionsToExport = @()
-CmdletsToExport="Get-Credential", "Get-ExecutionPolicy", "Set-ExecutionPolicy", "ConvertFrom-SecureString", "ConvertTo-SecureString", "Get-PfxCertificate" , "Protect-CmsMessage", "Unprotect-CmsMessage", "Get-CmsMessage"
+CmdletsToExport = "Get-Credential", "Get-ExecutionPolicy", "Set-ExecutionPolicy", "ConvertFrom-SecureString", "ConvertTo-SecureString", "Get-PfxCertificate" , "Protect-CmsMessage", "Unprotect-CmsMessage", "Get-CmsMessage"
 AliasesToExport = @()
-NestedModules="Microsoft.PowerShell.Security.dll"
+NestedModules = "Microsoft.PowerShell.Security.dll"
 HelpInfoURI = 'https://aka.ms/powershell73-help'
 }
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 b/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
index 6d47b2ce2cd..7470c795fdc 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
@@ -1,15 +1,18 @@
 @{
-GUID="A94C8C7E-9810-47C0-B8AF-65089C13A35A"
-Author="PowerShell"
-CompanyName="Microsoft Corporation"
-Copyright="Copyright (c) Microsoft Corporation."
-ModuleVersion="7.0.0.0"
+GUID = "A94C8C7E-9810-47C0-B8AF-65089C13A35A"
+Author = "PowerShell"
+CompanyName = "Microsoft Corporation"
+Copyright = "Copyright (c) Microsoft Corporation."
+ModuleVersion = "7.0.0.0"
 CompatiblePSEditions = @("Core")
-PowerShellVersion="3.0"
+PowerShellVersion = "3.0"
 FunctionsToExport = @()
-CmdletsToExport="Get-Acl", "Set-Acl", "Get-PfxCertificate", "Get-Credential", "Get-ExecutionPolicy", "Set-ExecutionPolicy", "Get-AuthenticodeSignature", "Set-AuthenticodeSignature", "ConvertFrom-SecureString", "ConvertTo-SecureString", "Get-CmsMessage", "Unprotect-CmsMessage", "Protect-CmsMessage" , "New-FileCatalog" , "Test-FileCatalog"
+CmdletsToExport = "Get-Acl", "Set-Acl", "Get-PfxCertificate", "Get-Credential", "Get-ExecutionPolicy", "Set-ExecutionPolicy", "Get-AuthenticodeSignature", "Set-AuthenticodeSignature", "ConvertFrom-SecureString", "ConvertTo-SecureString", "Get-CmsMessage", "Unprotect-CmsMessage", "Protect-CmsMessage" , "New-FileCatalog" , "Test-FileCatalog"
 AliasesToExport = @()
-NestedModules="Microsoft.PowerShell.Security.dll"
-TypesToProcess="Security.types.ps1xml"
+NestedModules = "Microsoft.PowerShell.Security.dll"
+# 'Security.types.ps1xml' refers to types from 'Microsoft.PowerShell.Security.dll' and thus requiring to load the assembly before processing the type file.
+# We declare 'Microsoft.PowerShell.Security.dll' in 'RequiredAssemblies' so as to make sure it's loaded before the type file processing.
+RequiredAssemblies = "Microsoft.PowerShell.Security.dll"
+TypesToProcess = "Security.types.ps1xml"
 HelpInfoURI = 'https://aka.ms/powershell73-help'
 }
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index 36f619aed77..7a6d09cba67 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -3851,13 +3851,6 @@ internal PSSnapInInfo ImportPSSnapIn(PSSnapInInfo psSnapInInfo, out PSSnapInExce
             assemblyEntry.SetPSSnapIn(psSnapInInfo);
             Assemblies.Add(assemblyEntry);
 
-            // entry from types.ps1xml references a type (Microsoft.PowerShell.Commands.SecurityDescriptorCommandsBase) in this assembly
-            if (psSnapInInfo.Name.Equals(CoreSnapin, StringComparison.OrdinalIgnoreCase))
-            {
-                assemblyEntry = new SessionStateAssemblyEntry("Microsoft.PowerShell.Security", null);
-                this.Assemblies.Add(assemblyEntry);
-            }
-
             if (cmdlets != null)
             {
                 foreach (SessionStateCmdletEntry cmdlet in cmdlets.Values)
diff --git a/test/powershell/Host/Startup.Tests.ps1 b/test/powershell/Host/Startup.Tests.ps1
index 1e49d9a6a36..47ad858a801 100644
--- a/test/powershell/Host/Startup.Tests.ps1
+++ b/test/powershell/Host/Startup.Tests.ps1
@@ -7,7 +7,6 @@ Describe "Validate start of console host" -Tag CI {
             'Microsoft.ApplicationInsights.dll'
             'Microsoft.Management.Infrastructure.dll'
             'Microsoft.PowerShell.ConsoleHost.dll'
-            'Microsoft.PowerShell.Security.dll'
             'Microsoft.Win32.Primitives.dll'
             'Microsoft.Win32.Registry.dll'
             'netstandard.dll'

From 9213b7765927299311579b4d3416677186c836e5 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Mon, 1 Aug 2022 21:43:54 -0700
Subject: [PATCH 516/645] Allow commands to still be executed even if the
 current working directory no longer exists (#17579)

---
 .../commands/management/Process.cs            |  8 +++-
 .../engine/CommandPathSearch.cs               | 12 ++++-
 .../engine/NativeCommandProcessor.cs          |  7 ++-
 .../NativeCommandProcessor.Tests.ps1          | 48 +++++++++++++++++++
 4 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
index 5aa97eaeb5d..7cbd1eea1f3 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
@@ -1908,8 +1908,12 @@ protected override void BeginProcessing()
             }
             else
             {
-                // Working Directory not specified -> Assign Current Path.
-                startInfo.WorkingDirectory = PathUtils.ResolveFilePath(this.SessionState.Path.CurrentFileSystemLocation.Path, this, isLiteralPath: true);
+                // Working Directory not specified -> Assign Current Path, but only if it still exists
+                var currentDirectory = PathUtils.ResolveFilePath(this.SessionState.Path.CurrentFileSystemLocation.Path, this, isLiteralPath: true);
+                if (Directory.Exists(currentDirectory))
+                {
+                    startInfo.WorkingDirectory = currentDirectory;
+                }
             }
 
             if (this.ParameterSetName.Equals("Default"))
diff --git a/src/System.Management.Automation/engine/CommandPathSearch.cs b/src/System.Management.Automation/engine/CommandPathSearch.cs
index d455273cacd..a5b8a232b23 100644
--- a/src/System.Management.Automation/engine/CommandPathSearch.cs
+++ b/src/System.Management.Automation/engine/CommandPathSearch.cs
@@ -110,7 +110,17 @@ private void ResolveCurrentDirectoryInLookupPaths()
                 sessionState.CurrentDrive.Provider.NameEquals(fileSystemProviderName) &&
                 sessionState.IsProviderLoaded(fileSystemProviderName);
 
-            string environmentCurrentDirectory = Directory.GetCurrentDirectory();
+            string? environmentCurrentDirectory = null;
+            
+            try
+            {
+                environmentCurrentDirectory = Directory.GetCurrentDirectory();
+            }
+            catch (FileNotFoundException)
+            {
+                // This can happen if the current working directory is deleted by another process on non-Windows
+                // In this case, we'll just ignore it and continue on with the current directory as null
+            }
 
             LocationGlobber pathResolver = _context.LocationGlobber;
 
diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index d1cf56034c8..30bde91f1a4 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -1378,7 +1378,12 @@ private ProcessStartInfo GetProcessStartInfo(
             string rawPath =
                 context.EngineSessionState.GetNamespaceCurrentLocation(
                     context.ProviderNames.FileSystem).ProviderPath;
-            startInfo.WorkingDirectory = WildcardPattern.Unescape(rawPath);
+
+            // Only set this if the PowerShell's current working directory still exists.
+            if (Directory.Exists(rawPath))
+            {
+                startInfo.WorkingDirectory = WildcardPattern.Unescape(rawPath);
+            }
 
             return startInfo;
         }
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
index 8175c4b07ce..d62230bb45a 100644
--- a/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
+++ b/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
@@ -51,6 +51,54 @@ Describe 'native commands with pipeline' -tags 'Feature' {
         Start-Sleep -Milliseconds 500
         (Get-Process 'yes' -ErrorAction Ignore).Count | Should -Be $yes
     }
+
+    It 'native command should still execute if the current working directory no longer exists with command: <command>' -Skip:($IsWindows) -TestCases @(
+        @{ command = 'ps' }
+        @{ command = 'start-process ps -nonewwindow'}
+    ){
+        param($command)
+
+        $wd = New-Item testdrive:/tmp -ItemType directory
+        $lock = New-Item testdrive:/lock -ItemType file
+        $script = @"
+            while (`$null -ne (Get-Item "$lock" -ErrorAction Ignore)) {
+                Start-Sleep -Seconds 1
+            }
+
+            try {
+                `$out = $command
+            }
+            catch {
+                `$null = Set-Content -Path "$testdrive/error" -Value (`$_ | Out-String)
+            }
+
+            `$null = Set-Content -Path "$testdrive/out" -Value `$out
+"@
+
+        $pwsh = Start-Process -FilePath "${PSHOME}/pwsh" -WorkingDirectory $wd -ArgumentList @('-noprofile','-command',$script)
+
+        Remove-Item -Path $wd -Force
+        Remove-Item $lock
+        $start = Get-Date
+
+        try {
+            while ($null -eq (Get-Item "$testdrive/error" -ErrorAction Ignore) -and $null -eq (Get-Item "$testdrive/out" -ErrorAction Ignore)) {
+                if (((Get-Date) - $start).TotalSeconds -gt 60) {
+                    throw "Timeout"
+                }
+
+                Start-Sleep -Seconds 1
+            }
+        }
+        finally {
+            $pwsh | Stop-Process -Force -ErrorAction Ignore
+        }
+
+        $err = Get-Item -Path "$testdrive/error" -ErrorAction Ignore
+        $err | Should -BeNullOrEmpty -Because $err
+        $out = Get-Item -Path "$testdrive/out" -ErrorAction Ignore
+        $out | Should -Not -BeNullOrEmpty
+    }
 }
 
 Describe "Native Command Processor" -tags "Feature" {

From 7fb867167e9702b292c643f6a4f4cc934acf4811 Mon Sep 17 00:00:00 2001
From: Frode Flaten <3436158+fflaten@users.noreply.github.com>
Date: Tue, 2 Aug 2022 07:18:54 +0200
Subject: [PATCH 517/645] Reenable IDE0031 (#17811)

---
 .editorconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 0fc10f74c13..517c9656ba6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -114,7 +114,6 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
 dotnet_style_prefer_conditional_expression_over_assignment = true:silent
 dotnet_style_prefer_auto_properties = true:suggestion
 csharp_prefer_simple_default_expression = true:suggestion
-dotnet_diagnostic.IDE0031.severity = none
 
 dotnet_code_quality_unused_parameters = non_public:suggestion
 

From 0e4d2e40cd715f9794b1960b13d0c76e85248a9e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 10:01:18 -0700
Subject: [PATCH 518/645] Bump xunit from 2.4.1 to 2.4.2 (#17817)

---
 test/xUnit/xUnit.tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index 94e45ffdd95..6579631951d 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageReference Include="XunitXml.TestLogger" Version="3.0.70" />

From cd380bc11acc5d8ecb0da79d08cf6f2cc791ff5a Mon Sep 17 00:00:00 2001
From: Chuckie Chen <chuckie_chen945@163.com>
Date: Wed, 3 Aug 2022 05:25:12 +0800
Subject: [PATCH 519/645] Fix a bug in `install-powershell.ps1` (#17794)

---
 tools/install-powershell.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install-powershell.ps1 b/tools/install-powershell.ps1
index 58b6c722949..b6c8f595ccb 100644
--- a/tools/install-powershell.ps1
+++ b/tools/install-powershell.ps1
@@ -125,7 +125,7 @@ Function Remove-Destination([string] $Destination) {
         if ($IsWinEnv -and ($Destination -eq $PSHOME)) {
             # handle the case where the updated folder is currently in use
             Get-ChildItem -Recurse -File -Path $PSHOME | ForEach-Object {
-                if ($_.extension -eq "old") {
+                if ($_.extension -eq ".old") {
                     Remove-Item $_
                 } else {
                     Move-Item $_.fullname "$($_.fullname).old"

From 51b2ac40d5d4d67c76d8a9ed1eb06138b380b40c Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Tue, 2 Aug 2022 20:03:13 -0700
Subject: [PATCH 520/645] Enable searching for assemblies in GAC_Arm64 on
 Windows (#17816)

---
 .../CoreCLR/CorePsAssemblyLoadContext.cs                 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
index c87815d15d9..18ae4fdfde7 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
@@ -365,14 +365,14 @@ private bool TryFindInGAC(AssemblyName assemblyName, out string assemblyFilePath
 
             if (!assemblyFound)
             {
-                string gacBitnessAwarePath = null;
+                string gacBitnessAwarePath;
 
                 if (Environment.Is64BitProcess)
                 {
                     if (string.IsNullOrEmpty(_gacPath64))
                     {
-                        // cache value of '_gacPath64' folder in member variable.
-                        _gacPath64 = $"{_winDir}{dirSeparator}Microsoft.NET{dirSeparator}assembly{dirSeparator}GAC_64";
+                       var gacName = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "GAC_Arm64" : "GAC_64";
+                        _gacPath64 = Path.Join(_winDir, "Microsoft.NET", "assembly", gacName);
                     }
 
                     gacBitnessAwarePath = _gacPath64;
@@ -381,8 +381,7 @@ private bool TryFindInGAC(AssemblyName assemblyName, out string assemblyFilePath
                 {
                     if (string.IsNullOrEmpty(_gacPath32))
                     {
-                        // cache value of '_gacPath32' folder in member variable.
-                        _gacPath32 = $"{_winDir}{dirSeparator}Microsoft.NET{dirSeparator}assembly{dirSeparator}GAC_32";
+                        _gacPath32 = Path.Join(_winDir, "Microsoft.NET", "assembly", "GAC_32");
                     }
 
                     gacBitnessAwarePath = _gacPath32;

From c072f5be92f925f4bc570099919c9269ed21a242 Mon Sep 17 00:00:00 2001
From: Frode Flaten <3436158+fflaten@users.noreply.github.com>
Date: Wed, 3 Aug 2022 05:35:04 +0200
Subject: [PATCH 521/645] Add test for LanguageMode using remoting (#17803)

---
 .../engine/Remoting/RemoteSession.Basic.Tests.ps1     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1 b/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1
index 84e25a276ec..e4432cd4841 100644
--- a/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1
+++ b/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1
@@ -338,5 +338,14 @@ Describe "Remoting loopback tests" -Tags @('CI', 'RequireAdminOnWindows') {
             $session | Remove-PSSession -ErrorAction Ignore
         }
     }
-}
 
+    It 'Language Mode is FullLanguage by default' {
+        $session = New-RemoteSession -ConfigurationName $endPoint
+        try {
+            $result = Invoke-Command -Session $session -ScriptBlock { $ExecutionContext.SessionState.LanguageMode }
+            $result | Should -Be ([System.Management.Automation.PSLanguageMode]::FullLanguage)
+        } finally {
+            $session | Remove-PSSession -ErrorAction Ignore
+        }
+    }
+}

From b66a93f74e9f488243c0c6e8ff596d89cdc49c45 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 22:23:59 -0700
Subject: [PATCH 522/645] Update .NET SDK version from
 `7.0.100-preview.6.22352.1` to `7.0.100-preview.7.22377.5` (#17776)

---
 assets/wix/files.wxs                          | 38 +++++++++++++++++--
 global.json                                   |  2 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  6 +--
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           |  8 ++--
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 .../System.Management.Automation.csproj       | 14 +++----
 .../Interop/DotNet/DotNetInterop.Tests.ps1    |  2 +-
 .../ParameterBinding.Tests.ps1                |  2 +-
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/WebListener.csproj     |  4 +-
 12 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 3bdd173e6e1..6f7d0e6cbc5 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1584,6 +1584,21 @@
         <Component Id="cmp044F67223E6D490D8533691BF50B2B86">
           <File Id="fil461F92924EE64C589D486A178AAD1342" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Tar.dll" />
         </Component>
+        <Component Id="cmp7C72179331DD48BCB12BF205F34B76AD">
+          <File Id="filF65735DC9B8B4957B27F5B33D2A322F4" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Runtime.InteropServices.JavaScript.dll" />
+        </Component>
+        <Component Id="cmpBB2921B987554B68B26862747C3BD398">
+          <File Id="fil1D77B59F22194840A66EFA782AB2BB95" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
+        </Component>
+        <Component Id="cmpD182C2F62588471F82252B0038C75327">
+          <File Id="filBD7A930797F148DA8F433C809DC7BFB4" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
+        </Component>
+        <Component Id="cmpF3EB02BB62A34F509B22CC370C430A20">
+          <File Id="fil489339762CDF41AE97538C020401BEC6" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Net.Quic.dll" />
+        </Component>
+        <Component Id="cmp16FC1857F01A4E388616BA7AA8CC5F73">
+          <File Id="fil877D1292F59541DAB6758F5A7A74D20D" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
+        </Component>
       </Directory>
       <Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
         <Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
@@ -1654,6 +1669,9 @@
           <Component Id="cmpDEDA23DDAB66342DB2C554F6B963C617">
             <File Id="fil5B71C67EDDC69A7238518F8E66D68DE7" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\Microsoft.PowerShell.Security\Microsoft.PowerShell.Security.psd1" />
           </Component>
+          <Component Id="cmp97D2E588E938462194C7549B3A0084FE">
+            <File Id="filFD228E44C4974694AB25D8B06EDE7BD2" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\Microsoft.PowerShell.Security\Security.types.ps1xml" />
+          </Component>
         </Directory>
         <Directory Id="dirDD3349AACE61FF0B4AEC004BF05FF2F9" Name="PSDiagnostics">
           <Component Id="cmpF79A92F228AF5EA2BA60CC33BE9DC6A0">
@@ -3123,8 +3141,14 @@
       <Component Id="cmp8A466581FE0540CEB2210C64DA5F970B">
         <File Id="filE75D9761159B495A8DF7A1035E36EF05" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Formats.Tar.dll" />
       </Component>
-      <Component Id="cmpCFB2D3927EB549CC9C65DA87B6BDC1F0">
-        <File Id="filCDB455902F6848C4ADC51ECA2BD8D99E" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.32404.dll" />
+      <Component Id="cmp9412841190084AEC978D2EB614E6AAE5">
+        <File Id="fil6B817BFD321945E780CA22E762DD9A9C" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.37506.dll" />
+      </Component>
+      <Component Id="cmp41C949169E9341CC9297641456FEE2CC">
+        <File Id="fil39EC96E6757D4C49B8AE32A532B205D5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Runtime.InteropServices.JavaScript.dll" />
+      </Component>
+      <Component Id="cmp0721DF55B34849B78C98AE00D863CBFF">
+        <File Id="fil72E7B79A9B10498CBE884076BC863617" KeyPath="yes" Source="$(var.ProductSourcePath)\clrgc.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4129,7 +4153,15 @@
       <ComponentRef Id="cmpF735DF855B6A444E8874E7FD15796C37" />
       <ComponentRef Id="cmp8A466581FE0540CEB2210C64DA5F970B" />
       <ComponentRef Id="cmp044F67223E6D490D8533691BF50B2B86" />
-      <ComponentRef Id="cmpCFB2D3927EB549CC9C65DA87B6BDC1F0" />
+      <ComponentRef Id="cmp97D2E588E938462194C7549B3A0084FE" />
+      <ComponentRef Id="cmp9412841190084AEC978D2EB614E6AAE5" />
+      <ComponentRef Id="cmp41C949169E9341CC9297641456FEE2CC" />
+      <ComponentRef Id="cmp7C72179331DD48BCB12BF205F34B76AD" />
+      <ComponentRef Id="cmpBB2921B987554B68B26862747C3BD398" />
+      <ComponentRef Id="cmp0721DF55B34849B78C98AE00D863CBFF" />
+      <ComponentRef Id="cmpD182C2F62588471F82252B0038C75327" />
+      <ComponentRef Id="cmpF3EB02BB62A34F509B22CC370C430A20" />
+      <ComponentRef Id="cmp16FC1857F01A4E388616BA7AA8CC5F73" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 05030bdd299..638ff46a12c 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100-preview.6.22352.1"
+    "version": "7.0.100-preview.7.22377.5"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index f05e342cbf4..483985aee84 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.7.22375.6" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 606e6ffebff..a09a69a84ee 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-2.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.6.22356.1" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-3.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.7.22375.6" />
     <PackageReference Include="NJsonSchema" Version="10.7.2" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 509e7162ec4..f61abc2f4c5 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.7.22375.6" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 45f77f0dd89..aa699cf5eb3 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.6.22356.1" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.6.22356.1" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.7.22375.6" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0-preview1.22261.2" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.10.0-preview1.22261.2" />
@@ -30,7 +30,7 @@
     <PackageReference Include="System.Private.ServiceModel" Version="4.10.0-preview1.22261.2" />
     <!-- 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="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.7.22375.6" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 1df5496da74..a8010f4d216 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.7.22375.6" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index b396d79abf0..cc867501e8b 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.6.22356.1" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.6.22356.1" />
-    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.7.22375.6" />
     <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
-    <PackageReference Include="System.Management" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="System.Management" Version="7.0.0-preview.7.22375.6" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.6.22356.1" />
-    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.6.22356.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.7.22375.6" />
     <!-- 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.3.0-preview.1" />
diff --git a/test/powershell/Language/Interop/DotNet/DotNetInterop.Tests.ps1 b/test/powershell/Language/Interop/DotNet/DotNetInterop.Tests.ps1
index 02d49c4435c..42426b8279a 100644
--- a/test/powershell/Language/Interop/DotNet/DotNetInterop.Tests.ps1
+++ b/test/powershell/Language/Interop/DotNet/DotNetInterop.Tests.ps1
@@ -121,7 +121,7 @@ namespace DotNetInterop
     }
 
     It "Calling constructor of a ByRef-like type via dotnet adapter should fail gracefully - <Number>" -TestCases @(
-        @{ Number = 1; Script = { [System.Span[string]]::new.Invoke("abc") } }
+        @{ Number = 1; Script = { [System.Span[string]]::new.Invoke([ref]$null) } }
         @{ Number = 2; Script = { [DotNetInterop.MyByRefLikeType]::new.Invoke(2) } }
     ) {
         param($Script)
diff --git a/test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1 b/test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1
index bf48dd34640..8fa1c1bbcba 100644
--- a/test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1
+++ b/test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1
@@ -130,7 +130,7 @@ Describe "Parameter Binding Tests" -Tags "CI" {
         $e = { test-singleintparameter -Parameter1 'exampleInvalidParam' } |
             Should -Throw -ErrorId "ParameterArgumentTransformationError,test-singleintparameter" -PassThru
         $e.CategoryInfo | Should -Match "ParameterBindingArgumentTransformationException"
-        $e.Exception.Message | Should -Match "Input string was not in a correct format"
+        $e.Exception.Message | Should -Match "The input string 'exampleInvalidParam' was not in a correct format"
         $e.Exception.Message | Should -Match "Parameter1"
     }
 
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 1c5ddecbbce..579c339efc5 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.7.22375.6" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 5cccca789ec..0b42550cd48 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.6.22330.3" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.6.22356.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.7.22376.6" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.7.22375.6" />
   </ItemGroup>
 
   <ItemGroup>

From e7f90f0aa7e8dbdbe199c6120c2d5239a32c7427 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 2 Aug 2022 23:06:01 -0700
Subject: [PATCH 523/645] Fix other path constructions using `Path.Join`
 (#17825)

---
 .../CoreCLR/CorePsAssemblyLoadContext.cs               | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
index 18ae4fdfde7..0e547138220 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
@@ -346,9 +346,6 @@ private bool TryFindInGAC(AssemblyName assemblyName, out string assemblyFilePath
                 return false;
             }
 
-            bool assemblyFound = false;
-            char dirSeparator = IO.Path.DirectorySeparatorChar;
-
             if (string.IsNullOrEmpty(_winDir))
             {
                 // cache value of '_winDir' folder in member variable.
@@ -358,10 +355,10 @@ private bool TryFindInGAC(AssemblyName assemblyName, out string assemblyFilePath
             if (string.IsNullOrEmpty(_gacPathMSIL))
             {
                 // cache value of '_gacPathMSIL' folder in member variable.
-                _gacPathMSIL = $"{_winDir}{dirSeparator}Microsoft.NET{dirSeparator}assembly{dirSeparator}GAC_MSIL";
+                _gacPathMSIL = Path.Join(_winDir, "Microsoft.NET", "assembly", "GAC_MSIL");
             }
 
-            assemblyFound = FindInGac(_gacPathMSIL, assemblyName, out assemblyFilePath);
+            bool assemblyFound = FindInGac(_gacPathMSIL, assemblyName, out assemblyFilePath);
 
             if (!assemblyFound)
             {
@@ -399,8 +396,7 @@ private static bool FindInGac(string gacRoot, AssemblyName assemblyName, out str
             bool assemblyFound = false;
             assemblyPath = null;
 
-            char dirSeparator = IO.Path.DirectorySeparatorChar;
-            string tempAssemblyDirPath = $"{gacRoot}{dirSeparator}{assemblyName.Name}";
+            string tempAssemblyDirPath = Path.Join(gacRoot, assemblyName.Name);
 
             if (Directory.Exists(tempAssemblyDirPath))
             {

From b618f45721b95da7cb7d6f4b8cade858d59c8eab Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <mr.molkree@gmail.com>
Date: Wed, 3 Aug 2022 20:40:05 +0400
Subject: [PATCH 524/645] Enable Dependabot for GitHub Actions (#17775)

---
 .github/dependabot.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 38a493b7f36..37c0fc6ca7c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -51,3 +51,10 @@ updates:
       interval: "daily"
     labels:
       - "CL-BuildPackaging"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "CL-BuildPackaging"

From 8d5a501ef93c00f124f80b2b98d70d7db22faaad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 10:55:20 -0700
Subject: [PATCH 525/645] Bump `actions/upload-artifact` from 2 to 3 (#17832)

---
 .github/workflows/daily.yml    | 2 +-
 .github/workflows/exp-json.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 10187a50097..6b13366f875 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -122,7 +122,7 @@ jobs:
           Find-Dotnet
           ./tools/findMissingNotices.ps1 -Fix
       - name: Upload cgmanifest
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: always() && env.CGMANIFEST_PATH != ''
         with:
           name: cgmanifest
diff --git a/.github/workflows/exp-json.yml b/.github/workflows/exp-json.yml
index 43532515923..e2088f45506 100644
--- a/.github/workflows/exp-json.yml
+++ b/.github/workflows/exp-json.yml
@@ -66,7 +66,7 @@ jobs:
           $expFeaturesJson | Out-File $newFileName -Force
 
       - name: Upload experimental features windows
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: experimentalJson
           path: experimental-feature-*-new.json

From 3aa238f35707ff0c5a7a654fe342b1bfbdca16bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 10:55:55 -0700
Subject: [PATCH 526/645] Bump `peter-evans/create-pull-request` from 3 to 4
 (#17831)

---
 .github/workflows/daily.yml    | 6 +++---
 .github/workflows/exp-json.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 6b13366f875..0c8b269db19 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -48,7 +48,7 @@ jobs:
           webhook_url: ${{ secrets.PS_BUILD_TEAMS_CHANNEL }}
           overwrite: "{title: `Failure in .github/daily.yml updating .NET build. Look at ${workflow_link}`}"
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         id: cpr
         if: env.CREATE_PR == 'true'
         with:
@@ -84,7 +84,7 @@ jobs:
           }
           exit 0
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         id: cprtpn
         if: env.CREATE_PR == 'true'
         with:
@@ -128,7 +128,7 @@ jobs:
           name: cgmanifest
           path: ${{ env.CGMANIFEST_PATH }}
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         id: cprcgmanifest
         if: env.CGMANIFEST_PATH != ''
         with:
diff --git a/.github/workflows/exp-json.yml b/.github/workflows/exp-json.yml
index e2088f45506..f3c28be258e 100644
--- a/.github/workflows/exp-json.yml
+++ b/.github/workflows/exp-json.yml
@@ -133,7 +133,7 @@ jobs:
           Set-GWVariable -Name CREATE_EXP_JSON_PR -Value $createPR
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         id: cpr
         if: env.CREATE_EXP_JSON_PR == 'true'
         with:

From a63c598c5ea2ce01bdc37bfb21df6206c513657a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 10:56:25 -0700
Subject: [PATCH 527/645] Bump `github/codeql-action` from 1 to 2 (#17830)

---
 .github/workflows/codeql-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 903ee79cf4d..45730a7138b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -36,7 +36,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,4 +59,4 @@ jobs:
       name: Build
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

From 3b36d01742fce95c281ca05c58c77222d9ae7edc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 10:56:54 -0700
Subject: [PATCH 528/645] Bump `actions/download-artifact` from 2 to 3 (#17829)

---
 .github/workflows/exp-json.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/exp-json.yml b/.github/workflows/exp-json.yml
index f3c28be258e..bac418372bc 100644
--- a/.github/workflows/exp-json.yml
+++ b/.github/workflows/exp-json.yml
@@ -81,7 +81,7 @@ jobs:
         with:
           fetch-depth: '0'
       - name: Download artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: experimentalJson
       - name: Compare json files

From ef5e36df01f652d40d89adad03e2cc481719f508 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 10:57:12 -0700
Subject: [PATCH 529/645] Bump `actions/checkout` from 2 to 3 (#17828)

---
 .github/workflows/backport.yml          | 2 +-
 .github/workflows/codeql-analysis.yml   | 2 +-
 .github/workflows/daily.yml             | 6 +++---
 .github/workflows/exp-json.yml          | 4 ++--
 .github/workflows/markdownLink.yml      | 2 +-
 .github/workflows/markdownLinkDaily.yml | 2 +-
 .github/workflows/rebase.yml            | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 2a32b62d1d5..3116dd6ecf5 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -39,7 +39,7 @@ jobs:
             body: backport_start_body
           });
     - name: Checkout repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - name: Run backport
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 45730a7138b..aa201230f46 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: '0'
 
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 0c8b269db19..5ba0945d229 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -24,7 +24,7 @@ jobs:
     if: github.repository == 'PowerShell/PowerShell'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Sync tags
         run: |
           git fetch --prune --unshallow --tags
@@ -63,7 +63,7 @@ jobs:
     if: github.repository == 'PowerShell/PowerShell'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Update Notices file
         run: |
           Invoke-WebRequest -Uri https://aka.ms/pwsh-daily-tpn -OutFile ./ThirdPartyNotices.txt
@@ -105,7 +105,7 @@ jobs:
       CGMANIFEST_PATH: ''
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Sync tags
         run: |
           git fetch --prune --unshallow --tags
diff --git a/.github/workflows/exp-json.yml b/.github/workflows/exp-json.yml
index bac418372bc..cee56be1216 100644
--- a/.github/workflows/exp-json.yml
+++ b/.github/workflows/exp-json.yml
@@ -29,7 +29,7 @@ jobs:
     name: Update experimental features json
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: '0'
       - name: Create experimental features file
@@ -77,7 +77,7 @@ jobs:
     needs: create-expjson
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: '0'
       - name: Download artifacts
diff --git a/.github/workflows/markdownLink.yml b/.github/workflows/markdownLink.yml
index 88c46b64b77..5b33b7fe524 100644
--- a/.github/workflows/markdownLink.yml
+++ b/.github/workflows/markdownLink.yml
@@ -9,7 +9,7 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v3
     - uses: gaurav-nelson/github-action-markdown-link-check@v1
       with:
         use-quiet-mode: 'yes'
diff --git a/.github/workflows/markdownLinkDaily.yml b/.github/workflows/markdownLinkDaily.yml
index 4e20ec9473a..0fef5c3f499 100644
--- a/.github/workflows/markdownLinkDaily.yml
+++ b/.github/workflows/markdownLinkDaily.yml
@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'PowerShell/PowerShell'
     steps:
     - name: Checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v3
     - name: Check Links
       uses: gaurav-nelson/github-action-markdown-link-check@v1
       with:
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index f610e1b53df..d9905f94b46 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout the latest code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - name: Post rebase started comment to pull request

From 38ebdb29880133ea6f5e73cf77b664eca1597de8 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 3 Aug 2022 12:22:39 -0700
Subject: [PATCH 530/645] Update changelog and `.spelling` for
 `7.3.0-preview.6` release (#17835)

---
 .spelling            |  5 ++++
 CHANGELOG/preview.md | 70 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)

diff --git a/.spelling b/.spelling
index d048e3261ac..5bd81a0135b 100644
--- a/.spelling
+++ b/.spelling
@@ -1203,6 +1203,11 @@ manifest.spdx.json
 buildinfo
 SKUs
 vmImage
+InternalCommands.cs
+CommonCommandParameters.cs
+preview.6.22352.1
+v2.2.6
+ResultsComparer
  - CHANGELOG.md
 aavdberg
 asrosent
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index 4c77a3d48d4..56ffbc92083 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,5 +1,75 @@
 # Current preview release
 
+## [7.3.0-preview.6] - 2022-07-18
+
+### General Cmdlet Updates and Fixes
+
+- Fix `Export-PSSession` to not throw error when a rooted path is specified for `-OutputModule` (#17671)
+- Change `ConvertFrom-Json -AsHashtable` to use ordered hashtable (#17405)
+- Remove potential ANSI escape sequences in strings before using in `Out-GridView` (#17664)
+- Add the `-Milliseconds` parameter to `New-TimeSpan` (#17621) (Thanks @NoMoreFood!)
+- Update `Set-AuthenticodeSignature` to use `SHA256` as the default (#17560) (Thanks @jborean93!)
+- Fix tab completion regression when completing `ValidateSet` values (#17628) (Thanks @MartinGC94!)
+- Show optional parameters as such when displaying method definition and overloads (#13799) (Thanks @eugenesmlv!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@sethvs, @MartinGC94, @eltociear</p>
+
+</summary>
+
+<ul>
+<li>Fix comment in InternalCommands.cs (#17669) (Thanks @sethvs!)</li>
+<li>Use discards for unused variables (#17620) (Thanks @MartinGC94!)</li>
+<li>Fix typo in CommonCommandParameters.cs (#17524) (Thanks @eltociear!)</li>
+</ul>
+
+</details>
+
+### Tests
+
+- Fix SDK tests for release build (#17678)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@tamasvajk</p>
+
+</summary>
+
+<ul>
+<li>Create test artifacts for Windows ARM64 (#17675)</li>
+<li>Update to the latest NOTICES file (#17607)</li>
+<li>Update .NET SDK version from <code>7.0.100-preview.5.22307.18</code> to <code>7.0.100-preview.6.22352.1</code> (#17634)</li>
+<li>Set the compound assignment preference to false (#17632)</li>
+<li>Update DotnetMetadata.json to start consuming .NET 7 Preview 6 builds (#17630)</li>
+<li>Install .NET 3.1 as it is required by the vPack task (#17600)</li>
+<li>Update to use PSReadLine <code>v2.2.6</code> (#17595)</li>
+<li>Fix <code>build.psm1</code> to not specify both version and quality for <code>dotnet-install</code> (#17589) (Thanks @tamasvajk!)</li>
+<li>Bump Newtonsoft.Json in /test/perf/dotnet-tools/Reporting (#17592)</li>
+<li>Bump Newtonsoft.Json in /test/perf/dotnet-tools/ResultsComparer (#17566)</li>
+<li>Disable RPM SBOM test. (#17532)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Remove `katacoda.com` from doc as it now returns 404 (#17625)
+- Update change log for `v7.2.5` and `v7.3.0-preview.5` (#17565)
+- Update `README.md` and `metadata.json` for upcoming releases (#17526)
+
+[7.3.0-preview.6]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.5...v7.3.0-preview.6
+
 ## [7.3.0-preview.5] - 2022-06-21
 
 ### Engine Updates and Fixes

From 8950962b044ef05c91eddf4f54636a17e96d6bca Mon Sep 17 00:00:00 2001
From: Dominik Kaszewski <dakaszewski@gmail.com>
Date: Wed, 3 Aug 2022 21:29:23 +0200
Subject: [PATCH 531/645] Detect default runtime using dotnet --info in
 build.psm1 (#17818)

* Detect runtime using dotnet --info

* Fix path joined with backslash in Start-DevPowerShell

* Rename variable to not collide with automatic one

* Fix platform on Windows

* Fix platform on OSX

* Review: separate detection per-platform

* Revert else split to minimize diff

* Update build.psm1

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
---
 build.psm1 | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 9f4e1641b9b..75596596062 100644
--- a/build.psm1
+++ b/build.psm1
@@ -8,6 +8,7 @@ param(
 
 . "$PSScriptRoot\tools\buildCommon\startNativeExecution.ps1"
 
+# CI runs with PowerShell 5.0, so don't use features like ?: && ||
 Set-StrictMode -Version 3.0
 
 # On Unix paths is separated by colon
@@ -861,26 +862,29 @@ function New-PSOptions {
     Write-Verbose "Using framework '$Framework'"
 
     if (-not $Runtime) {
-        if ($environment.IsLinux) {
-            $Runtime = "linux-x64"
-        } elseif ($environment.IsMacOS) {
-            if ($PSVersionTable.OS.Contains('ARM64')) {
-                $Runtime = "osx-arm64"
-            }
-            else {
-                $Runtime = "osx-x64"
+        $Info = dotnet --info
+        Write-Verbose "dotnet --info:`n${Info}"
+
+        $Platform, $Architecture = $info |
+            Select-String '^\s*OS Platform:\s+(\w+)$', '^\s*Architecture:\s+(\w+)$' |
+            Select-Object -First 2 |
+            ForEach-Object { $_.Matches.Groups[1].Value }
+
+        switch ($Platform) {
+            'Windows' {
+                # For x86 and x64 architectures, we use win7-x64 and win7-x86 RIDs.
+                # For arm and arm64 architectures, we use win-arm and win-arm64 RIDs.
+                $Platform = if ($Architecture[0] -eq 'x') { 'win7' } else { 'win' }
+                $Runtime = "${Platform}-${Architecture}"
             }
-        } else {
-            $RID = dotnet --info | ForEach-Object {
-                if ($_ -match "RID") {
-                    $_ -split "\s+" | Select-Object -Last 1
-                }
+
+            'Linux' {
+                $Runtime = "linux-${Architecture}"
             }
 
-            # We plan to release packages targeting win7-x64 and win7-x86 RIDs,
-            # which supports all supported windows platforms.
-            # So we, will change the RID to win7-<arch>
-            $Runtime = $RID -replace "win\d+", "win7"
+            'Darwin' {
+                $Runtime = "osx-${Architecture}"
+            }
         }
 
         if (-not $Runtime) {
@@ -2272,7 +2276,7 @@ function Start-DevPowerShell {
 
         # splatting for the win
         $startProcessArgs = @{
-            FilePath = "$BinDir\pwsh"
+            FilePath = Join-Path $BinDir 'pwsh'
         }
 
         if ($ArgumentList) {

From c2323db4a0b93ad21c4af229400b26914b8cfb9d Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 3 Aug 2022 21:34:03 -0700
Subject: [PATCH 532/645] Re-enable tests because the corresponding dotnet
 issues were fixed (#17839)

---
 test/powershell/Host/ConsoleHost.Tests.ps1          |  3 +--
 test/powershell/Language/Parser/Parser.Tests.ps1    | 13 +++----------
 .../Test-Connection.Tests.ps1                       |  3 ++-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/test/powershell/Host/ConsoleHost.Tests.ps1 b/test/powershell/Host/ConsoleHost.Tests.ps1
index 1798a71939f..ff2d537d836 100644
--- a/test/powershell/Host/ConsoleHost.Tests.ps1
+++ b/test/powershell/Host/ConsoleHost.Tests.ps1
@@ -1106,8 +1106,7 @@ Describe 'Pwsh startup and PATH' -Tag CI {
 }
 
 Describe 'Console host name' -Tag CI {
-    It 'Name is pwsh' -Pending {
-        # waiting on https://github.com/dotnet/runtime/issues/33673
+    It 'Name is pwsh' {
         (Get-Process -Id $PID).Name | Should -BeExactly 'pwsh'
     }
 }
diff --git a/test/powershell/Language/Parser/Parser.Tests.ps1 b/test/powershell/Language/Parser/Parser.Tests.ps1
index 3c38dc0dca0..e0f90d3a326 100644
--- a/test/powershell/Language/Parser/Parser.Tests.ps1
+++ b/test/powershell/Language/Parser/Parser.Tests.ps1
@@ -867,9 +867,7 @@ foo``u{2195}abc
             @{ Script = "0x12"; ExpectedValue = "18"; ExpectedType = [int] }
             @{ Script = "-0x12"; ExpectedValue = "-18"; ExpectedType = [int] }
 
-            # Disabling this because https://github.com/dotnet/runtime/issues/54251
-            # @{ Script = "0x80000000"; ExpectedValue = $([int32]::MinValue); ExpectedType = [int] }
-
+            @{ Script = "0x80000000"; ExpectedValue = $([int32]::MinValue); ExpectedType = [int] }
             @{ Script = "0x7fffffff"; ExpectedValue = $([int32]::MaxValue); ExpectedType = [int] }
             @{ Script = "0x100000000"; ExpectedValue = [int64]0x100000000; ExpectedType = [long] }
             @{ Script = "0xFF"; ExpectedValue = "255"; ExpectedType = [int] }
@@ -1053,9 +1051,7 @@ foo``u{2195}abc
             @{ Script = "0xFFFFu"; ExpectedValue = "65535"; ExpectedType = [uint] }
             @{ Script = "0xFFFFFFu"; ExpectedValue = "16777215"; ExpectedType = [uint] }
 
-            # Disabling this because https://github.com/dotnet/runtime/issues/54251
-            # @{ Script = "0xFFFFFFFFu"; ExpectedValue = "$([uint]::MaxValue)"; ExpectedType = [uint] }
-
+            @{ Script = "0xFFFFFFFFu"; ExpectedValue = "$([uint]::MaxValue)"; ExpectedType = [uint] }
             @{ Script = "0xFFFFFFFFFFu"; ExpectedValue = "1099511627775"; ExpectedType = [ulong] }
             @{ Script = "0xFFFFFFFFFFFFu"; ExpectedValue = "281474976710655"; ExpectedType = [ulong] }
             @{ Script = "0xFFFFFFFFFFFFFFu"; ExpectedValue = "72057594037927935"; ExpectedType = [ulong] }
@@ -1065,10 +1061,7 @@ foo``u{2195}abc
             @{ Script = "0b10u"; ExpectedValue = "2"; ExpectedType = [uint] }
             @{ Script = "0b11111111u"; ExpectedValue = "255"; ExpectedType = [uint] }
             @{ Script = "0b1111111111111111u"; ExpectedValue = "65535"; ExpectedType = [uint] }
-
-            # Disabling this because https://github.com/dotnet/runtime/issues/54251
-            # @{ Script = "0b11111111111111111111111111111111u"; ExpectedValue = "4294967295"; ExpectedType = [uint] }
-
+            @{ Script = "0b11111111111111111111111111111111u"; ExpectedValue = "4294967295"; ExpectedType = [uint] }
             @{ Script = "0b1111111111111111111111111111111111111111111111111111111111111111u"; ExpectedValue = "18446744073709551615"; ExpectedType = [ulong] }
             #Multipliers
             @{ Script = "1ukb"; ExpectedValue = "1024"; ExpectedType = [uint] }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
index 1d639fe5f2d..b70aff4d3a7 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
@@ -32,7 +32,8 @@ function GetExternalHostAddress([string]$HostName)
     }
 }
 
-# Adding RequireSudoOnUnix due to issue: https://github.com/dotnet/runtime/issues/66746
+# Adding RequireSudoOnUnix due to an intentional breaking change.
+# See https://github.com/dotnet/runtime/issues/66746
 Describe "Test-Connection" -tags "CI", "RequireSudoOnUnix" {
     BeforeAll {
         $hostName = [System.Net.Dns]::GetHostName()

From 471d9cda41754fde0db8ed63ac3ebbe651fd465e Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 3 Aug 2022 21:35:18 -0700
Subject: [PATCH 533/645] Remove unneeded verbose message in build (#17840)

---
 build.psm1 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 75596596062..819a6573610 100644
--- a/build.psm1
+++ b/build.psm1
@@ -862,10 +862,7 @@ function New-PSOptions {
     Write-Verbose "Using framework '$Framework'"
 
     if (-not $Runtime) {
-        $Info = dotnet --info
-        Write-Verbose "dotnet --info:`n${Info}"
-
-        $Platform, $Architecture = $info |
+        $Platform, $Architecture = dotnet --info |
             Select-String '^\s*OS Platform:\s+(\w+)$', '^\s*Architecture:\s+(\w+)$' |
             Select-Object -First 2 |
             ForEach-Object { $_.Matches.Groups[1].Value }

From ee13e09b969b469723235121a687b00176fe1882 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Aug 2022 21:47:00 +0500
Subject: [PATCH 534/645] Bump cirrus-actions/rebase from 1.6 to 1.7 (#17843)

Bumps [cirrus-actions/rebase](https://github.com/cirrus-actions/rebase) from 1.6 to 1.7.
- [Release notes](https://github.com/cirrus-actions/rebase/releases)
- [Commits](https://github.com/cirrus-actions/rebase/compare/1.6...1.7)

---
updated-dependencies:
- dependency-name: cirrus-actions/rebase
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/rebase.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index d9905f94b46..629efd42f12 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -27,6 +27,6 @@ jobs:
             body: backport_start_body
           });
     - name: Automatic Rebase
-      uses: cirrus-actions/rebase@1.6
+      uses: cirrus-actions/rebase@1.7
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 78757fa7fdb9054183a683e5655e7183da9702ba Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 4 Aug 2022 11:26:34 -0700
Subject: [PATCH 535/645] Update the comment about why R2R is disabled (#17850)

---
 PowerShell.Common.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 39e799d5a34..593570c3589 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -137,7 +137,7 @@
 
     <TargetFramework>net7.0</TargetFramework>
     <LangVersion>10.0</LangVersion>
-    <!-- disable ReadyToRun due to issue: https://github.com/dotnet/runtime/issues/65412
+    <!-- disable ReadyToRun due to issue: https://github.com/dotnet/runtime/issues/72550
     <PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
     <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols-->
 

From b9586f9355b400b2978f615c2d0637b0b7151669 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Aug 2022 11:28:16 -0700
Subject: [PATCH 536/645] Bump actions/github-script from 3 to 6 (#17842)

Bumps [actions/github-script](https://github.com/actions/github-script) from 3 to 6.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v3...v6)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/backport.yml | 4 ++--
 .github/workflows/rebase.yml   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 3116dd6ecf5..bfa448413ef 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Extract backport target branch
-      uses: actions/github-script@v3
+      uses: actions/github-script@v6
       id: target-branch-extractor
       with:
         result-encoding: string
@@ -28,7 +28,7 @@ jobs:
 
           return target_branch[1];
     - name: Post backport started comment to pull request
-      uses: actions/github-script@v3
+      uses: actions/github-script@v6
       with:
         script: |
           const backport_start_body = `Started backporting to ${{ steps.target-branch-extractor.outputs.result }}: https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${process.env.GITHUB_RUN_ID}`;
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index 629efd42f12..ce4c83e390d 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -16,7 +16,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Post rebase started comment to pull request
-      uses: actions/github-script@v3
+      uses: actions/github-script@v6
       with:
         script: |
           const backport_start_body = `Started rebase: https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${process.env.GITHUB_RUN_ID}`;

From 65b83e90d5ee79464dba0dc2b41d3da38c4f8d5c Mon Sep 17 00:00:00 2001
From: Varun Sharma <varunsh@stepsecurity.io>
Date: Thu, 4 Aug 2022 12:12:34 -0700
Subject: [PATCH 537/645] Add GitHub token permissions for workflows (#17781)

Signed-off-by: Varun Sharma <varunsh@stepsecurity.io>
---
 .github/workflows/codeql-analysis.yml   |  7 +++++++
 .github/workflows/createReminders.yml   |  6 ++++++
 .github/workflows/daily.yml             | 12 ++++++++++++
 .github/workflows/exp-json.yml          |  6 ++++++
 .github/workflows/markdownLink.yml      |  3 +++
 .github/workflows/markdownLinkDaily.yml |  3 +++
 .github/workflows/processReminders.yml  |  6 ++++++
 .github/workflows/rebase.yml            |  6 ++++++
 8 files changed, 49 insertions(+)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index aa201230f46..48ff5aad04c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -14,8 +14,15 @@ defaults:
 env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
 
+permissions:
+  contents: read
+
 jobs:
   analyze:
+    permissions:
+      actions: read  # for github/codeql-action/init to get workflow details
+      contents: read  # for actions/checkout to fetch code
+      security-events: write  # for github/codeql-action/analyze to upload SARIF results
     name: Analyze
     runs-on: ubuntu-18.04
 
diff --git a/.github/workflows/createReminders.yml b/.github/workflows/createReminders.yml
index b779e19d545..290141703d7 100644
--- a/.github/workflows/createReminders.yml
+++ b/.github/workflows/createReminders.yml
@@ -4,8 +4,14 @@ on:
   issue_comment:
     types: [created, edited]
 
+permissions:
+  contents: read
+
 jobs:
   reminder:
+    permissions:
+      issues: write  # for agrc/create-reminder-action to set reminders on issues
+      pull-requests: write  # for agrc/create-reminder-action to set reminders on PRs
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 5ba0945d229..dbc85f6ee5b 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -16,8 +16,14 @@ env:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   POWERSHELL_TELEMETRY_OPTOUT: 1
 
+permissions:
+  contents: read
+
 jobs:
   update-dotnet-preview:
+    permissions:
+      contents: write  # for peter-evans/create-pull-request to create branch
+      pull-requests: write  # for peter-evans/create-pull-request to create a PR
     name: Update .NET preview
     timeout-minutes: 15
     runs-on: windows-latest
@@ -57,6 +63,9 @@ jobs:
           base: master
           branch: dotnet_update
   update-tpn:
+    permissions:
+      contents: write  # for peter-evans/create-pull-request to create branch
+      pull-requests: write  # for peter-evans/create-pull-request to create a PR
     name: Update Notices File
     timeout-minutes: 15
     runs-on: windows-latest
@@ -97,6 +106,9 @@ jobs:
           draft: false
           branch: update-cgmanifest
   update-cgmanifest:
+    permissions:
+      contents: write  # for peter-evans/create-pull-request to create branch
+      pull-requests: write  # for peter-evans/create-pull-request to create a PR
     name: Update cgmanifest
     timeout-minutes: 15
     runs-on: windows-latest
diff --git a/.github/workflows/exp-json.yml b/.github/workflows/exp-json.yml
index cee56be1216..629ff0f55e4 100644
--- a/.github/workflows/exp-json.yml
+++ b/.github/workflows/exp-json.yml
@@ -16,6 +16,9 @@ env:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   POWERSHELL_TELEMETRY_OPTOUT: 1
 
+permissions:
+  contents: read
+
 jobs:
   create-expjson:
     strategy:
@@ -72,6 +75,9 @@ jobs:
           path: experimental-feature-*-new.json
 
   compare-expjson-files:
+    permissions:
+      contents: write  # for peter-evans/create-pull-request to create branch
+      pull-requests: write  # for peter-evans/create-pull-request to create a PR
     runs-on: ubuntu-latest
     name: Compare experimental json files and create PR
     needs: create-expjson
diff --git a/.github/workflows/markdownLink.yml b/.github/workflows/markdownLink.yml
index 5b33b7fe524..2c0796ac2d1 100644
--- a/.github/workflows/markdownLink.yml
+++ b/.github/workflows/markdownLink.yml
@@ -5,6 +5,9 @@ on:
       - 'release/**'
 
 name: Check links for modified files
+permissions:
+  contents: read
+
 jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/markdownLinkDaily.yml b/.github/workflows/markdownLinkDaily.yml
index 0fef5c3f499..7a4a1259a64 100644
--- a/.github/workflows/markdownLinkDaily.yml
+++ b/.github/workflows/markdownLinkDaily.yml
@@ -9,6 +9,9 @@ on:
   # At 13:00 UTC every day.
   - cron:  '0 13 * * *'
 
+permissions:
+  contents: read
+
 jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/processReminders.yml b/.github/workflows/processReminders.yml
index 65322ebd7bf..c660788a620 100644
--- a/.github/workflows/processReminders.yml
+++ b/.github/workflows/processReminders.yml
@@ -5,8 +5,14 @@ on:
     - cron: '*/15 * * * *'
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   reminder:
+    permissions:
+      issues: write  # for agrc/reminder-action to set reminders on issues
+      pull-requests: write  # for agrc/reminder-action to set reminders on PRs
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index ce4c83e390d..2ec027625b6 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -5,8 +5,14 @@ on:
   issue_comment:
     types: [created]
 name: Automatic Rebase
+permissions:
+  contents: read
+
 jobs:
   rebase:
+    permissions:
+      contents: write  # for cirrus-actions/rebase to push code to rebase
+      pull-requests: write  # for actions/github-script to create PR comment
     name: Rebase
     if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
     runs-on: ubuntu-latest

From 53a212ee65656ac1e562dfffc1b83204d871a45f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadas=20Medi=C5=A1auskas?= <thetadas+github@gmail.com>
Date: Mon, 8 Aug 2022 18:18:51 +0100
Subject: [PATCH 538/645] Make generated implicit remoting modules backwards
 compatible with PowerShell 5 (#17227)

* Fix implicit remoting generator version check

* Fix implicit remoting generator version check
---
 .../commands/utility/ImplicitRemotingCommands.cs              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
index 7190c16cad7..f0044dd1885 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
@@ -2100,7 +2100,9 @@ private void GenerateModuleHeader(TextWriter writer)
 
             // In Win8, we are no longer loading all assemblies by default.
             // So we need to use the fully qualified name when accessing a type in that assembly
-            string versionOfScriptGenerator = "[" + typeof(ExportPSSessionCommand).AssemblyQualifiedName + "]" + "::VersionOfScriptGenerator";
+            Type type = typeof(ExportPSSessionCommand);
+            string asmName = type.Assembly.GetName().Name;
+            string versionOfScriptGenerator = $"[{type.FullName}, {asmName}]::VersionOfScriptGenerator";
             GenerateTopComment(writer);
             writer.Write(
                 HeaderTemplate,

From 55c5e789bd1a24772d1316e9bad1c2b94c27b6a2 Mon Sep 17 00:00:00 2001
From: David Bar-On <61089727+davidBar-On@users.noreply.github.com>
Date: Mon, 8 Aug 2022 21:29:45 +0300
Subject: [PATCH 539/645] Fix for deserializing imported ordered dictionary
 (#15545)

---
 .../engine/serialization.cs                   | 107 +++++++----
 .../XMLCommand.Tests.ps1                      | 177 ++++++++++++++++++
 2 files changed, 248 insertions(+), 36 deletions(-)

diff --git a/src/System.Management.Automation/engine/serialization.cs b/src/System.Management.Automation/engine/serialization.cs
index be72947769e..76b7c38b7b3 100644
--- a/src/System.Management.Automation/engine/serialization.cs
+++ b/src/System.Management.Automation/engine/serialization.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
@@ -3668,7 +3669,7 @@ private PSObject ReadPSObject()
                     else if (IsKnownContainerTag(out ct))
                     {
                         s_trace.WriteLine("Found container node {0}", ct);
-                        baseObject = ReadKnownContainer(ct);
+                        baseObject = ReadKnownContainer(ct, dso.InternalTypeNames);
                     }
                     else if (IsNextElement(SerializationStrings.PSObjectTag))
                     {
@@ -3932,12 +3933,12 @@ private bool IsKnownContainerTag(out ContainerType ct)
             return ct != ContainerType.None;
         }
 
-        private object ReadKnownContainer(ContainerType ct)
+        private object ReadKnownContainer(ContainerType ct, ConsolidatedString InternalTypeNames)
         {
             switch (ct)
             {
                 case ContainerType.Dictionary:
-                    return ReadDictionary(ct);
+                    return ReadDictionary(ct, InternalTypeNames);
 
                 case ContainerType.Enumerable:
                 case ContainerType.List:
@@ -3986,19 +3987,81 @@ private object ReadListContainer(ContainerType ct)
             return list;
         }
 
+        /// <summary>
+        /// Utilitily class for ReadDictionary(), supporting ordered or non-ordered Dictionaty methods.
+        /// </summary>
+        private class PSDictionary
+        {
+            private IDictionary dict;
+            private readonly bool _isOrdered;
+            private int _keyClashFoundIteration = 0;
+
+            public PSDictionary(bool isOrdered) {
+                _isOrdered = isOrdered;
+
+                // By default use a non case-sensitive comparer
+                if (_isOrdered) {
+                    dict = new OrderedDictionary(StringComparer.CurrentCultureIgnoreCase);
+                } else {
+                    dict = new Hashtable(StringComparer.CurrentCultureIgnoreCase);
+                }
+            }
+
+            public object DictionaryObject { get { return dict; } }
+
+            public void Add(object key, object value) {
+                // On the first collision, copy the hash table to one that uses the `key` object's default comparer.
+                if (_keyClashFoundIteration == 0 && dict.Contains(key))
+                {
+                    _keyClashFoundIteration++;
+                    IDictionary newDict = _isOrdered ? new OrderedDictionary(dict.Count) : new Hashtable(dict.Count);
+
+                    foreach (DictionaryEntry entry in dict) {
+                        newDict.Add(entry.Key, entry.Value);
+                    }
+
+                    dict = newDict;
+                }
+
+                // win8: 389060. If there are still collisions even with case-sensitive default comparer,
+                // use an IEqualityComparer that does object ref equality.
+                if (_keyClashFoundIteration == 1 && dict.Contains(key))
+                {
+                    _keyClashFoundIteration++;
+                    IEqualityComparer equalityComparer = new ReferenceEqualityComparer();
+                    IDictionary newDict = _isOrdered ?
+                                            new OrderedDictionary(dict.Count, equalityComparer) :
+                                            new Hashtable(dict.Count, equalityComparer);
+
+                    foreach (DictionaryEntry entry in dict) {
+                        newDict.Add(entry.Key, entry.Value);
+                    }
+
+                    dict = newDict;
+                }
+
+                dict.Add(key, value);
+            }
+        }
+
         /// <summary>
         /// Deserialize Dictionary.
         /// </summary>
         /// <returns></returns>
-        private object ReadDictionary(ContainerType ct)
+        private object ReadDictionary(ContainerType ct, ConsolidatedString InternalTypeNames)
         {
             Dbg.Assert(ct == ContainerType.Dictionary, "Unrecognized ContainerType enum");
 
             // We assume the hash table is a PowerShell hash table and hence uses
             // a case insensitive string comparer.  If we discover a key collision,
             // we'll revert back to the default comparer.
-            Hashtable table = new Hashtable(StringComparer.CurrentCultureIgnoreCase);
-            int keyClashFoundIteration = 0;
+            
+            // Find whether original directory was ordered
+            bool isOrdered = InternalTypeNames.Count > 0 &&
+                (Deserializer.MaskDeserializationPrefix(InternalTypeNames[0]) == typeof(OrderedDictionary).FullName);
+
+            PSDictionary dictionary = new PSDictionary(isOrdered);
+
             if (ReadStartElementAndHandleEmpty(SerializationStrings.DictionaryTag))
             {
                 while (_reader.NodeType == XmlNodeType.Element)
@@ -4037,38 +4100,10 @@ private object ReadDictionary(ContainerType ct)
 
                     object value = ReadOneObject();
 
-                    // On the first collision, copy the hash table to one that uses the default comparer.
-                    if (table.ContainsKey(key) && (keyClashFoundIteration == 0))
-                    {
-                        keyClashFoundIteration++;
-                        Hashtable newHashTable = new Hashtable();
-                        foreach (DictionaryEntry entry in table)
-                        {
-                            newHashTable.Add(entry.Key, entry.Value);
-                        }
-
-                        table = newHashTable;
-                    }
-
-                    // win8: 389060. If there are still collisions even with case-sensitive default comparer,
-                    // use an IEqualityComparer that does object ref equality.
-                    if (table.ContainsKey(key) && (keyClashFoundIteration == 1))
-                    {
-                        keyClashFoundIteration++;
-                        IEqualityComparer equalityComparer = new ReferenceEqualityComparer();
-                        Hashtable newHashTable = new Hashtable(equalityComparer);
-                        foreach (DictionaryEntry entry in table)
-                        {
-                            newHashTable.Add(entry.Key, entry.Value);
-                        }
-
-                        table = newHashTable;
-                    }
-
                     try
                     {
                         // Add entry to hashtable
-                        table.Add(key, value);
+                        dictionary.Add(key, value);
                     }
                     catch (ArgumentException e)
                     {
@@ -4081,7 +4116,7 @@ private object ReadDictionary(ContainerType ct)
                 ReadEndElement();
             }
 
-            return table;
+            return dictionary.DictionaryObject;
         }
 
         #endregion known containers
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/XMLCommand.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/XMLCommand.Tests.ps1
index 7c61b448469..ea631d7f6f9 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/XMLCommand.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/XMLCommand.Tests.ps1
@@ -52,6 +52,183 @@ Describe "XmlCommand DRT basic functionality Tests" -Tags "CI" {
 		$results.Property2 | Should -Be $property2
     }
 
+	It "Import Hashtable from exported non-ordered dictionary object should create non-ordered dictionary object" {
+		$dict = @{}
+		$dict['Larry'] = 'Poik!'
+		$dict['Curly'] = 'Nyuk!'
+		$dict['Moe'] = 'Wise guy!'
+		$dict['larry'] = 'poik!'
+		$dict['curly'] = 'nyuk!'
+		$dict['moe'] = 'wise guy!'
+		$dict.Count | Should -Be 3
+		$dict | Export-Clixml $testfile
+		$results = Import-Clixml $testfile
+		$results.GetType().Name | Should -BeExactly  "Hashtable"
+		$results.Count | Should -Be 3
+    }
+
+	It "Import OrderedDictionary from exported ordered dictionary object should create ordered dictionary object" {
+		$dict = [ordered]@{}
+		$dict['Larry'] = 'Poik!'
+		$dict['Curly'] = 'Nyuk!'
+		$dict['Moe'] = 'Wise guy!'
+		$dict['larry'] = 'poik!'
+		$dict['curly'] = 'nyuk!'
+		$dict['moe'] = 'wise guy!'
+		$dict.Count | Should -Be 3
+		$dict | Export-Clixml $testfile
+		$results = Import-Clixml $testfile
+		$results.GetType().Name | Should -BeExactly  "OrderedDictionary"
+		$results.Count | Should -Be 3
+		$results[0] | Should -BeExactly $dict[0]
+		$results[1] | Should -BeExactly $dict[1]
+		$results[2] | Should -BeExactly $dict[2]
+    }
+
+	It "Import Hashtable from exported non-ordered case-sentitive dictionary object" {
+		$dict = New-Object hashtable
+		$dict['Larry'] = 'Poik!'
+		$dict['Curly'] = 'Nyuk!'
+		$dict['Moe'] = 'Wise guy!'
+		$dict['larry'] = 'poik!'
+		$dict['curly'] = 'nyuk!'
+		$dict['moe'] = 'wise guy!'
+		$dict.Count | Should -Be 6
+		$dict | Export-Clixml $testfile
+		$results = Import-Clixml $testfile
+		$results.GetType().Name | Should -BeExactly  "Hashtable"
+		$results.Count | Should -Be 6
+	}
+
+	It "Import OrderedDictionary from XML with case-sensitive duplicate keys" {
+		$dupKeysXml =
+		'<Objs Version="1.1.0.1" xmlns="http://schemas.microsoft.com/powershell/2004/04">
+				<Obj RefId="0">
+					<TN RefId="0">
+					<T>System.Collections.Specialized.OrderedDictionary</T>
+					<T>System.Object</T>
+					</TN>
+					<DCT>
+					<En>
+						<S N="Key">Larry</S>
+						<S N="Value">Poik!</S>
+					</En>
+					<En>
+						<S N="Key">Moe</S>
+						<S N="Value">Wise guy!</S>
+					</En>
+					<En>
+						<S N="Key">Curly</S>
+						<S N="Value">Nyuk!</S>
+					</En>
+					<En>
+						<S N="Key">larry</S>
+						<S N="Value">poik!</S>
+					</En>
+					<En>
+						<S N="Key">moe</S>
+						<S N="Value">wise guy!</S>
+					</En>
+					<En>
+						<S N="Key">curly</S>
+						<S N="Value">nyuk!</S>
+					</En>
+					</DCT>
+				</Obj>
+			</Objs>
+			'
+		$dupKeysXml | Out-File -FilePath $testfile
+		$results = Import-Clixml $testfile
+		$results.GetType().Name | Should -BeExactly  "OrderedDictionary"
+		$results.Count | Should -Be 6
+	}
+
+	It "Import Hashtable from XML with duplicate keys" {
+		$dupKeysXml =
+			'<Objs Version="1.1.0.1" xmlns="http://schemas.microsoft.com/powershell/2004/04">
+				<Obj RefId="0">
+					<TN RefId="0">
+					<T>System.Collections.Hashtable</T>
+					<T>System.Object</T>
+					</TN>
+					<DCT>
+					<En>
+						<S N="Key">Larry</S>
+						<S N="Value">Poik!</S>
+					</En>
+					<En>
+						<S N="Key">Moe</S>
+						<S N="Value">Wise guy!</S>
+					</En>
+					<En>
+						<S N="Key">Curly</S>
+						<S N="Value">Nyuk!</S>
+					</En>
+					<En>
+						<S N="Key">Larry</S>
+						<S N="Value">Poik!</S>
+					</En>
+					<En>
+						<S N="Key">Moe</S>
+						<S N="Value">Wise guy!</S>
+					</En>
+					<En>
+						<S N="Key">Curly</S>
+						<S N="Value">Nyuk!</S>
+					</En>
+					</DCT>
+				</Obj>
+			</Objs>
+			'
+		$dupKeysXml | Out-File -FilePath $testfile
+		$results = Import-Clixml $testfile
+		$results.GetType().Name | Should -BeExactly  "Hashtable"
+		$results.Count | Should -Be 6
+	}
+
+	It "Import OrderedDictionary from XML with duplicate keys" {
+		$dupKeysXml =
+			'<Objs Version="1.1.0.1" xmlns="http://schemas.microsoft.com/powershell/2004/04">
+				<Obj RefId="0">
+					<TN RefId="0">
+					<T>System.Collections.Specialized.OrderedDictionary</T>
+					<T>System.Object</T>
+					</TN>
+					<DCT>
+					<En>
+						<S N="Key">Larry</S>
+						<S N="Value">Poik!</S>
+					</En>
+					<En>
+						<S N="Key">Moe</S>
+						<S N="Value">Wise guy!</S>
+					</En>
+					<En>
+						<S N="Key">Curly</S>
+						<S N="Value">Nyuk!</S>
+					</En>
+					<En>
+						<S N="Key">Larry</S>
+						<S N="Value">Poik!</S>
+					</En>
+					<En>
+						<S N="Key">Moe</S>
+						<S N="Value">Wise guy!</S>
+					</En>
+					<En>
+						<S N="Key">Curly</S>
+						<S N="Value">Nyuk!</S>
+					</En>
+					</DCT>
+				</Obj>
+			</Objs>
+			'
+		$dupKeysXml | Out-File -FilePath $testfile
+		$results = Import-Clixml $testfile
+		$results.GetType().Name | Should -BeExactly  "OrderedDictionary"
+		$results.Count | Should -Be 6
+	}
+
 	It "Export-Clixml StopProcessing should succeed" {
         $ps = [PowerShell]::Create()
         $null = $ps.AddScript("1..10")

From 2eed0f5f0a508fe2033f27a6a3697045fed75378 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 8 Aug 2022 11:56:01 -0700
Subject: [PATCH 540/645] Update release pipeline to use Approvals and automate
 some manual tasks (#17837)

---
 .../azureDevOps/releasePipeline.yml           | 292 +++++++++++++++---
 .../templates/release-CreateGitHubDraft.yml   |  34 +-
 .../templates/release/approvalJob.yml         |   4 +
 3 files changed, 278 insertions(+), 52 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index e1334f9320d..39e0902f026 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -12,6 +12,13 @@ resources:
       branches:
       - release/*
 
+  repositories:
+  - repository: Internal-PowerShellTeam-Tools
+    type: git
+    trigger: none
+    name: Internal-PowerShellTeam-Tools
+    ref: master
+
 variables:
   - name: runCodesignValidationInjection
     value : false
@@ -21,6 +28,7 @@ variables:
     value: true
   - name: BUILDSECMON_OPT_IN
     value: true
+  - group: ReleasePipelineSecrets
 
 stages:
 - stage: MSIXBundle
@@ -139,24 +147,97 @@ stages:
   dependsOn: []
   displayName: Manual Validation
   jobs:
-  - deployment: ValidateWinPkg
-    displayName: Validate Windows Packages
-    pool: server
-    environment: PSReleaseWinPkgValidate
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Validate Windows Packages
+      jobName: ValidateWinPkg
+      instructions: |
+        Validate zip and msipackages on Windows Server 2012 R2
 
-  - deployment: ValidateLinuxPkg
-    displayName: Validate Linux Packages
-    pool: server
-    environment: PSReleaseLinuxPkgValidate
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Validate OSX Packages
+      jobName: ValidateOsxPkg
+      instructions: |
+        Validate tar.gz package on osx-arm64
 
 - stage: ReleaseAutomation
   displayName: Release Automation
   dependsOn: []
   jobs:
-  - deployment: ReleaseAutomationKickOff
-    displayName: Kick off release ReleaseAutomation
-    pool: server
-    environment: PSReleaseAutomationKickOff
+  - job: KickOffRA
+    displayName: Kickoff Release Automation
+
+    pool:
+      name: PowerShell1ES
+      demands:
+      - ImageOverride -equals PSMMS2019-Secure
+
+    steps:
+    - checkout: Internal-PowerShellTeam-Tools
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        source: specific
+        project: PowerShellCore
+        pipeline: '696'
+        preferTriggeringPipeline: true
+        runVersion: latestFromBranch
+        runBranch: '$(Build.SourceBranch)'
+        artifact: metadata
+        path: '$(Pipeline.Workspace)/releasePipeline/metadata'
+
+    - pwsh: |
+        Get-ChildItem -Path $(Build.SourcesDirectory)
+        Import-Module $(Build.SourcesDirectory)\ReleaseTools\AzDO -Force
+        Set-AzDoAuthToken -Token $(RELEASEAUTOMATIONPAT)
+        Set-AzDoProjectInfo -ProjectOwner PowerShell-Rel -ProjectName Release-Automation
+        $packageBuildID = $(resources.pipeline.releasePipeline.runID)
+        $metadata = Get-Content -Raw -Path '$(Pipeline.Workspace)/releasePipeline/metadata/release.json' | ConvertFrom-Json
+        $buildInvocationInfo = Start-AzDOBuild -BuildDefinitionId 10 -BuildArguments @{ POWERSHELL_PACKAGE_BUILD_BUILDID = $packageBuildID } -Tag $metadata.ReleaseVersion, 'InProgress' -PassThru
+        Write-Verbose -Verbose "Kicked off release automation:`n$($buildInvocationInfo | Out-String)"
+        $status = $buildInvocationInfo | Wait-AzDOBuildStatus -Status Completed -timeoutMinutes 240
+        if ($status.result -ne 'Succeeded') {
+          Write-Verbose "There are errors in release automation tests. Please triage failures."
+        }
+
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Triage Release Automation Results
+      jobName: TriageRA
+      dependsOnJob: KickOffRA
+      instructions: |
+        Validate all the test failures and continue when signed off
+
+  - job: MarkRASignOff
+    displayName: Mark release automation signoff
+    dependsOn: TriageRA
+
+    pool:
+      name: PowerShell1ES
+      demands:
+      - ImageOverride -equals PSMMS2019-Secure
+
+    steps:
+    - checkout: Internal-PowerShellTeam-Tools
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        source: specific
+        project: PowerShellCore
+        pipeline: '696'
+        preferTriggeringPipeline: true
+        runVersion: latestFromBranch
+        runBranch: '$(Build.SourceBranch)'
+        artifact: metadata
+        path: '$(Pipeline.Workspace)/releasePipeline/metadata'
+
+    - pwsh: |
+        Import-Module $(Build.SourcesDirectory)\ReleaseTools\AzDO -Force
+        Set-AzDoAuthToken -Token $(RELEASEAUTOMATIONPAT)
+        Set-AzDoProjectInfo -ProjectOwner PowerShell-Rel -ProjectName Release-Automation
+        $metadata = Get-Content -Raw -Path '$(Pipeline.Workspace)/releasePipeline/metadata/release.json' | ConvertFrom-Json
+        $azDOBuild = Get-AzDOBuild -buildDefinitionId 10 -MaximumResult 100  | Where-Object { $_.tags -in $metadata.ReleaseVersion }
+        $azDoBuild | Remove-AzDOBuildTag -tag 'InProgress' -Pass | Add-AzDOBuildTag -tag 'SignedOff'
+      displayName: Signoff Release-Automation run
 
 - stage: GitHubDraftRelease
   displayName: Create GitHub draft release
@@ -210,11 +291,6 @@ stages:
   displayName: GitHub manual tasks
   dependsOn: GitHubDraftRelease
   jobs:
-  - deployment: UpdateChangeLog
-    displayName: Update Change Log
-    pool : server
-    environment: PSReleaseUpdateChangeLog
-
   - deployment: PushTag
     displayName: Push Git Tag
     pool : server
@@ -224,6 +300,7 @@ stages:
     displayName: Make GitHub Draft public
     pool : server
     environment: PSReleaseDraftPublic
+    dependsOn: PushTag
 
 - stage: PublishPackages
   displayName: Publish packages
@@ -256,10 +333,12 @@ stages:
   displayName: Ensure changes are in GH master
   dependsOn: PublishPackages
   jobs:
-  - deployment: MergeToMaster
-    displayName: Make sure changes are in master
-    pool: server
-    environment: PSReleaseChangesToMaster
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Make sure changes are in master
+      jobName: MergeToMaster
+      instructions: |
+        Make sure that changes README.md and metadata.json are merged into master on GitHub.
 
 - stage: ReleaseDocker
   displayName: Release Docker
@@ -280,19 +359,76 @@ stages:
     # adds newPwshOrgName (exists in new and old org)
     - group: PowerShellRelease
   jobs:
-  - template: templates/release/approvalJob.yml
-    parameters:
-      displayName: Start the release build
-      jobName: SnapStart
-      instructions: |
-        Start the snap pipeline at: https://dev.azure.com/$(newPwshOrgName)/PowerShell/_build?definitionId=49&_a=summary
+  - job: KickoffSnap
+    displayName: Kickoff Snap build
+
+    pool:
+      name: PowerShell1ES
+      demands:
+      - ImageOverride -equals PSMMS2019-Secure
+
+    steps:
+    - checkout: Internal-PowerShellTeam-Tools
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        source: specific
+        project: PowerShellCore
+        pipeline: '696'
+        preferTriggeringPipeline: true
+        runVersion: latestFromBranch
+        runBranch: '$(Build.SourceBranch)'
+        artifact: metadata
+        path: '$(Pipeline.Workspace)/releasePipeline/metadata'
+    - pwsh: |
+        Import-Module $(Build.SourcesDirectory)\ReleaseTools\AzDO -Force
+        Set-AzDoAuthToken -Token $(RELEASEAUTOMATIONPAT)
+        Set-AzDoProjectInfo -ProjectOwner PowerShell-Rel -ProjectName PowerShell
+        $metadata = Get-Content -Raw -Path '$(Pipeline.Workspace)/releasePipeline/metadata/release.json' | ConvertFrom-Json
+        $buildInvocationInfo = Start-AzDOBuild -BuildDefinitionId 49 -Tag $metadata.ReleaseVersion, 'InProgress' -PassThru
+        Write-Verbose -Verbose "Kicked off snap build: $($buildInvocationInfo.WebUrl)"
+        $status = $buildInvocationInfo | Wait-AzDOBuildStatus -Status Completed -timeoutMinutes 60
+        if ($status.result -ne 'Succeeded') {
+          throw "There are errors in snap build!!"
+        }
+
   - template: templates/release/approvalJob.yml
     parameters:
       displayName: Approve the release
       jobName: SnapEnd
+      dependsOnJob: KickoffSnap
       instructions: |
         Once the build is finished, approve the release of all channels.
 
+  - job: MarkSnapSignOff
+    displayName: Mark release automation signoff
+    dependsOn: SnapEnd
+
+    pool:
+      name: PowerShell1ES
+      demands:
+      - ImageOverride -equals PSMMS2019-Secure
+
+    steps:
+    - checkout: Internal-PowerShellTeam-Tools
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        source: specific
+        project: PowerShellCore
+        pipeline: '696'
+        preferTriggeringPipeline: true
+        runVersion: latestFromBranch
+        runBranch: '$(Build.SourceBranch)'
+        artifact: metadata
+        path: '$(Pipeline.Workspace)/releasePipeline/metadata'
+    - pwsh: |
+        Import-Module $(Build.SourcesDirectory)\ReleaseTools\AzDO -Force
+        Set-AzDoAuthToken -Token $(RELEASEAUTOMATIONPAT)
+        Set-AzDoProjectInfo -ProjectOwner PowerShell-Rel -ProjectName PowerShell
+        $metadata = Get-Content -Raw -Path '$(Pipeline.Workspace)/releasePipeline/metadata/release.json' | ConvertFrom-Json
+        $azDOBuild = Get-AzDOBuild -buildDefinitionId 49 -MaximumResult 100  | Where-Object { $_.tags -in $metadata.ReleaseVersion }
+        $azDoBuild | Remove-AzDOBuildTag -tag 'InProgress' -Pass | Add-AzDOBuildTag -tag 'SignedOff'
+      displayName: Signoff Release-Automation run
+
 - stage: ReleaseToMU
   displayName: Release to MU
   dependsOn:
@@ -309,28 +445,38 @@ stages:
   dependsOn: GitHubManualTasks
   displayName: Update DotNet SDK Docker images
   jobs:
-  - deployment: DotnetSDkDocker
-    displayName: Update .NET SDK docker images
-    pool: server
-    environment: PSReleaseUpdateDotnetDocker
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Update .NET SDK docker images
+      jobName: DotnetDocker
+      instructions: |
+        Create PR for updating dotnet-docker images to use latest PowerShell version.
+        1. Fork and clone https://github.com/dotnet/dotnet-docker.git
+        2. git checkout upstream/nightly -b updatePS
+        3. dotnet run --project .\eng\update-dependencies\ -- <dotnetversion> --product-version powershell=<powershellversion> --compute-shas
+        4. create PR targeting nightly branch
 
 - stage: UpdateWinGet
   dependsOn: GitHubManualTasks
   displayName: Add manifest entry to winget
   jobs:
-  - deployment: UpdateWinGet
-    displayName: Add manifest entry to winget
-    pool: server
-    environment: PSReleaseUpdateWinGet
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Add manifest entry to winget
+      jobName: UpdateWinGet
+      instructions: |
+        This is typically done by the community 1-2 days after the release.
 
 - stage: PublishMsix
   dependsOn: GitHubManualTasks
   displayName: Publish MSIX to store
   jobs:
-  - deployment: PublishMsix
-    displayName: Publish the MSIX Bundle package to store
-    pool: server
-    environment: PSReleasePublishMsix
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Publish the MSIX Bundle package to store
+      jobName: PublishMsix
+      instructions: |
+        Ask Steve to release MSIX bundle package to Store
 
 - stage: BuildInfoJson
   dependsOn: GitHubManualTasks
@@ -357,10 +503,50 @@ stages:
   dependsOn: GitHubManualTasks
   displayName: Release VPack
   jobs:
-  - deployment: ReleaseVPackManual
-    displayName: Release VPack
-    pool: server
-    environment: PSReleaseVpack
+  - job: KickoffvPack
+    displayName: Kickoff vPack build
+
+    pool:
+      name: PowerShell1ES
+      demands:
+      - ImageOverride -equals PSMMS2019-Secure
+
+    steps:
+    - checkout: Internal-PowerShellTeam-Tools
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        source: specific
+        project: PowerShellCore
+        pipeline: '696'
+        preferTriggeringPipeline: true
+        runVersion: latestFromBranch
+        runBranch: '$(Build.SourceBranch)'
+        artifact: metadata
+        path: '$(Pipeline.Workspace)/releasePipeline/metadata'
+
+    - pwsh: |
+        Import-Module $(Build.SourcesDirectory)\ReleaseTools\AzDO -Force
+        Set-AzDoAuthToken -Token $(MSCODEHUBPAT)
+        Set-AzDoProjectInfo -ProjectOwner mscodehub -ProjectName PowerShellCore
+        $metadata = Get-Content -Raw -Path '$(Pipeline.Workspace)/releasePipeline/metadata/release.json' | ConvertFrom-Json
+        $releaseVersion = $metadata.ReleaseVersion -replace '^v',''
+        $semanticVersion = [System.Management.Automation.SemanticVersion]$releaseVersion
+        $isPreview = $semanticVersion.PreReleaseLabel -ne $null
+
+        if (-not $isPreview) {
+          $buildInvocationInfo = Start-AzDOBuild -BuildDefinitionId 1238 -Tag $metadata.ReleaseVersion, 'InProgress' -PassThru
+          Write-Verbose -Verbose "Kicked off vPack build: $($buildInvocationInfo.WebUrl)"
+          $status = $buildInvocationInfo | Wait-AzDOBuildStatus -Status Completed -timeoutMinutes 60
+          if ($status.result -ne 'Succeeded') {
+            throw "There are errors in snap build!!"
+          }
+          else {
+            $buildInvocationInfo | Remove-AzDOBuildTag -tag 'InProgress' -Pass | Add-AzDOBuildTag -tag 'SignedOff'
+          }
+        }
+        else {
+          Write-Verbose -Verbose "This is a preview release with version: $semanticVersion skipping releasing vPack"
+        }
 
 - stage: ReleaseDeps
   dependsOn: GitHubManualTasks
@@ -379,12 +565,16 @@ stages:
   - ChangesToMaster
   - ReleaseDeps
   jobs:
-  - deployment: RetainBuild
-    displayName: Retain Build
-    pool: server
-    environment: PSReleaseRetainBuild
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Retain Build
+      jobName: RetainBuild
+      instructions: |
+        Retain the build
 
-  - deployment: DeleteBranch
-    displayName: Delete release branch
-    pool: server
-    environment: PSReleaseDeleteBranch
+  - template: templates/release/approvalJob.yml
+    parameters:
+      displayName: Delete release branch
+      jobName: DeleteBranch
+      instructions: |
+        Delete release
diff --git a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
index ce6eff7cb2a..035adae0c84 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
@@ -45,5 +45,37 @@ steps:
 
 - pwsh: |
     Import-module '$(Pipeline.Workspace)/tools/Scripts/GitHubRelease.psm1'
-    Publish-ReleaseDraft -Tag '$(ReleaseTag)' -Name '$(ReleaseTag) Release of PowerShell' -Description '<-- Update Me -->' -User PowerShell -Repository PowerShell  -PackageFolder $(System.ArtifactsDirectory) -Token $(GitHubReleasePat)
+    $releaseVersion = '$(ReleaseTag)' -replace '^v',''
+    $semanticVersion = [System.Management.Automation.SemanticVersion]$releaseVersion
+
+    $isPreview = $semanticVersion.PreReleaseLabel -ne $null
+
+    $fileName = if ($isPreview) {
+      "preview.md"
+    }
+    else {
+      $semanticVersion.Major + "." + $semanticVersion.Minor + ".md"
+    }
+
+    $filePath = $env:BUILD_SOURCESDIRECTORY/CHANGELOG/$fileName
+    Write-Verbose -Verbose "Selected Log file: $filePath"
+
+    if (-not (Test-Path $filePath)) {
+      throw "$filePath not found"
+    }
+
+    $changelog = Get-Content -Raw -Path $filePath
+
+    $startPattern = "^## \[" + ([regex]::Escape($releaseVersion)) + "\]"
+    $endPattern = "^## \[{0}\.{1}\.{2}*" -f $semanticVersion.Major, $semanticVersion.Minor, $semanticVersion.Patch
+
+    $clContent = $changelog | ForEach-Object {
+        if ($_ -match $startPattern) { $outputLine = $true }
+        elseif ($_ -match $endPattern) { $outputLine = $false }
+        if ($outputLine) { $_}
+      }
+
+    Write-Verbose -Verbose "Selected content: `n$clContent"
+
+    Publish-ReleaseDraft -Tag '$(ReleaseTag)' -Name '$(ReleaseTag) Release of PowerShell' -Description $clContent -User PowerShell -Repository PowerShell  -PackageFolder $(System.ArtifactsDirectory) -Token $(GitHubReleasePat)
   displayName: Publish Release Draft
diff --git a/tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml b/tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml
index 8404e64e0ef..b34cc4c75b6 100644
--- a/tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release/approvalJob.yml
@@ -16,9 +16,13 @@ parameters:
     values:
         - resume
         - reject
+  - name: dependsOnJob
+    type: string
+    default: ''
 
 jobs:
   - job: ${{ parameters.jobName }}
+    dependsOn: ${{ parameters.dependsOnJob }}
     displayName: ${{ parameters.displayName }}
     pool: server
     timeoutInMinutes: 4320 # job times out in 3 days

From 3f25ea91d05e9c5058493620c26606b8c8a4cff6 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 9 Aug 2022 23:09:42 +0000
Subject: [PATCH 541/645] Merged PR 22048: Add change log for 7.3.0-preview.7
 and .spelling file

Add change log for 7.3.0-preview.7 and .spelling file
---
 .spelling            |  20 ++++++++
 CHANGELOG/preview.md | 116 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/.spelling b/.spelling
index 5bd81a0135b..8f8bbd2ca61 100644
--- a/.spelling
+++ b/.spelling
@@ -49,6 +49,7 @@ alpha.9
 alternatestream
 alvarodelvalle
 amd64
+ananya26-vishnoi
 andschwa
 anmenaga
 api
@@ -110,6 +111,7 @@ catchable
 cdxml
 celsius
 CentOS
+codeql-action
 cgmanifest
 CGManifest
 changelog
@@ -124,6 +126,7 @@ checkbox
 checksum
 chibi
 childitem
+ChuckieChen945
 ChrisLGardner
 cimsession
 cimsupport
@@ -232,6 +235,7 @@ displaydataquery
 Distribution_Request.md
 distro
 distros
+dkaszews
 dll
 dlls
 dlwyatt
@@ -294,6 +298,7 @@ fbehrens
 felixfbecker
 ffeldhaus
 ffi
+fflaten
 filecatalog
 filename
 filesystem
@@ -387,6 +392,7 @@ Higinbotham
 himura2la
 hololens
 homebrew
+hostifaces
 hostname
 hotfix
 httpbin.org
@@ -506,6 +512,7 @@ markekraus
 marktiedemann
 Marusyk
 MarvTheRobot
+mattifestation
 matt9ucci
 mcbobke
 md
@@ -522,11 +529,13 @@ Microsoft.ApplicationInsights
 Microsoft.CodeAnalysis.CSharp
 Microsoft.CodeAnalysis.NetAnalyzers
 microsoft.com
+Microsoft.Management
 microsoft.management.infrastructure.cimcmdlets
 microsoft.management.infrastructure.native
 Microsoft.Management.Infrastructure.Runtime.Win
 microsoft.net.test.sdk
 microsoft.powershell.archive
+Microsoft.PowerShell.Commands
 microsoft.powershell.commands.diagnostics
 microsoft.powershell.commands.management
 microsoft.powershell.commands.utility
@@ -542,6 +551,7 @@ microsoft.powershell.psreadline
 microsoft.powershell.security
 microsoft.powershell.utility
 Microsoft.Security.Extensions
+Microsoft.WSMan
 microsoft.wsman.management
 microsoft.wsman.runtime
 mikeTWC1984
@@ -549,7 +559,9 @@ mirichmo
 mjanko5
 mkdir
 mklement0
+ModuleCmdletBase.cs
 MohiTheFish
+Molkree
 move-itemproperty
 ms-psrp
 msbuild
@@ -639,6 +651,7 @@ parameterbindercontroller
 parameterbinding
 ParenExpression
 ParseError.ToString
+Path.Join
 pathresolution
 PathResolvedToMultiple
 patochun
@@ -649,6 +662,7 @@ payette
 perf
 perfview
 perfview.exe
+peter-evans
 petseral
 plaintext
 pluggable
@@ -677,6 +691,7 @@ pre-build
 pre-compiled
 pre-generated
 pre-installed
+pre-parse
 pre-release
 pre-releases
 pre-requisites
@@ -703,6 +718,7 @@ preview.7.20358.6
 preview.7.20364.3
 preview.7.20366.2
 preview.7.20366.15
+preview.7.22377.5
 preview.4.20258.7
 preview.4.20229.10
 preview.4.22252.9
@@ -821,6 +837,7 @@ runspaceinit
 runspaces
 runtime
 runtimes
+Ryan-Hutchison-USAF
 SA1026CodeMustNotContainSpaceAfterNewKeywordInImplicitlyTypedArrayAllocation
 Saancreed
 sample-dotnet1
@@ -914,6 +931,7 @@ System.IO.Packaging
 System.InvalidOperationException
 system.manage
 system.management.automation
+System.Management.Automation.utils
 systemd
 SytzeAndr
 tabcompletion
@@ -1029,9 +1047,11 @@ v7.2.2
 v7.3.0
 validatenotnullorempty
 ValidateSet
+varunsh-coder
 versioned
 versioning
 vexx32
+Virtualization
 visualstudio
 vmsilvamolina
 vorobev
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index 56ffbc92083..cf80d139a56 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,5 +1,121 @@
 # Current preview release
 
+## [7.3.0-preview.7] - 2022-08-09
+
+### Breaking Changes
+
+- Move the type data definition of `System.Security.AccessControl.ObjectSecurity` to the `Microsoft.PowerShell.Security` module (#16355) (Thanks @iSazonov!)
+
+### Engine Updates and Fixes
+
+- Enable searching for assemblies in `GAC_Arm64` on Windows (#17816)
+- Fix parser exception in using statements with empty aliases (#16745) (Thanks @MartinGC94!)
+- Do not always collapse space between parameter and value for native arguments. (#17708)
+- Remove `PSNativePSPathResolution` experimental feature (#17670)
+
+### General Cmdlet Updates and Fixes
+
+- Fix for deserializing imported ordered dictionary (#15545) (Thanks @davidBar-On!)
+- Make generated implicit remoting modules backwards compatible with PowerShell 5.1 (#17227) (Thanks @Tadas!)
+- Re-enable IDE0031: Use Null propagation (#17811) (Thanks @fflaten!)
+- Allow commands to still be executed even if the current working directory no longer exists (#17579)
+- Stop referencing `Microsoft.PowerShell.Security` when the core snapin is used (#17771)
+- Add support for HTTPS with `Set-AuthenticodeSignature -TimeStampServer` (#16134) (Thanks @Ryan-Hutchison-USAF!)
+- Add type accelerator `ordered` for `OrderedDictionary` (#17804) (Thanks @fflaten!)
+- Fix the definition of the `PDH_COUNTER_INFO` struct (#17779)
+- Adding Virtualization Based Security feature names to Get-ComputerInfo (#16415) (Thanks @mattifestation!)
+- Fix `FileSystemProvider` to work with volume and pipe paths (#15873)
+- Remove pre-parse for array-based JSON (#15684) (Thanks @strawgate!)
+- Improve type inference for `$_` (#17716) (Thanks @MartinGC94!)
+- Prevent braces from being removed when completing variables (#17751) (Thanks @MartinGC94!)
+- Fix type inference for `ICollection` (#17752) (Thanks @MartinGC94!)
+- Fix `Test-Json` not handling non-object types at root (#17741) (Thanks @dkaszews!)
+- Change `Get-ChildItem` to treat trailing slash in path as indicating a directory when used with `-Recurse` (#17704)
+- Add `find.exe` to legacy argument binding behavior for Windows (#17715)
+- Add completion for index expressions for dictionaries (#17619) (Thanks @MartinGC94!)
+- Fix enum-ranges for `ValidateRange` in proxy commands (#17572) (Thanks @fflaten!)
+- Fix type completion for attribute tokens (#17484) (Thanks @MartinGC94!)
+- Add `-noprofileloadtime` switch to `pwsh` (#17535) (Thanks @rkeithhill!)
+- Fix legacy `ErrorView` types to use `$host.PrivateData` colors (#17705)
+- Improve dynamic parameter tab completion (#17661) (Thanks @MartinGC94!)
+- Avoid binding positional parameters when completing parameter in front of value (#17693) (Thanks @MartinGC94!)
+- Render decimal numbers in a table using current culture (#17650)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@fflaten, @Molkree, @eltociear</p>
+
+</summary>
+
+<ul>
+<li>Fix other path constructions using <code>Path.Join</code> (#17825)</li>
+<li>Use null propagation (#17787)(#17789)(#17790)(#17791)(#17792)(#17795) (Thanks @fflaten!)</li>
+<li>Re-enable compound assignment preference (#17784) (Thanks @Molkree!)</li>
+<li>Use null-coalescing assignment (#17719)(#17720)(#17721)(#17722)(#17723)(#17724)(#17725)(#17726)(#17727)(#17728)(#17729) (Thanks @Molkree!)</li>
+<li>Disable the warning <code>IDE0031</code> to take .NET 7 Preview 7 (#17770)</li>
+<li>Fix typo in <ode>ModuleCmdletBase.cs</code> (#17714) (Thanks @eltociear!)</li>
+</ul>
+
+</details>
+
+### Tests
+
+- Re-enable tests because the corresponding dotnet issues were fixed (#17839)
+- Add test for `LanguageMode` using remoting (#17803) (Thanks @fflaten!)
+- Fix test perf by stopping ongoing `write-progress` (#17749) (Thanks @fflaten!)
+- Re-enable the test `TestLoadNativeInMemoryAssembly` (#17738)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@varunsh-coder, @dkaszews, @Molkree, @ChuckieChen945</p>
+
+</summary>
+
+<ul>
+<li>Update release pipeline to use Approvals and automate some manual tasks (#17837)</li>
+<li>Add GitHub token permissions for workflows (#17781) (Thanks @varunsh-coder!)</li>
+<li>Bump actions/github-script from 3 to 6 (#17842)</li>
+<li>Bump cirrus-actions/rebase from 1.6 to 1.7 (#17843)</li>
+<li>Remove unneeded verbose message in build (#17840)</li>
+<li>Detect default runtime using dotnet --info in build.psm1 (#17818) (Thanks @dkaszews!)</li>
+<li>Bump <code>actions/checkout</code> from 2 to 3 (#17828)</li>
+<li>Bump <code>actions/download-artifact</code> from 2 to 3 (#17829)</li>
+<li>Bump <code>github/codeql-action</code> from 1 to 2 (#17830)</li>
+<li>Bump <code>peter-evans/create-pull-request</code> from 3 to 4 (#17831)</li>
+<li>Bump <code>actions/upload-artifact</code> from 2 to 3 (#17832)</li>
+<li>Enable Dependabot for GitHub Actions (#17775) (Thanks @Molkree!)</li>
+<li>Update .NET SDK version from <code>7.0.100-preview.6.22352.1</code> to <code>7.0.100-preview.7.22377.5</code> (#17776)</li>
+<li>Fix a bug in <code>install-powershell.ps1</code> (#17794) (Thanks @ChuckieChen945!)</li>
+<li>Bump xunit from 2.4.1 to 2.4.2 (#17817)</li>
+<li>Update how to update homebrew (#17798)</li>
+<li>Don't run link check on forks (#17797)</li>
+<li>Update dotnetmetadata.json to start consuming .NET 7 preview 7 builds (#17736)</li>
+<li>Bump PackageManagement from 1.4.7 to 1.4.8.1 (#17709)</li>
+<li>Exclude ARM images from running in CI (#17713)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update the comment about why R2R is disabled (#17850)
+- Update changelog and `.spelling` for `7.3.0-preview.6` release (#17835)
+- Updated `ADOPTERS.md` for Power BI (#17766)
+- Update README.md with the current Fedora version (#15717) (Thanks @ananya26-vishnoi!)
+- Update `README` and `metadata.json` for next release (#17676) (Thanks @SeeminglyScience!)
+
+[7.3.0-preview.7]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.6...v7.3.0-preview.7
+
 ## [7.3.0-preview.6] - 2022-07-18
 
 ### General Cmdlet Updates and Fixes

From 6583b805b61b800addce81d1f09e63a7e4ef499e Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 11 Aug 2022 15:46:59 -0700
Subject: [PATCH 542/645] Fix script by adding quotes

---
 .../azureDevOps/templates/release-CreateGitHubDraft.yml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
index 035adae0c84..426e58e0f64 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
@@ -57,7 +57,7 @@ steps:
       $semanticVersion.Major + "." + $semanticVersion.Minor + ".md"
     }
 
-    $filePath = $env:BUILD_SOURCESDIRECTORY/CHANGELOG/$fileName
+    $filePath = "$env:BUILD_SOURCESDIRECTORY/CHANGELOG/$fileName"
     Write-Verbose -Verbose "Selected Log file: $filePath"
 
     if (-not (Test-Path $filePath)) {

From 9d4e381de20c66f87f8deb9b065691ff0de4dc4b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 11 Aug 2022 16:15:03 -0700
Subject: [PATCH 543/645] Remove raw to process changelog line by line

---
 .../azureDevOps/templates/release-CreateGitHubDraft.yml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
index 426e58e0f64..b32c812430e 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
@@ -64,7 +64,7 @@ steps:
       throw "$filePath not found"
     }
 
-    $changelog = Get-Content -Raw -Path $filePath
+    $changelog = Get-Content -Path $filePath
 
     $startPattern = "^## \[" + ([regex]::Escape($releaseVersion)) + "\]"
     $endPattern = "^## \[{0}\.{1}\.{2}*" -f $semanticVersion.Major, $semanticVersion.Minor, $semanticVersion.Patch

From 2412ee82bb5b0133be65c776f325f02b11a8ecea Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 11 Aug 2022 16:38:39 -0700
Subject: [PATCH 544/645] Add Out-String to make the description a single
 string

---
 .../azureDevOps/templates/release-CreateGitHubDraft.yml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
index b32c812430e..9e439db7366 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
@@ -73,7 +73,7 @@ steps:
         if ($_ -match $startPattern) { $outputLine = $true }
         elseif ($_ -match $endPattern) { $outputLine = $false }
         if ($outputLine) { $_}
-      }
+      } | Out-String
 
     Write-Verbose -Verbose "Selected content: `n$clContent"
 

From 8b244ee86e0d6c5dae34d9b0d5f1b20fd0343681 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 14:49:16 -0700
Subject: [PATCH 545/645] Update the cgmanifest (#17923)

Co-authored-by: adityapatwardhan <adityapatwardhan@users.noreply.github.com>
---
 tools/cgmanifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index 1f792a61def..f6a977a64ff 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -1235,7 +1235,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Cryptography.Xml",
-          "Version": "6.0.0"
+          "Version": "6.0.1"
         }
       },
       "DevelopmentDependency": false

From 29a6bfb6d308059ce43a2c5cdb642ae7441dde81 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 14:56:45 -0700
Subject: [PATCH 546/645] Update the cgmanifest (#17929)

---
 tools/cgmanifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index f6a977a64ff..a290afb3c9c 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -35,7 +35,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.ApplicationInsights",
-          "Version": "2.20.0"
+          "Version": "2.21.0"
         }
       },
       "DevelopmentDependency": false

From 82ffcc4a7bda409674a20efeb000b4698da993ea Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 14:57:16 -0700
Subject: [PATCH 547/645] [release/v7.3.0-rc.1] Make sure
 `Security.types.ps1xml` gets signed in release build (#17930)

---
 tools/releaseBuild/azureDevOps/templates/windows-packaging.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index 7cd0f5e33a4..cb5b7ea8e7b 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -104,6 +104,7 @@ jobs:
         "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Host\Microsoft.PowerShell.Host.psd1" = "Modules\Microsoft.PowerShell.Host"
         "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Management\Microsoft.PowerShell.Management.psd1" = "Modules\Microsoft.PowerShell.Management"
         "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Security\Microsoft.PowerShell.Security.psd1" = "Modules\Microsoft.PowerShell.Security"
+        "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Security\Security.types.ps1xml" = "Modules\Microsoft.PowerShell.Security"
         "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Utility\Microsoft.PowerShell.Utility.psd1" = "Modules\Microsoft.PowerShell.Utility"
         "$($fullSymbolsFolder)\Modules\Microsoft.WSMan.Management\Microsoft.WSMan.Management.psd1" = "Modules\Microsoft.WSMan.Management"
         "$($fullSymbolsFolder)\Modules\Microsoft.WSMan.Management\WSMan.format.ps1xml" = "Modules\Microsoft.WSMan.Management"

From ff1d67980b043ef0655497b35a52380268a34cf9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 22:14:39 +0000
Subject: [PATCH 548/645] Complete ongoing `write-progress` (#17922)

---
 .../Microsoft.PowerShell.Utility/Write-Progress.Tests.ps1     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Progress.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Progress.Tests.ps1
index 6e6c9ee57c4..0f62cbcb6a6 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Progress.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Progress.Tests.ps1
@@ -24,6 +24,8 @@ Describe "Write-Progress DRT Unit Tests" -Tags "CI" {
     }
 
     It 'Activity longer than console width works' {
-        { Write-Progress -Activity ('a' * ([console]::WindowWidth + 1)) -Status ('b' * ([console]::WindowWidth + 1)) -Id 1 } | Should -Not -Throw
+        $activity = 'a' * ([console]::WindowWidth + 1)
+        { Write-Progress -Activity $activity -Status ('b' * ([console]::WindowWidth + 1)) -Id 1 } | Should -Not -Throw
+        Write-Progress -Activity $activity -Id 1 -Completed
     }
 }

From 9e01a404d47d39a3c8b28278d8fede1ac053d96f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 22:25:43 +0000
Subject: [PATCH 549/645] Update to use version 2.21.0 of Application Insights.
 (#17927)

---
 .../System.Management.Automation.csproj                         | 2 +-
 src/System.Management.Automation/utils/Telemetry.cs             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index cc867501e8b..602c5fbffad 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -14,7 +14,7 @@
     <!-- 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.20.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
     <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.7.22375.6" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.7.22375.6" />
diff --git a/src/System.Management.Automation/utils/Telemetry.cs b/src/System.Management.Automation/utils/Telemetry.cs
index 625f9571651..3d9f3c9e1f7 100644
--- a/src/System.Management.Automation/utils/Telemetry.cs
+++ b/src/System.Management.Automation/utils/Telemetry.cs
@@ -143,7 +143,7 @@ static ApplicationInsightsTelemetry()
             {
                 s_sessionId = Guid.NewGuid().ToString();
                 TelemetryConfiguration configuration = TelemetryConfiguration.CreateDefault();
-                configuration.InstrumentationKey = _psCoreTelemetryKey;
+                configuration.ConnectionString = "InstrumentationKey=" + _psCoreTelemetryKey;
 
                 // Set this to true to reduce latency during development
                 configuration.TelemetryChannel.DeveloperMode = false;

From f7a6f34ad28dfd6d18cfa15d7121bd325d8ec4f1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 18 Aug 2022 22:39:18 +0000
Subject: [PATCH 550/645] [release/v7.3.0-rc.1] Update list of PS team members
 in release tools (#17928)

---
 tools/releaseTools.psm1 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/releaseTools.psm1 b/tools/releaseTools.psm1
index c900135aaee..388f3654c37 100644
--- a/tools/releaseTools.psm1
+++ b/tools/releaseTools.psm1
@@ -33,15 +33,14 @@ class CommitNode {
 # These powershell team members don't use 'microsoft.com' for Github email or choose to not show their emails.
 # We have their names in this array so that we don't need to query GitHub to find out if they are powershell team members.
 $Script:powershell_team = @(
-    "Robert Holt"
     "Travis Plunk"
     "dependabot-preview[bot]"
     "dependabot[bot]"
-    "Joey Aiello"
-    "Tyler James Leonhardt"
+    "github-actions[bot]"
     "Anam Navied"
     "Andrew Schwartzmeyer"
     "Jason Helmick"
+    "Patrick Meinecke"
 )
 
 # They are very active contributors, so we keep their email-login mappings here to save a few queries to Github.

From edc15565acd4cf0e22c0cb802b6be9d6b72b4731 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 19 Aug 2022 17:18:38 +0000
Subject: [PATCH 551/645] Bump Microsoft.NET.Test.Sdk from 17.2.0 to 17.3.0
 (#17924)

---
 test/xUnit/xUnit.tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index 6579631951d..797f1bd52be 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageReference Include="XunitXml.TestLogger" Version="3.0.70" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
   </ItemGroup>
 
   <ItemGroup>

From a2b0d6461f224fa029890418e94f40eb80a2d693 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 26 Aug 2022 17:41:33 +0000
Subject: [PATCH 552/645] Update to the latest NOTICES file (#17926)

---
 ThirdPartyNotices.txt | 39 +--------------------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 64621d33567..cf58fe4e9c8 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -3118,46 +3118,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.Xml 6.0.0 - MIT
+System.Security.Cryptography.Xml 6.0.1 - MIT
 
 
-(c) Microsoft Corporation.
-Copyright (c) Andrew Arnott
-Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2017 Yoshifumi Kawai
-Copyright (c) Microsoft Corporation
-Copyright (c) 2007 James Newton-King
-Copyright (c) 2012-2014, Yann Collet
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Copyright (c) 2018 Alexander Chermyanin
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2013-2017, Milosz Krajewski
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2019 Microsoft Corporation, Daan Leijen
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
-Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 

From e55db842a4bf8f964382199e28be1147caa0dd34 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 Aug 2022 14:28:25 -0700
Subject: [PATCH 553/645] [release/v7.3.0-rc.1] Make Register MU timeout
 (#17995)

---
 .../RegisterMicrosoftUpdate.ps1               | 70 +++++++++++++++++++
 assets/wix/Product.wxs                        |  2 +-
 assets/wix/files.wxs                          |  4 ++
 .../powershell-win-core.csproj                |  2 +-
 4 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 assets/MicrosoftUpdate/RegisterMicrosoftUpdate.ps1

diff --git a/assets/MicrosoftUpdate/RegisterMicrosoftUpdate.ps1 b/assets/MicrosoftUpdate/RegisterMicrosoftUpdate.ps1
new file mode 100644
index 00000000000..fd341d4fbef
--- /dev/null
+++ b/assets/MicrosoftUpdate/RegisterMicrosoftUpdate.ps1
@@ -0,0 +1,70 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+param(
+    [ValidateSet('Hang', 'Fail')]
+    $TestHook
+)
+
+$waitTimeoutSeconds = 300
+switch ($TestHook) {
+    'Hang' {
+        $waitTimeoutSeconds = 10
+        $jobScript = { Start-Sleep -Seconds 600 }
+    }
+    'Fail' {
+        $jobScript = { throw "This job script should fail" }
+    }
+    default {
+        $jobScript = {
+            # This registers Microsoft Update via a predifened GUID with the Windows Update Agent.
+            # https://docs.microsoft.com/en-us/windows/win32/wua_sdk/opt-in-to-microsoft-update
+
+            $serviceManager = (New-Object -ComObject Microsoft.Update.ServiceManager)
+            $isRegistered = $serviceManager.QueryServiceRegistration('7971f918-a847-4430-9279-4a52d1efe18d').Service.IsRegisteredWithAu
+
+            if (!$isRegistered) {
+                Write-Verbose -Verbose "Opting into Microsoft Update as the Autmatic Update Service"
+                # 7 is the combination of asfAllowPendingRegistration, asfAllowOnlineRegistration, asfRegisterServiceWithAU
+                # AU means Automatic Updates
+                $null = $serviceManager.AddService2('7971f918-a847-4430-9279-4a52d1efe18d', 7, '')
+            }
+            else {
+                Write-Verbose -Verbose "Microsoft Update is already registered for Automatic Updates"
+            }
+
+            $isRegistered = $serviceManager.QueryServiceRegistration('7971f918-a847-4430-9279-4a52d1efe18d').Service.IsRegisteredWithAu
+
+            # Return if it was successful, which is the opposite of Pending.
+            return $isRegistered
+        }
+    }
+}
+
+Write-Verbose "Running job script: $jobScript" -Verbose
+$job = Start-ThreadJob -ScriptBlock $jobScript
+
+Write-Verbose "Waiting on Job for $waitTimeoutSeconds seconds" -Verbose
+$null = Wait-Job -Job $job -Timeout $waitTimeoutSeconds
+
+if ($job.State -ne 'Running') {
+    Write-Verbose "Job finished.  State: $($job.State)" -Verbose
+    $result = Receive-Job -Job $job -Verbose
+    Write-Verbose "Result: $result" -Verbose
+    if ($result) {
+        Write-Verbose "Registration succeeded" -Verbose
+        exit 0
+    }
+    else {
+        Write-Verbose "Registration failed" -Verbose
+        # at the time this was written, the MSI is ignoring the exit code
+        exit 1
+    }
+}
+else {
+    Write-Verbose "Job timed out" -Verbose
+    Write-Verbose "Stopping Job.  State: $($job.State)" -Verbose
+    Stop-Job -Job $job
+    # at the time this was written, the MSI is ignoring the exit code
+    exit 258
+}
diff --git a/assets/wix/Product.wxs b/assets/wix/Product.wxs
index bf6ab5d7cd8..85cc0011d36 100644
--- a/assets/wix/Product.wxs
+++ b/assets/wix/Product.wxs
@@ -87,7 +87,7 @@
     <SetProperty Id="EnableMU"
                  Before="EnableMU"
                  Sequence="execute"
-                 Value="&quot;[VersionFolder]pwsh.exe&quot; -NoProfile -ExecutionPolicy Bypass -Command &quot;$null=(New-Object -ComObject Microsoft.Update.ServiceManager).AddService2('7971f918-a847-4430-9279-4a52d1efe18d', 7, '')&quot;" />
+                 Value="&quot;[VersionFolder]pwsh.exe&quot; -NoProfile -ExecutionPolicy Bypass -File &quot;[VersionFolder]RegisterMicrosoftUpdate.ps1&quot;" />
     <CustomAction Id="EnableMU"
                   BinaryKey="WixCA"
                   DllEntry="CAQuietExec"
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 6f7d0e6cbc5..4da5773c5e4 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3150,6 +3150,9 @@
       <Component Id="cmp0721DF55B34849B78C98AE00D863CBFF">
         <File Id="fil72E7B79A9B10498CBE884076BC863617" KeyPath="yes" Source="$(var.ProductSourcePath)\clrgc.dll" />
       </Component>
+      <Component Id="cmp42A739F2AAC24D729DDBCAA096B8C55A">
+        <File Id="fil48314E2AC49B4E208C5667CEC50CA78C" KeyPath="yes" Source="$(var.ProductSourcePath)\RegisterMicrosoftUpdate.ps1" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -4162,6 +4165,7 @@
       <ComponentRef Id="cmpD182C2F62588471F82252B0038C75327" />
       <ComponentRef Id="cmpF3EB02BB62A34F509B22CC370C430A20" />
       <ComponentRef Id="cmp16FC1857F01A4E388616BA7AA8CC5F73" />
+      <ComponentRef Id="cmp42A739F2AAC24D729DDBCAA096B8C55A" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/src/powershell-win-core/powershell-win-core.csproj b/src/powershell-win-core/powershell-win-core.csproj
index 16f625827d4..9879e8485b4 100644
--- a/src/powershell-win-core/powershell-win-core.csproj
+++ b/src/powershell-win-core/powershell-win-core.csproj
@@ -29,7 +29,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
-    <Content Include="..\..\LICENSE.txt;..\..\ThirdPartyNotices.txt;..\powershell-native\Install-PowerShellRemoting.ps1;..\PowerShell.Core.Instrumentation\PowerShell.Core.Instrumentation.man;..\PowerShell.Core.Instrumentation\RegisterManifest.ps1;..\..\assets\GroupPolicy\PowerShellCoreExecutionPolicy.admx;..\..\assets\GroupPolicy\PowerShellCoreExecutionPolicy.adml;..\..\assets\GroupPolicy\InstallPSCorePolicyDefinitions.ps1">
+    <Content Include="..\..\LICENSE.txt;..\..\ThirdPartyNotices.txt;..\powershell-native\Install-PowerShellRemoting.ps1;..\PowerShell.Core.Instrumentation\PowerShell.Core.Instrumentation.man;..\PowerShell.Core.Instrumentation\RegisterManifest.ps1;..\..\assets\MicrosoftUpdate\RegisterMicrosoftUpdate.ps1;..\..\assets\GroupPolicy\PowerShellCoreExecutionPolicy.admx;..\..\assets\GroupPolicy\PowerShellCoreExecutionPolicy.adml;..\..\assets\GroupPolicy\InstallPSCorePolicyDefinitions.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>

From 72454c98a50b369eef530040204c22331659257f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 2 Sep 2022 12:35:48 -0700
Subject: [PATCH 554/645] Update to the latest NOTICES file (#17996)

---
 ThirdPartyNotices.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index cf58fe4e9c8..b2e206b7783 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -141,10 +141,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 ---------------------------------------------------------
 
-Microsoft.ApplicationInsights 2.20.0 - MIT
+Microsoft.ApplicationInsights 2.21.0 - MIT
 
 
-(c) Microsoft Corporation.
 
 MIT License
 

From 3c745d0c9246461ffb5ae6250e2487061f72e6ac Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 6 Sep 2022 15:12:10 -0700
Subject: [PATCH 555/645] [release/v7.3.0-rc.1] Add XML reference documents to
 NuPkg files for SDK (#18017)

---
 tools/packaging/packaging.psm1 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 2e278182f9b..775270acaba 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -2108,7 +2108,7 @@ function New-ILNugetPackageSource
 
     #region ref
     $refFolder = New-Item (Join-Path $filePackageFolder.FullName "ref/$script:netCoreRuntime") -ItemType Directory -Force
-    CopyReferenceAssemblies -assemblyName $fileBaseName -refBinPath $refBinPath -refNugetPath $refFolder -assemblyFileList $fileList
+    CopyReferenceAssemblies -assemblyName $fileBaseName -refBinPath $refBinPath -refNugetPath $refFolder -assemblyFileList $fileList -winBinPath $WinFxdBinPath
     #endregion ref
 
     $packageRuntimesFolderPath = $packageRuntimesFolder.FullName
@@ -2257,7 +2257,8 @@ function CopyReferenceAssemblies
         [string] $assemblyName,
         [string] $refBinPath,
         [string] $refNugetPath,
-        [string[]] $assemblyFileList
+        [string[]] $assemblyFileList,
+        [string] $winBinPath
     )
 
     $supportedRefList = @(
@@ -2286,7 +2287,8 @@ function CopyReferenceAssemblies
         default {
             $ref_SMA = Join-Path -Path $refBinPath -ChildPath System.Management.Automation.dll
             $ref_doc = Join-Path -Path $refBinPath -ChildPath System.Management.Automation.xml
-            Copy-Item $ref_SMA, $ref_doc -Destination $refNugetPath -Force
+            $self_ref_doc = Join-Path -Path $winBinPath -ChildPath "$assemblyName.xml"
+            Copy-Item $ref_SMA, $ref_doc, $self_ref_doc -Destination $refNugetPath -Force
             Write-Log "Copied file '$ref_SMA' and '$ref_doc' to '$refNugetPath'"
         }
     }

From 4d5d690b3cde923358a5082ce1004e627ddb9ede Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 17:17:24 -0700
Subject: [PATCH 556/645] [release/v7.3.0-rc.1] Update `README.md` and
 `metadata.json` for the next releases (#17925)

---
 README.md           | 82 ++++++++++++++++++++++-----------------------
 tools/metadata.json | 12 +++----
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/README.md b/README.md
index 518bf2ba212..49061b9d33a 100644
--- a/README.md
+++ b/README.md
@@ -64,49 +64,49 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 | 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.5/PowerShell-7.2.5-win-x86.msi
-[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x64.msi
-[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-lts_7.2.5-1.deb_amd64.deb
-[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-lts-7.2.5-1.rh.x86_64.rpm
-[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-lts-7.2.5-osx-x64.pkg
-[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-lts-7.2.5-osx-arm64.pkg
-
-[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x64.msi
-[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x86.msi
-[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell_7.2.5-1.deb_amd64.deb
-[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell_7.2.5-1.deb_amd64.deb
-[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell_7.2.5-1.deb_amd64.deb
-[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell_7.2.5-1.deb_amd64.deb
-[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell_7.2.5-1.deb_amd64.deb
-[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell_7.2.5-1.deb_amd64.deb
-[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-1.rh.x86_64.rpm
-[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-1.rh.x86_64.rpm
-[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-osx-x64.pkg
-[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-osx-arm64.pkg
-[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-arm64.zip
-[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x86.zip
-[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x64.zip
-[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-osx-x64.tar.gz
-[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-osx-arm64.tar.gz
-[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-linux-x64.tar.gz
-[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-linux-arm32.tar.gz
-[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-linux-arm64.tar.gz
+[lts-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/PowerShell-7.2.6-win-x86.msi
+[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/PowerShell-7.2.6-win-x64.msi
+[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell-lts_7.2.6-1.deb_amd64.deb
+[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell-lts-7.2.6-1.rh.x86_64.rpm
+[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell-lts-7.2.6-osx-x64.pkg
+[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell-lts-7.2.6-osx-arm64.pkg
+
+[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/PowerShell-7.2.6-win-x64.msi
+[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/PowerShell-7.2.6-win-x86.msi
+[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell_7.2.6-1.deb_amd64.deb
+[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell_7.2.6-1.deb_amd64.deb
+[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell_7.2.6-1.deb_amd64.deb
+[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell_7.2.6-1.deb_amd64.deb
+[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell_7.2.6-1.deb_amd64.deb
+[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell_7.2.6-1.deb_amd64.deb
+[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell-7.2.6-1.rh.x86_64.rpm
+[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell-7.2.6-1.rh.x86_64.rpm
+[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell-7.2.6-osx-x64.pkg
+[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell-7.2.6-osx-arm64.pkg
+[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/PowerShell-7.2.6-win-arm64.zip
+[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/PowerShell-7.2.6-win-x86.zip
+[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/PowerShell-7.2.6-win-x64.zip
+[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell-7.2.6-osx-x64.tar.gz
+[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell-7.2.6-osx-arm64.tar.gz
+[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell-7.2.6-linux-x64.tar.gz
+[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell-7.2.6-linux-arm32.tar.gz
+[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/powershell-7.2.6-linux-arm64.tar.gz
 [rl-snap]: https://snapcraft.io/powershell
 
-[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/PowerShell-7.3.0-preview.6-win-x64.msi
-[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/PowerShell-7.3.0-preview.6-win-x86.msi
-[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-preview_7.3.0-preview.6-1.deb_amd64.deb
-[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-preview-7.3.0_preview.6-1.rh.x86_64.rpm
-[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-osx-x64.pkg
-[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-osx-arm64.pkg
-[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/PowerShell-7.3.0-preview.6-win-arm64.zip
-[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/PowerShell-7.3.0-preview.6-win-x86.zip
-[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/PowerShell-7.3.0-preview.6-win-x64.zip
-[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-osx-x64.tar.gz
-[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-osx-arm64.tar.gz
-[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-linux-x64.tar.gz
-[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-linux-arm32.tar.gz
-[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.6/powershell-7.3.0-preview.6-linux-arm64.tar.gz
+[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/PowerShell-7.3.0-preview.7-win-x64.msi
+[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/PowerShell-7.3.0-preview.7-win-x86.msi
+[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/powershell-preview_7.3.0-preview.7-1.deb_amd64.deb
+[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/powershell-preview-7.3.0_preview.7-1.rh.x86_64.rpm
+[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/powershell-7.3.0-preview.7-osx-x64.pkg
+[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/powershell-7.3.0-preview.7-osx-arm64.pkg
+[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/PowerShell-7.3.0-preview.7-win-arm64.zip
+[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/PowerShell-7.3.0-preview.7-win-x86.zip
+[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/PowerShell-7.3.0-preview.7-win-x64.zip
+[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/powershell-7.3.0-preview.7-osx-x64.tar.gz
+[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/powershell-7.3.0-preview.7-osx-arm64.tar.gz
+[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/powershell-7.3.0-preview.7-linux-x64.tar.gz
+[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/powershell-7.3.0-preview.7-linux-arm32.tar.gz
+[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.3.0-preview.7/powershell-7.3.0-preview.7-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
diff --git a/tools/metadata.json b/tools/metadata.json
index 986bd104fab..44192df371d 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,10 +1,10 @@
 {
-  "StableReleaseTag": "v7.2.5",
-  "PreviewReleaseTag": "v7.3.0-preview.6",
-  "ServicingReleaseTag": "v7.0.11",
-  "ReleaseTag": "v7.2.5",
-  "LTSReleaseTag" : ["v7.2.5", "v7.0.11"],
-  "NextReleaseTag": "v7.3.0-preview.7",
+  "StableReleaseTag": "v7.2.6",
+  "PreviewReleaseTag": "v7.3.0-preview.7",
+  "ServicingReleaseTag": "v7.0.12",
+  "ReleaseTag": "v7.2.6",
+  "LTSReleaseTag" : ["v7.2.6", "v7.0.12"],
+  "NextReleaseTag": "v7.3.0-preview.8",
   "LTSRelease": { "Latest": false, "Package": false },
   "StableRelease":  { "Latest": false, "Package": false }
 }

From 7627e999a7908d98bebb95ef72170b61293b8d7a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 22:02:44 -0700
Subject: [PATCH 557/645] [release/v7.3.0-rc.1] Revert "Add `-StrictMode` to
 `Invoke-Command` to allow specifying strict mode when invoking command
 locally" (#18074)

---
 experimental-feature-linux.json               |   1 -
 experimental-feature-windows.json             |   1 -
 .../ExperimentalFeature.cs                    |   4 -
 .../remoting/commands/InvokeCommandCommand.cs | 122 ++----------------
 .../Invoke-Command.Tests.ps1                  |  41 ------
 5 files changed, 13 insertions(+), 156 deletions(-)
 delete mode 100644 test/powershell/Modules/Microsoft.PowerShell.Core/Invoke-Command.Tests.ps1

diff --git a/experimental-feature-linux.json b/experimental-feature-linux.json
index b0a5a696381..561e7b46c43 100644
--- a/experimental-feature-linux.json
+++ b/experimental-feature-linux.json
@@ -8,6 +8,5 @@
   "PSNativeCommandArgumentPassing",
   "PSNativeCommandErrorActionPreference",
   "PSRemotingSSHTransportErrorHandling",
-  "PSStrictModeAssignment",
   "PSSubsystemPluginModel"
 ]
diff --git a/experimental-feature-windows.json b/experimental-feature-windows.json
index b0a5a696381..561e7b46c43 100644
--- a/experimental-feature-windows.json
+++ b/experimental-feature-windows.json
@@ -8,6 +8,5 @@
   "PSNativeCommandArgumentPassing",
   "PSNativeCommandErrorActionPreference",
   "PSRemotingSSHTransportErrorHandling",
-  "PSStrictModeAssignment",
   "PSSubsystemPluginModel"
 ]
diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index 8a3e428b9c4..524d21d896a 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -27,7 +27,6 @@ public class ExperimentalFeature
         internal const string PSCleanBlockFeatureName = "PSCleanBlock";
         internal const string PSAMSIMethodInvocationLogging = "PSAMSIMethodInvocationLogging";
         internal const string PSExecFeatureName = "PSExec";
-        internal const string PSStrictModeAssignment = "PSStrictModeAssignment";
 
         #endregion
 
@@ -140,9 +139,6 @@ static ExperimentalFeature()
                 new ExperimentalFeature(
                     name: PSExecFeatureName,
                     description: "Add 'exec' built-in command on Linux and macOS"),
-                new ExperimentalFeature(
-                    name: PSStrictModeAssignment,
-                    description: "Add support of setting Strict-Mode with Invoke-Command"),
             };
 
             EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);
diff --git a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
index 804355d2e8d..a2a2397cb7a 100644
--- a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
@@ -263,72 +263,6 @@ public override SwitchParameter UseSSL
             }
         }
 
-        private sealed class ArgumentToPSVersionTransformationAttribute : ArgumentToVersionTransformationAttribute
-        {
-            protected override bool TryConvertFromString(string versionString, [NotNullWhen(true)] out Version version)
-            {
-                if (string.Equals("off", versionString, StringComparison.OrdinalIgnoreCase))
-                {
-                    version = new Version(0, 0);
-                    return true;
-                }
-
-                if (string.Equals("latest", versionString, StringComparison.OrdinalIgnoreCase))
-                {
-                    version = PSVersionInfo.PSVersion;
-                    return true;
-                }
-
-                return base.TryConvertFromString(versionString, out version);
-            }
-        }
-
-        private static readonly Version s_OffVersion = new Version(0, 0);
-
-        private sealed class ValidateVersionAttribute : ValidateArgumentsAttribute
-        {
-            protected override void Validate(object arguments, EngineIntrinsics engineIntrinsics)
-            {
-                Version version = arguments as Version;
-                if (version == s_OffVersion)
-                {
-                    return;
-                }
-
-                if (version == null || !PSVersionInfo.IsValidPSVersion(version))
-                {
-                    // No conversion succeeded so throw an exception...
-                    throw new ValidationMetadataException(
-                        "InvalidPSVersion",
-                        null,
-                        Metadata.ValidateVersionFailure,
-                        arguments);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets strict mode.
-        /// </summary>
-        [Experimental(ExperimentalFeature.PSStrictModeAssignment, ExperimentAction.Show)]
-        [Parameter(ParameterSetName = InvokeCommandCommand.InProcParameterSet)]
-        [ArgumentToPSVersionTransformation]
-        [ValidateVersion]
-        public Version StrictMode
-        {
-            get
-            {
-                return _strictmodeversion;
-            }
-
-            set
-            {
-                _strictmodeversion = value;
-            }
-        }
-
-        private Version _strictmodeversion = null;
-
         /// <summary>
         /// For WSMan session:
         /// If this parameter is not specified then the value specified in
@@ -908,8 +842,6 @@ public virtual SwitchParameter RemoteDebug
 
         #endregion
 
-        private Version _savedStrictModeVersion;
-
         #endregion Parameters
 
         #region Overrides
@@ -1033,12 +965,6 @@ protected override void BeginProcessing()
                     }
                 }
 
-                if (_strictmodeversion != null)
-                {
-                    _savedStrictModeVersion = Context.EngineSessionState.CurrentScope.StrictModeVersion;
-                    Context.EngineSessionState.CurrentScope.StrictModeVersion = _strictmodeversion;
-                }
-
                 return;
             }
 
@@ -1255,19 +1181,7 @@ protected override void ProcessRecord()
                 }
                 else if (ParameterSetName.Equals(InvokeCommandCommand.InProcParameterSet) && (_steppablePipeline != null))
                 {
-                    try
-                    {
-                        _steppablePipeline.Process(InputObject);
-                    }
-                    catch
-                    {
-                        if (_strictmodeversion != null)
-                        {
-                            Context.EngineSessionState.CurrentScope.StrictModeVersion = _savedStrictModeVersion;
-                        }
-                        
-                        throw;
-                    }
+                    _steppablePipeline.Process(InputObject);
                 }
                 else
                 {
@@ -1298,30 +1212,20 @@ protected override void EndProcessing()
             {
                 if (ParameterSetName.Equals(InvokeCommandCommand.InProcParameterSet))
                 {
-                    try
-                    {   
-                        if (_steppablePipeline != null)
-                        {
-                            _steppablePipeline.End();
-                        }
-                        else
-                        {
-                            ScriptBlock.InvokeUsingCmdlet(
-                                contextCmdlet: this,
-                                useLocalScope: !NoNewScope,
-                                errorHandlingBehavior: ScriptBlock.ErrorHandlingBehavior.WriteToCurrentErrorPipe,
-                                dollarUnder: AutomationNull.Value,
-                                input: _input,
-                                scriptThis: AutomationNull.Value,
-                                args: ArgumentList);
-                        }
+                    if (_steppablePipeline != null)
+                    {
+                        _steppablePipeline.End();
                     }
-                    finally
+                    else
                     {
-                        if (_strictmodeversion != null)
-                        {
-                            Context.EngineSessionState.CurrentScope.StrictModeVersion = _savedStrictModeVersion;
-                        }
+                        ScriptBlock.InvokeUsingCmdlet(
+                            contextCmdlet: this,
+                            useLocalScope: !NoNewScope,
+                            errorHandlingBehavior: ScriptBlock.ErrorHandlingBehavior.WriteToCurrentErrorPipe,
+                            dollarUnder: AutomationNull.Value,
+                            input: _input,
+                            scriptThis: AutomationNull.Value,
+                            args: ArgumentList);
                     }
                 }
                 else
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Invoke-Command.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Invoke-Command.Tests.ps1
deleted file mode 100644
index 1765e5d8217..00000000000
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Invoke-Command.Tests.ps1
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-Describe "Invoke-Command" -Tags "CI" {
-    Context "StrictMode tests" {
-        BeforeAll {
-            $skipTest = !($EnabledExperimentalFeatures -contains "PSStrictModeAssignment");
-            If (Test-Path Variable:InvokeCommand__Test) {
-                Remove-Item Variable:InvokeCommand__Test
-            }
-        }
-
-        It "Setting -StrictMode parameter with uninitialized variable throws error"  -skip:$skipTest {
-            { Invoke-Command -StrictMode 3.0 {$InvokeCommand__Test} } | Should -Throw -ErrorId 'VariableIsUndefined'
-        }
-
-        It "Setting -StrictMode parameter with initialized variable does not throw error" -skip:$skipTest {
-            $InvokeCommand__Test = 'Something'
-            Invoke-Command -StrictMode 3.0 {$InvokeCommand__Test} | Should -Be 'Something'
-            Remove-Item Variable:InvokeCommand__Test
-        }
-
-        It "-StrictMode parameter sets StrictMode back to original state after process completes" -skip:$skipTest {
-            { Invoke-Command -StrictMode 3.0 {$InvokeCommand__Test} } | Should -Throw -ErrorId 'VariableIsUndefined'
-            { Invoke-Command {$InvokeCommand__Test} } | Should -Not -Throw
-        }
-
-        It "-StrictMode parameter works on piped input" -skip:$skipTest {
-            "There" | Invoke-Command -ScriptBlock { "Hello $input" } -StrictMode 3.0 | Should -Be 'Hello There'
-            { "There" | Invoke-Command -ScriptBlock { "Hello $InvokeCommand__Test" } -StrictMode 3.0 } | Should -Throw -ErrorId 'VariableIsUndefined'
-        }
-
-        It "-StrictMode latest works" -skip:$skipTest {
-            { Invoke-Command -StrictMode latest {$InvokeCommand__Test} } | Should -Throw -ErrorId 'VariableIsUndefined'
-        }
-
-        It "-StrictMode off works" -skip:$skipTest {
-            { Invoke-Command -StrictMode off {$InvokeCommand__Test} } | Should -Not -Throw
-        }
-    }
-}

From ac95793f95094c2c7729db3d6b21450c9a2d26fe Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 22:03:24 -0700
Subject: [PATCH 558/645] [release/v7.3.0-rc.1] Make experimental feature
 `PSAnsiRenderingFileInfo` stable (#18078)

---
 experimental-feature-linux.json               |  1 -
 experimental-feature-windows.json             |  1 -
 .../ExperimentalFeature.cs                    |  3 -
 .../namespaces/FileSystemProvider.cs          | 55 ++++++++-----------
 .../Get-Item.Tests.ps1                        | 13 -----
 5 files changed, 22 insertions(+), 51 deletions(-)

diff --git a/experimental-feature-linux.json b/experimental-feature-linux.json
index 561e7b46c43..5484450a76c 100644
--- a/experimental-feature-linux.json
+++ b/experimental-feature-linux.json
@@ -1,6 +1,5 @@
 [
   "PSAMSIMethodInvocationLogging",
-  "PSAnsiRenderingFileInfo",
   "PSCleanBlock",
   "PSCommandNotFoundSuggestion",
   "PSExec",
diff --git a/experimental-feature-windows.json b/experimental-feature-windows.json
index 561e7b46c43..5484450a76c 100644
--- a/experimental-feature-windows.json
+++ b/experimental-feature-windows.json
@@ -1,6 +1,5 @@
 [
   "PSAMSIMethodInvocationLogging",
-  "PSAnsiRenderingFileInfo",
   "PSCleanBlock",
   "PSCommandNotFoundSuggestion",
   "PSExec",
diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index 524d21d896a..d656d577d9c 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -121,9 +121,6 @@ static ExperimentalFeature()
                 new ExperimentalFeature(
                     name: "PSLoadAssemblyFromNativeCode",
                     description: "Expose an API to allow assembly loading from native code"),
-                new ExperimentalFeature(
-                    name: "PSAnsiRenderingFileInfo",
-                    description: "Enable coloring for FileInfo objects"),
                 new ExperimentalFeature(
                     name: PSNativeCommandErrorActionPreferenceFeatureName,
                     description: "Native commands with non-zero exit codes issue errors according to $ErrorActionPreference when $PSNativeCommandUseErrorActionPreference is $true"),
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index 3c0aeaddc7b..07625fc2ab0 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -2068,43 +2068,32 @@ string ToModeString(FileSystemInfo fileSystemInfo)
         /// <returns>Name if a file or directory, Name -> Target if symlink.</returns>
         public static string NameString(PSObject instance)
         {
-            if (ExperimentalFeature.IsEnabled("PSAnsiRenderingFileInfo"))
+            if (instance?.BaseObject is FileSystemInfo fileInfo)
             {
-                if (instance?.BaseObject is FileSystemInfo fileInfo)
+                if (InternalSymbolicLinkLinkCodeMethods.IsReparsePointLikeSymlink(fileInfo))
                 {
-                    if (InternalSymbolicLinkLinkCodeMethods.IsReparsePointLikeSymlink(fileInfo))
-                    {
-                        return $"{PSStyle.Instance.FileInfo.SymbolicLink}{fileInfo.Name}{PSStyle.Instance.Reset} -> {fileInfo.LinkTarget}";
-                    }
-                    else if (fileInfo.Attributes.HasFlag(FileAttributes.Directory))
-                    {
-                        return $"{PSStyle.Instance.FileInfo.Directory}{fileInfo.Name}{PSStyle.Instance.Reset}";
-                    }
-                    else if (PSStyle.Instance.FileInfo.Extension.ContainsKey(fileInfo.Extension))
-                    {
-                        return $"{PSStyle.Instance.FileInfo.Extension[fileInfo.Extension]}{fileInfo.Name}{PSStyle.Instance.Reset}";
-                    }
-                    else if ((Platform.IsWindows && CommandDiscovery.PathExtensions.Contains(fileInfo.Extension.ToLower())) ||
-                        (!Platform.IsWindows && Platform.NonWindowsIsExecutable(fileInfo.FullName)))
-                    {
-                        return $"{PSStyle.Instance.FileInfo.Executable}{fileInfo.Name}{PSStyle.Instance.Reset}";
-                    }
-                    else
-                    {
-                        return fileInfo.Name;
-                    }
+                    return $"{PSStyle.Instance.FileInfo.SymbolicLink}{fileInfo.Name}{PSStyle.Instance.Reset} -> {fileInfo.LinkTarget}";
+                }
+                else if (fileInfo.Attributes.HasFlag(FileAttributes.Directory))
+                {
+                    return $"{PSStyle.Instance.FileInfo.Directory}{fileInfo.Name}{PSStyle.Instance.Reset}";
+                }
+                else if (PSStyle.Instance.FileInfo.Extension.ContainsKey(fileInfo.Extension))
+                {
+                    return $"{PSStyle.Instance.FileInfo.Extension[fileInfo.Extension]}{fileInfo.Name}{PSStyle.Instance.Reset}";
+                }
+                else if ((Platform.IsWindows && CommandDiscovery.PathExtensions.Contains(fileInfo.Extension.ToLower())) ||
+                    (!Platform.IsWindows && Platform.NonWindowsIsExecutable(fileInfo.FullName)))
+                {
+                    return $"{PSStyle.Instance.FileInfo.Executable}{fileInfo.Name}{PSStyle.Instance.Reset}";
+                }
+                else
+                {
+                    return fileInfo.Name;
                 }
-
-                return string.Empty;
-            }
-            else
-            {
-                return instance?.BaseObject is FileSystemInfo fileInfo
-                    ? InternalSymbolicLinkLinkCodeMethods.IsReparsePointLikeSymlink(fileInfo)
-                        ? $"{fileInfo.Name} -> {fileInfo.LinkTarget}"
-                        : fileInfo.Name
-                    : string.Empty;
             }
+
+            return string.Empty;
         }
 
         /// <summary>
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Item.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Item.Tests.ps1
index 35c05b1bb12..4efc250e0d7 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Item.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Item.Tests.ps1
@@ -208,17 +208,12 @@ Describe "Get-Item environment provider on Windows with accidental case-variant
 
 Describe 'Formatting for FileInfo objects' -Tags 'CI' {
     BeforeAll {
-        $PSDefaultParameterValues.Add('It:Skip', (-not $EnabledExperimentalFeatures.Contains('PSAnsiRenderingFileInfo')))
         $extensionTests = [System.Collections.Generic.List[HashTable]]::new()
         foreach ($extension in @('.zip', '.tgz', '.tar', '.gz', '.nupkg', '.cab', '.7z', '.ps1', '.psd1', '.psm1', '.ps1xml')) {
             $extensionTests.Add(@{extension = $extension})
         }
     }
 
-    AfterAll {
-        $PSDefaultParameterValues.Remove('It:Skip')
-    }
-
     It 'File type <extension> should have correct color' -TestCases $extensionTests {
         param($extension)
 
@@ -250,14 +245,6 @@ Describe 'Formatting for FileInfo objects' -Tags 'CI' {
 }
 
 Describe 'Formatting for FileInfo requiring admin' -Tags 'CI','RequireAdminOnWindows' {
-    BeforeAll {
-        $PSDefaultParameterValues.Add('It:Skip', (-not $EnabledExperimentalFeatures.Contains('PSAnsiRenderingFileInfo')))
-    }
-
-    AfterAll {
-        $PSDefaultParameterValues.Remove('It:Skip')
-    }
-
     It 'Symlink should have correct color' {
         $linkPath = Join-Path -Path $TestDrive -ChildPath 'link'
         $link = New-Item -ItemType SymbolicLink -Name 'link' -Value $TestDrive -Path $TestDrive

From ab8e1122490965dd3b490db968971b9d61d20c74 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 10:14:37 -0700
Subject: [PATCH 559/645] [release/v7.3.0-rc.1] Make experimental feature
 `PSCleanBlock` stable (#18075)

---
 experimental-feature-linux.json                   |  1 -
 experimental-feature-windows.json                 |  1 -
 .../engine/CommandMetadata.cs                     | 15 ++++-----------
 .../ExperimentalFeature/ExperimentalFeature.cs    |  4 ----
 .../engine/parser/tokenizer.cs                    |  8 --------
 5 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/experimental-feature-linux.json b/experimental-feature-linux.json
index 5484450a76c..14b1bde0eee 100644
--- a/experimental-feature-linux.json
+++ b/experimental-feature-linux.json
@@ -1,6 +1,5 @@
 [
   "PSAMSIMethodInvocationLogging",
-  "PSCleanBlock",
   "PSCommandNotFoundSuggestion",
   "PSExec",
   "PSLoadAssemblyFromNativeCode",
diff --git a/experimental-feature-windows.json b/experimental-feature-windows.json
index 5484450a76c..14b1bde0eee 100644
--- a/experimental-feature-windows.json
+++ b/experimental-feature-windows.json
@@ -1,6 +1,5 @@
 [
   "PSAMSIMethodInvocationLogging",
-  "PSCleanBlock",
   "PSCommandNotFoundSuggestion",
   "PSExec",
   "PSLoadAssemblyFromNativeCode",
diff --git a/src/System.Management.Automation/engine/CommandMetadata.cs b/src/System.Management.Automation/engine/CommandMetadata.cs
index 75d02ed59d5..a9094f54b36 100644
--- a/src/System.Management.Automation/engine/CommandMetadata.cs
+++ b/src/System.Management.Automation/engine/CommandMetadata.cs
@@ -864,15 +864,6 @@ internal string GetProxyCommand(string helpComment, bool generateDynamicParamete
 ", GetDynamicParamBlock());
             }
 
-            string cleanBlock = string.Empty;
-            if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSCleanBlockFeatureName))
-            {
-                cleanBlock = string.Format(CultureInfo.InvariantCulture, @"
-clean
-{{{0}}}
-", GetCleanBlock());
-            }
-
             string result = string.Format(CultureInfo.InvariantCulture, @"{0}
 param({1})
 
@@ -884,7 +875,9 @@ internal string GetProxyCommand(string helpComment, bool generateDynamicParamete
 
 end
 {{{5}}}
-{6}
+
+clean
+{{{6}}}
 <#
 {7}
 #>
@@ -895,7 +888,7 @@ internal string GetProxyCommand(string helpComment, bool generateDynamicParamete
                 GetBeginBlock(),
                 GetProcessBlock(),
                 GetEndBlock(),
-                cleanBlock,
+                GetCleanBlock(),
                 CodeGeneration.EscapeBlockCommentContent(helpComment));
 
             return result;
diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index d656d577d9c..e226014c15b 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -24,7 +24,6 @@ public class ExperimentalFeature
         internal const string PSNativeCommandArgumentPassingFeatureName = "PSNativeCommandArgumentPassing";
         internal const string PSNativeCommandErrorActionPreferenceFeatureName = "PSNativeCommandErrorActionPreference";
         internal const string PSRemotingSSHTransportErrorHandling = "PSRemotingSSHTransportErrorHandling";
-        internal const string PSCleanBlockFeatureName = "PSCleanBlock";
         internal const string PSAMSIMethodInvocationLogging = "PSAMSIMethodInvocationLogging";
         internal const string PSExecFeatureName = "PSExec";
 
@@ -127,9 +126,6 @@ static ExperimentalFeature()
                 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"),
                 new ExperimentalFeature(
                     name: PSAMSIMethodInvocationLogging,
                     description: "Provides AMSI notification of .NET method invocations."),
diff --git a/src/System.Management.Automation/engine/parser/tokenizer.cs b/src/System.Management.Automation/engine/parser/tokenizer.cs
index 1c5654b34c4..9e133016e85 100644
--- a/src/System.Management.Automation/engine/parser/tokenizer.cs
+++ b/src/System.Management.Automation/engine/parser/tokenizer.cs
@@ -699,16 +699,8 @@ static Tokenizer()
             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]);
             }
 

From 61607d53a05a7e0238825a5adb4a94bbc880337c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 10:16:13 -0700
Subject: [PATCH 560/645] [release/v7.3.0-rc.1] Handle PSObject argument
 specially in method invocation logging (#18079)

---
 .../engine/runtime/Operations/MiscOps.cs      | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
index a85bc8a8e78..1c15c6510bc 100644
--- a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
+++ b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
@@ -13,6 +13,7 @@
 using System.Management.Automation.Internal.Host;
 using System.Management.Automation.Language;
 using System.Management.Automation.Runspaces;
+using System.Numerics;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
@@ -3545,6 +3546,38 @@ internal static class MemberInvocationLoggingOps
             }
         );
 
+        private static string ArgumentToString(object arg)
+        {
+            object baseObj = PSObject.Base(arg);
+            if (baseObj is null)
+            {
+                // The argument is null or AutomationNull.Value.
+                return "null";
+            }
+
+            // The comparisons below are ordered by the likelihood of arguments being of those types.
+            if (baseObj is string str)
+            {
+                return str;
+            }
+
+            // Special case some types to call 'ToString' on the object. For the rest, we return its
+            // full type name to avoid calling a potentially expensive 'ToString' implementation.
+            Type baseType = baseObj.GetType();
+            if (baseType.IsEnum || baseType.IsPrimitive
+                || baseType == typeof(Guid)
+                || baseType == typeof(Uri)
+                || baseType == typeof(Version)
+                || baseType == typeof(SemanticVersion)
+                || baseType == typeof(BigInteger)
+                || baseType == typeof(decimal))
+            {
+                return baseObj.ToString();
+            }
+
+            return baseType.FullName;
+        }
+
         internal static void LogMemberInvocation(string targetName, string name, object[] args)
         {
             try
@@ -3554,7 +3587,7 @@ internal static void LogMemberInvocation(string targetName, string name, object[
 
                 for (int i = 0; i < args.Length; i++)
                 {
-                    string value = args[i] is null ? "null" : args[i].ToString();
+                    string value = ArgumentToString(args[i]);
 
                     if (i > 0)
                     {

From e1d5af6dfd56f41578eadb17bc33173024483eb5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 10:34:54 -0700
Subject: [PATCH 561/645] [release/v7.3.0-rc.1] Make experimental feature
 `PSNativeCommandArgumentPassing` stable (#18076)

---
 experimental-feature-linux.json               |  1 -
 experimental-feature-windows.json             |  1 -
 .../ExperimentalFeature.cs                    |  4 ---
 .../engine/InitialSessionState.cs             | 36 +++++--------------
 .../engine/NativeCommandParameterBinder.cs    | 24 +++++--------
 .../NativeCommandArguments.Tests.ps1          | 19 +++-------
 6 files changed, 23 insertions(+), 62 deletions(-)

diff --git a/experimental-feature-linux.json b/experimental-feature-linux.json
index 14b1bde0eee..863872016b5 100644
--- a/experimental-feature-linux.json
+++ b/experimental-feature-linux.json
@@ -3,7 +3,6 @@
   "PSCommandNotFoundSuggestion",
   "PSExec",
   "PSLoadAssemblyFromNativeCode",
-  "PSNativeCommandArgumentPassing",
   "PSNativeCommandErrorActionPreference",
   "PSRemotingSSHTransportErrorHandling",
   "PSSubsystemPluginModel"
diff --git a/experimental-feature-windows.json b/experimental-feature-windows.json
index 14b1bde0eee..863872016b5 100644
--- a/experimental-feature-windows.json
+++ b/experimental-feature-windows.json
@@ -3,7 +3,6 @@
   "PSCommandNotFoundSuggestion",
   "PSExec",
   "PSLoadAssemblyFromNativeCode",
-  "PSNativeCommandArgumentPassing",
   "PSNativeCommandErrorActionPreference",
   "PSRemotingSSHTransportErrorHandling",
   "PSSubsystemPluginModel"
diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index e226014c15b..2906f48ba86 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -21,7 +21,6 @@ public class ExperimentalFeature
         #region Const Members
 
         internal const string EngineSource = "PSEngine";
-        internal const string PSNativeCommandArgumentPassingFeatureName = "PSNativeCommandArgumentPassing";
         internal const string PSNativeCommandErrorActionPreferenceFeatureName = "PSNativeCommandErrorActionPreference";
         internal const string PSRemotingSSHTransportErrorHandling = "PSRemotingSSHTransportErrorHandling";
         internal const string PSAMSIMethodInvocationLogging = "PSAMSIMethodInvocationLogging";
@@ -114,9 +113,6 @@ static ExperimentalFeature()
                 new ExperimentalFeature(
                     name: "PSSubsystemPluginModel",
                     description: "A plugin model for registering and un-registering PowerShell subsystems"),
-                new ExperimentalFeature(
-                    name: PSNativeCommandArgumentPassingFeatureName,
-                    description: "Use ArgumentList when invoking a native command"),
                 new ExperimentalFeature(
                     name: "PSLoadAssemblyFromNativeCode",
                     description: "Expose an API to allow assembly loading from native code"),
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index 7a6d09cba67..09feaa0fdbc 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -4161,13 +4161,7 @@ .FORWARDHELPCATEGORY Cmdlet
         }
         else {
             $pagerCommand = 'less'
-            # PSNativeCommandArgumentPassing arguments should be constructed differently.
-            if ($EnabledExperimentalFeatures -contains 'PSNativeCommandArgumentPassing') {
-                $pagerArgs = '-s','-P','Page %db?B of %D:.\. Press h for help or q to quit\.'
-            }
-            else {
-                $pagerArgs = '-Ps""Page %db?B of %D:.\. Press h for help or q to quit\.$""'
-            }
+            $pagerArgs = '-s','-P','Page %db?B of %D:.\. Press h for help or q to quit\.'
         }
 
         # Respect PAGER environment variable which allows user to specify a custom pager.
@@ -4207,16 +4201,7 @@ .FORWARDHELPCATEGORY Cmdlet
             $consoleWidth = [System.Math]::Max([System.Console]::WindowWidth, 20)
 
             if ($pagerArgs) {
-                # Start the pager arguments directly if the PSNativeCommandArgumentPassing feature is enabled.
-                # Otherwise, supply pager arguments to an application without any PowerShell parsing of the arguments.
-                # Leave environment variable to help user debug arguments supplied in $env:PAGER.
-                if ($EnabledExperimentalFeatures -contains 'PSNativeCommandArgumentPassing') {
-                    $help | Out-String -Stream -Width ($consoleWidth - 1) | & $pagerCommand $pagerArgs
-                }
-                else {
-                    $env:__PSPAGER_ARGS = $pagerArgs
-                    $help | Out-String -Stream -Width ($consoleWidth - 1) | & $pagerCommand --% %__PSPAGER_ARGS%
-                }
+                $help | Out-String -Stream -Width ($consoleWidth - 1) | & $pagerCommand $pagerArgs
             }
             else {
                 $help | Out-String -Stream -Width ($consoleWidth - 1) | & $pagerCommand
@@ -4492,16 +4477,13 @@ static InitialSessionState()
                         new ArgumentTypeConverterAttribute(typeof(bool))));
             }
 
-            if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSNativeCommandArgumentPassingFeatureName))
-            {
-                builtinVariables.Add(
-                    new SessionStateVariableEntry(
-                        SpecialVariables.NativeArgumentPassing,
-                        Platform.IsWindows ? NativeArgumentPassingStyle.Windows : NativeArgumentPassingStyle.Standard,
-                        RunspaceInit.NativeCommandArgumentPassingDescription,
-                        ScopedItemOptions.None,
-                        new ArgumentTypeConverterAttribute(typeof(NativeArgumentPassingStyle))));
-            }
+            builtinVariables.Add(
+                new SessionStateVariableEntry(
+                    SpecialVariables.NativeArgumentPassing,
+                    Platform.IsWindows ? NativeArgumentPassingStyle.Windows : NativeArgumentPassingStyle.Standard,
+                    RunspaceInit.NativeCommandArgumentPassingDescription,
+                    ScopedItemOptions.None,
+                    new ArgumentTypeConverterAttribute(typeof(NativeArgumentPassingStyle))));
 
             BuiltInVariables = builtinVariables.ToArray();
         }
diff --git a/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs b/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
index aa0e94a5837..567a00387d5 100644
--- a/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
+++ b/src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
@@ -193,23 +193,17 @@ internal NativeArgumentPassingStyle ArgumentPassingStyle
         {
             get
             {
-                if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSNativeCommandArgumentPassingFeatureName))
+                try
                 {
-                    try
-                    {
-                        // This will default to the new behavior if it is set to anything other than Legacy
-                        var preference = LanguagePrimitives.ConvertTo<NativeArgumentPassingStyle>(
-                            Context.GetVariableValue(SpecialVariables.NativeArgumentPassingVarPath, NativeArgumentPassingStyle.Standard));
-                        return preference;
-                    }
-                    catch
-                    {
-                        // The value is not convertable send back Legacy
-                        return NativeArgumentPassingStyle.Legacy;
-                    }
+                    var preference = LanguagePrimitives.ConvertTo<NativeArgumentPassingStyle>(
+                        Context.GetVariableValue(SpecialVariables.NativeArgumentPassingVarPath, NativeArgumentPassingStyle.Standard));
+                    return preference;
+                }
+                catch
+                {
+                    // The value is not convertable send back Legacy
+                    return NativeArgumentPassingStyle.Legacy;
                 }
-
-                return NativeArgumentPassingStyle.Legacy;
             }
         }
 
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
index 191f7211f6a..d96720139bb 100644
--- a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
+++ b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
@@ -4,9 +4,6 @@
 param()
 
 Describe "Behavior is specific for each platform" -tags "CI" {
-    BeforeAll {
-        $skipTests = $EnabledExperimentalFeatures -notcontains 'PSNativeCommandArgumentPassing'
-    }
     It "PSNativeCommandArgumentPassing is set to 'Windows' on Windows systems" -skip:(-not $IsWindows) {
         $PSNativeCommandArgumentPassing | Should -Be "Windows"
     }
@@ -28,8 +25,7 @@ Describe "Behavior is specific for each platform" -tags "CI" {
 
 Describe "tests for multiple languages and extensions" -tags "CI" {
     AfterAll {
-        if (-not $IsWindows -or
-            $EnabledExperimentalFeatures -notcontains 'PSNativeCommandArgumentPassing') {
+        if (-not $IsWindows) {
             return
         }
         $PSNativeCommandArgumentPassing = $passingStyle
@@ -126,7 +122,7 @@ echo Argument 4 is: ^<%4^>
 
         # determine whether we should skip the tests we just defined
         # doing it in this order ensures that the test output will show each skipped test
-        $skipTests = -not $IsWindows -or $EnabledExperimentalFeatures -notcontains 'PSNativeCommandArgumentPassing'
+        $skipTests = -not $IsWindows
         if ($skipTests) {
             return
         }
@@ -162,12 +158,7 @@ echo Argument 4 is: ^<%4^>
 
 Describe "Will error correctly if an attempt to set variable to improper value" -tags "CI" {
     It "will error when setting variable incorrectly" {
-        if ($EnabledExperimentalFeatures -contains 'PSNativeCommandArgumentPassing') {
-            { $global:PSNativeCommandArgumentPassing = "zzz" } | Should -Throw -ExceptionType System.Management.Automation.ArgumentTransformationMetadataException
-        }
-        else {
-            Set-Test -State skipped -Because "Experimental feature 'PSNativeCommandArgumentPassing' is not enabled"
-        }
+        { $global:PSNativeCommandArgumentPassing = "zzz" } | Should -Throw -ExceptionType System.Management.Automation.ArgumentTransformationMetadataException
     }
 }
 
@@ -203,7 +194,7 @@ foreach ( $argumentListValue in "Standard","Legacy","Windows" ) {
             $a = 'a"b c"d'
             $lines = testexe -echoargs $a 'a"b c"d' a"b c"d "a'b c'd"
             $lines.Count | Should -Be 4
-            if (($EnabledExperimentalFeatures -contains 'PSNativeCommandArgumentPassing') -and $PSNativeCommandArgumentPassing -ne "Legacy") {
+            if ($PSNativeCommandArgumentPassing -ne "Legacy") {
                 $lines[0] | Should -BeExactly 'Arg 0 is <a"b c"d>'
                 $lines[1] | Should -BeExactly 'Arg 1 is <a"b c"d>'
             }
@@ -229,7 +220,7 @@ foreach ( $argumentListValue in "Standard","Legacy","Windows" ) {
         It "Should handle spaces between escaped quotes (ArgumentList=${PSNativeCommandArgumentPassing})" {
             $lines = testexe -echoargs 'a\"b c\"d' "a\`"b c\`"d"
             $lines.Count | Should -Be 2
-            if (($EnabledExperimentalFeatures -contains 'PSNativeCommandArgumentPassing') -and $PSNativeCommandArgumentPassing -ne "Legacy") {
+            if ($PSNativeCommandArgumentPassing -ne "Legacy") {
                 $lines[0] | Should -BeExactly 'Arg 0 is <a\"b c\"d>'
                 $lines[1] | Should -BeExactly 'Arg 1 is <a\"b c\"d>'
             }

From 78b555bdb08bc2955bab929de2ac9d7cc22b4464 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 10:51:48 -0700
Subject: [PATCH 562/645] [release/v7.3.0-rc.1] Make experimental feature
 `PSExec` stable (#18077)

---
 experimental-feature-linux.json                        |  1 -
 experimental-feature-windows.json                      |  1 -
 .../engine/ExperimentalFeature/ExperimentalFeature.cs  |  6 +-----
 .../engine/InitialSessionState.cs                      | 10 ++--------
 .../engine/Modules/SwitchProcessCommand.cs             |  1 -
 .../Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1   |  4 ++--
 test/powershell/engine/Basic/DefaultCommands.Tests.ps1 |  2 ++
 7 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/experimental-feature-linux.json b/experimental-feature-linux.json
index 863872016b5..326b8f608e1 100644
--- a/experimental-feature-linux.json
+++ b/experimental-feature-linux.json
@@ -1,7 +1,6 @@
 [
   "PSAMSIMethodInvocationLogging",
   "PSCommandNotFoundSuggestion",
-  "PSExec",
   "PSLoadAssemblyFromNativeCode",
   "PSNativeCommandErrorActionPreference",
   "PSRemotingSSHTransportErrorHandling",
diff --git a/experimental-feature-windows.json b/experimental-feature-windows.json
index 863872016b5..326b8f608e1 100644
--- a/experimental-feature-windows.json
+++ b/experimental-feature-windows.json
@@ -1,7 +1,6 @@
 [
   "PSAMSIMethodInvocationLogging",
   "PSCommandNotFoundSuggestion",
-  "PSExec",
   "PSLoadAssemblyFromNativeCode",
   "PSNativeCommandErrorActionPreference",
   "PSRemotingSSHTransportErrorHandling",
diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index 2906f48ba86..8d8c2dd3122 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -24,7 +24,6 @@ public class ExperimentalFeature
         internal const string PSNativeCommandErrorActionPreferenceFeatureName = "PSNativeCommandErrorActionPreference";
         internal const string PSRemotingSSHTransportErrorHandling = "PSRemotingSSHTransportErrorHandling";
         internal const string PSAMSIMethodInvocationLogging = "PSAMSIMethodInvocationLogging";
-        internal const string PSExecFeatureName = "PSExec";
 
         #endregion
 
@@ -124,10 +123,7 @@ static ExperimentalFeature()
                     description: "Removes the SSH remoting transport stdErr stream message handling as terminating errors, and instead just writes error messages to console."),
                 new ExperimentalFeature(
                     name: PSAMSIMethodInvocationLogging,
-                    description: "Provides AMSI notification of .NET method invocations."),
-                new ExperimentalFeature(
-                    name: PSExecFeatureName,
-                    description: "Add 'exec' built-in command on Linux and macOS"),
+                    description: "Provides AMSI notification of .NET method invocations.")
             };
 
             EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index 09feaa0fdbc..072323c7a00 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -4678,10 +4678,7 @@ internal static SessionStateAliasEntry[] BuiltInAliases
                 };
 
 #if UNIX
-                if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSExecFeatureName))
-                {
-                    builtInAliases.Add(new SessionStateAliasEntry("exec", "Switch-Process"));
-                }
+                builtInAliases.Add(new SessionStateAliasEntry("exec", "Switch-Process"));
 #endif
 
                 return builtInAliases.ToArray();
@@ -5323,10 +5320,7 @@ private static void InitializeCoreCmdletsAndProviders(
             }
 
 #if UNIX
-            if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSExecFeatureName))
-            {
-                cmdlets.Add("Switch-Process", new SessionStateCmdletEntry("Switch-Process", typeof(SwitchProcessCommand), helpFile));
-            }
+            cmdlets.Add("Switch-Process", new SessionStateCmdletEntry("Switch-Process", typeof(SwitchProcessCommand), helpFile));
 #endif
 
             foreach (var val in cmdlets.Values)
diff --git a/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs b/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
index 298587679b1..1bad35bfd31 100644
--- a/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
@@ -17,7 +17,6 @@ namespace Microsoft.PowerShell.Commands
     /// <summary>
     /// Implements a cmdlet that allows use of execv API.
     /// </summary>
-    [Experimental(ExperimentalFeature.PSExecFeatureName, ExperimentAction.Show)]
     [Cmdlet(VerbsCommon.Switch, "Process", HelpUri = "https://go.microsoft.com/fwlink/?linkid=2181448")]
     public sealed class SwitchProcessCommand : PSCmdlet
     {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
index bd3c87e0f5c..640fb8e0fc9 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
@@ -4,7 +4,7 @@
 Describe 'Switch-Process tests for Unix' -Tags 'CI' {
     BeforeAll {
         $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-        if (-not [ExperimentalFeature]::IsEnabled('PSExec') -or $IsWindows)
+        if ($IsWindows)
         {
             $PSDefaultParameterValues['It:Skip'] = $true
             return
@@ -53,7 +53,7 @@ Describe 'Switch-Process tests for Unix' -Tags 'CI' {
 Describe 'Switch-Process for Windows' {
     BeforeAll {
         $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
-        if (-not $IsWindows)
+        if (!$IsWindows)
         {
             $PSDefaultParameterValues['It:Skip'] = $true
             return
diff --git a/test/powershell/engine/Basic/DefaultCommands.Tests.ps1 b/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
index aaa6cb432bd..bdcd5af0000 100644
--- a/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
+++ b/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
@@ -58,6 +58,7 @@ Describe "Verify approved aliases list" -Tags "CI" {
 "Alias",        "epsn",                             "Export-PSSession",                 $($FullCLR                               ),     "",                     "",                     ""
 "Alias",        "erase",                            "Remove-Item",                      $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     ""
 "Alias",        "etsn",                             "Enter-PSSession",                  $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     ""
+"Alias",        "exec",                             "Switch-Process",                   $(                              $CoreUnix),     "",                     "",                     ""
 "Alias",        "exsn",                             "Exit-PSSession",                   $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     ""
 "Alias",        "fc",                               "Format-Custom",                    $($FullCLR -or $CoreWindows -or $CoreUnix),     "ReadOnly",             "",                     ""
 "Alias",        "fhx",                              "Format-Hex",                       $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     ""
@@ -482,6 +483,7 @@ Describe "Verify approved aliases list" -Tags "CI" {
 "Cmdlet",       "Stop-Transcript",                  "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "Suspend-Job",                      "",                                 $($FullCLR                               ),     "",                     "",                     ""
 "Cmdlet",       "Suspend-Service",                  "",                                 $($FullCLR -or $CoreWindows              ),     "",                     "",                     "Medium"
+"Cmdlet",       "Switch-Process",                   "",                                 $(                              $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "Tee-Object",                       "",                                 $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     "Medium"
 "Cmdlet",       "Test-Connection",                  "",                                 $(             $CoreWindows -or $CoreUnix),     "",                     "",                     "None"
 "Cmdlet",       "Test-ComputerSecureChannel",       "",                                 $($FullCLR                               ),     "",                     "",                     ""

From d1bd7eb841610201eb4908b42699668b47199720 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 13 Sep 2022 14:51:32 -0700
Subject: [PATCH 563/645] Make experimental feature
 `PSAMSIMethodInvocationLogging` stable (#18041) (#18083)

---
 experimental-feature-linux.json               |  1 -
 experimental-feature-windows.json             |  1 -
 .../ExperimentalFeature.cs                    |  6 +---
 .../engine/runtime/Binding/Binders.cs         | 29 +++++++++----------
 4 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/experimental-feature-linux.json b/experimental-feature-linux.json
index 326b8f608e1..e4ad9621293 100644
--- a/experimental-feature-linux.json
+++ b/experimental-feature-linux.json
@@ -1,5 +1,4 @@
 [
-  "PSAMSIMethodInvocationLogging",
   "PSCommandNotFoundSuggestion",
   "PSLoadAssemblyFromNativeCode",
   "PSNativeCommandErrorActionPreference",
diff --git a/experimental-feature-windows.json b/experimental-feature-windows.json
index 326b8f608e1..e4ad9621293 100644
--- a/experimental-feature-windows.json
+++ b/experimental-feature-windows.json
@@ -1,5 +1,4 @@
 [
-  "PSAMSIMethodInvocationLogging",
   "PSCommandNotFoundSuggestion",
   "PSLoadAssemblyFromNativeCode",
   "PSNativeCommandErrorActionPreference",
diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index 8d8c2dd3122..c03c53f335f 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -23,7 +23,6 @@ public class ExperimentalFeature
         internal const string EngineSource = "PSEngine";
         internal const string PSNativeCommandErrorActionPreferenceFeatureName = "PSNativeCommandErrorActionPreference";
         internal const string PSRemotingSSHTransportErrorHandling = "PSRemotingSSHTransportErrorHandling";
-        internal const string PSAMSIMethodInvocationLogging = "PSAMSIMethodInvocationLogging";
 
         #endregion
 
@@ -120,10 +119,7 @@ static ExperimentalFeature()
                     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: PSAMSIMethodInvocationLogging,
-                    description: "Provides AMSI notification of .NET method invocations.")
+                    description: "Removes the SSH remoting transport stdErr stream message handling as terminating errors, and instead just writes error messages to console.")
             };
 
             EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);
diff --git a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
index e6f7eee438e..8662cc72ecd 100644
--- a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
+++ b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
@@ -6891,22 +6891,19 @@ internal static DynamicMetaObject InvokeDotNetMethod(
                     expr = Expression.Block(expr, ExpressionCache.AutomationNullConstant);
                 }
 
-                if (ExperimentalFeature.IsEnabled(ExperimentalFeature.PSAMSIMethodInvocationLogging))
-                {
-                    // Expression block runs two expressions in order:
-                    //  - Log method invocation to AMSI Notifications (can throw PSSecurityException)
-                    //  - Invoke method
-                    string targetName = methodInfo.ReflectedType?.FullName ?? string.Empty;
-                    expr = Expression.Block(
-                        Expression.Call(
-                            CachedReflectionInfo.MemberInvocationLoggingOps_LogMemberInvocation,
-                            Expression.Constant(targetName),
-                            Expression.Constant(name),
-                            Expression.NewArrayInit(
-                                typeof(object),
-                                args.Select(static e => e.Expression.Cast(typeof(object))))),
-                        expr);
-                }
+                // Expression block runs two expressions in order:
+                //  - Log method invocation to AMSI Notifications (can throw PSSecurityException)
+                //  - Invoke method
+                string targetName = methodInfo.ReflectedType?.FullName ?? string.Empty;
+                expr = Expression.Block(
+                    Expression.Call(
+                        CachedReflectionInfo.MemberInvocationLoggingOps_LogMemberInvocation,
+                        Expression.Constant(targetName),
+                        Expression.Constant(name),
+                        Expression.NewArrayInit(
+                            typeof(object),
+                            args.Select(static e => e.Expression.Cast(typeof(object))))),
+                    expr);
 
                 // If we're calling SteppablePipeline.{Begin|Process|End}, we don't want
                 // to wrap exceptions - this is very much a special case to help error

From ec7bb207e93ff158ae64bf711fed37444e146c14 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 14 Sep 2022 11:18:40 -0700
Subject: [PATCH 564/645] Make experimental feature
 `PSRemotingSSHTransportErrorHandling` stable (#18046) (#18085)

---
 experimental-feature-linux.json               |  1 -
 experimental-feature-windows.json             |  1 -
 .../ExperimentalFeature.cs                    |  6 +-
 .../fanin/OutOfProcTransportManager.cs        | 99 +++----------------
 4 files changed, 16 insertions(+), 91 deletions(-)

diff --git a/experimental-feature-linux.json b/experimental-feature-linux.json
index e4ad9621293..4dee9496504 100644
--- a/experimental-feature-linux.json
+++ b/experimental-feature-linux.json
@@ -2,6 +2,5 @@
   "PSCommandNotFoundSuggestion",
   "PSLoadAssemblyFromNativeCode",
   "PSNativeCommandErrorActionPreference",
-  "PSRemotingSSHTransportErrorHandling",
   "PSSubsystemPluginModel"
 ]
diff --git a/experimental-feature-windows.json b/experimental-feature-windows.json
index e4ad9621293..4dee9496504 100644
--- a/experimental-feature-windows.json
+++ b/experimental-feature-windows.json
@@ -2,6 +2,5 @@
   "PSCommandNotFoundSuggestion",
   "PSLoadAssemblyFromNativeCode",
   "PSNativeCommandErrorActionPreference",
-  "PSRemotingSSHTransportErrorHandling",
   "PSSubsystemPluginModel"
 ]
diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index c03c53f335f..517b153d7ad 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -22,7 +22,6 @@ public class ExperimentalFeature
 
         internal const string EngineSource = "PSEngine";
         internal const string PSNativeCommandErrorActionPreferenceFeatureName = "PSNativeCommandErrorActionPreference";
-        internal const string PSRemotingSSHTransportErrorHandling = "PSRemotingSSHTransportErrorHandling";
 
         #endregion
 
@@ -116,10 +115,7 @@ static ExperimentalFeature()
                     description: "Expose an API to allow assembly loading from native code"),
                 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.")
+                    description: "Native commands with non-zero exit codes issue errors according to $ErrorActionPreference when $PSNativeCommandUseErrorActionPreference is $true")
             };
 
             EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);
diff --git a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
index 9a1e4ff47e3..e270a3efeb2 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
@@ -1819,50 +1819,30 @@ private void ProcessErrorThread(object state)
                 {
                     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)
-                        { }
+                    // Blocking read from StdError stream
+                    error = reader.ReadLine();
 
-                        continue;
+                    if (error == null)
+                    {
+                        // Stream is closed unexpectedly.
+                        throw new PSInvalidOperationException(RemotingErrorIdStrings.SSHAbruptlyTerminated);
                     }
 
-                    error = ReadError(reader);
-
                     if (error.Length == 0)
                     {
                         // Ignore
                         continue;
                     }
 
-                    // Any SSH client error results in a broken session.
-                    PSRemotingTransportException psrte = new PSRemotingTransportException(
-                        PSRemotingErrorId.IPCServerProcessReportedError,
-                        RemotingErrorIdStrings.IPCServerProcessReportedError,
-                        StringUtil.Format(RemotingErrorIdStrings.SSHClientEndWithErrorMessage, error));
-                    HandleSSHError(psrte);
+                    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)
+                    { }
                 }
             }
             catch (ObjectDisposedException)
@@ -1888,55 +1868,6 @@ private void HandleSSHError(PSRemotingTransportException psrte)
             CloseConnection();
         }
 
-        private static string ReadError(StreamReader reader)
-        {
-            // Blocking read from StdError stream
-            string error = reader.ReadLine();
-
-            if (error == null)
-            {
-                // Stream is closed unexpectedly.
-                throw new PSInvalidOperationException(RemotingErrorIdStrings.SSHAbruptlyTerminated);
-            }
-
-            if ((error.Length == 0) ||
-                error.Contains("WARNING:", StringComparison.OrdinalIgnoreCase))
-            {
-                // Handle as interactive warning message
-                Console.WriteLine(error);
-                return string.Empty;
-            }
-
-            // SSH may return a multi-line error message.
-            // The StdError pipe stream is open ended causing StreamReader read operations to block
-            // if there is no incoming data.  Since we don't know how many error message lines there
-            // will be we use an asynchronous read with timeout to prevent blocking indefinitely.
-            System.Text.StringBuilder sb = new Text.StringBuilder(error);
-            var running = true;
-            while (running)
-            {
-                try
-                {
-                    var task = reader.ReadLineAsync();
-                    if (task.Wait(1000) && (task.Result != null))
-                    {
-                        sb.Append(Environment.NewLine);
-                        sb.Append(task.Result);
-                    }
-                    else
-                    {
-                        running = false;
-                    }
-                }
-                catch (Exception)
-                {
-                    running = false;
-                }
-            }
-
-            return sb.ToString();
-        }
-
         private void StartReaderThread(
             StreamReader reader)
         {

From f5a725cfc6d1a1e1ea33f07b5035f9e142710aa0 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 14 Sep 2022 14:44:22 -0700
Subject: [PATCH 565/645] Backport of 'Fix error formatting to use color
 defined in $PSStyle.Formatting' (#18086)

---
 .../PowerShellCore_format_ps1xml.cs           | 185 +++++++-----------
 .../engine/InitialSessionState.cs             |   2 +-
 test/powershell/Host/ConsoleHost.Tests.ps1    |   5 +-
 3 files changed, 73 insertions(+), 119 deletions(-)

diff --git a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
index f4b9d03489c..9b2f6596bd5 100644
--- a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
+++ b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
@@ -811,33 +811,18 @@ private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Autom
                             $ellipsis = ""`u{2026}""
                             $resetColor = ''
                             $errorColor = ''
-                            if ($Host.UI.SupportsVirtualTerminal -and ([string]::IsNullOrEmpty($env:__SuppressAnsiEscapeSequences))) {
-                                if ($null -ne $psstyle) {
-                                    $errorColor = $psstyle.Formatting.Error
-                                }
-
-                                $resetColor = [System.Management.Automation.VTUtility]::GetEscapeSequence(
-                                    [System.Management.Automation.VTUtility+VT]::Reset
-                                )
-                            }
+                            $accentColor = ''
 
-                            function Get-VT100Color([ConsoleColor] $color) {
-                                if (!$Host.UI.SupportsVirtualTerminal -or !([string]::IsNullOrEmpty($env:__SuppressAnsiEscapeSequences))) {
-                                    return ''
-                                }
-
-                                return [System.Management.Automation.VTUtility]::GetEscapeSequence($color)
+                            if ($Host.UI.SupportsVirtualTerminal -and ([string]::IsNullOrEmpty($env:__SuppressAnsiEscapeSequences))) {
+                                $resetColor = $PSStyle.Reset
+                                $errorColor = $psstyle.Formatting.Error
+                                $accentColor = $PSStyle.Formatting.FormatAccent
                             }
 
                             function Show-ErrorRecord($obj, [int]$indent = 0, [int]$depth = 1) {
                                 $newline = [Environment]::Newline
                                 $output = [System.Text.StringBuilder]::new()
                                 $prefix = ' ' * $indent
-                                $accentColor = ''
-
-                                if ($null -ne $Host.PrivateData) {
-                                    $accentColor = Get-VT100Color ($Host.PrivateData.FormatAccentColor ?? $Host.PrivateData.ErrorForegroundColor)
-                                }
 
                                 $expandTypes = @(
                                     'Microsoft.Rest.HttpRequestMessageWrapper'
@@ -1066,36 +1051,17 @@ private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Autom
                                     Set-StrictMode -Off
                                     $newline = [Environment]::Newline
 
-                                    function Get-ConciseViewPositionMessage {
-
-                                        $resetColor = ''
-                                        if ($Host.UI.SupportsVirtualTerminal -and ([string]::IsNullOrEmpty($env:__SuppressAnsiEscapeSequences))) {
-                                            $resetColor = [System.Management.Automation.VTUtility]::GetEscapeSequence(
-                                                [System.Management.Automation.VTUtility+VT]::Reset
-                                            )
-                                        }
-
-                                        function Get-VT100Color([ConsoleColor] $color) {
-                                            if (!$Host.UI.SupportsVirtualTerminal -or !([string]::IsNullOrEmpty($env:__SuppressAnsiEscapeSequences))) {
-                                                return ''
-                                            }
-
-                                            return [System.Management.Automation.VTUtility]::GetEscapeSequence($color)
-                                        }
+                                    $resetColor = ''
+                                    $errorColor = ''
+                                    $accentColor = ''
 
-                                        # return length of string sans VT100 codes
-                                        function Get-RawStringLength($string) {
-                                            $vtCodes = ""`e[0m"", ""`e[2;30m"", ""`e[2;31m"", ""`e[2;32m"", ""`e[2;33m"", ""`e[2;34m"",
-                                                ""`e[2;35m"", ""`e[2;36m"", ""`e[2;37m"", ""`e[1;30m"", ""`e[1;31m"", ""`e[1;32m"",
-                                                ""`e[1;33m"", ""`e[1;34m"", ""`e[1;35m"", ""`e[1;36m"", ""`e[1;37m""
-
-                                            $newString = $string
-                                            foreach ($vtCode in $vtCodes) {
-                                                $newString = $newString.Replace($vtCode, '')
-                                            }
+                                    if ($Host.UI.SupportsVirtualTerminal -and ([string]::IsNullOrEmpty($env:__SuppressAnsiEscapeSequences))) {
+                                        $resetColor = $PSStyle.Reset
+                                        $errorColor = $PSStyle.Formatting.Error
+                                        $accentColor = $PSStyle.Formatting.ErrorAccent
+                                    }
 
-                                            return $newString.Length
-                                        }
+                                    function Get-ConciseViewPositionMessage {
 
                                         # returns a string cut to last whitespace
                                         function Get-TruncatedString($string, [int]$length) {
@@ -1107,14 +1073,6 @@ function Get-ConciseViewPositionMessage {
                                             return ($string.Substring(0,$length) -split '\s',-2)[0]
                                         }
 
-                                        $errorColor = ''
-                                        $accentColor = ''
-
-                                        if ($null -ne $Host.PrivateData) {
-                                            $errorColor = Get-VT100Color $Host.PrivateData.ErrorForegroundColor
-                                            $accentColor = Get-VT100Color ($Host.PrivateData.ErrorAccentColor ?? $errorColor)
-                                        }
-
                                         $posmsg = ''
                                         $headerWhitespace = ''
                                         $offsetWhitespace = ''
@@ -1217,7 +1175,7 @@ function Get-ConciseViewPositionMessage {
 
                                         # if rendering line information, break up the message if it's wider than the console
                                         if ($myinv -and $myinv.ScriptName -or $err.CategoryInfo.Category -eq 'ParserError') {
-                                            $prefixLength = Get-RawStringLength -string $prefix
+                                            $prefixLength = [System.Management.Automation.Internal.StringDecorated]::new($prefix).ContentLength
                                             $prefixVtLength = $prefix.Length - $prefixLength
 
                                             # replace newlines in message so it lines up correct
@@ -1296,82 +1254,77 @@ function Get-ConciseViewPositionMessage {
                                         $myinv = $err.InvocationInfo
                                     }
 
-                                    if ($ErrorView -ne 'ConciseView' -and $null -ne $host.PrivateData) {
-                                        if ($null -ne $host.PrivateData.ErrorForegroundColor) {
-                                            [Console]::ForegroundColor = $host.PrivateData.ErrorForegroundColor
-                                        }
+                                    if ($err.FullyQualifiedErrorId -eq 'NativeCommandErrorMessage' -or $err.FullyQualifiedErrorId -eq 'NativeCommandError') {
+                                        return ""${errorColor}$($err.Exception.Message)${resetcolor}""
+                                    }
 
-                                        if ($null -ne $host.PrivateData.ErrorBackgroundColor) {
-                                            [Console]::BackgroundColor = $host.PrivateData.ErrorBackgroundColor
-                                        }
+                                    $myinv = $err.InvocationInfo
+                                    if ($ErrorView -eq 'DetailedView') {
+                                        $message = Get-Error | Out-String
+                                        return ""${errorColor}${message}${resetcolor}""
                                     }
 
-                                    if ($err.FullyQualifiedErrorId -eq 'NativeCommandErrorMessage' -or $err.FullyQualifiedErrorId -eq 'NativeCommandError') {
-                                        $err.Exception.Message
+                                    if ($ErrorView -eq 'CategoryView') {
+                                        $message = $err.CategoryInfo.GetMessage()
+                                        return ""${errorColor}${message}${resetcolor}""
                                     }
-                                    else
-                                    {
-                                        $myinv = $err.InvocationInfo
-                                        if ($ErrorView -eq 'DetailedView') {
-                                            return (Get-Error | Out-String)
-                                        }
-                                        elseif ($ErrorView -eq 'ConciseView') {
-                                            $posmsg = Get-ConciseViewPositionMessage
-                                        }
-                                        elseif ($myinv -and ($myinv.MyCommand -or ($err.CategoryInfo.Category -ne 'ParserError'))) {
-                                            $posmsg = $myinv.PositionMessage
-                                        } else {
-                                            $posmsg = ''
-                                        }
 
-                                        if ($posmsg -ne '')
-                                        {
-                                            $posmsg = $newline + $posmsg
-                                        }
+                                    $posmsg = ''
+                                    if ($ErrorView -eq 'ConciseView') {
+                                        $posmsg = Get-ConciseViewPositionMessage
+                                    }
+                                    elseif ($myinv -and ($myinv.MyCommand -or ($err.CategoryInfo.Category -ne 'ParserError'))) {
+                                        $posmsg = $myinv.PositionMessage
+                                    }
 
-                                        if ($err.PSMessageDetails) {
-                                            $posmsg = ' : ' +  $err.PSMessageDetails + $posmsg
-                                        }
+                                    if ($posmsg -ne '') {
+                                        $posmsg = $newline + $posmsg
+                                    }
+
+                                    if ($err.PSMessageDetails) {
+                                        $posmsg = ' : ' +  $err.PSMessageDetails + $posmsg
+                                    }
 
-                                        if ($ErrorView -eq 'ConciseView') {
-                                            return $posmsg
+                                    if ($ErrorView -eq 'ConciseView') {
+                                        if ($err.PSMessageDetails) {
+                                            $posmsg = ""${errorColor}${posmsg}""
                                         }
+                                        return $posmsg
+                                    }
 
-                                        $indent = 4
+                                    $indent = 4
 
-                                        $errorCategoryMsg = $err.ErrorCategory_Message
+                                    $errorCategoryMsg = $err.ErrorCategory_Message
 
-                                        if ($null -ne $errorCategoryMsg)
-                                        {
-                                            $indentString = '+ CategoryInfo          : ' + $err.ErrorCategory_Message
-                                        }
-                                        else
-                                        {
-                                            $indentString = '+ CategoryInfo          : ' + $err.CategoryInfo
-                                        }
+                                    if ($null -ne $errorCategoryMsg)
+                                    {
+                                        $indentString = '+ CategoryInfo          : ' + $err.ErrorCategory_Message
+                                    }
+                                    else
+                                    {
+                                        $indentString = '+ CategoryInfo          : ' + $err.CategoryInfo
+                                    }
 
-                                        $posmsg += $newline + $indentString
+                                    $posmsg += $newline + $indentString
 
-                                        $indentString = ""+ FullyQualifiedErrorId : "" + $err.FullyQualifiedErrorId
-                                        $posmsg += $newline + $indentString
+                                    $indentString = ""+ FullyQualifiedErrorId : "" + $err.FullyQualifiedErrorId
+                                    $posmsg += $newline + $indentString
 
-                                        $originInfo = $err.OriginInfo
+                                    $originInfo = $err.OriginInfo
 
-                                        if (($null -ne $originInfo) -and ($null -ne $originInfo.PSComputerName))
-                                        {
-                                            $indentString = ""+ PSComputerName        : "" + $originInfo.PSComputerName
-                                            $posmsg += $newline + $indentString
-                                        }
+                                    if (($null -ne $originInfo) -and ($null -ne $originInfo.PSComputerName))
+                                    {
+                                        $indentString = ""+ PSComputerName        : "" + $originInfo.PSComputerName
+                                        $posmsg += $newline + $indentString
+                                    }
 
-                                        if ($ErrorView -eq 'CategoryView') {
-                                            $err.CategoryInfo.GetMessage()
-                                        }
-                                        elseif (! $err.ErrorDetails -or ! $err.ErrorDetails.Message) {
-                                            $err.Exception.Message + $posmsg
-                                        } else {
-                                            $err.ErrorDetails.Message + $posmsg
-                                        }
+                                    $finalMsg = if ($err.ErrorDetails.Message) {
+                                        $err.ErrorDetails.Message + $posmsg
+                                    } else {
+                                        $err.Exception.Message + $posmsg
                                     }
+
+                                    ""${errorColor}${finalMsg}${resetcolor}""
                                 ")
                     .EndEntry()
                 .EndControl());
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index 072323c7a00..e75ca018f8e 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -4335,7 +4335,7 @@ static InitialSessionState()
                     SpecialVariables.PSStyle,
                     PSStyle.Instance,
                     RunspaceInit.PSStyleDescription,
-                    ScopedItemOptions.None),
+                    ScopedItemOptions.Constant),
 
                 // Variable which controls the encoding for piping data to a NativeCommand
                 new SessionStateVariableEntry(
diff --git a/test/powershell/Host/ConsoleHost.Tests.ps1 b/test/powershell/Host/ConsoleHost.Tests.ps1
index ff2d537d836..ccec3d7455f 100644
--- a/test/powershell/Host/ConsoleHost.Tests.ps1
+++ b/test/powershell/Host/ConsoleHost.Tests.ps1
@@ -420,14 +420,15 @@ export $envVarName='$guid'
         It "errors are in text if error is redirected, encoded command, non-interactive, and outputformat specified" {
             $p = [Diagnostics.Process]::new()
             $p.StartInfo.FileName = "pwsh"
-            $encoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes('$ErrorView="NormalView";throw "boom"'))
+            $encoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes('throw "boom"'))
             $p.StartInfo.Arguments = "-EncodedCommand $encoded -ExecutionPolicy Bypass -NoLogo -NonInteractive -NoProfile -OutputFormat text"
             $p.StartInfo.UseShellExecute = $false
             $p.StartInfo.RedirectStandardError = $true
             $p.Start() | Out-Null
             $out = $p.StandardError.ReadToEnd()
             $out | Should -Not -BeNullOrEmpty
-            $out.Split([Environment]::NewLine)[0] | Should -BeExactly "boom"
+            $out = $out.Split([Environment]::NewLine)[0]
+            [System.Management.Automation.Internal.StringDecorated]::new($out).ToString("PlainText") | Should -BeExactly "Exception: boom"
         }
     }
 

From 730bc3732ad1ed45ab399ad78ef21f9d87ca520e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 14:58:31 -0700
Subject: [PATCH 566/645] [release/v7.3.0-rc.1] Filter out compiler generated
 types for `Add-Type -PassThru` (#18103)

---
 .../commands/utility/AddType.cs                        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
index 6cdfb512dce..00d6b11efcf 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
@@ -13,6 +13,7 @@
 using System.Management.Automation.Internal;
 using System.Management.Automation.Security;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.Loader;
 using System.Security;
 using System.Text;
@@ -891,7 +892,14 @@ private IEnumerable<PortableExecutableReference> GetPortableExecutableReferences
 
         private void WriteTypes(Assembly assembly)
         {
-            WriteObject(assembly.GetTypes(), true);
+            foreach (Type type in assembly.GetTypes())
+            {
+                // We only write out types that are not auto-generated by compiler.
+                if (type.GetCustomAttribute<CompilerGeneratedAttribute>() is null)
+                {
+                    WriteObject(type);
+                }
+            }
         }
 
         #endregion LoadAssembly

From df5ca3973321895bf70806a20d8232f87c210e55 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 15:17:27 -0700
Subject: [PATCH 567/645] [release/v7.3.0-rc.1] Add ConfigurationFile option to
 syntax frontmatter (#18104)

---
 .../resources/ManagedEntranceStrings.resx                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
index 778584742b6..15cd09e7de0 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
+++ b/src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx
@@ -145,8 +145,8 @@
     <value>Usage: pwsh[.exe] [-Login] [[-File] &lt;filePath&gt; [args]]
                   [-Command { - | &lt;script-block&gt; [-args &lt;arg-array&gt;]
                                 | &lt;string&gt; [&lt;CommandParameters&gt;] } ]
-                  [-ConfigurationName &lt;string&gt;] [-CustomPipeName &lt;string&gt;]
-                  [-EncodedCommand &lt;Base64EncodedCommand&gt;]
+                  [-ConfigurationName &lt;string&gt;] [-ConfigurationFile &lt;filePath&gt;]
+                  [-CustomPipeName &lt;string&gt;] [-EncodedCommand &lt;Base64EncodedCommand&gt;]
                   [-ExecutionPolicy &lt;ExecutionPolicy&gt;] [-InputFormat {Text | XML}]
                   [-Interactive] [-MTA] [-NoExit] [-NoLogo] [-NonInteractive] [-NoProfile]
                   [-NoProfileLoadTime] [-OutputFormat {Text | XML}] 

From 578aef29af131a8779a3b70106ad32f531e202f4 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 15 Sep 2022 16:55:16 -0700
Subject: [PATCH 568/645] [release/v7.3.0-rc.1] Update
 `DotnetRuntimeMetadata.json` for .NET 7 RC1 build (#18106)

---
 DotnetRuntimeMetadata.json                    |  8 ++---
 assets/wix/files.wxs                          | 30 +++++++++----------
 global.json                                   |  2 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  6 ++--
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           | 20 ++++++-------
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 .../System.Management.Automation.csproj       | 14 ++++-----
 .../BenchmarkDotNet.Extensions.csproj         |  4 +--
 .../ResultsComparer/ResultsComparer.csproj    |  2 +-
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/WebListener.csproj     |  4 +--
 13 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 7b07dcc16c3..c13bf52cd59 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,13 +1,13 @@
 {
   "sdk": {
-    "channel": "7.0.1xx-preview7",
+    "channel": "7.0.1xx-rc1",
     "quality": "daily",
     "qualityFallback": "preview",
-    "packageVersionPattern": "7.0.0-preview.7",
+    "packageVersionPattern": "7.0.0-rc.1",
     "sdkImageVersion": "7.0.100",
-    "nextChannel": "7.0.1xx-preview7",
+    "nextChannel": "7.0.1xx-rc1",
     "azureFeed": "",
-    "sdkImageOverride": ""
+    "sdkImageOverride": "7.0.100-rc.1.22431.12"
   },
   "internalfeed": {
     "url": ""
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 4da5773c5e4..4a9c36ad3d7 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1587,17 +1587,17 @@
         <Component Id="cmp7C72179331DD48BCB12BF205F34B76AD">
           <File Id="filF65735DC9B8B4957B27F5B33D2A322F4" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Runtime.InteropServices.JavaScript.dll" />
         </Component>
-        <Component Id="cmpBB2921B987554B68B26862747C3BD398">
-          <File Id="fil1D77B59F22194840A66EFA782AB2BB95" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
-        </Component>
-        <Component Id="cmpD182C2F62588471F82252B0038C75327">
-          <File Id="filBD7A930797F148DA8F433C809DC7BFB4" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
-        </Component>
         <Component Id="cmpF3EB02BB62A34F509B22CC370C430A20">
           <File Id="fil489339762CDF41AE97538C020401BEC6" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Net.Quic.dll" />
         </Component>
-        <Component Id="cmp16FC1857F01A4E388616BA7AA8CC5F73">
-          <File Id="fil877D1292F59541DAB6758F5A7A74D20D" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
+        <Component Id="cmp2BB1C07A912442B0BB6270D7EB3185F3">
+          <File Id="fil2D6E6E560F1743729D90C204D69C369C" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
+        </Component>
+        <Component Id="cmpF5FD2E392BD94BCD957480F128A38E10">
+          <File Id="fil9C11C1DAFDC94C0588965EA6EAAA7592" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
+        </Component>
+        <Component Id="cmp28DEAACC47FD4B04A95521A375761643">
+          <File Id="filE0DD0282CF6C440C99209B0B7495422C" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
         </Component>
       </Directory>
       <Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
@@ -3141,9 +3141,6 @@
       <Component Id="cmp8A466581FE0540CEB2210C64DA5F970B">
         <File Id="filE75D9761159B495A8DF7A1035E36EF05" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Formats.Tar.dll" />
       </Component>
-      <Component Id="cmp9412841190084AEC978D2EB614E6AAE5">
-        <File Id="fil6B817BFD321945E780CA22E762DD9A9C" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.37506.dll" />
-      </Component>
       <Component Id="cmp41C949169E9341CC9297641456FEE2CC">
         <File Id="fil39EC96E6757D4C49B8AE32A532B205D5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Runtime.InteropServices.JavaScript.dll" />
       </Component>
@@ -3153,6 +3150,9 @@
       <Component Id="cmp42A739F2AAC24D729DDBCAA096B8C55A">
         <File Id="fil48314E2AC49B4E208C5667CEC50CA78C" KeyPath="yes" Source="$(var.ProductSourcePath)\RegisterMicrosoftUpdate.ps1" />
       </Component>
+      <Component Id="cmp76EB2749D0464D41AD1D2BA2C51CF4C9">
+        <File Id="filDC81A93ACA6045E4A22C108F59D69083" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.42610.dll" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -4157,15 +4157,15 @@
       <ComponentRef Id="cmp8A466581FE0540CEB2210C64DA5F970B" />
       <ComponentRef Id="cmp044F67223E6D490D8533691BF50B2B86" />
       <ComponentRef Id="cmp97D2E588E938462194C7549B3A0084FE" />
-      <ComponentRef Id="cmp9412841190084AEC978D2EB614E6AAE5" />
       <ComponentRef Id="cmp41C949169E9341CC9297641456FEE2CC" />
       <ComponentRef Id="cmp7C72179331DD48BCB12BF205F34B76AD" />
-      <ComponentRef Id="cmpBB2921B987554B68B26862747C3BD398" />
       <ComponentRef Id="cmp0721DF55B34849B78C98AE00D863CBFF" />
-      <ComponentRef Id="cmpD182C2F62588471F82252B0038C75327" />
       <ComponentRef Id="cmpF3EB02BB62A34F509B22CC370C430A20" />
-      <ComponentRef Id="cmp16FC1857F01A4E388616BA7AA8CC5F73" />
       <ComponentRef Id="cmp42A739F2AAC24D729DDBCAA096B8C55A" />
+      <ComponentRef Id="cmp2BB1C07A912442B0BB6270D7EB3185F3" />
+      <ComponentRef Id="cmp76EB2749D0464D41AD1D2BA2C51CF4C9" />
+      <ComponentRef Id="cmpF5FD2E392BD94BCD957480F128A38E10" />
+      <ComponentRef Id="cmp28DEAACC47FD4B04A95521A375761643" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 638ff46a12c..fa6c98cbf9e 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100-preview.7.22377.5"
+    "version": "7.0.100-rc.1.22431.12"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 483985aee84..48fcd1861c4 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-rc.1.22426.10" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index a09a69a84ee..18f9c39df02 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-3.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-1.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0-rc.1.22426.10" />
     <PackageReference Include="NJsonSchema" Version="10.7.2" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index f61abc2f4c5..36317ba86ee 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-rc.1.22426.10" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index aa699cf5eb3..e2d6644ae25 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,19 +18,19 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.IO.Packaging" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-rc.1.22426.10" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0-preview1.22261.2" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.10.0-preview1.22261.2" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.10.0-preview1.22261.2" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0-preview1.22261.2" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.10.0-preview1.22261.2" />
-    <PackageReference Include="System.Private.ServiceModel" Version="4.10.0-preview1.22261.2" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0" />
+    <PackageReference Include="System.ServiceModel.Http" Version="4.10.0" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.10.0" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0" />
+    <PackageReference Include="System.ServiceModel.Security" Version="4.10.0" />
+    <PackageReference Include="System.Private.ServiceModel" Version="4.10.0" />
     <!-- 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="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.1.22426.10" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index a8010f4d216..0ac640d196e 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-rc.1.22426.10" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 602c5fbffad..03414ef381b 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="System.DirectoryServices" Version="7.0.0-rc.1.22426.10" />
     <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
-    <PackageReference Include="System.Management" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.Management" Version="7.0.0-rc.1.22426.10" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="System.Security.Permissions" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22426.10" />
     <!-- 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.3.0-preview.1" />
diff --git a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj
index f0c3a35115e..02a372fa115 100644
--- a/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj
+++ b/test/perf/dotnet-tools/BenchmarkDotNet.Extensions/BenchmarkDotNet.Extensions.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
index 3180d45b64a..c40f05d7b77 100644
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
     <PackageReference Include="Perfolizer" Version="0.2.1" />
   </ItemGroup>
 </Project>
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 579c339efc5..3b8ded97a05 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.1.22426.10" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 0b42550cd48..972638cbba0 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.7.22376.6" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-rc.1.22427.1" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22426.10" />
   </ItemGroup>
 
   <ItemGroup>

From 4b0b4ff4eb9007782765a2acd853f48eb26d28a2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 17:42:37 -0700
Subject: [PATCH 569/645] [release/v7.3.0-rc.1] Re-enable building with
 Ready-to-Run (#18107)

---
 PowerShell.Common.props                | 3 +--
 test/powershell/Host/Startup.Tests.ps1 | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 593570c3589..cf5c11c9ed2 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -137,9 +137,8 @@
 
     <TargetFramework>net7.0</TargetFramework>
     <LangVersion>10.0</LangVersion>
-    <!-- disable ReadyToRun due to issue: https://github.com/dotnet/runtime/issues/72550
     <PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
-    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols-->
+    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/test/powershell/Host/Startup.Tests.ps1 b/test/powershell/Host/Startup.Tests.ps1
index 47ad858a801..ddaa2736a5c 100644
--- a/test/powershell/Host/Startup.Tests.ps1
+++ b/test/powershell/Host/Startup.Tests.ps1
@@ -70,7 +70,6 @@ Describe "Validate start of console host" -Tag CI {
         else {
             $allowedAssemblies += @(
                 'System.Net.Sockets.dll'
-                'System.Reflection.Emit.dll'
             )
         }
 

From 1088166dc3d3eacc67eb71869250735fafff2bde Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 16 Sep 2022 21:36:11 +0000
Subject: [PATCH 570/645] Merged PR 22551: Update cgmanifest.json for
 7.3.0-preview.8

Update cgmanifest.json for 7.3.0-preview.8
---
 tools/cgmanifest.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index a290afb3c9c..b69881cd658 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -65,7 +65,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Common",
-          "Version": "4.2.0"
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -75,7 +75,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.CSharp",
-          "Version": "4.2.0"
+          "Version": "4.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -765,7 +765,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Configuration.ConfigurationManager",
-          "Version": "6.0.0"
+          "Version": "6.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -775,7 +775,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Data.Odbc",
-          "Version": "6.0.0"
+          "Version": "6.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -1015,7 +1015,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Private.ServiceModel",
-          "Version": "4.9.0"
+          "Version": "4.10.0"
         }
       },
       "DevelopmentDependency": false
@@ -1265,7 +1265,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Duplex",
-          "Version": "4.9.0"
+          "Version": "4.10.0"
         }
       },
       "DevelopmentDependency": false
@@ -1275,7 +1275,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Http",
-          "Version": "4.9.0"
+          "Version": "4.10.0"
         }
       },
       "DevelopmentDependency": false
@@ -1285,7 +1285,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.NetTcp",
-          "Version": "4.9.0"
+          "Version": "4.10.0"
         }
       },
       "DevelopmentDependency": false
@@ -1295,7 +1295,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Primitives",
-          "Version": "4.9.0"
+          "Version": "4.10.0"
         }
       },
       "DevelopmentDependency": false
@@ -1305,7 +1305,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.ServiceModel.Security",
-          "Version": "4.9.0"
+          "Version": "4.10.0"
         }
       },
       "DevelopmentDependency": false

From fc76469050eacc39093eb20a19919a1198a5fd4c Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 16 Sep 2022 22:27:46 +0000
Subject: [PATCH 571/645] Merged PR 22553: Update ThirdPartyNotices.txt for
 7.3.0-preview.8

Update ThirdPartyNotices.txt for 7.3.0-preview.8
---
 ThirdPartyNotices.txt | 96 ++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 52 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index b2e206b7783..ceb1155c1b2 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -228,7 +228,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.CodeAnalysis.Common 4.2.0 - MIT
+Microsoft.CodeAnalysis.Common 4.3.0 - MIT
 
 
 
@@ -246,7 +246,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Microsoft.CodeAnalysis.CSharp 4.2.0 - MIT
+Microsoft.CodeAnalysis.CSharp 4.3.0 - MIT
 
 
 
@@ -1408,45 +1408,50 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Configuration.ConfigurationManager 6.0.0 - MIT
+System.Configuration.ConfigurationManager 6.0.1 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2020 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -1478,45 +1483,50 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Data.Odbc 6.0.0 - MIT
+System.Data.Odbc 6.0.1 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2020 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -2576,12 +2586,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Private.ServiceModel 4.9.0 - MIT
+System.Private.ServiceModel 4.10.0 - MIT
 
 
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -3289,12 +3296,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Duplex 4.9.0 - MIT
+System.ServiceModel.Duplex 4.10.0 - MIT
 
 
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -3325,12 +3329,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Http 4.9.0 - MIT
+System.ServiceModel.Http 4.10.0 - MIT
 
 
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -3361,12 +3362,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.NetTcp 4.9.0 - MIT
+System.ServiceModel.NetTcp 4.10.0 - MIT
 
 
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -3397,12 +3395,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Primitives 4.9.0 - MIT
+System.ServiceModel.Primitives 4.10.0 - MIT
 
 
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -3433,12 +3428,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Security 4.9.0 - MIT
+System.ServiceModel.Security 4.10.0 - MIT
 
 
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 

From 7a61c806bf208688fc628822cd310a3c79d964be Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Mon, 19 Sep 2022 21:33:25 +0000
Subject: [PATCH 572/645] Merged PR 22577: Update the change log for
 v7.3.0-preview.8

Update the change log for v7.3.0-preview.8
---
 .spelling            |  1 +
 CHANGELOG/preview.md | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/.spelling b/.spelling
index 8f8bbd2ca61..08cddf17bbd 100644
--- a/.spelling
+++ b/.spelling
@@ -1575,5 +1575,6 @@ vmImage
 ci.psm1
 jcotton42
 centos-7
+Security.types.ps1xml
  - ADOPTERS.md
 MicrosoftPowerBIMgmt
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index cf80d139a56..41a27232a2b 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,5 +1,45 @@
 # Current preview release
 
+## [7.3.0-preview.8] - 2022-09-20
+
+### General Cmdlet Updates and Fixes
+
+- Filter out compiler generated types for `Add-Type -PassThru` (#18095)
+- Fix error formatting to use color defined in `$PSStyle.Formatting` (#17987)
+- Handle `PSObject` argument specially in method invocation logging (#18060)
+- Revert the experimental feature `PSStrictModeAssignment` (#18040)
+- Make experimental feature `PSAMSIMethodInvocationLogging` stable (#18041)
+- Make experimental feature `PSAnsiRenderingFileInfo` stable (#18042)
+- Make experimental feature `PSCleanBlock` stable (#18043)
+- Make experimental feature `PSNativeCommandArgumentPassing` stable (#18044)
+- Make experimental feature `PSExec` stable (#18045)
+- Make experimental feature `PSRemotingSSHTransportErrorHandling` stable (#18046)
+- Add the `ConfigurationFile` option to the PowerShell help content (#18093)
+
+### Build and Packaging Improvements
+
+<summary>
+<p>Bump .NET SDK to version `7.0.100-rc.1`</p>
+</summary>
+
+<details>
+<ul>
+<li>Update ThirdPartyNotices.txt for 7.3.0-preview.8 (Internal 22553)</li>
+<li>Update cgmanifest.json for 7.3.0-preview.8 (Internal 22551)</li>
+<li>Re-enable building with Ready-to-Run (#18107)</li>
+<li>Make sure <code>Security.types.ps1xml</code> gets signed in release build (#17930)</li>
+<li>Update <code>DotnetRuntimeMetadata.json</code> for .NET 7 RC1 build (#18106)</li>
+<li>Add XML reference documents to NuPkg files for SDK (#18017)</li>
+<li>Make Register MU timeout (#17995)</li>
+<li>Bump Microsoft.NET.Test.Sdk from 17.2.0 to 17.3.0 (#17924)</li>
+<li>Update list of PS team members in release tools (#17928)</li>
+<li>Update to use version 2.21.0 of Application Insights (#17927)</li>
+<li>Complete ongoing <code>Write-Progress</code> in test (#17922)</li>
+</ul>
+</details>
+
+[7.3.0-preview.8]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.7...v7.3.0-preview.8
+
 ## [7.3.0-preview.7] - 2022-08-09
 
 ### Breaking Changes

From 86397ec4d2d646ab4205c00531f9d3a051e226ec Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 12:36:52 -0700
Subject: [PATCH 573/645] [release/v7.3.0-rc.1] Remove XML files for min-size
 package (#18275)

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
---
 build.psm1                                            | 11 +++++------
 tools/packaging/packaging.psm1                        |  7 +++----
 .../azureDevOps/templates/windows-packaging.yml       |  4 ++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 819a6573610..050440dd014 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1602,14 +1602,14 @@ function Show-PSPesterError
         $description = $testFailure.description
         $name = $testFailure.name
         $message = $testFailure.failure.message
-        $StackTrace = $testFailure.failure."stack-trace"
+        $stack_trace = $testFailure.failure."stack-trace"
     }
     elseif ($PSCmdlet.ParameterSetName -eq 'object')
     {
         $description = $testFailureObject.Describe + '/' + $testFailureObject.Context
         $name = $testFailureObject.Name
         $message = $testFailureObject.FailureMessage
-        $StackTrace = $testFailureObject.StackTrace
+        $stack_trace = $testFailureObject.StackTrace
     }
     else
     {
@@ -1621,7 +1621,7 @@ function Show-PSPesterError
     Write-Log -isError -message "message:"
     Write-Log -isError -message $message
     Write-Log -isError -message "stack-trace:"
-    Write-Log -isError -message $StackTrace
+    Write-Log -isError -message $stack_trace
 
 }
 
@@ -1659,14 +1659,14 @@ function Test-XUnitTestResults
         $description = $failure.type
         $name = $failure.method
         $message = $failure.failure.message
-        $StackTrace = $failure.failure.'stack-trace'
+        $stack_trace = $failure.failure.'stack-trace'
 
         Write-Log -isError -message ("Description: " + $description)
         Write-Log -isError -message ("Name:        " + $name)
         Write-Log -isError -message "message:"
         Write-Log -isError -message $message
         Write-Log -isError -message "stack-trace:"
-        Write-Log -isError -message $StackTrace
+        Write-Log -isError -message $stack_trace
         Write-Log -isError -message " "
     }
 
@@ -2846,7 +2846,6 @@ assembly
                 # only create an assembly group if we have tests
                 if ( $tCases.count -eq 0 -and ! $includeEmpty ) { continue }
                 $tGroup = $tCases | Group-Object result
-                $total = $tCases.Count
                 $asm = [testassembly]::new()
                 $asm.environment = $environment
                 $asm."run-date" = $rundate
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 775270acaba..d3484793a74 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -4587,7 +4587,6 @@ function Invoke-AzDevOpsLinuxPackageBuild {
             # Remove symbol files, xml document files.
             Remove-Item "${buildFolder}\*.pdb", "${buildFolder}\*.xml" -Force
 
-
             ## Build 'linux-arm' and create 'tar.gz' package for it.
             ## Note that 'linux-arm' can only be built on Ubuntu environment.
             $buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${arm32LinuxBuildFolder}"
@@ -4600,14 +4599,14 @@ function Invoke-AzDevOpsLinuxPackageBuild {
             # Remove symbol files.
             Remove-Item "${buildFolder}\*.pdb" -Force
         } elseif ($BuildType -eq 'rpm') {
-            ## Build 'min-size'
+            ## Build for Mariner
             $options = Get-PSOptions
-            Write-Verbose -Verbose "---- Min-Size ----"
+            Write-Verbose -Verbose "---- Mariner ----"
             Write-Verbose -Verbose "options.Output: $($options.Output)"
             Write-Verbose -Verbose "options.Top $($options.Top)"
             $binDir = Join-Path -Path $options.Top -ChildPath 'bin'
             if (Test-Path -Path $binDir) {
-                Write-Verbose -Verbose "Remove $binDir, to get a clean build for min-size package"
+                Write-Verbose -Verbose "Remove $binDir, to get a clean build for Mariner package"
                 Remove-Item -Path $binDir -Recurse -Force
             }
 
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index cb5b7ea8e7b..befcebf3bd3 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -202,6 +202,10 @@ jobs:
       $BuildPath = '$(System.ArtifactsDirectory)\$(SymbolsFolder)'
 
       Update-PSSignedBuildFolder -BuildPath $BuildPath -SignedFilesPath $SignedFilesPath
+      if ($env:BuildConfiguration -eq 'minSize') {
+        ## Remove XML files when making a min-size package.
+        Remove-Item "$BuildPath/*.xml" -Force
+      }
     displayName: Merge ThirdParty signed files with Build
     condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
 

From b39084bae8d9e18b59b3d688924b635cd91e4c2b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 12:40:03 -0700
Subject: [PATCH 574/645] [release/v7.3.0-rc.1] Update MSI exit message
 (#18260)

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 assets/wix/Product.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/wix/Product.wxs b/assets/wix/Product.wxs
index 85cc0011d36..8dc2d3a3f16 100644
--- a/assets/wix/Product.wxs
+++ b/assets/wix/Product.wxs
@@ -110,7 +110,7 @@
     <UI>
       <Dialog Id="MyExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
         <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="yes" Text="!(loc.ExitDialogBitmap)" />
-        <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" TabSkip="yes" />
+        <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Bigger}!(loc.Error1707)" TabSkip="yes" />
         <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" TabSkip="yes" />
         <!-- divider between check boxes and button row -->
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" TabSkip="yes"  />

From 647398666e6a188bc403286e50659060528b50ae Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 13:21:09 -0700
Subject: [PATCH 575/645] [release/v7.3.0-rc.1] Move ApiScan to compliance
 build (#18278)

* Add build and APIScan to compliance build

* dynamically set version

set releaseTagVar default

* publish logs

* set to standard verbosity

only update status every 5 minutes

* add guardian export

Publish Guardian reports

publish whole artifact folder

update publish

switch to guardian publish task

* Download symbols

* Create configuration that doesn't make it ready to run

* temp files are huge, don't preserve

* remove APIScan from release build

* remove duplicate install tool task

Co-authored-by: Travis Plunk <github@ez13.net>
---
 PowerShell.Common.props                       |  12 +-
 build.psm1                                    |   6 +-
 tools/releaseBuild/azureDevOps/compliance.yml |   7 ++
 .../azureDevOps/templates/compliance.yml      |  20 +---
 .../templates/compliance/apiscan.yml          | 112 ++++++++++++++++++
 5 files changed, 133 insertions(+), 24 deletions(-)
 create mode 100644 tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index cf5c11c9ed2..99b53418049 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -137,8 +137,6 @@
 
     <TargetFramework>net7.0</TargetFramework>
     <LangVersion>10.0</LangVersion>
-    <PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
-    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -171,7 +169,15 @@
 
   <!-- Define all OS, release configuration properties -->
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+
+  <!-- Define all OS, release configuration properties -->
+  <PropertyGroup Condition=" '$(Configuration)' == 'StaticAnalysis' ">
     <Optimize>true</Optimize>
+    <DebugType>full</DebugType>
   </PropertyGroup>
 
   <!-- Define windows, release configuration properties -->
@@ -193,6 +199,8 @@
   <!-- Define all OS, CodeCoverage configuration properties -->
   <PropertyGroup Condition=" '$(Configuration)' == 'CodeCoverage' ">
     <!-- This is required to be portable to Coverlet tool !-->
+    <PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
+    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
diff --git a/build.psm1 b/build.psm1
index 050440dd014..41a9fe928e6 100644
--- a/build.psm1
+++ b/build.psm1
@@ -319,7 +319,7 @@ function Start-PSBuild {
                      "win7-x86")]
         [string]$Runtime,
 
-        [ValidateSet('Debug', 'Release', 'CodeCoverage', '')] # We might need "Checked" as well
+        [ValidateSet('Debug', 'Release', 'CodeCoverage', 'StaticAnalysis', '')] # We might need "Checked" as well
         [string]$Configuration,
 
         [ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d{1,2})?)?$")]
@@ -814,7 +814,7 @@ function Compress-TestContent {
 function New-PSOptions {
     [CmdletBinding()]
     param(
-        [ValidateSet("Debug", "Release", "CodeCoverage", '')]
+        [ValidateSet('Debug', 'Release', 'CodeCoverage', 'StaticAnalysis', '')]
         [string]$Configuration,
 
         [ValidateSet("net7.0")]
@@ -2234,7 +2234,7 @@ function Start-DevPowerShell {
         [string[]]$ArgumentList = @(),
         [switch]$LoadProfile,
         [Parameter(ParameterSetName='ConfigurationParamSet')]
-        [ValidateSet("Debug", "Release", "CodeCoverage", '')] # should match New-PSOptions -Configuration values
+        [ValidateSet('Debug', 'Release', 'CodeCoverage', 'StaticAnalysis', '')] # should match New-PSOptions -Configuration values
         [string]$Configuration,
         [Parameter(ParameterSetName='BinDirParamSet')]
         [string]$BinDir,
diff --git a/tools/releaseBuild/azureDevOps/compliance.yml b/tools/releaseBuild/azureDevOps/compliance.yml
index 0b713cb0ae7..19935237216 100644
--- a/tools/releaseBuild/azureDevOps/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/compliance.yml
@@ -39,6 +39,13 @@ stages:
       - template: templates/compliance/compliance.yml
         parameters:
           parentJobs: []
+  - stage: APIScan
+    displayName: 'ApiScan'
+    dependsOn: []
+    jobs:
+      - template: templates/compliance/apiscan.yml
+        parameters:
+          parentJobs: []
   - stage: notice
     displayName: Generate Notice File
     dependsOn: []
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml
index 0c4a162bb11..0a416389bf4 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance.yml
@@ -9,9 +9,6 @@ jobs:
   - name: NugetSecurityAnalysisWarningLevel
     value: none
 
-  # Defines the variables APIScanClient, APIScanTenant and APIScanSecret
-  - group: PS-PS-APIScan
-
   displayName: Compliance
   dependsOn:
     ${{ parameters.parentJobs }}
@@ -20,9 +17,6 @@ jobs:
     demands:
     - ImageOverride -equals PSMMS2019-Secure
 
-  # APIScan can take a long time
-  timeoutInMinutes: 180
-
   steps:
   - checkout: self
     clean: true
@@ -93,18 +87,6 @@ jobs:
 
   # PreFASt is not applicable
 
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-apiscan.APIScan@2
-    displayName: 'Run APIScan'
-    inputs:
-      softwareFolder: '$(CompliancePath)'
-      softwareName: PowerShell
-      softwareVersionNum: '$(ReleaseTagVar)'
-      isLargeApp: false
-      preserveTempFiles: true
-    env:
-      AzureServicesAuthConnectionString: RunAs=App;AppId=$(APIScanClient);TenantId=$(APIScanTenant);AppKey=$(APIScanSecret)
-    continueOnError: true
-
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
     displayName: 'Publish Security Analysis Logs to Build Artifacts'
     continueOnError: true
@@ -129,7 +111,7 @@ jobs:
     displayName: 'Create Security Analysis Report'
     inputs:
       TsvFile: false
-      APIScan: true
+      APIScan: false
       BinSkim: true
       CredScan: true
       PoliCheck: true
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
new file mode 100644
index 00000000000..0aa6c498f4c
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
@@ -0,0 +1,112 @@
+jobs:
+  - job: APIScan
+    variables:
+      - name: runCodesignValidationInjection
+        value : false
+      - name: NugetSecurityAnalysisWarningLevel
+        value: none
+      - name: ReleaseTagVar
+        value: fromBranch
+      # Defines the variables APIScanClient, APIScanTenant and APIScanSecret
+      - group: PS-PS-APIScan
+      # PAT permissions NOTE: Declare a SymbolServerPAT variable in this group with a 'microsoft' organizanization scoped PAT with 'Symbols' Read permission.
+      # A PAT in the wrong org will give a single Error 203. No PAT will give a single Error 401, and individual pdbs may be missing even if permissions are correct.
+      - group: symbols
+
+    pool:
+      name: PowerShell1ES
+      demands:
+        - ImageOverride -equals PSMMS2019-Secure
+
+    # APIScan can take a long time
+    timeoutInMinutes: 180
+
+    steps:
+    - template: ../SetVersionVariables.yml
+      parameters:
+        ReleaseTagVar: $(ReleaseTagVar)
+        CreateJson: yes
+        UseJson: no
+
+    - pwsh: |
+        Import-Module .\build.psm1 -force
+        Start-PSBootstrap
+      workingDirectory: '$(Build.SourcesDirectory)'
+      retryCountOnTaskFailure: 2
+      displayName: 'Bootstrap'
+
+    - pwsh: |
+        Import-Module .\build.psm1 -force
+        Find-DotNet
+        dotnet tool install dotnet-symbol --tool-path $(Agent.ToolsDirectory)\tools\dotnet-symbol
+        $symbolToolPath = Get-ChildItem -Path $(Agent.ToolsDirectory)\tools\dotnet-symbol\dotnet-symbol.exe | Select-Object -First 1 -ExpandProperty FullName
+        Write-Host "##vso[task.setvariable variable=symbolToolPath]$symbolToolPath"
+      displayName: Install dotnet-symbol
+      retryCountOnTaskFailure: 2
+
+    - pwsh: |
+        Import-Module .\build.psm1 -force
+        Find-DotNet
+        Start-PSBuild -Configuration StaticAnalysis -PSModuleRestore -Clean
+
+        $OutputFolder = Split-Path (Get-PSOutput)
+        Write-Host "##vso[task.setvariable variable=BinDir]$OutputFolder"
+      workingDirectory: '$(Build.SourcesDirectory)'
+      displayName: 'Build PowerShell Source'
+
+    - pwsh: |
+        Get-ChildItem -Path env:
+      displayName: Capture Environment
+      condition: succeededOrFailed()
+
+    # Explicitly download symbols for the drop since the SDL image doesn't have http://SymWeb access and APIScan cannot handle https yet.
+    - pwsh: |
+        Import-Module .\build.psm1 -force
+        Find-DotNet
+        $pat = '$(SymbolServerPAT)'
+        if ($pat -like '*PAT*' -or $pat -eq '')
+        {
+          throw 'No PAT defined'
+        }
+        $url = 'https://microsoft.artifacts.visualstudio.com/defaultcollection/_apis/symbol/symsrv'
+        $(symbolToolPath) --authenticated-server-path $(SymbolServerPAT) $url --symbols -d "$env:BinDir\*" --recurse-subdirectories
+      displayName: 'Download Symbols for binaries'
+      retryCountOnTaskFailure: 2
+      workingDirectory: '$(Build.SourcesDirectory)'
+
+    - task: securedevelopmentteam.vss-secure-development-tools.build-task-apiscan.APIScan@2
+      displayName: 'Run APIScan'
+      inputs:
+        softwareFolder: '$(BinDir)'
+        softwareName: PowerShell
+        softwareVersionNum: '$(ReleaseTagVar)'
+        isLargeApp: false
+        preserveTempFiles: false
+        verbosityLevel: standard
+        # write a status update every 5 minutes.  Default is 1 minute
+        statusUpdateInterval: '00:05:00'
+      env:
+        AzureServicesAuthConnectionString: RunAs=App;AppId=$(APIScanClient);TenantId=$(APIScanTenant);AppKey=$(APIScanSecret)
+
+    - task: securedevelopmentteam.vss-secure-development-tools.build-task-report.SdtReport@2
+      continueOnError: true
+      displayName: 'Guardian Export'
+      inputs:
+        GdnExportVstsConsole: true
+        GdnExportSarifFile: true
+        GdnExportHtmlFile: true
+        GdnExportAllTools: false
+        GdnExportGdnToolApiScan: true
+        #this didn't do anything GdnExportCustomLogsFolder: '$(Build.ArtifactStagingDirectory)/Guardian'
+
+    - pwsh: |
+        Get-ChildItem -Path env:
+      displayName: Capture Environment
+      condition: succeededOrFailed()
+
+    - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@3
+      displayName: 'Publish Guardian Artifacts'
+      inputs:
+        AllTools: false
+        APIScan: true
+        ArtifactName: APIScan

From e65ff98a04f00fbef90331105ff5a9e3c91b2ab1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 13:32:14 -0700
Subject: [PATCH 576/645] [release/v7.3.0-rc.1] Add branch counter to
 compliance build (#18283)

Co-authored-by: travis plunk <github@ez13.net>
---
 .../releaseBuild/azureDevOps/templates/compliance/apiscan.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
index 0aa6c498f4c..55a40f34e00 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
@@ -12,6 +12,10 @@ jobs:
       # PAT permissions NOTE: Declare a SymbolServerPAT variable in this group with a 'microsoft' organizanization scoped PAT with 'Symbols' Read permission.
       # A PAT in the wrong org will give a single Error 203. No PAT will give a single Error 401, and individual pdbs may be missing even if permissions are correct.
       - group: symbols
+      - name: branchCounterKey
+        value: $[format('{0:yyyyMMdd}-{1}', pipeline.startTime,variables['Build.SourceBranch'])]
+      - name: branchCounter
+        value: $[counter(variables['branchCounterKey'], 1)]
 
     pool:
       name: PowerShell1ES

From d7a414b759e0010e95f8d97700c2a745f6ffe46f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 13:37:16 -0700
Subject: [PATCH 577/645] [release/v7.3.0-rc.1] Create tasks to collect and
 publish hashes for build files. (#18284)

Co-authored-by: James Truher <jimtru@microsoft.com>
---
 .../templates/compliance/apiscan.yml           | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
index 55a40f34e00..df58aeae1ae 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
@@ -78,6 +78,24 @@ jobs:
       retryCountOnTaskFailure: 2
       workingDirectory: '$(Build.SourcesDirectory)'
 
+    - pwsh: |
+        Get-ChildItem '$(BinDir)' -File |
+        Foreach-Object {
+          [pscustomobject]@{
+            Path = $_.FullName
+            Version = $_.VersionInfo.FileVersion
+            Md5Hash = (Get-FileHash -Algorithm MD5 -Path $_.FullName).Hash
+            Sha512Hash = (Get-FileHash -Algorithm SHA512 -Path $_.FullName).Hash
+          }
+        } | Export-Csv -Path '$(Build.SourcesDirectory)/ReleaseFileHash.csv'
+      displayName: 'Create release file hash artifact'
+
+    - task: PublishBuildArtifacts@1
+      displayName: 'Publish Build File Hash artifact'
+      inputs:
+        pathToPublish: '$(Build.SourcesDirectory)/ReleaseFileHash.csv'
+        artifactName: ReleaseFilesHash
+
     - task: securedevelopmentteam.vss-secure-development-tools.build-task-apiscan.APIScan@2
       displayName: 'Run APIScan'
       inputs:

From 28bbed7960dad4f1ac75e4b0477fb5cb35421846 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 14:19:00 -0700
Subject: [PATCH 578/645] [release/v7.3.0-rc.1] Recurse the file listing.
 (#18285)

Co-authored-by: James Truher <jimtru@microsoft.com>
---
 tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
index df58aeae1ae..c972106195d 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
@@ -79,7 +79,7 @@ jobs:
       workingDirectory: '$(Build.SourcesDirectory)'
 
     - pwsh: |
-        Get-ChildItem '$(BinDir)' -File |
+        Get-ChildItem '$(BinDir)' -File -Recurse |
         Foreach-Object {
           [pscustomobject]@{
             Path = $_.FullName

From 5da2c1e26a9000ed3abdda0f17213c0b882af154 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 09:52:32 -0700
Subject: [PATCH 579/645] [release/v7.3.0-rc.1] Make the link to minimal
 package blob public during release (#18175)

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
---
 .../azureDevOps/templates/release-MakeContainerPublic.yml     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-MakeContainerPublic.yml b/tools/releaseBuild/azureDevOps/templates/release-MakeContainerPublic.yml
index 870f2794dcb..65d5ea50191 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-MakeContainerPublic.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-MakeContainerPublic.yml
@@ -11,6 +11,10 @@ steps:
     az storage container set-permission --account-name $(StorageAccount) --name $(azureVersion) --public-access blob
   displayName: Make container public
 
+- pwsh: |
+    az storage container set-permission --account-name $(StorageAccount) --name $(azureVersion)-gc --public-access blob
+  displayName: Make guest configuration miminal package container public
+
 - pwsh: |
     az logout
   displayName: az logout

From e19b173efaf99caab7b2704d2848180e8138a15d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 09:53:42 -0700
Subject: [PATCH 580/645] [release/v7.3.0-rc.1] On Unix, only explicitly
 terminate the native process if not in background (#18279)

Co-authored-by: Dominik Kaszewski <dakaszewski@gmail.com>
Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
Co-authored-by: Steve Lee <slee@microsoft.com>
---
 .../engine/NativeCommandProcessor.cs          | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index 30bde91f1a4..eab59af5add 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -422,7 +422,7 @@ internal override void Prepare(IDictionary psDefaultParameterValues)
             catch (Exception)
             {
                 // Do cleanup in case of exception
-                CleanUp();
+                CleanUp(killBackgroundProcess: true);
                 throw;
             }
         }
@@ -444,7 +444,7 @@ internal override void ProcessRecord()
             catch (Exception)
             {
                 // Do cleanup in case of exception
-                CleanUp();
+                CleanUp(killBackgroundProcess: true);
                 throw;
             }
         }
@@ -904,7 +904,7 @@ internal override void Complete()
             finally
             {
                 // Do some cleanup
-                CleanUp();
+                CleanUp(killBackgroundProcess: false);
             }
 
             // An exception was thrown while attempting to run the program
@@ -1161,7 +1161,8 @@ internal void StopProcessing()
         /// <summary>
         /// Aggressively clean everything up...
         /// </summary>
-        private void CleanUp()
+        /// <param name="killBackgroundProcess">If set, also terminate background process.</param>
+        private void CleanUp(bool killBackgroundProcess)
         {
             // We need to call 'NotifyEndApplication' as appropriate during cleanup
             if (_hasNotifiedBeginApplication)
@@ -1171,17 +1172,20 @@ private void CleanUp()
 
             try
             {
-                // on Unix, we need to kill the process to ensure it terminates as Dispose() merely
-                // closes the redirected streams and the processs does not exit on macOS.  However,
-                // on Windows, a winexe like notepad should continue running so we don't want to kill it.
+                // on Unix, we need to kill the process (if not running in background) to ensure it terminates,
+                // as Dispose() merely closes the redirected streams and the process does not exit.
+                // However, on Windows, a winexe like notepad should continue running so we don't want to kill it.
 #if UNIX
-                try
-                {
-                    _nativeProcess?.Kill();
-                }
-                catch
+                if (killBackgroundProcess || !_isRunningInBackground)
                 {
-                    // Ignore all exception since it is cleanup.
+                    try
+                    {
+                        _nativeProcess?.Kill();
+                    }
+                    catch
+                    {
+                        // Ignore all exceptions since it is cleanup.
+                    }
                 }
 #endif
                 _nativeProcess?.Dispose();

From 525be7602a4e5fea68a3163555f458fb17b525db Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 10:37:30 -0700
Subject: [PATCH 581/645] [release/v7.3.0-rc.1] Remove unnecessary native
 dependencies from the package (#18297)

* Change the PDB type for release builds are portable

* Remove unnecessary dependencies from the package

* Update PowerShell.Common.props

* Update PowerShell.Common.props

* Fix wix files

* Get the correct file name for the platform

* Address CR feedback

* Re-add PresentationNative_cor3.dll

* Fix wix

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 PowerShell.Common.props | 16 +---------
 assets/wix/files.wxs    | 16 +++-------
 build.psm1              | 67 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 27 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 99b53418049..5e7e41f1470 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -172,16 +172,11 @@
     <PublishReadyToRun>true</PublishReadyToRun>
     <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
     <Optimize>true</Optimize>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
 
   <!-- Define all OS, release configuration properties -->
   <PropertyGroup Condition=" '$(Configuration)' == 'StaticAnalysis' ">
-    <Optimize>true</Optimize>
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-
-  <!-- Define windows, release configuration properties -->
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' And '$(IsWindows)' == 'true' ">
     <Optimize>true</Optimize>
     <!-- This is required to be full for compliance tools !-->
     <DebugType>full</DebugType>
@@ -193,15 +188,6 @@
          Debugging the issues resolves the problem
      -->
     <Optimize>false</Optimize>
-    <DebugType>portable</DebugType>
-  </PropertyGroup>
-
-  <!-- Define all OS, CodeCoverage configuration properties -->
-  <PropertyGroup Condition=" '$(Configuration)' == 'CodeCoverage' ">
-    <!-- This is required to be portable to Coverlet tool !-->
-    <PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
-    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
-    <DebugType>portable</DebugType>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 4a9c36ad3d7..c0ca7d624d4 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -2936,9 +2936,6 @@
       <Component Id="cmpF2634E50875D4698921081E3C6B1D5DC">
         <File Id="fil5A54754B01054DB590032470CE5F1EBD" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationCore.dll" />
       </Component>
-      <Component Id="cmpBFAC308E2D8645278D61C126C0FC2C61">
-        <File Id="fil2954DD50127543F991A9F0A539E80FA4" KeyPath="yes" Source="$(var.ProductSourcePath)\PenImc_cor3.dll" />
-      </Component>
       <Component Id="cmp8F0E2CF1B76B4D5185CB6A8DB9236F93">
         <File Id="fil91831C8BEFBB49AE8A4FDE50300CA3E8" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationFramework-SystemXml.dll" />
       </Component>
@@ -3023,9 +3020,6 @@
       <Component Id="cmp930F2D2320B94F6397ECD91862AF7A90">
         <File Id="fil0B2E8182CDEC485F8364AB82F5EA2D35" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationFramework.Luna.dll" />
       </Component>
-      <Component Id="cmp5C8827EF42BE4C098EF08EBD4011DA47">
-        <File Id="fil15D3E880E8AD4F9A970422D79FADDBAF" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationNative_cor3.dll" />
-      </Component>
       <Component Id="cmp6C0567CC32E4457A8F2D03C6E7F5897E">
         <File Id="filB46C0C9BDA404C51ACB0F93E5ADACDE5" KeyPath="yes" Source="$(var.ProductSourcePath)\WindowsFormsIntegration.dll" />
       </Component>
@@ -3089,9 +3083,6 @@
       <Component Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E">
         <File Id="fil6EF5C2AED8674A32B0F3CCEE9CBEED71" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Formats.Asn1.dll" />
       </Component>
-      <Component Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D">
-        <File Id="fil8FEEEB3B27DF40148EB85CE6AE1A420B" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.DiaSymReader.Native.$(var.FileArchitecture).dll" />
-      </Component>
       <Component Id="cmpB92B70CEFC2F438386F97264FB436CDD">
         <File Id="fil824D1A506096432888ABC2FDFAFABEE5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.EventLog.Messages.dll" />
       </Component>
@@ -3153,6 +3144,9 @@
       <Component Id="cmp76EB2749D0464D41AD1D2BA2C51CF4C9">
         <File Id="filDC81A93ACA6045E4A22C108F59D69083" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.42610.dll" />
       </Component>
+      <Component Id="cmp6986F8B66C514347A25E03DD3096B5AE">
+        <File Id="fil9276D1BDBF8B4C91B90761633720A419" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationNative_cor3.dll" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -4052,7 +4046,6 @@
       <ComponentRef Id="cmp30126C60BD784974B74EA45AE9B04032" />
       <ComponentRef Id="cmp9EC1507780D247E095EA92A7715B4BAC" />
       <ComponentRef Id="cmpF2634E50875D4698921081E3C6B1D5DC" />
-      <ComponentRef Id="cmpBFAC308E2D8645278D61C126C0FC2C61" />
       <ComponentRef Id="cmp8F0E2CF1B76B4D5185CB6A8DB9236F93" />
       <ComponentRef Id="cmp14EA1CB2EC4E4B1DB7F7968B5B3D8E16" />
       <ComponentRef Id="cmpF543DDEF59CB4ACB85CBC9A106BD853D" />
@@ -4081,7 +4074,6 @@
       <ComponentRef Id="cmpDEE7C0BADEA14B9A9AFFD4C9BF4E7702" />
       <ComponentRef Id="cmp10ABC7FB464B42FCA1EDEC7015AFEDCF" />
       <ComponentRef Id="cmp930F2D2320B94F6397ECD91862AF7A90" />
-      <ComponentRef Id="cmp5C8827EF42BE4C098EF08EBD4011DA47" />
       <ComponentRef Id="cmp6C0567CC32E4457A8F2D03C6E7F5897E" />
       <ComponentRef Id="cmp18A181D71C894FBE96F4A3563213DC57" />
       <ComponentRef Id="cmp1C666476BE6044B4B8C74450F1F32E67" />
@@ -4103,7 +4095,6 @@
       <ComponentRef Id="cmpE9599A00802144DF98F5792E029C8875" />
       <ComponentRef Id="cmp0989343D60B74AF082291F612F0E6FA6" />
       <ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
-      <ComponentRef Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D" />
       <ComponentRef Id="cmpB92B70CEFC2F438386F97264FB436CDD" />
       <ComponentRef Id="cmp8635213A03B04AAE8E1BFB7EA85E0DB2" />
       <ComponentRef Id="cmp834F3E0C83664E92B0D115A39A8FAACB" />
@@ -4166,6 +4157,7 @@
       <ComponentRef Id="cmp76EB2749D0464D41AD1D2BA2C51CF4C9" />
       <ComponentRef Id="cmpF5FD2E392BD94BCD957480F128A38E10" />
       <ComponentRef Id="cmp28DEAACC47FD4B04A95521A375761643" />
+      <ComponentRef Id="cmp6986F8B66C514347A25E03DD3096B5AE" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/build.psm1 b/build.psm1
index 41a9fe928e6..0fab7f37b88 100644
--- a/build.psm1
+++ b/build.psm1
@@ -674,6 +674,8 @@ Fix steps:
         Restore-PSPester -Destination (Join-Path $publishPath "Modules")
     }
 
+    Clear-NativeDependencies -PublishFolder $publishPath
+
     if ($PSOptionsPath) {
         $resolvedPSOptionsPath = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($PSOptionsPath)
         $parent = Split-Path -Path $resolvedPSOptionsPath
@@ -3357,3 +3359,68 @@ function Find-AzCopy {
     $azCopy = Get-Command -Name azCopy -ErrorAction Stop | Select-Object -First 1
     return $azCopy.Path
 }
+
+function Clear-NativeDependencies
+{
+    param(
+        [Parameter(Mandatory=$true)] [string] $PublishFolder
+    )
+
+    $diasymFileNamePattern = 'microsoft.diasymreader.native.{0}.dll'
+
+    switch -regex ($($script:Options.Runtime)) {
+        '.*-x64' {
+            $diasymFileName = $diasymFileNamePattern -f 'amd64'
+        }
+        '.*-x86' {
+            $diasymFileName = $diasymFileNamePattern -f 'x86'
+        }
+        '.*-arm' {
+            $diasymFileName = $diasymFileNamePattern -f 'arm'
+        }
+        '.*-arm64' {
+            $diasymFileName = $diasymFileNamePattern -f 'arm64'
+        }
+        'fxdependent.*' {
+            Write-Verbose -Message "$($script:Options.Runtime) is a fxdependent runtime, skipping diasymreader removal" -Verbose
+            $diasymFileName = $null
+        }
+        Default {
+            throw "Unknown runtime $($script:Options.Runtime)"
+        }
+    }
+
+    $filesToDeleteCore = @($diasymFileName)
+
+    $filesToDeleteWinDesktop = @('penimc_cor3.dll')
+
+    $deps = Get-Content "$PublishFolder/pwsh.deps.json" -Raw | ConvertFrom-Json -Depth 20
+    $targetRuntime = ".NETCoreApp,Version=v7.0/$($script:Options.Runtime)"
+
+    $runtimePackNetCore = $deps.targets.${targetRuntime}.PSObject.Properties.Name -like 'runtimepack.Microsoft.NETCore.App.Runtime*'
+    $runtimePackWinDesktop = $deps.targets.${targetRuntime}.PSObject.Properties.Name -like 'runtimepack.Microsoft.WindowsDesktop.App.Runtime*'
+
+    if ($runtimePackNetCore)
+    {
+        $filesToDeleteCore | ForEach-Object {
+            Write-Verbose "Removing $_ from pwsh.deps.json" -Verbose
+            $deps.targets.${targetRuntime}.${runtimePackNetCore}.native.PSObject.Properties.Remove($_)
+            if (Test-Path $PublishFolder/$_) {
+                Remove-Item -Path $PublishFolder/$_ -Force -Verbose
+            }
+        }
+    }
+
+    if ($runtimePackWinDesktop)
+    {
+        $filesToDeleteWinDesktop | ForEach-Object {
+            Write-Verbose "Removing $_ from pwsh.deps.json" -Verbose
+            $deps.targets.${targetRuntime}.${runtimePackWinDesktop}.native.PSObject.Properties.Remove($_)
+            if (Test-Path $PublishFolder/$_) {
+                Remove-Item -Path $PublishFolder/$_ -Force -Verbose
+            }
+        }
+    }
+
+    $deps | ConvertTo-Json -Depth 20 | Set-Content "$PublishFolder/pwsh.deps.json" -Force
+}

From 963279d799dc804021bdd0c93a96f360997c8585 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 10:47:03 -0700
Subject: [PATCH 582/645] [release/v7.3.0-rc.1] Bump
 Microsoft.PowerShell.Native from 7.3.0-preview.1 to 7.3.0-rc.1 (#18296)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../System.Management.Automation.csproj                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 03414ef381b..75deb301ba1 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22426.10" />
     <!-- 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.3.0-preview.1" />
+    <PackageReference Include="Microsoft.PowerShell.Native" Version="7.3.0-rc.1" />
     <!-- Signing APIs -->
     <PackageReference Include="Microsoft.Security.Extensions" Version="1.2.0" />
   </ItemGroup>

From b39829c9ca010dde517197ace5176ad395258a52 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 10:52:18 -0700
Subject: [PATCH 583/645] [release/v7.3.0-rc.1] Update to use ComputeCore.dll
 for PowerShell Direct (#18295)

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
---
 src/System.Management.Automation/utils/PInvokeDllNames.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/utils/PInvokeDllNames.cs b/src/System.Management.Automation/utils/PInvokeDllNames.cs
index bff2ca2656e..a1bbe282aa7 100644
--- a/src/System.Management.Automation/utils/PInvokeDllNames.cs
+++ b/src/System.Management.Automation/utils/PInvokeDllNames.cs
@@ -89,7 +89,7 @@ internal static class PinvokeDllNames
         internal const string PrivilegeCheckDllName = "api-ms-win-security-base-l1-1-0.dll";                 /*76*/
         internal const string ImpersonateNamedPipeClientDllName = "api-ms-win-core-namedpipe-l1-1-0.dll";    /*77*/
         internal const string RevertToSelfDllName = "api-ms-win-security-base-l1-1-0.dll";                   /*78*/
-        internal const string CreateProcessInComputeSystemDllName = "vmcompute.dll";                         /*79*/
+        internal const string CreateProcessInComputeSystemDllName = "ComputeCore.dll";                       /*79*/
         internal const string CLSIDFromProgIDDllName = "api-ms-win-core-com-l1-1-0.dll";                     /*80*/
         internal const string LoadLibraryEx = "api-ms-win-core-libraryloader-l1-1-0.dll";                    /*81*/
         internal const string FreeLibrary = "api-ms-win-core-libraryloader-l1-1-0.dll";                      /*82*/

From 7667a4d4ba6f92bf9edb14e254338df474497c08 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 11:22:36 -0700
Subject: [PATCH 584/645] [release/v7.3.0-rc.1] Do not cleanup pwsh.deps.json
 for framework dependent packages (#18300)

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
---
 build.psm1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 0fab7f37b88..863dc0d2db9 100644
--- a/build.psm1
+++ b/build.psm1
@@ -3382,8 +3382,8 @@ function Clear-NativeDependencies
             $diasymFileName = $diasymFileNamePattern -f 'arm64'
         }
         'fxdependent.*' {
-            Write-Verbose -Message "$($script:Options.Runtime) is a fxdependent runtime, skipping diasymreader removal" -Verbose
-            $diasymFileName = $null
+            Write-Verbose -Message "$($script:Options.Runtime) is a fxdependent runtime, no cleanup needed in pwsh.deps.json" -Verbose
+            return
         }
         Default {
             throw "Unknown runtime $($script:Options.Runtime)"

From 99c298a5b4c1ed6dc2415e82da15331fc7ac59e9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 23:52:54 +0000
Subject: [PATCH 585/645] Add missing `-Tag 'CI'` to describe blocks. (#18317)

---
 .../Language/Scripting/CleanBlockErrorHandling.Tests.ps1      | 2 +-
 .../Scripting/HashtableToPSCustomObjectConversion.Tests.ps1   | 2 +-
 .../NativeExecution/NativeCommandArguments.Tests.ps1          | 2 +-
 .../Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1          | 2 +-
 .../Microsoft.PowerShell.Utility/Format-List.Tests.ps1        | 2 +-
 .../Microsoft.PowerShell.Utility/Format-Table.Tests.ps1       | 2 +-
 test/powershell/engine/Formatting/OutputRendering.Tests.ps1   | 2 +-
 test/powershell/engine/Formatting/PSStyle.Tests.ps1           | 4 ++--
 test/powershell/engine/Module/IsolatedModule.Tests.ps1        | 2 +-
 test/powershell/engine/OrderedHashtable.Tests.ps1             | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/powershell/Language/Scripting/CleanBlockErrorHandling.Tests.ps1 b/test/powershell/Language/Scripting/CleanBlockErrorHandling.Tests.ps1
index 68904d4c79f..0d459da87b8 100644
--- a/test/powershell/Language/Scripting/CleanBlockErrorHandling.Tests.ps1
+++ b/test/powershell/Language/Scripting/CleanBlockErrorHandling.Tests.ps1
@@ -540,7 +540,7 @@ Describe "Error handling within a single 'Clean' block" -Tag 'CI' {
     }
 }
 
-Describe "Multiple errors from 'Clean' and another named block" {
+Describe "Multiple errors from 'Clean' and another named block" -Tag 'CI' {
 
     BeforeAll {
         function MultipleErrors {
diff --git a/test/powershell/Language/Scripting/HashtableToPSCustomObjectConversion.Tests.ps1 b/test/powershell/Language/Scripting/HashtableToPSCustomObjectConversion.Tests.ps1
index 8d0d1ac24fe..6afd2402032 100644
--- a/test/powershell/Language/Scripting/HashtableToPSCustomObjectConversion.Tests.ps1
+++ b/test/powershell/Language/Scripting/HashtableToPSCustomObjectConversion.Tests.ps1
@@ -142,7 +142,7 @@ Describe "Tests for hashtable to PSCustomObject conversion" -Tags "CI" {
     }
 }
 
-Describe "Error message with settable Property information" {
+Describe "Error message with settable Property information" -Tag 'CI' {
     BeforeAll {
         Add-Type @"
 namespace HashtableConversionTest {
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
index d96720139bb..9cf10e8c901 100644
--- a/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
+++ b/test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
@@ -162,7 +162,7 @@ Describe "Will error correctly if an attempt to set variable to improper value"
     }
 }
 
-Describe "find.exe uses legacy behavior on Windows" {
+Describe "find.exe uses legacy behavior on Windows" -Tag 'CI' {
     BeforeAll {
         $currentSetting = $PSNativeCommandArgumentPassing
         $PSNativeCommandArgumentPassing = "Windows"
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
index 640fb8e0fc9..858a04fb4e8 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
@@ -50,7 +50,7 @@ Describe 'Switch-Process tests for Unix' -Tags 'CI' {
     }
 }
 
-Describe 'Switch-Process for Windows' {
+Describe 'Switch-Process for Windows' -Tag 'CI' {
     BeforeAll {
         $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
         if (!$IsWindows)
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
index 675d1fd5106..bf10868e1f6 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-List.Tests.ps1
@@ -232,7 +232,7 @@ decimal : 4567.123456789
     }
 }
 
-Describe 'Format-List color tests' {
+Describe 'Format-List color tests' -Tag 'CI' {
     BeforeAll {
         $originalRendering = $PSStyle.OutputRendering
         $PSStyle.OutputRendering = 'Ansi'
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1
index 47364842b78..3947497b0de 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Format-Table.Tests.ps1
@@ -866,7 +866,7 @@ A Name                                  B
         }
     }
 
-Describe 'Table color tests' {
+Describe 'Table color tests' -Tag 'CI' {
     BeforeAll {
         $originalRendering = $PSStyle.OutputRendering
         $PSStyle.OutputRendering = 'Ansi'
diff --git a/test/powershell/engine/Formatting/OutputRendering.Tests.ps1 b/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
index 7b67f71233c..a1c721e7646 100644
--- a/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
+++ b/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-Describe 'OutputRendering tests' {
+Describe 'OutputRendering tests' -Tag 'CI' {
     BeforeEach {
         if ($null -ne $PSStyle) {
             $oldOutputRendering = $PSStyle.OutputRendering
diff --git a/test/powershell/engine/Formatting/PSStyle.Tests.ps1 b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
index e232ebe6d57..56f404084ae 100644
--- a/test/powershell/engine/Formatting/PSStyle.Tests.ps1
+++ b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-Describe 'Tests for $PSStyle automatic variable' {
+Describe 'Tests for $PSStyle automatic variable' -Tag 'CI' {
     BeforeAll {
         $styleDefaults = @{
             Reset = "`e[0m"
@@ -359,7 +359,7 @@ Describe 'Tests for $PSStyle automatic variable' {
     }
 }
 
-Describe 'Handle strings with escape sequences in formatting' {
+Describe 'Handle strings with escape sequences in formatting' -Tag 'CI' {
 
     BeforeAll {
         function Get-DemoObjects {
diff --git a/test/powershell/engine/Module/IsolatedModule.Tests.ps1 b/test/powershell/engine/Module/IsolatedModule.Tests.ps1
index 114b1d1610a..5d1289271de 100644
--- a/test/powershell/engine/Module/IsolatedModule.Tests.ps1
+++ b/test/powershell/engine/Module/IsolatedModule.Tests.ps1
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-Describe "Isolated module scenario - load the whole module in custom ALC" {
+Describe "Isolated module scenario - load the whole module in custom ALC" -Tag 'CI' {
     It "Loading 'IsolatedModule' should work as expected" {
         ## The 'IsolatedModule' module can be found at '<repo-root>\test\tools\Modules'.
         ## The module assemblies are created and deployed by '<repo-root>\test\tools\TestAlc'.
diff --git a/test/powershell/engine/OrderedHashtable.Tests.ps1 b/test/powershell/engine/OrderedHashtable.Tests.ps1
index 4df61c49edb..2ffa84539c4 100644
--- a/test/powershell/engine/OrderedHashtable.Tests.ps1
+++ b/test/powershell/engine/OrderedHashtable.Tests.ps1
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-Describe 'Tests for OrderedHashtable' {
+Describe 'Tests for OrderedHashtable' -Tag 'CI' {
 
     It 'Can create an empty OrderedHashtable' {
         $oh =[System.Management.Automation.OrderedHashtable]::new()

From 081b014e8b9030632b3ad9ad54b270f1b76be9b5 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 25 Oct 2022 09:47:39 -0700
Subject: [PATCH 586/645] [release/v7.3.0-rc.1] Replace win7 runtime with win8
 and remove APISets (#18304) (#18354)

---
 .../windows/templates/windows-packaging.yml   |   2 +-
 assets/wix/files.wxs                          | 492 ------------------
 build.psm1                                    |  22 +-
 .../Microsoft.PowerShell.SDK.csproj           |   1 -
 src/ResGen/ResGen.csproj                      |   2 +-
 src/TypeCatalogGen/TypeCatalogGen.csproj      |   2 +-
 .../powershell-win-core.csproj                |   2 +-
 test/hosting/hosting.tests.csproj             |   1 -
 test/packaging/windows/exe.tests.ps1          |  10 +-
 test/packaging/windows/msi.tests.ps1          |  10 +-
 .../Get-ExperimentalFeature.Tests.ps1         |   4 +-
 test/tools/OpenCover/OpenCover.psm1           |   4 +-
 test/tools/TestExe/TestExe.csproj             |   2 +-
 test/tools/TestService/TestService.csproj     |   2 +-
 test/xUnit/xUnit.tests.csproj                 |   2 +-
 tools/ci.psm1                                 |   2 +-
 tools/findMissingNotices.ps1                  |  14 +-
 tools/packaging/packaging.psm1                |   8 +-
 .../PowerShellPackage.ps1                     |   4 +-
 .../azureDevOps/templates/testartifacts.yml   |   8 +-
 .../templates/windows-hosted-build.yml        |   4 +-
 .../templates/windows-packaging.yml           |   4 +-
 22 files changed, 56 insertions(+), 546 deletions(-)

diff --git a/.vsts-ci/windows/templates/windows-packaging.yml b/.vsts-ci/windows/templates/windows-packaging.yml
index 832fe73af5e..011a7424291 100644
--- a/.vsts-ci/windows/templates/windows-packaging.yml
+++ b/.vsts-ci/windows/templates/windows-packaging.yml
@@ -4,7 +4,7 @@ parameters:
   - name: jobName
     default: 'win_packaging'
   - name: runtimePrefix
-    default: 'win7'
+    default: 'win81'
   - name: architecture
     default: 'x64'
   - name: channel
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index c0ca7d624d4..ae7d69c9326 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -77,9 +77,6 @@
       <Component Id="cmp8D31C0EED6D178C8313F057D6EE90970">
         <File Id="fil1E2CEF14CCAFA3945E18883DD2470572" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.FileVersionInfo.dll" />
       </Component>
-      <Component Id="cmpEC0174D67CBA8D49D44387CCDC8E7986">
-        <File Id="fil1CEA5D053C438E2B271B665BD41E4C22" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-wow64-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp02D5012CE68A72B4EB57A85BF4E40843">
         <File Id="filD5DB09D96F86A527D7CEAB0EAFF51B86" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.Security.dll" />
       </Component>
@@ -95,9 +92,6 @@
       <Component Id="cmp2F126B84C7D50DC3F8F8E273DD6CE7DC">
         <File Id="fil8F88BBAEC0F5B596BEAA3853DAEFDFBB" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.WebSockets.Client.dll" />
       </Component>
-      <Component Id="cmp492FB39320E285A540ADEADE18A5F96E">
-        <File Id="fil4E40359806A4B4741A94233918CCB490" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-threadpool-legacy-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp0C53A9DAF0450D9AD0734770DD18662A">
         <File Id="fil6653C29C95DDA011D027F382392D8800" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.dll" />
       </Component>
@@ -128,36 +122,18 @@
       <Component Id="cmp6C6F29B464717486F94FE5416BFFE029">
         <File Id="fil57FAF01CE0638DCB4B3473056CE1B49B" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Reflection.Metadata.dll" />
       </Component>
-      <Component Id="cmpFF8748C4903DCFC623FFDA416F2AE314">
-        <File Id="filC0DEC4F5D91C81FCF4777186AD29D611" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-ro-typeresolution-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmpCC81CFD99DC82F17A1EA3D8763C0B35B">
-        <File Id="fil9CA808BFA526CF7688EED5105251D4C2" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-string-obsolete-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp52FBB26F92105AD3AD35C220A657AD2A">
         <File Id="fil4368B0042787DED34FE6630A87B55358" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordbi.dll" />
       </Component>
       <Component Id="cmp717F2424B3CF81CE7C4CF659DB544785">
         <File Id="filF7F095921CD48A7EB311C4E636C4B4BE" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Management.Automation.xml" />
       </Component>
-      <Component Id="cmpE76D27D7B5D2ABAF88E777361EB91660">
-        <File Id="fil47B903568DF7E9B8A73851F7E4A2FEAB" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Eventing-Legacy-L1-1-0.dll" />
-      </Component>
       <Component Id="cmp3233756873AD35E45D8AFF0DECB12A10">
         <File Id="fil8FA95BFDD5FD05813DE64D663DAEF2C7" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.Cng.dll" />
       </Component>
-      <Component Id="cmpC34CACA6E967ECA4F9CCF56570BD8185">
-        <File Id="fil86BFC3F494414BCAD87DBEFCB224C6EE" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-service-private-l1-1-1.dll" />
-      </Component>
-      <Component Id="cmpFD7E03A554A320F567F49F8211D93A59">
-        <File Id="fil88C312289A4A16E91764CC7A693178D5" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-console-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp580A12A38C2531DBD6B76F4A159A7A84">
         <File Id="fil79E4FCD27530036F78FCF8EF09B2AF45" KeyPath="yes" Source="$(var.ProductSourcePath)\System.ComponentModel.EventBasedAsync.dll" />
       </Component>
-      <Component Id="cmp65A9F72C0AE530B5080F50972BD208B0">
-        <File Id="fil0EBDC3A5667954155B167DBA3D2F3E0A" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-registry-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpCC2EA506ACC015C30257216EB54EF45C">
         <File Id="filF929D1F6273B2D99D06A623E318B63D0" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.DiagnosticSource.dll" />
       </Component>
@@ -173,18 +149,12 @@
       <Component Id="cmp5977DC14DE00AD6E597A2FEBB8C3B58B">
         <File Id="filEE7925E7A712381B024DAE39831F7AEB" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Threading.dll" />
       </Component>
-      <Component Id="cmp689C7CE34E0246D8B56D370E898354CE">
-        <File Id="fil41BA8405669095002402115395C528D6" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-service-private-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp634E012FEF6122735D91DE4B1BCC1116">
         <File Id="filA6CD4693B91587C49C03C169292C4467" KeyPath="yes" Source="$(var.ProductSourcePath)\netstandard.dll" />
       </Component>
       <Component Id="cmpDB015975B1AF141A6CDDA12B31DA2B74">
         <File Id="filAB89FE6AB1DADD58D58CAEF1DB5535C1" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Management.Infrastructure.Native.dll" />
       </Component>
-      <Component Id="cmp78C94EF3D79D1B59DE4388AA2667668E">
-        <File Id="fil3B354385633C6093E72CB08E11614534" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-string-obsolete-l1-1-1.dll" />
-      </Component>
       <Component Id="cmp2C924B87CA7B55E4B688163D0424BF1B">
         <File Id="filCE0E4D674C0174C77D9D65543C16D1E7" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.VisualBasic.dll" />
       </Component>
@@ -194,15 +164,9 @@
       <Component Id="cmp0D69AF816E19455A8CF5034C61317EA4">
         <File Id="fil8C7C4F9B663882D6E458709F9E960D1D" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Memory.dll" />
       </Component>
-      <Component Id="cmp9517BE666A9E7C23D64C30BB87042294">
-        <File Id="fil8143B5E64F2386C860822E87526A6629" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-service-winsvc-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp20E61B6FB720A911BF811B96C3D45849">
         <File Id="filDDFDBF4A80E8D78988F324D618FE8AD0" KeyPath="yes" Source="$(var.ProductSourcePath)\System.ServiceModel.Http.dll" />
       </Component>
-      <Component Id="cmpD28050E830C7622BACAB507E9B96785E">
-        <File Id="filFCA0110393F714783961BE30134AC9CD" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-processenvironment-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpBECA40B2C3C12E0305699CA1817C9F5D">
         <File Id="filEA9F344FCC5D9139BD56D1D572D8F1A2" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.FileSystem.AccessControl.dll" />
       </Component>
@@ -212,12 +176,6 @@
       <Component Id="cmp433305CEF42F648A101FB57F72AE371A">
         <File Id="fil629A79C359986D653B8CBFC19696CE20" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Xml.XPath.dll" />
       </Component>
-      <Component Id="cmp37330FDB9A02F3FB463D113D31EDCA86">
-        <File Id="fil28CC4368AD2429118839DE4A8F8B748B" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-processsecurity-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmp28A6204649AC15DA0210CE3067308BDE">
-        <File Id="filAD7A1E9276AC1F8C21308870DF4A5F32" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-normalization-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpA4C6AF97A7B02D8D55E1E09AB7F74558">
         <File Id="fil4D7DC681B9B221FD8DDDD6FF9C31CF22" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Xml.XmlDocument.dll" />
       </Component>
@@ -227,9 +185,6 @@
       <Component Id="cmp18FD8ABAE1B131CE3834F0E2BB07E5B8">
         <File Id="fil4107C2714D75DB3C2AFC183E124E17DB" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Management.Infrastructure.Native.Unmanaged.dll" />
       </Component>
-      <Component Id="cmp8552B147D2AAFD164533C72368BFB61C">
-        <File Id="fil04EEAADB490702694BCFB90B84B878D7" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-winrt-robuffer-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp33AA41435A9FDD75B7D5FA6869C6F441">
         <File Id="fil4E4BF6DF7AC1C464DBEB5F6246C5C280" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Configuration.dll" />
       </Component>
@@ -260,24 +215,12 @@
       <Component Id="cmp4CB166B799668590C946561BBF2EFDE1">
         <File Id="fil0190F42D9CCACA0269421EFE6529CC5B" KeyPath="yes" Source="$(var.ProductSourcePath)\mi.dll" />
       </Component>
-      <Component Id="cmpB9AA376C913A011DB4FCF8058BBA8243">
-        <File Id="filCF52386189A53C286BDEF8C9B52CA4F2" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-errorhandling-l1-1-1.dll" />
-      </Component>
-      <Component Id="cmp91FC3112769800144B79BEECAD84D60A">
-        <File Id="fil3EFD21D71624904B663676389EC4AC6C" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-file-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpC3FFE4945C208FFF74B59235DE2524CF">
         <File Id="fil4218FAC2CC51817C686AF14AAC6FEDA3" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Principal.Windows.dll" />
       </Component>
       <Component Id="cmp15AFF93E2D617D9DE5CDC199C300E4DD">
         <File Id="filD9E55D71A3E7EAD811149113EBD9C56E" KeyPath="yes" Source="$(var.ProductSourcePath)\System.ServiceModel.dll" />
       </Component>
-      <Component Id="cmp104BF385BB4C3CF9750E85D0E8920B23">
-        <File Id="fil94BDC941965711885C978AB8E58338EA" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-xstate-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmp35BE916168DCD7CEDDC7D8A2C72F6FED">
-        <File Id="filCAF39F57D1C313F734A8643F40DD7E0D" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-heap-obsolete-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpB3D5B3B0C9FE6C6A76115D09B1099682">
         <File Id="filB0A2D715ECAE6A71E58D5620117DC4B4" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Claims.dll" />
       </Component>
@@ -296,12 +239,6 @@
       <Component Id="cmpFD2810C7EB4AE4047C456491CE5AABA5">
         <File Id="fil85181A3D9E2FA46E2948D559AA2C0ECD" KeyPath="yes" Source="$(var.ProductSourcePath)\hostpolicy.dll" />
       </Component>
-      <Component Id="cmpCB73A07CE8A738AA1591F9E7C13B0DC6">
-        <File Id="fil419AACC589CA54F69185792E235354ED" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-threadpool-private-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmpF719432933DD98076D8DC76F7CDF5873">
-        <File Id="fil2A29CF5D42227D76E482BA9FC9AEE510" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-security-sddl-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp1941A7354E2716358AAAFF73CC82FD5A">
         <File Id="fil0B541F0B5771BB99EA46800B713FB631" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.CodeAnalysis.CSharp.dll" />
       </Component>
@@ -317,39 +254,18 @@
       <Component Id="cmp5FAAF1291504DF59081EF8F6E96FD8CE">
         <File Id="fil34A3165883DC63493497C5C2ED6AFFDD" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Runtime.Numerics.dll" />
       </Component>
-      <Component Id="cmpE055F2004E1479FA6B4D7510DFCC9F1D">
-        <File Id="filC99F3C9FD82C6494BDC2C4C6A73E7D4A" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-errorhandling-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmp77CC2EF6D97E13B55707EED8DC63EEC8">
-        <File Id="filD0870435A5B134071E218EAC8EF1DD5A" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-security-cryptoapi-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpF942FF1161AC1F9C83A3D6676E8E9A4B">
         <File Id="filCEE0CD23A96F9B24F21D225BAC09CAE5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.FileSystem.Watcher.dll" />
       </Component>
-      <Component Id="cmpDE30E0D93EFD2C6AB2915E8BB0944FDF">
-        <File Id="fil2475EC8834F26D4D54E7CA80434AC63D" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Eventing-Consumer-L1-1-0.dll" />
-      </Component>
-      <Component Id="cmpFB4ABE0562394C67AF3F84DAD5DCD1EA">
-        <File Id="filAFE9772FFD6C2C5C1F50DE7B3CB0519F" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-com-private-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpD49FA4B84FFCC31FC3E727D1D4F8B90F">
         <File Id="fil8F95D4B84EA33F6FFA0C620A0ED329C9" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.TraceSource.dll" />
       </Component>
-      <Component Id="cmpC26581911B1D95692FE9CD4E52E093D0">
-        <File Id="fil117E4F1D5E7AE673F138A78B00980769" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-registry-l2-1-0.dll" />
-      </Component>
-      <Component Id="cmpC6593A8DA78C5D231EFBE229F2AA7F6D">
-        <File Id="filB3374458847DF286A86840FFDF3D56C8" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-console-l2-1-0.dll" />
-      </Component>
       <Component Id="cmp670F6F3CA4A21026C71203A94EF9F57A">
         <File Id="fil958FE11B0C532F00B66AD150DBCCF679" KeyPath="yes" Source="$(var.ProductSourcePath)\pwsh.deps.json" />
       </Component>
       <Component Id="cmpF83B856F8ECFE51256947060F4FCA385">
         <File Id="fil5F63D1773F4E4192FA72D2088592F792" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Reflection.Emit.Lightweight.dll" />
       </Component>
-      <Component Id="cmp1000361436DD46A7A215CE64CCB3070F">
-        <File Id="fil9806E0C3A4E47BAB9084220B46D38E6D" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-delayload-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp3C4A26443C1FF5DCF10620805BA1810E">
         <File Id="fil1219FE1887E2A8387C8AD89E97035F5E" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Text.Encoding.CodePages.dll" />
       </Component>
@@ -368,33 +284,18 @@
       <Component Id="cmpA2AE100BE9A48176C32A44F8EAFED880">
         <File Id="fil51942620832D103D1578529E4E3ADE4B" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.Pipes.AccessControl.dll" />
       </Component>
-      <Component Id="cmp67AFE3748590F117178E5617E219F1F8">
-        <File Id="fil97A434048B02E6A1D47A7B2662623A9A" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-processthreads-l1-1-2.dll" />
-      </Component>
-      <Component Id="cmp734102C1EBBE0D4417B67AA90D416EC4">
-        <File Id="fil2A4D34AE8559DDC2E9857799701C48A5" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Core-StringAnsi-L1-1-0.dll" />
-      </Component>
       <Component Id="cmp04AC57A0E3245015D9DFB332698F3E26">
         <File Id="filD484411B6AE3B42F2DABD1739690E702" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.HttpListener.dll" />
       </Component>
       <Component Id="cmp1E29A0D7860190642C2D8504982890F9">
         <File Id="filDAAF9305BBAD857AA9CAB6751F36659B" KeyPath="yes" Source="$(var.ProductSourcePath)\clrjit.dll" />
       </Component>
-      <Component Id="cmp2FB548B56B09B010468883CA4073600D">
-        <File Id="fil14F804504728E51F98C2B6CA5AE34FFE" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Core-Kernel32-Private-L1-1-2.dll" />
-      </Component>
       <Component Id="cmp4D3236B49B126CF9FFC5234678B3B302">
         <File Id="fil45A37A6A6BF9B8DC936724BC40BAEDC5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Text.RegularExpressions.dll" />
       </Component>
       <Component Id="cmp175D272DFC7FF99BFB93DD4C19681023">
         <File Id="fil1CEFF33EF14BA698805AFE523DC65241" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.PowerShell.Commands.Diagnostics.xml" />
       </Component>
-      <Component Id="cmpBCA9F625A04F14271B3727E3DB3182CB">
-        <File Id="fil0405983B2561B7D7E53E5931351D7607" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-heap-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmpAEA2387D6556C1CBCD2E10B2E71FFAA1">
-        <File Id="fil18F650B6DD78EE81D1D242C20EBB9E41" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-shlwapi-legacy-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp2F8D30568317F98B5965066D6D186037">
         <File Id="filAD97565F90A4823BF51772C3ABA6F33E" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Management.Infrastructure.CimCmdlets.dll" />
       </Component>
@@ -410,9 +311,6 @@
       <Component Id="cmpD53ED8782D7CC7C913ECB3436A2FD7D7">
         <File Id="fil2F2D79333159F787952C64D7D01486A7" KeyPath="yes" Source="$(var.ProductSourcePath)\pwrshplugin.dll" />
       </Component>
-      <Component Id="cmpEA2A37C87C5D278D1C97725C0BE5E814">
-        <File Id="fil8D602F2046030D2832416FAD3B277F52" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-localization-obsolete-l1-2-0.dll" />
-      </Component>
       <Component Id="cmp1A9CC77C3CEB765A85E2A5D41237626C">
         <File Id="fil0264B1880EB060B54A0B4E576FED9907" KeyPath="yes" Source="$(var.ProductSourcePath)\PowerShell.Core.Instrumentation.dll" />
       </Component>
@@ -431,24 +329,12 @@
       <Component Id="cmp2D91B1A06F475760CF19519E4C2CC84A">
         <File Id="fil31CEFACA9FA241943FA590181557B5A3" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Collections.Concurrent.dll" />
       </Component>
-      <Component Id="cmpD46F8000F402AC1F58F8C5457CD90ADE">
-        <File Id="filD0097CAAB507B9429F41B235DDE07069" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Core-Kernel32-Private-L1-1-0.dll" />
-      </Component>
-      <Component Id="cmpE66ABF016916C709133CA0DB9366469F">
-        <File Id="filFA000A944FE548C097C84147D0CA21CF" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-processthreads-l1-1-1.dll" />
-      </Component>
       <Component Id="cmpECCD26D8C540FA35F5C633B318EB742E">
         <File Id="fil38A8C3ECF0FC07CA43DDD606D658FD52" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Threading.Overlapped.dll" />
       </Component>
       <Component Id="cmp644DFED4A59040568D091F0EA5F691E6">
         <File Id="fil69EA4231E04E7B76EE0676A3C7EB4F91" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.Pkcs.dll" />
       </Component>
-      <Component Id="cmpCC989C2FC3319628C5A0897A9CDB4C7D">
-        <File Id="fil2FBB26045517B5A73BF6024C55539694" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-processthreads-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmpC9085D713FC071587C61ACFE51384BDD">
-        <File Id="fil66F905C6F4A541A57FCD88B5185585C3" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Core-Kernel32-Private-L1-1-1.dll" />
-      </Component>
       <Component Id="cmpB942FEF3BC11F835DF30CDDD845486AD">
         <File Id="filDC4E31FB49CF8CF0C75DD0029CF396A7" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Text.Encodings.Web.dll" />
       </Component>
@@ -470,21 +356,12 @@
       <Component Id="cmp1043F63E626C53139A6B800DE19F1D31">
         <File Id="fil0EB434BCEE047250C3BD80952FC61DA0" KeyPath="yes" Source="$(var.ProductSourcePath)\System.ObjectModel.dll" />
       </Component>
-      <Component Id="cmp5EFA00ED72CAE35E2305583E29C7C0E7">
-        <File Id="fil7B391D35320BDE264190F5B0E15027A3" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-comm-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp5E5EC336758293C396FB70037EAECB51">
         <File Id="fil822A044DA3EDC8B87F6455195D0EA67D" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Private.CoreLib.dll" />
       </Component>
       <Component Id="cmp283684B3318BCD5A91BF7209D7334305">
         <File Id="fil784BD86176B1BFD7016FD9FC7DA3EEA1" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.WebHeaderCollection.dll" />
       </Component>
-      <Component Id="cmp0A0A39DD78246C9E3C90FA18EC033480">
-        <File Id="filCE4963B76A7BA5A844237E14E9F61ABD" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-xstate-l2-1-0.dll" />
-      </Component>
-      <Component Id="cmp3C23CFE2F3E20CB67AB209A01D404991">
-        <File Id="fil730B988B1A97362AAB610BEDF1E1A5F0" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-file-l2-1-0.dll" />
-      </Component>
       <Component Id="cmpD34C8CD8BF5F802DCE6D79BD031400F6">
         <File Id="fil27A678473205AA4BD5E8DE285BB16AED" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Runtime.InteropServices.RuntimeInformation.dll" />
       </Component>
@@ -494,12 +371,6 @@
       <Component Id="cmpC0838E8C57D468419FA312FCDC692C2D">
         <File Id="filE92700424FB4BB41804808AC33421D6D" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.Mail.dll" />
       </Component>
-      <Component Id="cmp53AF51D171028D3271F1D0D78B95C0B4">
-        <File Id="fil71F21DF83265410E2E6A3D219D850DB0" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-debug-l1-1-1.dll" />
-      </Component>
-      <Component Id="cmp638B7DC05FC5B4ABB321BFEAF36D6C2F">
-        <File Id="filB2EC26320BDBF8A5059651D849DDF4FB" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-debug-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp79CAE24B87836EB856F795A0F0C0277A">
         <File Id="fil12A170221FD22352E7324E6890C04CA6" KeyPath="yes" Source="$(var.ProductSourcePath)\pwsh.dll" />
       </Component>
@@ -512,42 +383,21 @@
       <Component Id="cmp6E73647D495A1EA3BE6C1A2F86D804FC">
         <File Id="filB478492CAABC7EE17FECCFF0AB30DB70" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Linq.Parallel.dll" />
       </Component>
-      <Component Id="cmp1E51AA1C97285F18C1F3502915AC2142">
-        <File Id="filB885B41EC08A61B003A7E2B0A8C03AA7" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-processenvironment-l1-2-0.dll" />
-      </Component>
       <Component Id="cmp8C0438E44E39800EA412C6D1DF647015">
         <File Id="filAD9895244BE9130C2D45E8E9926AC9F6" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Xml.XDocument.dll" />
       </Component>
-      <Component Id="cmpDA3111DDBA4FDD64BF4EFCD32783E9D7">
-        <File Id="fil2F3F18223A914D352BB0E9063DB48132" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-file-l2-1-1.dll" />
-      </Component>
       <Component Id="cmpDDAD601E3283C9A170131D9676843483">
         <File Id="filCC01AF1DE2FE65E4DF7CCE5C6CDB096B" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.SecureString.dll" />
       </Component>
-      <Component Id="cmp4AF23AD5CF83E8C3CA23CE6DBF09DAB7">
-        <File Id="filB255F4E595D82780CB1FEB55B1183B07" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-localization-l2-1-0.dll" />
-      </Component>
       <Component Id="cmp05645B419F5DAB7E6BC89BD9531A9755">
         <File Id="fil14AE20B0568E9371BA26F1190ABAD834" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Win32.Registry.AccessControl.dll" />
       </Component>
-      <Component Id="cmp2C1C15AF6A853A37210F9952FF8276EB">
-        <File Id="filA85B43C96E1908D618FCB8D63A8D4889" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-file-l1-2-1.dll" />
-      </Component>
       <Component Id="cmp45F95FD91411CA915989BD31546E10D1">
         <File Id="fil2ACD94A1805C0347571BB794FF4D90C3" KeyPath="yes" Source="$(var.ProductSourcePath)\System.ComponentModel.Annotations.dll" />
       </Component>
-      <Component Id="cmpDA00EC2351C7C8CD19772559BAEB6DD6">
-        <File Id="fil47622DFE076EB13E5887DF8226C496B0" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-localization-l1-2-0.dll" />
-      </Component>
       <Component Id="cmp0F8AC22D198FF9516030549234B252F8">
         <File Id="fil1735E18A9DFF6425B5557342574D789F" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.PowerShell.Security.dll" />
       </Component>
-      <Component Id="cmp8C0CE0CEB2C635A3548CCA5419C133CD">
-        <File Id="filEB3C9141B41E1E7840F985911810C808" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-url-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmp2894FC5AF337A8727F082F5A0E568CC0">
-        <File Id="filD43C17E491FD12424F3AE1157D0F5D5C" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-datetime-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp8D09BA10F62939C1D17CD5C08719F9BF">
         <File Id="filB0D5E1DC5CEE7556AEC1C22E2BBD60AF" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Private.DataContractSerialization.dll" />
       </Component>
@@ -563,9 +413,6 @@
       <Component Id="cmpDA936E7EF0404307D9CAAA7A365EDC24">
         <File Id="fil9BA469F99DEACB9C3889D424BCF527BE" KeyPath="yes" Source="$(var.ProductSourcePath)\RegisterManifest.ps1" />
       </Component>
-      <Component Id="cmp9DB38F210B5251337BFF171CF8092C02">
-        <File Id="fil90EA9C9E54ACBA3E61BD34100F6F87C2" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-datetime-l1-1-1.dll" />
-      </Component>
       <Component Id="cmp5DE1EE232F232719DFB8EC9DF88FDE03">
         <File Id="fil2135FED9A28927554E9E89521120FA3D" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.Primitives.dll" />
       </Component>
@@ -587,39 +434,21 @@
       <Component Id="cmp017F1FE334055D7A9ED621D69CE55DD4">
         <File Id="fil7108E4467B9B1B6950FDA3885B294F4B" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Collections.dll" />
       </Component>
-      <Component Id="cmpC962D0075A7DCFD1C87041AF911A97C4">
-        <File Id="filFB91171A35689958EF80BFA34AF822C9" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-localization-l1-2-1.dll" />
-      </Component>
       <Component Id="cmpAF7B98CB7B1CC0D4106B4C84AA309583">
         <File Id="filAE3B54B12338F68C0A696BD16AEB3EFD" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Reflection.Emit.ILGeneration.dll" />
       </Component>
-      <Component Id="cmpEE2EE1FE3AAC419D5923F7AA11FC0428">
-        <File Id="filE81524048CBD2CA1A82F7B890435F3C0" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-file-l1-2-0.dll" />
-      </Component>
       <Component Id="cmpAC7C31925201F03A444F9E7FF233A2E2">
         <File Id="fil8E1A9C9244DC7CD633105FABAEA43302" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Data.Common.dll" />
       </Component>
       <Component Id="cmpC89F4A0C4FCF5246E06A4731AA00C0DB">
         <File Id="fil45FD220795A0E966BB78B221ED9848E6" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.NameResolution.dll" />
       </Component>
-      <Component Id="cmpDB3B9CEC7C9F97F45B27DA073C1B9741">
-        <File Id="fil2B7ECADE2F11AF121935A7485EA61D16" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-psapi-obsolete-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmp6FFA891A2BA5D635134A4BDD472C137A">
-        <File Id="fil942517CC055709BF43D443442DC3337A" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-devices-config-L1-1-0.dll" />
-      </Component>
       <Component Id="cmp52295A769FD374E0181E6FC42AF3B629">
         <File Id="filF314A6F1C7F0B5A9BDF8EBA66F395B62" KeyPath="yes" Source="$(var.ProductSourcePath)\System.ComponentModel.dll" />
       </Component>
-      <Component Id="cmpE6A39823164370DE762EB2160B7C052F">
-        <File Id="filB4F6AB38C1BB290BE6CD067A4231F065" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-namedpipe-l1-2-1.dll" />
-      </Component>
       <Component Id="cmpE63E1F7A32DC1B4394F26FCF12FE68BE">
         <File Id="filBF797950BA7A109F4D24350C3F9EF978" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore.dll" />
       </Component>
-      <Component Id="cmp9D918AAA3F478AEEA32C3F8AC939B4C5">
-        <File Id="fil993C3BC6BCC32603B42D8903725344C4" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-timezone-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp8D76B2CDD3B11893BF22B139DE325E42">
         <File Id="filA0913F87390C8D0069330A6F07D3CD22" KeyPath="yes" Source="$(var.ProductSourcePath)\miutils.dll" />
       </Component>
@@ -638,24 +467,15 @@
       <Component Id="cmp64AEE1A0E20B562B674944DA4AA8A81C">
         <File Id="filD4C59D08B7FDB77F0FF476FC7251672F" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Runtime.Loader.dll" />
       </Component>
-      <Component Id="cmpC4CE8B3AFBDD05F2D1CA184EC6F2F6AD">
-        <File Id="fil10D7C023F8D11F6CB451AECF1B6361C6" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-rtlsupport-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp38EACDEC714E7574DA1D1B71A64D7F98">
         <File Id="filE44A87AFA7A89AA321A26AE3C4D3F6BE" KeyPath="yes" Source="$(var.ProductSourcePath)\System.ServiceModel.Security.dll" />
       </Component>
-      <Component Id="cmp96749B04C9D0B48A5CC24A8429A55B11">
-        <File Id="filD4AA6CA55D6D4270C643FA5E44452C0A" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-devices-config-L1-1-1.dll" />
-      </Component>
       <Component Id="cmp720268936DAFEB403249538726C7A0D9">
         <File Id="fil06D99936E89D84A6875BB5B946D12F3D" KeyPath="yes" Source="$(var.ProductSourcePath)\coreclr.dll" />
       </Component>
       <Component Id="cmpA0F24CD99B1551D92627563E93CC69C0">
         <File Id="fil8C9F81981EE0D89E23A0F34229C279F4" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.PowerShell.ConsoleHost.dll" />
       </Component>
-      <Component Id="cmpC65F6EE65E7395F8683053ECF4C5597A">
-        <File Id="fil1E7F567FCFFB88F7850FCB18077243D1" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-handle-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpBA74BDCF772CB3A06B99296F5AF3F5D1">
         <File Id="fil25A7360F158740ECFA5A76B00D3B130A" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Xml.ReaderWriter.dll" />
       </Component>
@@ -668,57 +488,27 @@
       <Component Id="cmpB165A04A8913ADEDA1A4E52C10B29E96">
         <File Id="filDE9022D6A3719B943A70B71C95351627" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.Packaging.dll" />
       </Component>
-      <Component Id="cmp1B314F22E3B6E2BAC952D8DF075723FF">
-        <File Id="filC4ED9946819AA2CFF20DFF4A7030F02E" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-synch-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpF7F591858894BF922DA7F68B3CB3B370">
         <File Id="fil1D3638AA0768BA11AD4E17A37A61EA4B" KeyPath="yes" Source="$(var.ProductSourcePath)\System.AppContext.dll" />
       </Component>
-      <Component Id="cmp35D7682643503FA3EFF9B04CDB83867B">
-        <File Id="fil7C8B595703B044953E072CC7C56C0B4C" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-string-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpEFC858F94DD206B5A4996C7D3095341A">
         <File Id="fil87757235BB45DE1A731E7798684D2E4F" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Buffers.dll" />
       </Component>
       <Component Id="cmp9F363F3906D6771691F96605FC6C958D">
         <File Id="fil0E651F3A87FD0E2F6688E74D89C36221" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.Csp.dll" />
       </Component>
-      <Component Id="cmp826F9B36D96BE5650A67E9C5D2D918DD">
-        <File Id="filFC261040E8CB88F7BDFE2B3ED0D56276" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-service-core-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp195E63B53BC91EA56A2D52AF3EF028FA">
         <File Id="fil95B305E194567AA74D17C54ED97C54E6" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.CodeAnalysis.dll" />
       </Component>
-      <Component Id="cmpF81DCE7B330D9CF5B70501D76A1D5543">
-        <File Id="fil61D6EA9C8839BA487DBAEBB150E858C4" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-service-core-l1-1-1.dll" />
-      </Component>
       <Component Id="cmp18616D3BE360362E7108A71442D95DA8">
         <File Id="fil8D7B22962C80211E17C7EFBB3ADC9987" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.TextWriterTraceListener.dll" />
       </Component>
-      <Component Id="cmp57452FCE70ED7D869F91A25A8FE9767C">
-        <File Id="fil2E5768AEC52298AF7D3B0608A3D38408" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-winrt-string-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpBFAA43F2923CBC760EE2FFC7616F91B0">
         <File Id="fil85D0126E8D869B35972E3303A0699695" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.PowerShell.SDK.xml" />
       </Component>
-      <Component Id="cmp1D7850EEB288BF7DF2D7BFFD10B380EE">
-        <File Id="fil8D0D17F213D36AF39126304D49489F04" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Eventing-Provider-L1-1-0.dll" />
-      </Component>
-      <Component Id="cmp901434E222CA7B72B0DDFFCB9C9D4958">
-        <File Id="fil445A43545AFA497B51CB7DBD86EE0E6D" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-winrt-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmp699BF8B9FD723FDDF914160D33D620DE">
-        <File Id="filA5156FD8F4095AA825A77141F2B1B1D3" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-threadpool-l1-2-0.dll" />
-      </Component>
-      <Component Id="cmpD33D82ABF51BB671F2DB4ACA9B7BD11C">
-        <File Id="filAB14F1D53B1F41BD9DEB0DCE1D118BD1" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-memory-l1-1-3.dll" />
-      </Component>
       <Component Id="cmp43AFEE697DBFCD5C8A53EC540E8582F4">
         <File Id="fil5528B0A0650E07288BCE1AEDA5B8FE9A" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Text.Encoding.dll" />
       </Component>
-      <Component Id="cmp0845AF852A390748CB4C6618A133CA9B">
-        <File Id="fil15F532C1B116CCEE581D1FAC8BF0B46A" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-sysinfo-l1-2-1.dll" />
-      </Component>
       <Component Id="cmp8DB8D2B11EE3C64E01A5AA5792113C7D">
         <File Id="fil3744CB2259DFBA16ADAD1586637D401D" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Transactions.dll" />
       </Component>
@@ -731,78 +521,36 @@
       <Component Id="cmp3AFA8B48759D983BCC7FCAB0F8C00049">
         <File Id="fil24DF95946328B11A367703E6E2134625" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.MemoryMappedFiles.dll" />
       </Component>
-      <Component Id="cmp778C0CA0C6DB9B22F55E500E3DD4CE67">
-        <File Id="fil173D6CBCA65AD2FE8D51CA5F2CEEFDA8" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-shlwapi-obsolete-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpFB9E5DA3F7ED32C900C5711426C700B0">
         <File Id="filFDCC96E6DBB1FAAC7D993E592AF8BD4F" KeyPath="yes" Source="$(var.ProductSourcePath)\pwsh.xml" />
       </Component>
       <Component Id="cmp57FB26AB5D4FC65F8AC6DCA5CA4EAB50">
         <File Id="filF557E03D1EC6FAAA6CFD9DB353CDBFD8" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.PowerShell.CoreCLR.Eventing.dll" />
       </Component>
-      <Component Id="cmp95793F2DBCB53FC6574271778B460A23">
-        <File Id="filF407C994BA57C53C0434A4BD455829AA" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-interlocked-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmp702A2FEFD38FFCF605ED1C313EC71458">
-        <File Id="filFA6AE5F94234309C16C0496F3A330393" KeyPath="yes" Source="$(var.ProductSourcePath)\ext-ms-win-ntuser-keyboard-l1-2-1.dll" />
-      </Component>
       <Component Id="cmp2FAC51A60BB0A9076A393D722CF1B290">
         <File Id="fil71E85B4B2F588B1A89FE7939A5394758" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.OpenSsl.dll" />
       </Component>
-      <Component Id="cmp097CB187E2BDE58F7392C2C072809466">
-        <File Id="fil4817A7A6DFA799361C5FC812556EC2B5" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-sysinfo-l1-2-0.dll" />
-      </Component>
-      <Component Id="cmp13DAFD4716AE6C1A7628B61627C60A19">
-        <File Id="filF58C27616A41D775DBA54725748881B2" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-security-cpwl-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp1BEF581DBB396BA29E4B59C883BB8649">
         <File Id="fil331920D9CDAF039A65492B7D28C99A00" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Win32.Registry.dll" />
       </Component>
-      <Component Id="cmp40B149871A5BA98DC82EE7856A4CD736">
-        <File Id="filB47670A8BEFCC6BD5C6860E576241ACD" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-realtime-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmpEA4FB4C2137ACB359A57F047FB3F064D">
-        <File Id="fil43C692DBF517066D6041E48921372DE0" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Security-LsaPolicy-L1-1-0.dll" />
-      </Component>
-      <Component Id="cmpEB4CED5CB081B9AAF87D6CAD0FC28F95">
-        <File Id="fil38FD2547858C006A3B9722F56948F33A" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-winrt-registration-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpDF8E2441E58692CD330DCA991DB9BC92">
         <File Id="filE0422AB1C6EFDB95AC9F4FF283407DDE" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Globalization.dll" />
       </Component>
       <Component Id="cmp8A908B31F517E0EFE0E38C4CB806CAA7">
         <File Id="fil7CBA14DEF37BFCDC82E3A5FA8D0D14A5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Private.ServiceModel.dll" />
       </Component>
-      <Component Id="cmp5561B29D282E093AFF80AAD64EED626F">
-        <File Id="fil2A4B1904E66B125FCA1E9470E6158B2C" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-memory-l1-1-2.dll" />
-      </Component>
       <Component Id="cmpA146B98771DAB537AE20DD014A4466A9">
         <File Id="filFA8437354A0E516CF1366BBEB33D2632" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Collections.Specialized.dll" />
       </Component>
       <Component Id="cmp3D6E19CC426EF726E2F956E58F78DDF2">
         <File Id="fil09CE56902D994FB6AAF734FBBCBDE100" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.PowerShell.Security.xml" />
       </Component>
-      <Component Id="cmpCEA7A07A4FBA646463AB6AD07587507B">
-        <File Id="fil6D19007DF36A8E64971B04A16E864607" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Core-ProcessTopology-Obsolete-L1-1-0.dll" />
-      </Component>
       <Component Id="cmp1EC7D70A01B5B94D053A703D9A242572">
         <File Id="fil670FD94C4B7FB313C116A91BE9265A7E" KeyPath="yes" Source="$(var.ProductSourcePath)\System.ValueTuple.dll" />
       </Component>
       <Component Id="cmpEC5CF579D39FC75DC38E051E55A5CAD5">
         <File Id="fil4A7C610F14DCD44CC1B18DAE9300D97C" KeyPath="yes" Source="$(var.ProductSourcePath)\powershell.config.json" />
       </Component>
-      <Component Id="cmp0B896DBA6AFF2FD27FCD0E0968E23992">
-        <File Id="fil8FF727772B90722FC5C21D64E7B579DA" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-psapi-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmpC6A24F97E0D6739A51FE9CC80148F511">
-        <File Id="filCC7CF83D67F2AC3B2593CED11CBA374C" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-memory-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmp9544B34C5A30F75D0F45F5718A1795F0">
-        <File Id="filD4CAA59C10BE6BD526C91A9B35BCD9E3" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-sysinfo-l1-2-2.dll" />
-      </Component>
-      <Component Id="cmpBDF0DC73F4F799A46B1DE220E58C1920">
-        <File Id="filD691AB2F5A0AE38E8F794ED19D6AFCD8" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-winrt-error-l1-1-1.dll" />
-      </Component>
       <Component Id="cmp8EC2515ECF0A11A1228D21FE3D995FB0">
         <File Id="filCDBBEF49681DE6AE3FEC59336EB7DA77" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Runtime.dll" />
       </Component>
@@ -818,54 +566,27 @@
       <Component Id="cmpB063BE196D23C33165CC5637F6E2379E">
         <File Id="filEF6993469CB62233BADF206F868F21DA" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Reflection.Extensions.dll" />
       </Component>
-      <Component Id="cmpC634BE3C2B885CE5986B811D0B7642DA">
-        <File Id="filEFC44DB753E2153353126E915136241F" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-io-l1-1-1.dll" />
-      </Component>
       <Component Id="cmp436662C08195044E5CFF8872E2AC66B6">
         <File Id="fil8404A0EC5BDF81765E68C2CB4C4795DC" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Globalization.Extensions.dll" />
       </Component>
-      <Component Id="cmpC1252325D4A857CE4815CB4887232E08">
-        <File Id="fil5204510E4CC5699C03039D5A4348FC96" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-io-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmp80516C165B610FEA7ABAD8867D4C1177">
-        <File Id="fil352FF9155508CDDCEC0D258256BB6A76" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-com-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpAC0BB9176567509DFA5D438A69EF0C71">
         <File Id="filD77FF9BFB2A3D35F44D3DA506442CCD1" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Runtime.Extensions.dll" />
       </Component>
       <Component Id="cmp15F65BD31868E4E4686961153E4082C1">
         <File Id="fil6C46F21CCA0950989860DD2FE76C8107" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Data.dll" />
       </Component>
-      <Component Id="cmp7CFC0926206345463E941DC960BE9832">
-        <File Id="filCF7C5A4FDF9D9A75336211CE2007BB87" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-util-l1-1-0.dll" />
-      </Component>
       <Component Id="cmpB0131B8F2F785C0DB1D557A5E3E0ABE5">
         <File Id="fil3942A5D5F553D55351CF2DEF0C4F7A07" KeyPath="yes" Source="$(var.ProductSourcePath)\System.dll" />
       </Component>
       <Component Id="cmp0BFDFC86C64711DBC2FD08597D1378E2">
         <File Id="fil8087A5D23E90890B580017D767328250" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.Encoding.dll" />
       </Component>
-      <Component Id="cmp21715E66168ACE3CEA6DE5D415CE7FDF">
-        <File Id="fil79FA20BA1A433CD500A0BFBEAB857C7B" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-winrt-error-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmpF25DC4B00595182390A170310D95EA1D">
-        <File Id="filB6C7E2AE9E04C508E56B2BB2A29727B2" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Base-Util-L1-1-0.dll" />
-      </Component>
-      <Component Id="cmpB666825D77A8B064DA727325776EAE74">
-        <File Id="fil4462D6F7EC9D2E9E75BB0546B45A2375" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-sysinfo-l1-2-3.dll" />
-      </Component>
       <Component Id="cmpA75C2EC5A5EA46DE98DFE2962FEDECC0">
         <File Id="fil29566AAF2D7442428E3A0D322F522F41" KeyPath="yes" Source="$(var.ProductSourcePath)\LICENSE.txt" />
       </Component>
       <Component Id="cmp0C712C23BAC746AABB5659096ED329EA">
         <File Id="fil0C712C23BAC746AABB5659096ED329EA" KeyPath="yes" Source="$(var.ProductSourcePath)\ThirdPartyNotices.txt" />
       </Component>
-      <Component Id="cmp2BFC761F21E7234B46E57BA4DD2D9992">
-        <File Id="fil9CD147A434F516BF71154AB7CC8D7D3E" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-memory-l1-1-1.dll" />
-      </Component>
-      <Component Id="cmpAB383E4D8CF6F11984650BD4E72F4510">
-        <File Id="fil428D61C546B7B580479069D1E90D9046" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-service-management-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp292CCC20E7FD700B54FBD52A473A57D8">
         <File Id="fil8E4E9B9A80766525D7B35D0C6841BE66" KeyPath="yes" Source="$(var.ProductSourcePath)\System.IO.IsolatedStorage.dll" />
       </Component>
@@ -875,21 +596,12 @@
       <Component Id="cmp1AF8D943CB5BB73A094F79D704EC212F">
         <File Id="fil401197C1C42AB6070B1A3CED5A49D985" KeyPath="yes" Source="$(var.ProductSourcePath)\System.ServiceModel.NetTcp.dll" />
       </Component>
-      <Component Id="cmp72B6F40E64433679004948C683A17F74">
-        <File Id="fil789FA5301B1A1B6AD1D15C5AEF3C536A" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-namedpipe-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp3B31D67E3C0F6CC8FD23D9CC07CC9D9D">
         <File Id="fil7A9B2070D4F4502E26C54F7E6BC8CAA9" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.PowerShell.Commands.Management.xml" />
       </Component>
       <Component Id="cmp3CCDC632173A23176E6D04C24350D195">
         <File Id="filF800F635DD6E8F1F4877700265D94C1E" KeyPath="yes" Source="$(var.ProductSourcePath)\mscorrc.dll" />
       </Component>
-      <Component Id="cmp1C282D02791A944B172B9CBEAD1FAB88">
-        <File Id="fil67DF0B0525C8833BE4FADDAA0783BC1A" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-stringloader-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmpE126C38FBB91AEC118DA44D096195A02">
-        <File Id="filD9DE576D032ACEB4BB75BFFBD4F7D34D" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp0B385D84913472F263B64812AF8A786E">
         <File Id="fil53AD163CF2730C014879D6A913795249" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.AccessControl.dll" />
       </Component>
@@ -899,15 +611,9 @@
       <Component Id="cmp01B060B21C4DE4D6793761203C0B0D67">
         <File Id="filCBC393F83FC607F3774A644243A26F53" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Reflection.TypeExtensions.dll" />
       </Component>
-      <Component Id="cmpD44A732D25686A0CA69B36B72D4FA8B6">
-        <File Id="filF78F9883195BCF3491DD443970734976" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Core-String-L2-1-0.dll" />
-      </Component>
       <Component Id="cmp5673E8FDA66481CD8AA936694C059FFD">
         <File Id="fil9601165F4D910747EDA9CFB061B93084" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Management.Infrastructure.dll" />
       </Component>
-      <Component Id="cmpCAE9BC7900246A998C9FFB85E2017DA4">
-        <File Id="fil4B41B4DB6C486B0BB2D7B28E454FDBD7" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Eventing-ClassicProvider-L1-1-0.dll" />
-      </Component>
       <Component Id="cmpE0FBBD56CE6FE2E1CDD3041D3447C578">
         <File Id="fil16990855CE60DBD3513D01B3EBE990A7" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Globalization.Calendars.dll" />
       </Component>
@@ -929,33 +635,21 @@
       <Component Id="cmp69C84168BA11BF2BEF4D8171EF6DC789">
         <File Id="fil104AAF1FA248694A93D7B5439050DF2F" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.Cryptography.Algorithms.dll" />
       </Component>
-      <Component Id="cmp7B944B473907CA6C3BB932806E46E5B3">
-        <File Id="fil88B1525460606FC3AD7DB765E65038DA" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-stringloader-l1-1-1.dll" />
-      </Component>
       <Component Id="cmp9E59176D953343E959C4D4C6FB3A0B2E">
         <File Id="fil5759D4832040C0A8424C5A01EC42CD81" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Threading.Thread.dll" />
       </Component>
-      <Component Id="cmp796D96057D21272C6888BA16E71621A6">
-        <File Id="filADAE7F30016FA9252914A19ABDA8E9D7" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-security-provider-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp09FC5AE7AC1DEE9FA331E11474827936">
         <File Id="fil2BAFC9A7B3A28E4CE855665823BA8E7C" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Numerics.Vectors.dll" />
       </Component>
       <Component Id="cmpF780CC7E5C204F6E10B5B47620F46811">
         <File Id="fil5A34C0D4D001F3E1B087252ECF88EB20" KeyPath="yes" Source="$(var.ProductSourcePath)\System.ServiceProcess.dll" />
       </Component>
-      <Component Id="cmpBFA0597694F7DEC5642F4DDFBB45F896">
-        <File Id="fil4044E303D81BB2A62CF5AAD12A0C7DE6" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-shutdown-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp18535DF89416A031A513808AB8CE4B56">
         <File Id="fil52AE8E8AD62EEA8CBD86A1D9C7DA54FE" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Management.Automation.dll" />
       </Component>
       <Component Id="cmpF47CAA3A846D0FD72C81B4A04768665C">
         <File Id="fil77F3F4CFCFCA39C1B1B083A36C2E5BC5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Linq.dll" />
       </Component>
-      <Component Id="cmpBE223BF60ADD50DD211D379C90DFF2F5">
-        <File Id="fil9BFF09C886536D52626CFAE4FE64DCFC" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-version-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp52B77FCAF50F9D0DDA11553DDFE24918">
         <File Id="fil348C7A16CC8CDFA0576850571545CB5F" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.Process.dll" />
       </Component>
@@ -965,69 +659,33 @@
       <Component Id="cmp7E56AF43A9C9F3BD725032B4F4E23B34">
         <File Id="fil42480739C6CDCA0667E1F6F06A719BB0" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Xml.dll" />
       </Component>
-      <Component Id="cmp0F07FB10C2781EF64985C0231E9D1880">
-        <File Id="fil6E0BB58744826C3FCC0A488B5EB8168C" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Eventing-Controller-L1-1-0.dll" />
-      </Component>
       <Component Id="cmp6CC2AE24D70256108843A35BBE543ABD">
         <File Id="filFE8BE7F83A33AD0F85B656639641E1E4" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.Tools.dll" />
       </Component>
       <Component Id="cmp97AD5D1CAADB8D87FAEFC54F0C4B1589">
         <File Id="fil767FF6EB7B7A5812137BC8FEC3EEA1E6" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Collections.Immutable.dll" />
       </Component>
-      <Component Id="cmp7B96661EFE30D6FCD749BFA049D70D35">
-        <File Id="fil7DABC93B7AB8B576F1F17928631C50E8" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-synch-l1-2-0.dll" />
-      </Component>
       <Component Id="cmp983EFF7B0E21D7CBA5007E969992B47D">
         <File Id="filF0726AE341018A3F393282EEDE1F95AD" KeyPath="yes" Source="$(var.ProductSourcePath)\pwsh.runtimeconfig.json" />
       </Component>
-      <Component Id="cmp5729F92BFE2487ED81F16B9F76F5A0D8">
-        <File Id="fil1D814BE2F3A0D26425F9BD2DC3AC69E6" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-profile-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmp8930D9CAAE48EEA1DDF7B05ECA4C1E8D">
-        <File Id="fil788EA3360C765EEDAC59EB3311975703" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-EventLog-Legacy-L1-1-0.dll" />
-      </Component>
-      <Component Id="cmp8BB683B8EFA12D81B0093983B9A86989">
-        <File Id="fil2162FC84D19CF4E7A6A4079F585FC50C" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-shutdown-l1-1-1.dll" />
-      </Component>
       <Component Id="cmp8C02558B25F6B22C6A6E900C20C10FF9">
         <File Id="fil21851B0F37E9D23DE498C9E82740E072" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.Debug.dll" />
       </Component>
-      <Component Id="cmp4A011DF9C2CA4BB2CDC862EF06663926">
-        <File Id="fil1A228651DBBF0F08F248160821399CC7" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-kernel32-legacy-l1-1-2.dll" />
-      </Component>
       <Component Id="cmp88A6FB261DFD24D9E25F2AF63C232B4F">
         <File Id="filB2F5F6A1E83826930D17A3EAD3B7443E" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.PowerShell.Commands.Utility.dll" />
       </Component>
       <Component Id="cmpFC754EAE0337C1473B750A7AEBA4062C">
         <File Id="fil11DCE0E2B85A6D286CB3D936E8BBB90C" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Win32.Primitives.dll" />
       </Component>
-      <Component Id="cmpF0C4435AA0B6F2F56D0D000A43EE1277">
-        <File Id="fil0521BA12454B6AAC63D5931273EE9785" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-fibers-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp155A485C71B7DE54A5EF8B9B663B01CC">
         <File Id="filCD4FBC2BA645383317FA103756778D25" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Runtime.Serialization.Primitives.dll" />
       </Component>
-      <Component Id="cmp0112845AD6F6887B3A1094D1202C3188">
-        <File Id="fil73B2F8B7D12AB572B98376CFFE6503C2" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-sysinfo-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmp0336F0CDFF2D0715CD342BF0D0EAF38E">
-        <File Id="filF44FB384837000B3C4362F42E0A4C7A5" KeyPath="yes" Source="$(var.ProductSourcePath)\ext-ms-win-advapi32-encryptedfile-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp6A634BAE51EBC7D342FE45DD4F83CBB5">
         <File Id="filE572B009FD3EF37539E7CBFC7BA73529" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Transactions.Local.dll" />
       </Component>
-      <Component Id="cmpC2BD980E9AD88FA8C1CD0ADB81E5D8B3">
-        <File Id="filDCD250A35B067A2AF51E0C96652F7696" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-service-management-l2-1-0.dll" />
-      </Component>
-      <Component Id="cmp8E3882C311D8863C7AAC79BF98EBF1E4">
-        <File Id="filB5B7CD321FA93443E6FA20F9AC1627E6" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-security-base-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp43AFF4A88319BF3E995AD16A510F82A8">
         <File Id="filBC85F1EEB02AC7D670B4E26525BA5A9A" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Drawing.Primitives.dll" />
       </Component>
-      <Component Id="cmpEF39CD6043D82DB539B242B149364D0E">
-        <File Id="fil45A05CAE6D52C6A2FA430CCF6B31E71A" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-fibers-l1-1-1.dll" />
-      </Component>
       <Component Id="cmpD791ACEC788E2D11F1C4AC2E8E1C4BC5">
         <File Id="filB6680C03C25992D849279EDD10C5B49D" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Drawing.dll" />
       </Component>
@@ -1049,24 +707,12 @@
       <Component Id="cmp96E2F9A08067109988A4087BCE3B74D4">
         <File Id="fil44FDA9956B03240403424FD98F0FD93E" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.StackTrace.dll" />
       </Component>
-      <Component Id="cmp82A5E06C6CFE9382D9175B993EB1EBAD">
-        <File Id="filD4E50BDA9352D0C9A75480CDDC4B2C1A" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-libraryloader-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp10B674B9EE153B7FA9E743D45CF5639E">
         <File Id="fil0C388FE4B66E0936ACDB5F4021030EA7" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Security.dll" />
       </Component>
-      <Component Id="cmpA73318A1FACCEA81EF1EFA5F78374D59">
-        <File Id="fil376F144635A392696506C12392682282" KeyPath="yes" Source="$(var.ProductSourcePath)\API-MS-Win-Core-PrivateProfile-L1-1-0.dll" />
-      </Component>
-      <Component Id="cmp25CBD6073CD07C77389077CC7BE7A048">
-        <File Id="fil72CCE92E32D1D9E2EAB034C81B2438E3" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-kernel32-legacy-l1-1-1.dll" />
-      </Component>
       <Component Id="cmp1CCCE9201A646726052C421D989AA9C0">
         <File Id="fil0F3ED14FA9E91C793FE501367368E1C5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Reflection.DispatchProxy.dll" />
       </Component>
-      <Component Id="cmp6D952234CE10B4FEBDF02EBBC1C03E1E">
-        <File Id="filFCBD722AF058E27102503E0ECA9CD4CA" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-security-lsalookup-l2-1-1.dll" />
-      </Component>
       <Component Id="cmp7C73A78033C737A6EA4AAC81D6943407">
         <File Id="fil5545AC480C6918BF535EAE9C4F6051E3" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Core.dll" />
       </Component>
@@ -1079,33 +725,18 @@
       <Component Id="cmp405FE4AEFE314F91B7F8089861BBB353">
         <File Id="fil5B0454C486E63568724251FA8D860174" KeyPath="yes" Source="$(var.ProductSourcePath)\PowerShell.Core.Instrumentation.man" />
       </Component>
-      <Component Id="cmpA0853678FFF217EE041189B7EA010175">
-        <File Id="fil1BB407F2602F39F014CC24248CF1FC3F" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-psapi-ansi-l1-1-0.dll" />
-      </Component>
       <Component Id="cmp61E08B784DA94759BE764CB429E64262">
         <File Id="fil4ECECEC1E31F5937E1F8E4FDECA6DD33" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Private.Xml.Linq.dll" />
       </Component>
       <Component Id="cmp2355D3B8000E494433D3A278D46BF391">
         <File Id="fil127A3B771DC95AE976865BDF6237393B" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.Primitives.dll" />
       </Component>
-      <Component Id="cmp2A9C9BC07379929ECE9B4C6C3F0A87C9">
-        <File Id="filD9DEC4D9F82509757BBB653591352619" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-security-lsalookup-l2-1-0.dll" />
-      </Component>
       <Component Id="cmpDD17B4F6040D47BCF57B5DA3B31574AA">
         <File Id="fil193558DC9C4564112C7FBCC4EA170BE6" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.WSMan.Management.dll" />
       </Component>
       <Component Id="cmp2B7D32EFF6CCECD440A55172A3756706">
         <File Id="filBAEB22C184CF2D6E951E054DCEC0369D" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Net.Http.WinHttpHandler.dll" />
       </Component>
-      <Component Id="cmp30357FCEAC7B88BDCF0B20D55C22F61F">
-        <File Id="fil50B555A3393035E22F0A1704CE341C65" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-kernel32-legacy-l1-1-0.dll" />
-      </Component>
-      <Component Id="cmp557A49B03E72CD07149A6CD0595C9245">
-        <File Id="fil12F0D932C25DAFEF4BDC6DA500EF1258" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-privateprofile-l1-1-1.dll" />
-      </Component>
-      <Component Id="cmp51F2F26684B5C4D0FFFFFBD72174D1BC">
-        <File Id="fil3EEF1D08102F0A83F48EFBB44396FCBA" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-libraryloader-l1-1-1.dll" />
-      </Component>
       <Component Id="cmpf2a3c81eb19246b6be74af07e70a06f0">
         <File Id="fil90f9e9f09d6744f68331100e6d7da03d" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.PowerShell.MarkdownRender.dll" />
       </Component>
@@ -3176,13 +2807,11 @@
       <ComponentRef Id="cmp0068EDEA68F0D5BF766CE0305A9082BA" />
       <ComponentRef Id="cmp36DE82D9AD5932124FEC1B067B0D011D" />
       <ComponentRef Id="cmp8D31C0EED6D178C8313F057D6EE90970" />
-      <ComponentRef Id="cmpEC0174D67CBA8D49D44387CCDC8E7986" />
       <ComponentRef Id="cmp02D5012CE68A72B4EB57A85BF4E40843" />
       <ComponentRef Id="cmp0AC970BEC366F9ADB96BD5FA34459C23" />
       <ComponentRef Id="cmp268C3104F2C2E1772E901BF932388BA0" />
       <ComponentRef Id="cmp5C3D90690414B641947FDA684E9BE9A9" />
       <ComponentRef Id="cmp2F126B84C7D50DC3F8F8E273DD6CE7DC" />
-      <ComponentRef Id="cmp492FB39320E285A540ADEADE18A5F96E" />
       <ComponentRef Id="cmp0C53A9DAF0450D9AD0734770DD18662A" />
       <ComponentRef Id="cmpE4D79A97914A11003CA89DB008133BA0" />
       <ComponentRef Id="cmpAA3881D6DE91B932AEE8F4C42EF99218" />
@@ -3193,40 +2822,27 @@
       <ComponentRef Id="cmp9EF36C5215C8ACA61D304C3A476AB978" />
       <ComponentRef Id="cmp9EF36C5215C8ACA61D304C3A476AB979" />
       <ComponentRef Id="cmp6C6F29B464717486F94FE5416BFFE029" />
-      <ComponentRef Id="cmpFF8748C4903DCFC623FFDA416F2AE314" />
-      <ComponentRef Id="cmpCC81CFD99DC82F17A1EA3D8763C0B35B" />
       <ComponentRef Id="cmp52FBB26F92105AD3AD35C220A657AD2A" />
       <ComponentRef Id="cmp717F2424B3CF81CE7C4CF659DB544785" />
-      <ComponentRef Id="cmpE76D27D7B5D2ABAF88E777361EB91660" />
       <ComponentRef Id="cmp3233756873AD35E45D8AFF0DECB12A10" />
-      <ComponentRef Id="cmpC34CACA6E967ECA4F9CCF56570BD8185" />
-      <ComponentRef Id="cmpFD7E03A554A320F567F49F8211D93A59" />
       <ComponentRef Id="cmp580A12A38C2531DBD6B76F4A159A7A84" />
-      <ComponentRef Id="cmp65A9F72C0AE530B5080F50972BD208B0" />
       <ComponentRef Id="cmpCC2EA506ACC015C30257216EB54EF45C" />
       <ComponentRef Id="cmp23FD946C6681D6747F1B638ECBE8C8BC" />
       <ComponentRef Id="cmp4B935A8190C2D7D1F0E0DB9E5AAD7F30" />
       <ComponentRef Id="cmp2B60F4AC2E8D95A558C3E121A6252D37" />
       <ComponentRef Id="cmp5977DC14DE00AD6E597A2FEBB8C3B58B" />
-      <ComponentRef Id="cmp689C7CE34E0246D8B56D370E898354CE" />
       <ComponentRef Id="cmp634E012FEF6122735D91DE4B1BCC1116" />
       <ComponentRef Id="cmpDB015975B1AF141A6CDDA12B31DA2B74" />
-      <ComponentRef Id="cmp78C94EF3D79D1B59DE4388AA2667668E" />
       <ComponentRef Id="cmp2C924B87CA7B55E4B688163D0424BF1B" />
       <ComponentRef Id="cmp0D69AF816E19455A8CF5034C61317EA3" />
       <ComponentRef Id="cmp0D69AF816E19455A8CF5034C61317EA4" />
-      <ComponentRef Id="cmp9517BE666A9E7C23D64C30BB87042294" />
       <ComponentRef Id="cmp20E61B6FB720A911BF811B96C3D45849" />
-      <ComponentRef Id="cmpD28050E830C7622BACAB507E9B96785E" />
       <ComponentRef Id="cmpBECA40B2C3C12E0305699CA1817C9F5D" />
       <ComponentRef Id="cmp90EDB840A03FF0E0AB30DBA7DDD1BCE1" />
       <ComponentRef Id="cmp433305CEF42F648A101FB57F72AE371A" />
-      <ComponentRef Id="cmp37330FDB9A02F3FB463D113D31EDCA86" />
-      <ComponentRef Id="cmp28A6204649AC15DA0210CE3067308BDE" />
       <ComponentRef Id="cmpA4C6AF97A7B02D8D55E1E09AB7F74558" />
       <ComponentRef Id="cmp06E8C21C125E29603C631488D5EBC1CA" />
       <ComponentRef Id="cmp18FD8ABAE1B131CE3834F0E2BB07E5B8" />
-      <ComponentRef Id="cmp8552B147D2AAFD164533C72368BFB61C" />
       <ComponentRef Id="cmp33AA41435A9FDD75B7D5FA6869C6F441" />
       <ComponentRef Id="cmpF51764A0306591EAE22DAC7C60CD94C3" />
       <ComponentRef Id="cmpCF291BFA1FC042E050794DC43CC97162" />
@@ -3237,69 +2853,46 @@
       <ComponentRef Id="cmpD8208C4E8508687BF4672F2A0EB64E67" />
       <ComponentRef Id="cmp16E86C327EA784631EE474C8518A5FA5" />
       <ComponentRef Id="cmp4CB166B799668590C946561BBF2EFDE1" />
-      <ComponentRef Id="cmpB9AA376C913A011DB4FCF8058BBA8243" />
-      <ComponentRef Id="cmp91FC3112769800144B79BEECAD84D60A" />
       <ComponentRef Id="cmpC3FFE4945C208FFF74B59235DE2524CF" />
       <ComponentRef Id="cmp15AFF93E2D617D9DE5CDC199C300E4DD" />
-      <ComponentRef Id="cmp104BF385BB4C3CF9750E85D0E8920B23" />
-      <ComponentRef Id="cmp35BE916168DCD7CEDDC7D8A2C72F6FED" />
       <ComponentRef Id="cmpB3D5B3B0C9FE6C6A76115D09B1099682" />
       <ComponentRef Id="cmp9568B438265B4B9537FB278425E51F9D" />
       <ComponentRef Id="cmp96F5D79C2A39A3FCE2832C9F0DA1FFB9" />
       <ComponentRef Id="cmp7F0E91316B501D5C0C5FDC147C91981E" />
       <ComponentRef Id="cmp49EA2B6077C3CFE16C87CE6C69B211FB" />
       <ComponentRef Id="cmpFD2810C7EB4AE4047C456491CE5AABA5" />
-      <ComponentRef Id="cmpCB73A07CE8A738AA1591F9E7C13B0DC6" />
-      <ComponentRef Id="cmpF719432933DD98076D8DC76F7CDF5873" />
       <ComponentRef Id="cmp1941A7354E2716358AAAFF73CC82FD5A" />
       <ComponentRef Id="cmp669738F33BAC5E1BAE50F3215C98E413" />
       <ComponentRef Id="cmp7C918B64BCE3FB35E1CC46F248EC19CA" />
       <ComponentRef Id="cmpFE8DC0C226472F454DB6C4215FD68B98" />
       <ComponentRef Id="cmp5FAAF1291504DF59081EF8F6E96FD8CE" />
-      <ComponentRef Id="cmpE055F2004E1479FA6B4D7510DFCC9F1D" />
-      <ComponentRef Id="cmp77CC2EF6D97E13B55707EED8DC63EEC8" />
       <ComponentRef Id="cmpF942FF1161AC1F9C83A3D6676E8E9A4B" />
-      <ComponentRef Id="cmpDE30E0D93EFD2C6AB2915E8BB0944FDF" />
-      <ComponentRef Id="cmpFB4ABE0562394C67AF3F84DAD5DCD1EA" />
       <ComponentRef Id="cmpD49FA4B84FFCC31FC3E727D1D4F8B90F" />
-      <ComponentRef Id="cmpC26581911B1D95692FE9CD4E52E093D0" />
-      <ComponentRef Id="cmpC6593A8DA78C5D231EFBE229F2AA7F6D" />
       <ComponentRef Id="cmp670F6F3CA4A21026C71203A94EF9F57A" />
       <ComponentRef Id="cmpF83B856F8ECFE51256947060F4FCA385" />
-      <ComponentRef Id="cmp1000361436DD46A7A215CE64CCB3070F" />
       <ComponentRef Id="cmp3C4A26443C1FF5DCF10620805BA1810E" />
       <ComponentRef Id="cmp46562550D9D7CE53CAB162E828DE0283" />
       <ComponentRef Id="cmp8D3944B62C435DB200C2997753F11B4C" />
       <ComponentRef Id="cmpCA53F2E8DB1BC17C1D52DF65193093F5" />
       <ComponentRef Id="cmpA2AE100BE9A48176C32A44F8EAFED87F" />
       <ComponentRef Id="cmpA2AE100BE9A48176C32A44F8EAFED880" />
-      <ComponentRef Id="cmp67AFE3748590F117178E5617E219F1F8" />
-      <ComponentRef Id="cmp734102C1EBBE0D4417B67AA90D416EC4" />
       <ComponentRef Id="cmp04AC57A0E3245015D9DFB332698F3E26" />
       <ComponentRef Id="cmp1E29A0D7860190642C2D8504982890F9" />
-      <ComponentRef Id="cmp2FB548B56B09B010468883CA4073600D" />
       <ComponentRef Id="cmp4D3236B49B126CF9FFC5234678B3B302" />
       <ComponentRef Id="cmp175D272DFC7FF99BFB93DD4C19681023" />
-      <ComponentRef Id="cmpBCA9F625A04F14271B3727E3DB3182CB" />
-      <ComponentRef Id="cmpAEA2387D6556C1CBCD2E10B2E71FFAA1" />
       <ComponentRef Id="cmp2F8D30568317F98B5965066D6D186037" />
       <ComponentRef Id="cmp61361B29279CEB7B0434A889BB3C3B71" />
       <ComponentRef Id="cmpFCCFD9A69F8311B86AF6ECFD358911D6" />
       <ComponentRef Id="cmp4C42AE293DE5ECC32068657DD0E1E109" />
       <ComponentRef Id="cmpD53ED8782D7CC7C913ECB3436A2FD7D7" />
-      <ComponentRef Id="cmpEA2A37C87C5D278D1C97725C0BE5E814" />
       <ComponentRef Id="cmp1A9CC77C3CEB765A85E2A5D41237626C" />
       <ComponentRef Id="cmpD5D62965C267D4B4347E027709E5DE28" />
       <ComponentRef Id="cmp41178538CA436F109303D32F58555D03" />
       <ComponentRef Id="cmpD81F583B13E6C2D6E4F2CE880505FA06" />
       <ComponentRef Id="cmpB9583E9956348FD3CA8882B90B6EA5C2" />
       <ComponentRef Id="cmp2D91B1A06F475760CF19519E4C2CC84A" />
-      <ComponentRef Id="cmpD46F8000F402AC1F58F8C5457CD90ADE" />
-      <ComponentRef Id="cmpE66ABF016916C709133CA0DB9366469F" />
       <ComponentRef Id="cmpECCD26D8C540FA35F5C633B318EB742E" />
       <ComponentRef Id="cmp644DFED4A59040568D091F0EA5F691E6" />
-      <ComponentRef Id="cmpCC989C2FC3319628C5A0897A9CDB4C7D" />
-      <ComponentRef Id="cmpC9085D713FC071587C61ACFE51384BDD" />
       <ComponentRef Id="cmpB942FEF3BC11F835DF30CDDD845486AD" />
       <ComponentRef Id="cmp7C30328B9DC0AAABC18A5CA8E7F7488D" />
       <ComponentRef Id="cmp13A6DAF93DDD3EAC212153536C80BF67" />
@@ -3307,38 +2900,25 @@
       <ComponentRef Id="cmpB22A40932F4E4471B6D5B34DC9FA758A" />
       <ComponentRef Id="cmpD195B2A584856051C325572DBB7E0FA9" />
       <ComponentRef Id="cmp1043F63E626C53139A6B800DE19F1D31" />
-      <ComponentRef Id="cmp5EFA00ED72CAE35E2305583E29C7C0E7" />
       <ComponentRef Id="cmp5E5EC336758293C396FB70037EAECB51" />
       <ComponentRef Id="cmp283684B3318BCD5A91BF7209D7334305" />
-      <ComponentRef Id="cmp0A0A39DD78246C9E3C90FA18EC033480" />
-      <ComponentRef Id="cmp3C23CFE2F3E20CB67AB209A01D404991" />
       <ComponentRef Id="cmpD34C8CD8BF5F802DCE6D79BD031400F6" />
       <ComponentRef Id="cmp4696307ABC78C14C575582B4755098FB" />
       <ComponentRef Id="cmpC0838E8C57D468419FA312FCDC692C2D" />
-      <ComponentRef Id="cmp53AF51D171028D3271F1D0D78B95C0B4" />
-      <ComponentRef Id="cmp638B7DC05FC5B4ABB321BFEAF36D6C2F" />
       <ComponentRef Id="cmp79CAE24B87836EB856F795A0F0C0277A" />
       <ComponentRef Id="cmpC46C08E02A4A83F863F812A3EC12B002" />
       <ComponentRef Id="cmp9782F919130CAF5E0CF02FE60CC64205" />
       <ComponentRef Id="cmp6E73647D495A1EA3BE6C1A2F86D804FC" />
-      <ComponentRef Id="cmp1E51AA1C97285F18C1F3502915AC2142" />
       <ComponentRef Id="cmp8C0438E44E39800EA412C6D1DF647015" />
-      <ComponentRef Id="cmpDA3111DDBA4FDD64BF4EFCD32783E9D7" />
       <ComponentRef Id="cmpDDAD601E3283C9A170131D9676843483" />
-      <ComponentRef Id="cmp4AF23AD5CF83E8C3CA23CE6DBF09DAB7" />
       <ComponentRef Id="cmp05645B419F5DAB7E6BC89BD9531A9755" />
-      <ComponentRef Id="cmp2C1C15AF6A853A37210F9952FF8276EB" />
       <ComponentRef Id="cmp45F95FD91411CA915989BD31546E10D1" />
-      <ComponentRef Id="cmpDA00EC2351C7C8CD19772559BAEB6DD6" />
       <ComponentRef Id="cmp0F8AC22D198FF9516030549234B252F8" />
-      <ComponentRef Id="cmp8C0CE0CEB2C635A3548CCA5419C133CD" />
-      <ComponentRef Id="cmp2894FC5AF337A8727F082F5A0E568CC0" />
       <ComponentRef Id="cmp8D09BA10F62939C1D17CD5C08719F9BF" />
       <ComponentRef Id="cmp0B5700EBDA661492378A8D2BE4B0CCC2" />
       <ComponentRef Id="cmpE69980AC1BF483BDE6C2D72667346B7D" />
       <ComponentRef Id="cmp2D1EF1D94DDCAFF77A9EEC75A59A633C" />
       <ComponentRef Id="cmpDA936E7EF0404307D9CAAA7A365EDC24" />
-      <ComponentRef Id="cmp9DB38F210B5251337BFF171CF8092C02" />
       <ComponentRef Id="cmp5DE1EE232F232719DFB8EC9DF88FDE03" />
       <ComponentRef Id="cmp2C835739E602911F79B064D2F0CB241A" />
       <ComponentRef Id="cmpC57663058794D67CD71E9334A7DBFB11" />
@@ -3346,113 +2926,66 @@
       <ComponentRef Id="cmpA1069497315F9B59DAC010E401DDE5F8" />
       <ComponentRef Id="cmp79B0C6718C0A7BFE6B6810F6DAD41E81" />
       <ComponentRef Id="cmp017F1FE334055D7A9ED621D69CE55DD4" />
-      <ComponentRef Id="cmpC962D0075A7DCFD1C87041AF911A97C4" />
       <ComponentRef Id="cmpAF7B98CB7B1CC0D4106B4C84AA309583" />
-      <ComponentRef Id="cmpEE2EE1FE3AAC419D5923F7AA11FC0428" />
       <ComponentRef Id="cmpAC7C31925201F03A444F9E7FF233A2E2" />
       <ComponentRef Id="cmpC89F4A0C4FCF5246E06A4731AA00C0DB" />
-      <ComponentRef Id="cmpDB3B9CEC7C9F97F45B27DA073C1B9741" />
-      <ComponentRef Id="cmp6FFA891A2BA5D635134A4BDD472C137A" />
       <ComponentRef Id="cmp52295A769FD374E0181E6FC42AF3B629" />
-      <ComponentRef Id="cmpE6A39823164370DE762EB2160B7C052F" />
       <ComponentRef Id="cmpE63E1F7A32DC1B4394F26FCF12FE68BE" />
-      <ComponentRef Id="cmp9D918AAA3F478AEEA32C3F8AC939B4C5" />
       <ComponentRef Id="cmp8D76B2CDD3B11893BF22B139DE325E42" />
       <ComponentRef Id="cmp7C933AD570F24DA97B5E88CC962819C7" />
       <ComponentRef Id="cmpAB17E329B5A2939CE67126E57D959964" />
       <ComponentRef Id="cmp2675882C487AD9F183386887CB760379" />
       <ComponentRef Id="cmp469F96AA1B86FD69DF010ED2B43C0490" />
       <ComponentRef Id="cmp64AEE1A0E20B562B674944DA4AA8A81C" />
-      <ComponentRef Id="cmpC4CE8B3AFBDD05F2D1CA184EC6F2F6AD" />
       <ComponentRef Id="cmp38EACDEC714E7574DA1D1B71A64D7F98" />
-      <ComponentRef Id="cmp96749B04C9D0B48A5CC24A8429A55B11" />
       <ComponentRef Id="cmp720268936DAFEB403249538726C7A0D9" />
       <ComponentRef Id="cmpA0F24CD99B1551D92627563E93CC69C0" />
-      <ComponentRef Id="cmpC65F6EE65E7395F8683053ECF4C5597A" />
       <ComponentRef Id="cmpBA74BDCF772CB3A06B99296F5AF3F5D1" />
       <ComponentRef Id="cmpEE95B532571A9267B39D72710F1E5E4D" />
       <ComponentRef Id="cmpDF8E0D57CF8B265448B5CBF3B36CD151" />
       <ComponentRef Id="cmpB165A04A8913ADEDA1A4E52C10B29E96" />
-      <ComponentRef Id="cmp1B314F22E3B6E2BAC952D8DF075723FF" />
       <ComponentRef Id="cmpF7F591858894BF922DA7F68B3CB3B370" />
-      <ComponentRef Id="cmp35D7682643503FA3EFF9B04CDB83867B" />
       <ComponentRef Id="cmpEFC858F94DD206B5A4996C7D3095341A" />
       <ComponentRef Id="cmp9F363F3906D6771691F96605FC6C958D" />
-      <ComponentRef Id="cmp826F9B36D96BE5650A67E9C5D2D918DD" />
       <ComponentRef Id="cmp195E63B53BC91EA56A2D52AF3EF028FA" />
-      <ComponentRef Id="cmpF81DCE7B330D9CF5B70501D76A1D5543" />
       <ComponentRef Id="cmp18616D3BE360362E7108A71442D95DA8" />
-      <ComponentRef Id="cmp57452FCE70ED7D869F91A25A8FE9767C" />
       <ComponentRef Id="cmpBFAA43F2923CBC760EE2FFC7616F91B0" />
-      <ComponentRef Id="cmp1D7850EEB288BF7DF2D7BFFD10B380EE" />
-      <ComponentRef Id="cmp901434E222CA7B72B0DDFFCB9C9D4958" />
-      <ComponentRef Id="cmp699BF8B9FD723FDDF914160D33D620DE" />
-      <ComponentRef Id="cmpD33D82ABF51BB671F2DB4ACA9B7BD11C" />
       <ComponentRef Id="cmp43AFEE697DBFCD5C8A53EC540E8582F4" />
-      <ComponentRef Id="cmp0845AF852A390748CB4C6618A133CA9B" />
       <ComponentRef Id="cmp8DB8D2B11EE3C64E01A5AA5792113C7D" />
       <ComponentRef Id="cmp1940FD2AD1FA5AC8438D6551BB1950BD" />
       <ComponentRef Id="cmp0CA8C4585AF8DAC840FAD7021CDCE5C0" />
       <ComponentRef Id="cmp3AFA8B48759D983BCC7FCAB0F8C00049" />
-      <ComponentRef Id="cmp778C0CA0C6DB9B22F55E500E3DD4CE67" />
       <ComponentRef Id="cmpFB9E5DA3F7ED32C900C5711426C700B0" />
       <ComponentRef Id="cmp57FB26AB5D4FC65F8AC6DCA5CA4EAB50" />
-      <ComponentRef Id="cmp95793F2DBCB53FC6574271778B460A23" />
-      <ComponentRef Id="cmp702A2FEFD38FFCF605ED1C313EC71458" />
       <ComponentRef Id="cmp2FAC51A60BB0A9076A393D722CF1B290" />
-      <ComponentRef Id="cmp097CB187E2BDE58F7392C2C072809466" />
-      <ComponentRef Id="cmp13DAFD4716AE6C1A7628B61627C60A19" />
       <ComponentRef Id="cmp1BEF581DBB396BA29E4B59C883BB8649" />
-      <ComponentRef Id="cmp40B149871A5BA98DC82EE7856A4CD736" />
-      <ComponentRef Id="cmpEA4FB4C2137ACB359A57F047FB3F064D" />
-      <ComponentRef Id="cmpEB4CED5CB081B9AAF87D6CAD0FC28F95" />
       <ComponentRef Id="cmpDF8E2441E58692CD330DCA991DB9BC92" />
       <ComponentRef Id="cmp8A908B31F517E0EFE0E38C4CB806CAA7" />
-      <ComponentRef Id="cmp5561B29D282E093AFF80AAD64EED626F" />
       <ComponentRef Id="cmpA146B98771DAB537AE20DD014A4466A9" />
       <ComponentRef Id="cmp3D6E19CC426EF726E2F956E58F78DDF2" />
-      <ComponentRef Id="cmpCEA7A07A4FBA646463AB6AD07587507B" />
       <ComponentRef Id="cmp1EC7D70A01B5B94D053A703D9A242572" />
       <ComponentRef Id="cmpEC5CF579D39FC75DC38E051E55A5CAD5" />
-      <ComponentRef Id="cmp0B896DBA6AFF2FD27FCD0E0968E23992" />
-      <ComponentRef Id="cmpC6A24F97E0D6739A51FE9CC80148F511" />
-      <ComponentRef Id="cmp9544B34C5A30F75D0F45F5718A1795F0" />
-      <ComponentRef Id="cmpBDF0DC73F4F799A46B1DE220E58C1920" />
       <ComponentRef Id="cmp8EC2515ECF0A11A1228D21FE3D995FB0" />
       <ComponentRef Id="cmp6B614FF53759D8CAD6F32B6314151A6B" />
       <ComponentRef Id="cmpE9303C0491BAC84D57D1F1E13FD324DC" />
       <ComponentRef Id="cmp9747A8C42FC4ABE5FA0C3B30FC11C16A" />
       <ComponentRef Id="cmpB063BE196D23C33165CC5637F6E2379E" />
-      <ComponentRef Id="cmpC634BE3C2B885CE5986B811D0B7642DA" />
       <ComponentRef Id="cmp436662C08195044E5CFF8872E2AC66B6" />
-      <ComponentRef Id="cmpC1252325D4A857CE4815CB4887232E08" />
-      <ComponentRef Id="cmp80516C165B610FEA7ABAD8867D4C1177" />
       <ComponentRef Id="cmpAC0BB9176567509DFA5D438A69EF0C71" />
       <ComponentRef Id="cmp15F65BD31868E4E4686961153E4082C1" />
-      <ComponentRef Id="cmp7CFC0926206345463E941DC960BE9832" />
       <ComponentRef Id="cmpB0131B8F2F785C0DB1D557A5E3E0ABE5" />
       <ComponentRef Id="cmp0BFDFC86C64711DBC2FD08597D1378E2" />
-      <ComponentRef Id="cmp21715E66168ACE3CEA6DE5D415CE7FDF" />
-      <ComponentRef Id="cmpF25DC4B00595182390A170310D95EA1D" />
-      <ComponentRef Id="cmpB666825D77A8B064DA727325776EAE74" />
       <ComponentRef Id="cmpA75C2EC5A5EA46DE98DFE2962FEDECC0" />
       <ComponentRef Id="cmp0C712C23BAC746AABB5659096ED329EA" />
-      <ComponentRef Id="cmp2BFC761F21E7234B46E57BA4DD2D9992" />
-      <ComponentRef Id="cmpAB383E4D8CF6F11984650BD4E72F4510" />
       <ComponentRef Id="cmp292CCC20E7FD700B54FBD52A473A57D8" />
       <ComponentRef Id="cmp6D0CF71D0549216C4A22884F5FBF18BE" />
       <ComponentRef Id="cmp1AF8D943CB5BB73A094F79D704EC212F" />
-      <ComponentRef Id="cmp72B6F40E64433679004948C683A17F74" />
       <ComponentRef Id="cmp3B31D67E3C0F6CC8FD23D9CC07CC9D9D" />
       <ComponentRef Id="cmp3CCDC632173A23176E6D04C24350D195" />
-      <ComponentRef Id="cmp1C282D02791A944B172B9CBEAD1FAB88" />
-      <ComponentRef Id="cmpE126C38FBB91AEC118DA44D096195A02" />
       <ComponentRef Id="cmp0B385D84913472F263B64812AF8A786E" />
       <ComponentRef Id="cmp95827D8E0B4E4131783143CFFE240926" />
       <ComponentRef Id="cmp01B060B21C4DE4D6793761203C0B0D67" />
-      <ComponentRef Id="cmpD44A732D25686A0CA69B36B72D4FA8B6" />
       <ComponentRef Id="cmp5673E8FDA66481CD8AA936694C059FFD" />
-      <ComponentRef Id="cmpCAE9BC7900246A998C9FFB85E2017DA4" />
       <ComponentRef Id="cmpE0FBBD56CE6FE2E1CDD3041D3447C578" />
       <ComponentRef Id="cmpFF61B94B438F85A8FC779E3C7A5FECA2" />
       <ComponentRef Id="cmp6D6C7959EEEBF107E24588B13122FAD4" />
@@ -3460,39 +2993,23 @@
       <ComponentRef Id="cmp07C4F6061FD5D7A3AA81BFC762A789BA" />
       <ComponentRef Id="cmp188E47B9BA2A9807918F7C62545C6B4C" />
       <ComponentRef Id="cmp69C84168BA11BF2BEF4D8171EF6DC789" />
-      <ComponentRef Id="cmp7B944B473907CA6C3BB932806E46E5B3" />
       <ComponentRef Id="cmp9E59176D953343E959C4D4C6FB3A0B2E" />
-      <ComponentRef Id="cmp796D96057D21272C6888BA16E71621A6" />
       <ComponentRef Id="cmp09FC5AE7AC1DEE9FA331E11474827936" />
       <ComponentRef Id="cmpF780CC7E5C204F6E10B5B47620F46811" />
-      <ComponentRef Id="cmpBFA0597694F7DEC5642F4DDFBB45F896" />
       <ComponentRef Id="cmp18535DF89416A031A513808AB8CE4B56" />
       <ComponentRef Id="cmpF47CAA3A846D0FD72C81B4A04768665C" />
-      <ComponentRef Id="cmpBE223BF60ADD50DD211D379C90DFF2F5" />
       <ComponentRef Id="cmp52B77FCAF50F9D0DDA11553DDFE24918" />
       <ComponentRef Id="cmp928BA3636D092BE0BB40E8A621B2A71A" />
       <ComponentRef Id="cmp7E56AF43A9C9F3BD725032B4F4E23B34" />
-      <ComponentRef Id="cmp0F07FB10C2781EF64985C0231E9D1880" />
       <ComponentRef Id="cmp6CC2AE24D70256108843A35BBE543ABD" />
       <ComponentRef Id="cmp97AD5D1CAADB8D87FAEFC54F0C4B1589" />
-      <ComponentRef Id="cmp7B96661EFE30D6FCD749BFA049D70D35" />
       <ComponentRef Id="cmp983EFF7B0E21D7CBA5007E969992B47D" />
-      <ComponentRef Id="cmp5729F92BFE2487ED81F16B9F76F5A0D8" />
-      <ComponentRef Id="cmp8930D9CAAE48EEA1DDF7B05ECA4C1E8D" />
-      <ComponentRef Id="cmp8BB683B8EFA12D81B0093983B9A86989" />
       <ComponentRef Id="cmp8C02558B25F6B22C6A6E900C20C10FF9" />
-      <ComponentRef Id="cmp4A011DF9C2CA4BB2CDC862EF06663926" />
       <ComponentRef Id="cmp88A6FB261DFD24D9E25F2AF63C232B4F" />
       <ComponentRef Id="cmpFC754EAE0337C1473B750A7AEBA4062C" />
-      <ComponentRef Id="cmpF0C4435AA0B6F2F56D0D000A43EE1277" />
       <ComponentRef Id="cmp155A485C71B7DE54A5EF8B9B663B01CC" />
-      <ComponentRef Id="cmp0112845AD6F6887B3A1094D1202C3188" />
-      <ComponentRef Id="cmp0336F0CDFF2D0715CD342BF0D0EAF38E" />
       <ComponentRef Id="cmp6A634BAE51EBC7D342FE45DD4F83CBB5" />
-      <ComponentRef Id="cmpC2BD980E9AD88FA8C1CD0ADB81E5D8B3" />
-      <ComponentRef Id="cmp8E3882C311D8863C7AAC79BF98EBF1E4" />
       <ComponentRef Id="cmp43AFF4A88319BF3E995AD16A510F82A8" />
-      <ComponentRef Id="cmpEF39CD6043D82DB539B242B149364D0E" />
       <ComponentRef Id="cmpD791ACEC788E2D11F1C4AC2E8E1C4BC5" />
       <ComponentRef Id="cmp04302602790BC8ABBF6E4333C261968E" />
       <ComponentRef Id="cmpBBA71095399E6775AC36EA3A6E0C0ECA" />
@@ -3500,25 +3017,16 @@
       <ComponentRef Id="cmp5AE7EE76C29D2CA65ABB585EE15C18AB" />
       <ComponentRef Id="cmp0906BA39F4872AC5CE33EA9778CF24E5" />
       <ComponentRef Id="cmp96E2F9A08067109988A4087BCE3B74D4" />
-      <ComponentRef Id="cmp82A5E06C6CFE9382D9175B993EB1EBAD" />
       <ComponentRef Id="cmp10B674B9EE153B7FA9E743D45CF5639E" />
-      <ComponentRef Id="cmpA73318A1FACCEA81EF1EFA5F78374D59" />
-      <ComponentRef Id="cmp25CBD6073CD07C77389077CC7BE7A048" />
       <ComponentRef Id="cmp1CCCE9201A646726052C421D989AA9C0" />
-      <ComponentRef Id="cmp6D952234CE10B4FEBDF02EBBC1C03E1E" />
       <ComponentRef Id="cmp7C73A78033C737A6EA4AAC81D6943407" />
       <ComponentRef Id="cmp99B544AF658E943EE6140147819FCBC1" />
       <ComponentRef Id="cmpBA27F493BA63114999D9C645A559ACBE" />
       <ComponentRef Id="cmp405FE4AEFE314F91B7F8089861BBB353" />
-      <ComponentRef Id="cmpA0853678FFF217EE041189B7EA010175" />
       <ComponentRef Id="cmp61E08B784DA94759BE764CB429E64262" />
       <ComponentRef Id="cmp2355D3B8000E494433D3A278D46BF391" />
-      <ComponentRef Id="cmp2A9C9BC07379929ECE9B4C6C3F0A87C9" />
       <ComponentRef Id="cmpDD17B4F6040D47BCF57B5DA3B31574AA" />
       <ComponentRef Id="cmp2B7D32EFF6CCECD440A55172A3756706" />
-      <ComponentRef Id="cmp30357FCEAC7B88BDCF0B20D55C22F61F" />
-      <ComponentRef Id="cmp557A49B03E72CD07149A6CD0595C9245" />
-      <ComponentRef Id="cmp51F2F26684B5C4D0FFFFFBD72174D1BC" />
       <ComponentRef Id="cmpf2a3c81eb19246b6be74af07e70a06f0" />
       <ComponentRef Id="cmp50D8B0DCCF114B58987590FF8212ACB9" />
       <ComponentRef Id="cmpC39C65F1709E407B9D6AD3AF64F710D3" />
diff --git a/build.psm1 b/build.psm1
index 863dc0d2db9..f293bedcb08 100644
--- a/build.psm1
+++ b/build.psm1
@@ -270,7 +270,7 @@ function Test-IsReleaseCandidate
     return $false
 }
 
-$optimizedFddRegex = 'fxdependent-(linux|alpine|win|win7|osx)-(x64|x86|arm64|arm)'
+$optimizedFddRegex = 'fxdependent-(linux|alpine|win|win81|osx)-(x64|x86|arm64|arm)'
 
 function Start-PSBuild {
     [CmdletBinding(DefaultParameterSetName="Default")]
@@ -315,8 +315,8 @@ function Start-PSBuild {
                      "osx-x64",
                      "win-arm",
                      "win-arm64",
-                     "win7-x64",
-                     "win7-x86")]
+                     "win81-x64",
+                     "win81-x86")]
         [string]$Runtime,
 
         [ValidateSet('Debug', 'Release', 'CodeCoverage', 'StaticAnalysis', '')] # We might need "Checked" as well
@@ -349,8 +349,8 @@ function Start-PSBuild {
     }
 
     if ($ForMinimalSize) {
-        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'"
+        if ($Runtime -and "linux-x64", "win81-x64", "osx-x64" -notcontains $Runtime) {
+            throw "Build for the minimal size is enabled only for following runtimes: 'linux-x64', 'win81-x64', 'osx-x64'"
         }
     }
 
@@ -528,7 +528,7 @@ Fix steps:
         if ($Options.Runtime -notlike 'fxdependent*' -or $Options.Runtime -match $optimizedFddRegex) {
             Write-Verbose "Building without shim" -Verbose
             $sdkToUse = 'Microsoft.NET.Sdk'
-            if ($Options.Runtime -like 'win7-*' -and !$ForMinimalSize) {
+            if ($Options.Runtime -like 'win81-*' -and !$ForMinimalSize) {
                 ## WPF/WinForm and the PowerShell GraphicalHost assemblies are included
                 ## when 'Microsoft.NET.Sdk.WindowsDesktop' is used.
                 $sdkToUse = 'Microsoft.NET.Sdk.WindowsDesktop'
@@ -721,7 +721,7 @@ function Restore-PSPackage
         }
         else {
             $sdkToUse = 'Microsoft.NET.Sdk'
-            if ($Options.Runtime -like 'win7-*' -and !$Options.ForMinimalSize) {
+            if ($Options.Runtime -like 'win81-*' -and !$Options.ForMinimalSize) {
                 $sdkToUse = 'Microsoft.NET.Sdk.WindowsDesktop'
             }
         }
@@ -836,8 +836,8 @@ function New-PSOptions {
                      "osx-x64",
                      "win-arm",
                      "win-arm64",
-                     "win7-x64",
-                     "win7-x86")]
+                     "win81-x64",
+                     "win81-x86")]
         [string]$Runtime,
 
         # Accept a path to the output directory
@@ -871,9 +871,9 @@ function New-PSOptions {
 
         switch ($Platform) {
             'Windows' {
-                # For x86 and x64 architectures, we use win7-x64 and win7-x86 RIDs.
+                # For x86 and x64 architectures, we use win81-x64 and win81-x86 RIDs.
                 # For arm and arm64 architectures, we use win-arm and win-arm64 RIDs.
-                $Platform = if ($Architecture[0] -eq 'x') { 'win7' } else { 'win' }
+                $Platform = if ($Architecture[0] -eq 'x') { 'win81' } else { 'win' }
                 $Runtime = "${Platform}-${Architecture}"
             }
 
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index e2d6644ae25..682511ffba9 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -29,7 +29,6 @@
     <PackageReference Include="System.ServiceModel.Security" Version="4.10.0" />
     <PackageReference Include="System.Private.ServiceModel" Version="4.10.0" />
     <!-- 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="7.0.0-rc.1.22426.10" />
   </ItemGroup>
 
diff --git a/src/ResGen/ResGen.csproj b/src/ResGen/ResGen.csproj
index f86d5328ba8..84bde77f294 100644
--- a/src/ResGen/ResGen.csproj
+++ b/src/ResGen/ResGen.csproj
@@ -7,7 +7,7 @@
     <OutputType>Exe</OutputType>
     <TieredCompilation>true</TieredCompilation>
     <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
-    <RuntimeIdentifiers>win7-x86;win7-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win81-x86;win81-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
 </Project>
diff --git a/src/TypeCatalogGen/TypeCatalogGen.csproj b/src/TypeCatalogGen/TypeCatalogGen.csproj
index 170819a6bf9..1258bd28ac8 100644
--- a/src/TypeCatalogGen/TypeCatalogGen.csproj
+++ b/src/TypeCatalogGen/TypeCatalogGen.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <TieredCompilation>true</TieredCompilation>
     <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
-    <RuntimeIdentifiers>win7-x86;win7-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win81-x86;win81-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
 </Project>
diff --git a/src/powershell-win-core/powershell-win-core.csproj b/src/powershell-win-core/powershell-win-core.csproj
index 9879e8485b4..e44a8a2f42d 100644
--- a/src/powershell-win-core/powershell-win-core.csproj
+++ b/src/powershell-win-core/powershell-win-core.csproj
@@ -8,7 +8,7 @@
     <TieredCompilation>true</TieredCompilation>
     <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
     <TieredCompilationQuickJitForLoops>true</TieredCompilationQuickJitForLoops>
-    <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win81-x86;win81-x64</RuntimeIdentifiers>
     <RootNamespace>Microsoft.PowerShell</RootNamespace>
     <ApplicationManifest>..\..\assets\pwsh.manifest</ApplicationManifest>
     <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
diff --git a/test/hosting/hosting.tests.csproj b/test/hosting/hosting.tests.csproj
index 3a73e139318..cb72e0a90ef 100644
--- a/test/hosting/hosting.tests.csproj
+++ b/test/hosting/hosting.tests.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <Description>PowerShell hosting SDK xUnit Tests</Description>
     <AssemblyName>powershell-hosting-tests</AssemblyName>
-    <!--RuntimeIdentifiers>win7-x86;win7-x64;osx.10.13-x64;linux-x64</RuntimeIdentifiers-->
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/test/packaging/windows/exe.tests.ps1 b/test/packaging/windows/exe.tests.ps1
index 5a72195900e..2e0ffc9e9c1 100644
--- a/test/packaging/windows/exe.tests.ps1
+++ b/test/packaging/windows/exe.tests.ps1
@@ -63,17 +63,17 @@ Describe -Name "Windows EXE" -Fixture {
     Context "$Channel-$Runtime" {
         BeforeAll {
             Write-Verbose "cr-$channel-$runtime" -Verbose
-            switch ("$channel-$runtime") {
-                "preview-win7-x64" {
+            switch -regex ("$channel-$runtime") {
+                "preview-win\d*-x64" {
                     $msiUpgradeCode = '39243d76-adaf-42b1-94fb-16ecf83237c8'
                 }
-                "stable-win7-x64" {
+                "stable-win\d*-x64" {
                     $msiUpgradeCode = '31ab5147-9a97-4452-8443-d9709f0516e1'
                 }
-                "preview-win7-x86" {
+                "preview-win\d*-x86" {
                     $msiUpgradeCode = '86abcfbd-1ccc-4a88-b8b2-0facfde29094'
                 }
-                "stable-win7-x86" {
+                "stable-win\d*-x86" {
                     $msiUpgradeCode = '1d00683b-0f84-4db8-a64f-2f98ad42fe06'
                 }
                 default {
diff --git a/test/packaging/windows/msi.tests.ps1 b/test/packaging/windows/msi.tests.ps1
index 0ee34ca482c..6e4f9ff2f2f 100644
--- a/test/packaging/windows/msi.tests.ps1
+++ b/test/packaging/windows/msi.tests.ps1
@@ -145,23 +145,23 @@ Describe -Name "Windows MSI" -Fixture {
             $pwshPath = Join-Path $env:ProgramFiles -ChildPath "PowerShell"
             $pwshx86Path = Join-Path ${env:ProgramFiles(x86)} -ChildPath "PowerShell"
 
-            switch ("$channel-$runtime") {
-                "preview-win7-x64" {
+            switch -regex ("$channel-$runtime") {
+                "preview-win\d*-x64" {
                     $versionPath = Join-Path -Path $pwshPath -ChildPath '7-preview'
                     $revisionRange = 0, 99
                     $msiUpgradeCode = '39243d76-adaf-42b1-94fb-16ecf83237c8'
                 }
-                "stable-win7-x64" {
+                "stable-win\d*-x64" {
                     $versionPath = Join-Path -Path $pwshPath -ChildPath '7'
                     $revisionRange = 500, 500
                     $msiUpgradeCode = '31ab5147-9a97-4452-8443-d9709f0516e1'
                 }
-                "preview-win7-x86" {
+                "preview-win\d*-x86" {
                     $versionPath = Join-Path -Path $pwshx86Path -ChildPath '7-preview'
                     $revisionRange = 0, 99
                     $msiUpgradeCode = '86abcfbd-1ccc-4a88-b8b2-0facfde29094'
                 }
-                "stable-win7-x86" {
+                "stable-win\d*-x86" {
                     $versionPath = Join-Path -Path $pwshx86Path -ChildPath '7'
                     $revisionRange = 500, 500
                     $msiUpgradeCode = '1d00683b-0f84-4db8-a64f-2f98ad42fe06'
diff --git a/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1 b/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
index 02c4ad856b7..f561440856f 100644
--- a/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
+++ b/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
@@ -167,7 +167,7 @@ Describe "Default enablement of Experimental Features" -Tags CI {
     It "On stable builds, Experimental Features are not enabled" -Skip:($isPreview) {
         foreach ($expFeature in Get-ExperimentalFeature)
         {
-            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win7-x64\publish)
+            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win81-x64\publish)
             # is launched from another pwsh (with $PSHOME like C:\program files\powershell\7)
             # resulting in combined PSModulePath which is used by Get-ExperimentalFeature to enum module-scoped exp.features from both pwsh locations.
             # So we need to exclude parent's modules' exp.features from verification using filtering on $PSHOME.
@@ -184,7 +184,7 @@ Describe "Default enablement of Experimental Features" -Tags CI {
 
         foreach ($expFeature in Get-ExperimentalFeature)
         {
-            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win7-x64\publish)
+            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win81-x64\publish)
             # is launched from another pwsh (with $PSHOME like C:\program files\powershell\7)
             # resulting in combined PSModulePath which is used by Get-ExperimentalFeature to enum module-scoped exp.features from both pwsh locations.
             # So we need to exclude parent's modules' exp.features from verification using filtering on $PSHOME.
diff --git a/test/tools/OpenCover/OpenCover.psm1 b/test/tools/OpenCover/OpenCover.psm1
index f9130df5ae9..262c1e075bd 100644
--- a/test/tools/OpenCover/OpenCover.psm1
+++ b/test/tools/OpenCover/OpenCover.psm1
@@ -615,7 +615,7 @@ function Install-OpenCover
 .Description
    Invoke-OpenCover runs tests under OpenCover by executing tests on PowerShell located at $PowerShellExeDirectory.
 .EXAMPLE
-   Invoke-OpenCover -TestPath $PWD/test/powershell -PowerShellExeDirectory $PWD/src/powershell-win-core/bin/CodeCoverage/7.0/win7-x64
+   Invoke-OpenCover -TestPath $PWD/test/powershell -PowerShellExeDirectory $PWD/src/powershell-win-core/bin/CodeCoverage/7.0/win81-x64
 #>
 function Invoke-OpenCover
 {
@@ -624,7 +624,7 @@ function Invoke-OpenCover
         [parameter()]$OutputLog = "$HOME/Documents/OpenCover.xml",
         [parameter()]$TestPath = "${script:psRepoPath}/test/powershell",
         [parameter()]$OpenCoverPath = "$HOME/OpenCover",
-        [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net7.0/win7-x64/publish",
+        [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net7.0/win81-x64/publish",
         [parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml",
         [parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml",
         [parameter()]$PesterLogFormat = "NUnitXml",
diff --git a/test/tools/TestExe/TestExe.csproj b/test/tools/TestExe/TestExe.csproj
index 8eec2019df3..21f10e03c35 100644
--- a/test/tools/TestExe/TestExe.csproj
+++ b/test/tools/TestExe/TestExe.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <TieredCompilation>true</TieredCompilation>
     <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
-    <RuntimeIdentifiers>win7-x86;win7-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win81-x86;win81-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
 </Project>
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 3b8ded97a05..7630007f414 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <TieredCompilation>true</TieredCompilation>
     <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
-    <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win81-x86;win81-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index 797f1bd52be..e181c62660a 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -6,7 +6,7 @@
     <Description>PowerShell xUnit Tests</Description>
     <AssemblyName>powershell-tests</AssemblyName>
     <GenerateProgramFile>true</GenerateProgramFile>
-    <RuntimeIdentifiers>win7-x86;win7-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win81-x86;win81-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/tools/ci.psm1 b/tools/ci.psm1
index e2feca60dd3..a03acea2dc0 100644
--- a/tools/ci.psm1
+++ b/tools/ci.psm1
@@ -467,7 +467,7 @@ function Get-ReleaseTag
 function Invoke-CIFinish
 {
     param(
-        [string] $Runtime = 'win7-x64',
+        [string] $Runtime = 'win81-x64',
         [string] $Channel = 'preview',
         [Validateset('Build','Package')]
         [string[]] $Stage = ('Build','Package')
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index 658e95212db..a6ded1e0d60 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -166,8 +166,8 @@ function Get-CGRegistrations {
             "osx-x64",
             "win-arm",
             "win-arm64",
-            "win7-x64",
-            "win7-x86",
+            "win81-x64",
+            "win81-x86",
             "modules")]
         [string]$Runtime,
 
@@ -196,7 +196,7 @@ function Get-CGRegistrations {
             $folder = $unixProjectName
             $target = "$dotnetTargetName|$Runtime"
         }
-        "win7-.*" {
+        "win81-.*" {
             $sdkToUse = $winDesktopSdk
             $folder = $windowsProjectName
             $target = "$dotnetTargetNameWin7|$Runtime"
@@ -264,7 +264,7 @@ function Get-CGRegistrations {
 $registrations = [System.Collections.Generic.Dictionary[string, Registration]]::new()
 $lastCount = 0
 $registrationChanged = $false
-foreach ($runtime in "win7-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win7-x86") {
+foreach ($runtime in "win81-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win81-x86") {
     $registrationChanged = (Get-CGRegistrations -Runtime $runtime -RegistrationTable $registrations) -or $registrationChanged
     $count = $registrations.Count
     $newCount = $count - $lastCount
@@ -275,7 +275,11 @@ foreach ($runtime in "win7-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm"
 $newRegistrations = $registrations.Keys | Sort-Object | ForEach-Object { $registrations[$_] }
 
 $count = $newRegistrations.Count
-$newJson = @{Registrations = $newRegistrations } | ConvertTo-Json -depth 99
+$newJson = @{
+    Registrations = $newRegistrations
+     '$schema' = "https://json.schemastore.org/component-detection-manifest.json"
+} | ConvertTo-Json -depth 99
+
 if ($Fix -and $registrationChanged) {
     $newJson | Set-Content $cgManifestPath
     Set-GWVariable -Name CGMANIFEST_PATH -Value $cgManifestPath
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index d3484793a74..654b48ddfd7 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -41,7 +41,7 @@ function Start-PSPackage {
         [string[]]$Type,
 
         # Generate windows downlevel package
-        [ValidateSet("win7-x86", "win7-x64", "win-arm", "win-arm64")]
+        [ValidateSet("win81-x86", "win81-x64", "win-arm", "win-arm64")]
         [ValidateScript({$Environment.IsWindows})]
         [string] $WindowsRuntime,
 
@@ -102,7 +102,7 @@ function Start-PSPackage {
         }
 
         if ($Environment.IsWindows) {
-            # Runtime will be one of win7-x64, win7-x86, "win-arm" and "win-arm64" on Windows.
+            # Runtime will be one of win81-x64, win81-x86, "win-arm" and "win-arm64" on Windows.
             # Build the name suffix for universal win-plat packages.
             switch ($Runtime) {
                 "win-arm"   { $NameSuffix = "win-arm32" }
@@ -3200,7 +3200,7 @@ function New-MSIPatch
         # This example shows how to produce a Debug-x64 installer for development purposes.
         cd $RootPathOfPowerShellRepo
         Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
-        New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
+        New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win81-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
 #>
 function New-MSIPackage
 {
@@ -3591,7 +3591,7 @@ function Start-MsiBuild {
         # This example shows how to produce a Debug-x64 installer for development purposes.
         cd $RootPathOfPowerShellRepo
         Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
-        New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
+        New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win81-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
 #>
 function New-MSIXPackage
 {
diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
index ae0bc4f2b10..443f22bd859 100644
--- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
+++ b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
@@ -11,8 +11,8 @@ param (
 
     [string] $destination = "$env:WORKSPACE",
 
-    [ValidateSet("win7-x64", "win7-x86", "win-arm", "win-arm64", "fxdependent", "fxdependent-win-desktop")]
-    [string] $Runtime = 'win7-x64',
+    [ValidateSet("win81-x64", "win81-x86", "win-arm", "win-arm64", "fxdependent", "fxdependent-win-desktop")]
+    [string] $Runtime = 'win81-x64',
 
     [switch] $ForMinimalSize,
 
diff --git a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
index b75ade828a3..4d7111f94de 100644
--- a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
+++ b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
@@ -35,8 +35,8 @@ jobs:
 
         switch ($runtime)
         {
-          win7-x64 { $packageName = "TestPackage-win-x64.zip" }
-          win7-x86 { $packageName = "TestPackage-win-x86.zip" }
+          win81-x64 { $packageName = "TestPackage-win-x64.zip" }
+          win81-x86 { $packageName = "TestPackage-win-x86.zip" }
           win-arm64 { $packageName = "TestPackage-win-arm64.zip" }
           linux-x64 { $packageName = "TestPackage-linux-x64.zip" }
           linux-arm { $packageName = "TestPackage-linux-arm.zip" }
@@ -49,8 +49,8 @@ jobs:
         Write-Host "##vso[artifact.upload containerfolder=testArtifacts;artifactname=testArtifacts]$(System.ArtifactsDirectory)/$packageName"
       }
 
-      BuildTestPackage -runtime win7-x64
-      BuildTestPackage -runtime win7-x86
+      BuildTestPackage -runtime win81-x64
+      BuildTestPackage -runtime win81-x86
       BuildTestPackage -runtime win-arm64
       BuildTestPackage -runtime linux-x64
       BuildTestPackage -runtime linux-arm
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
index 1201edf98b7..f5dfe4b75cf 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -50,8 +50,8 @@ jobs:
 
       $runtime = switch ($env:Architecture)
         {
-          "x64" { "win7-x64" }
-          "x86" { "win7-x86" }
+          "x64" { "win81-x64" }
+          "x86" { "win81-x86" }
           "arm" { "win-arm"}
           "arm64" { "win-arm64" }
           "fxdependent" { "fxdependent" }
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index befcebf3bd3..10870c8521a 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -239,8 +239,8 @@ jobs:
   - pwsh: |
       $runtime = switch ($env:Architecture)
         {
-          "x64" { "win7-x64" }
-          "x86" { "win7-x86" }
+          "x64" { "win81-x64" }
+          "x86" { "win81-x86" }
           "arm" { "win-arm"}
           "arm64" { "win-arm64" }
           "fxdependent" { "fxdependent" }

From a5739b17393d2976a6a89481ed3ab7f6b4c19603 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 10:34:32 -0700
Subject: [PATCH 587/645] [release/v7.3.0-rc.1] Revert "Replace win7 runtime
 with win8 and remove APISets (#18304)" (#18376)

---
 .../windows/templates/windows-packaging.yml   |  2 +-
 build.psm1                                    | 22 +++++++++----------
 src/ResGen/ResGen.csproj                      |  2 +-
 src/TypeCatalogGen/TypeCatalogGen.csproj      |  2 +-
 .../powershell-win-core.csproj                |  2 +-
 test/hosting/hosting.tests.csproj             |  1 +
 test/packaging/windows/exe.tests.ps1          | 10 ++++-----
 test/packaging/windows/msi.tests.ps1          | 10 ++++-----
 .../Get-ExperimentalFeature.Tests.ps1         |  4 ++--
 test/tools/OpenCover/OpenCover.psm1           |  4 ++--
 test/tools/TestExe/TestExe.csproj             |  2 +-
 test/tools/TestService/TestService.csproj     |  2 +-
 test/xUnit/xUnit.tests.csproj                 |  2 +-
 tools/ci.psm1                                 |  2 +-
 tools/findMissingNotices.ps1                  | 10 ++++-----
 tools/packaging/packaging.psm1                |  8 +++----
 .../PowerShellPackage.ps1                     |  4 ++--
 .../azureDevOps/templates/testartifacts.yml   |  8 +++----
 .../templates/windows-hosted-build.yml        |  4 ++--
 .../templates/windows-packaging.yml           |  4 ++--
 20 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/.vsts-ci/windows/templates/windows-packaging.yml b/.vsts-ci/windows/templates/windows-packaging.yml
index 011a7424291..832fe73af5e 100644
--- a/.vsts-ci/windows/templates/windows-packaging.yml
+++ b/.vsts-ci/windows/templates/windows-packaging.yml
@@ -4,7 +4,7 @@ parameters:
   - name: jobName
     default: 'win_packaging'
   - name: runtimePrefix
-    default: 'win81'
+    default: 'win7'
   - name: architecture
     default: 'x64'
   - name: channel
diff --git a/build.psm1 b/build.psm1
index f293bedcb08..863dc0d2db9 100644
--- a/build.psm1
+++ b/build.psm1
@@ -270,7 +270,7 @@ function Test-IsReleaseCandidate
     return $false
 }
 
-$optimizedFddRegex = 'fxdependent-(linux|alpine|win|win81|osx)-(x64|x86|arm64|arm)'
+$optimizedFddRegex = 'fxdependent-(linux|alpine|win|win7|osx)-(x64|x86|arm64|arm)'
 
 function Start-PSBuild {
     [CmdletBinding(DefaultParameterSetName="Default")]
@@ -315,8 +315,8 @@ function Start-PSBuild {
                      "osx-x64",
                      "win-arm",
                      "win-arm64",
-                     "win81-x64",
-                     "win81-x86")]
+                     "win7-x64",
+                     "win7-x86")]
         [string]$Runtime,
 
         [ValidateSet('Debug', 'Release', 'CodeCoverage', 'StaticAnalysis', '')] # We might need "Checked" as well
@@ -349,8 +349,8 @@ function Start-PSBuild {
     }
 
     if ($ForMinimalSize) {
-        if ($Runtime -and "linux-x64", "win81-x64", "osx-x64" -notcontains $Runtime) {
-            throw "Build for the minimal size is enabled only for following runtimes: 'linux-x64', 'win81-x64', 'osx-x64'"
+        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'"
         }
     }
 
@@ -528,7 +528,7 @@ Fix steps:
         if ($Options.Runtime -notlike 'fxdependent*' -or $Options.Runtime -match $optimizedFddRegex) {
             Write-Verbose "Building without shim" -Verbose
             $sdkToUse = 'Microsoft.NET.Sdk'
-            if ($Options.Runtime -like 'win81-*' -and !$ForMinimalSize) {
+            if ($Options.Runtime -like 'win7-*' -and !$ForMinimalSize) {
                 ## WPF/WinForm and the PowerShell GraphicalHost assemblies are included
                 ## when 'Microsoft.NET.Sdk.WindowsDesktop' is used.
                 $sdkToUse = 'Microsoft.NET.Sdk.WindowsDesktop'
@@ -721,7 +721,7 @@ function Restore-PSPackage
         }
         else {
             $sdkToUse = 'Microsoft.NET.Sdk'
-            if ($Options.Runtime -like 'win81-*' -and !$Options.ForMinimalSize) {
+            if ($Options.Runtime -like 'win7-*' -and !$Options.ForMinimalSize) {
                 $sdkToUse = 'Microsoft.NET.Sdk.WindowsDesktop'
             }
         }
@@ -836,8 +836,8 @@ function New-PSOptions {
                      "osx-x64",
                      "win-arm",
                      "win-arm64",
-                     "win81-x64",
-                     "win81-x86")]
+                     "win7-x64",
+                     "win7-x86")]
         [string]$Runtime,
 
         # Accept a path to the output directory
@@ -871,9 +871,9 @@ function New-PSOptions {
 
         switch ($Platform) {
             'Windows' {
-                # For x86 and x64 architectures, we use win81-x64 and win81-x86 RIDs.
+                # For x86 and x64 architectures, we use win7-x64 and win7-x86 RIDs.
                 # For arm and arm64 architectures, we use win-arm and win-arm64 RIDs.
-                $Platform = if ($Architecture[0] -eq 'x') { 'win81' } else { 'win' }
+                $Platform = if ($Architecture[0] -eq 'x') { 'win7' } else { 'win' }
                 $Runtime = "${Platform}-${Architecture}"
             }
 
diff --git a/src/ResGen/ResGen.csproj b/src/ResGen/ResGen.csproj
index 84bde77f294..f86d5328ba8 100644
--- a/src/ResGen/ResGen.csproj
+++ b/src/ResGen/ResGen.csproj
@@ -7,7 +7,7 @@
     <OutputType>Exe</OutputType>
     <TieredCompilation>true</TieredCompilation>
     <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
-    <RuntimeIdentifiers>win81-x86;win81-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x86;win7-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
 </Project>
diff --git a/src/TypeCatalogGen/TypeCatalogGen.csproj b/src/TypeCatalogGen/TypeCatalogGen.csproj
index 1258bd28ac8..170819a6bf9 100644
--- a/src/TypeCatalogGen/TypeCatalogGen.csproj
+++ b/src/TypeCatalogGen/TypeCatalogGen.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <TieredCompilation>true</TieredCompilation>
     <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
-    <RuntimeIdentifiers>win81-x86;win81-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x86;win7-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
 </Project>
diff --git a/src/powershell-win-core/powershell-win-core.csproj b/src/powershell-win-core/powershell-win-core.csproj
index e44a8a2f42d..9879e8485b4 100644
--- a/src/powershell-win-core/powershell-win-core.csproj
+++ b/src/powershell-win-core/powershell-win-core.csproj
@@ -8,7 +8,7 @@
     <TieredCompilation>true</TieredCompilation>
     <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
     <TieredCompilationQuickJitForLoops>true</TieredCompilationQuickJitForLoops>
-    <RuntimeIdentifiers>win81-x86;win81-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
     <RootNamespace>Microsoft.PowerShell</RootNamespace>
     <ApplicationManifest>..\..\assets\pwsh.manifest</ApplicationManifest>
     <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
diff --git a/test/hosting/hosting.tests.csproj b/test/hosting/hosting.tests.csproj
index cb72e0a90ef..3a73e139318 100644
--- a/test/hosting/hosting.tests.csproj
+++ b/test/hosting/hosting.tests.csproj
@@ -5,6 +5,7 @@
   <PropertyGroup>
     <Description>PowerShell hosting SDK xUnit Tests</Description>
     <AssemblyName>powershell-hosting-tests</AssemblyName>
+    <!--RuntimeIdentifiers>win7-x86;win7-x64;osx.10.13-x64;linux-x64</RuntimeIdentifiers-->
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/test/packaging/windows/exe.tests.ps1 b/test/packaging/windows/exe.tests.ps1
index 2e0ffc9e9c1..5a72195900e 100644
--- a/test/packaging/windows/exe.tests.ps1
+++ b/test/packaging/windows/exe.tests.ps1
@@ -63,17 +63,17 @@ Describe -Name "Windows EXE" -Fixture {
     Context "$Channel-$Runtime" {
         BeforeAll {
             Write-Verbose "cr-$channel-$runtime" -Verbose
-            switch -regex ("$channel-$runtime") {
-                "preview-win\d*-x64" {
+            switch ("$channel-$runtime") {
+                "preview-win7-x64" {
                     $msiUpgradeCode = '39243d76-adaf-42b1-94fb-16ecf83237c8'
                 }
-                "stable-win\d*-x64" {
+                "stable-win7-x64" {
                     $msiUpgradeCode = '31ab5147-9a97-4452-8443-d9709f0516e1'
                 }
-                "preview-win\d*-x86" {
+                "preview-win7-x86" {
                     $msiUpgradeCode = '86abcfbd-1ccc-4a88-b8b2-0facfde29094'
                 }
-                "stable-win\d*-x86" {
+                "stable-win7-x86" {
                     $msiUpgradeCode = '1d00683b-0f84-4db8-a64f-2f98ad42fe06'
                 }
                 default {
diff --git a/test/packaging/windows/msi.tests.ps1 b/test/packaging/windows/msi.tests.ps1
index 6e4f9ff2f2f..0ee34ca482c 100644
--- a/test/packaging/windows/msi.tests.ps1
+++ b/test/packaging/windows/msi.tests.ps1
@@ -145,23 +145,23 @@ Describe -Name "Windows MSI" -Fixture {
             $pwshPath = Join-Path $env:ProgramFiles -ChildPath "PowerShell"
             $pwshx86Path = Join-Path ${env:ProgramFiles(x86)} -ChildPath "PowerShell"
 
-            switch -regex ("$channel-$runtime") {
-                "preview-win\d*-x64" {
+            switch ("$channel-$runtime") {
+                "preview-win7-x64" {
                     $versionPath = Join-Path -Path $pwshPath -ChildPath '7-preview'
                     $revisionRange = 0, 99
                     $msiUpgradeCode = '39243d76-adaf-42b1-94fb-16ecf83237c8'
                 }
-                "stable-win\d*-x64" {
+                "stable-win7-x64" {
                     $versionPath = Join-Path -Path $pwshPath -ChildPath '7'
                     $revisionRange = 500, 500
                     $msiUpgradeCode = '31ab5147-9a97-4452-8443-d9709f0516e1'
                 }
-                "preview-win\d*-x86" {
+                "preview-win7-x86" {
                     $versionPath = Join-Path -Path $pwshx86Path -ChildPath '7-preview'
                     $revisionRange = 0, 99
                     $msiUpgradeCode = '86abcfbd-1ccc-4a88-b8b2-0facfde29094'
                 }
-                "stable-win\d*-x86" {
+                "stable-win7-x86" {
                     $versionPath = Join-Path -Path $pwshx86Path -ChildPath '7'
                     $revisionRange = 500, 500
                     $msiUpgradeCode = '1d00683b-0f84-4db8-a64f-2f98ad42fe06'
diff --git a/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1 b/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
index f561440856f..02c4ad856b7 100644
--- a/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
+++ b/test/powershell/engine/ExperimentalFeature/Get-ExperimentalFeature.Tests.ps1
@@ -167,7 +167,7 @@ Describe "Default enablement of Experimental Features" -Tags CI {
     It "On stable builds, Experimental Features are not enabled" -Skip:($isPreview) {
         foreach ($expFeature in Get-ExperimentalFeature)
         {
-            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win81-x64\publish)
+            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win7-x64\publish)
             # is launched from another pwsh (with $PSHOME like C:\program files\powershell\7)
             # resulting in combined PSModulePath which is used by Get-ExperimentalFeature to enum module-scoped exp.features from both pwsh locations.
             # So we need to exclude parent's modules' exp.features from verification using filtering on $PSHOME.
@@ -184,7 +184,7 @@ Describe "Default enablement of Experimental Features" -Tags CI {
 
         foreach ($expFeature in Get-ExperimentalFeature)
         {
-            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win81-x64\publish)
+            # In CI, pwsh that is running tests (with $PSHOME like D:\a\1\s\src\powershell-win-core\bin\release\net7.0\win7-x64\publish)
             # is launched from another pwsh (with $PSHOME like C:\program files\powershell\7)
             # resulting in combined PSModulePath which is used by Get-ExperimentalFeature to enum module-scoped exp.features from both pwsh locations.
             # So we need to exclude parent's modules' exp.features from verification using filtering on $PSHOME.
diff --git a/test/tools/OpenCover/OpenCover.psm1 b/test/tools/OpenCover/OpenCover.psm1
index 262c1e075bd..f9130df5ae9 100644
--- a/test/tools/OpenCover/OpenCover.psm1
+++ b/test/tools/OpenCover/OpenCover.psm1
@@ -615,7 +615,7 @@ function Install-OpenCover
 .Description
    Invoke-OpenCover runs tests under OpenCover by executing tests on PowerShell located at $PowerShellExeDirectory.
 .EXAMPLE
-   Invoke-OpenCover -TestPath $PWD/test/powershell -PowerShellExeDirectory $PWD/src/powershell-win-core/bin/CodeCoverage/7.0/win81-x64
+   Invoke-OpenCover -TestPath $PWD/test/powershell -PowerShellExeDirectory $PWD/src/powershell-win-core/bin/CodeCoverage/7.0/win7-x64
 #>
 function Invoke-OpenCover
 {
@@ -624,7 +624,7 @@ function Invoke-OpenCover
         [parameter()]$OutputLog = "$HOME/Documents/OpenCover.xml",
         [parameter()]$TestPath = "${script:psRepoPath}/test/powershell",
         [parameter()]$OpenCoverPath = "$HOME/OpenCover",
-        [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net7.0/win81-x64/publish",
+        [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net7.0/win7-x64/publish",
         [parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml",
         [parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml",
         [parameter()]$PesterLogFormat = "NUnitXml",
diff --git a/test/tools/TestExe/TestExe.csproj b/test/tools/TestExe/TestExe.csproj
index 21f10e03c35..8eec2019df3 100644
--- a/test/tools/TestExe/TestExe.csproj
+++ b/test/tools/TestExe/TestExe.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <TieredCompilation>true</TieredCompilation>
     <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
-    <RuntimeIdentifiers>win81-x86;win81-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x86;win7-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
 </Project>
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 7630007f414..3b8ded97a05 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <TieredCompilation>true</TieredCompilation>
     <TieredCompilationQuickJit>true</TieredCompilationQuickJit>
-    <RuntimeIdentifiers>win81-x86;win81-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index e181c62660a..797f1bd52be 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -6,7 +6,7 @@
     <Description>PowerShell xUnit Tests</Description>
     <AssemblyName>powershell-tests</AssemblyName>
     <GenerateProgramFile>true</GenerateProgramFile>
-    <RuntimeIdentifiers>win81-x86;win81-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x86;win7-x64;osx-x64;linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/tools/ci.psm1 b/tools/ci.psm1
index a03acea2dc0..e2feca60dd3 100644
--- a/tools/ci.psm1
+++ b/tools/ci.psm1
@@ -467,7 +467,7 @@ function Get-ReleaseTag
 function Invoke-CIFinish
 {
     param(
-        [string] $Runtime = 'win81-x64',
+        [string] $Runtime = 'win7-x64',
         [string] $Channel = 'preview',
         [Validateset('Build','Package')]
         [string[]] $Stage = ('Build','Package')
diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1
index a6ded1e0d60..c7a6514d723 100644
--- a/tools/findMissingNotices.ps1
+++ b/tools/findMissingNotices.ps1
@@ -166,8 +166,8 @@ function Get-CGRegistrations {
             "osx-x64",
             "win-arm",
             "win-arm64",
-            "win81-x64",
-            "win81-x86",
+            "win7-x64",
+            "win7-x86",
             "modules")]
         [string]$Runtime,
 
@@ -196,7 +196,7 @@ function Get-CGRegistrations {
             $folder = $unixProjectName
             $target = "$dotnetTargetName|$Runtime"
         }
-        "win81-.*" {
+        "win7-.*" {
             $sdkToUse = $winDesktopSdk
             $folder = $windowsProjectName
             $target = "$dotnetTargetNameWin7|$Runtime"
@@ -264,7 +264,7 @@ function Get-CGRegistrations {
 $registrations = [System.Collections.Generic.Dictionary[string, Registration]]::new()
 $lastCount = 0
 $registrationChanged = $false
-foreach ($runtime in "win81-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win81-x86") {
+foreach ($runtime in "win7-x64", "linux-x64", "osx-x64", "alpine-x64", "win-arm", "linux-arm", "linux-arm64", "osx-arm64", "win-arm64", "win7-x86") {
     $registrationChanged = (Get-CGRegistrations -Runtime $runtime -RegistrationTable $registrations) -or $registrationChanged
     $count = $registrations.Count
     $newCount = $count - $lastCount
@@ -276,7 +276,7 @@ $newRegistrations = $registrations.Keys | Sort-Object | ForEach-Object { $regist
 
 $count = $newRegistrations.Count
 $newJson = @{
-    Registrations = $newRegistrations
+    Registrations = $newRegistrations 
      '$schema' = "https://json.schemastore.org/component-detection-manifest.json"
 } | ConvertTo-Json -depth 99
 
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 654b48ddfd7..d3484793a74 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -41,7 +41,7 @@ function Start-PSPackage {
         [string[]]$Type,
 
         # Generate windows downlevel package
-        [ValidateSet("win81-x86", "win81-x64", "win-arm", "win-arm64")]
+        [ValidateSet("win7-x86", "win7-x64", "win-arm", "win-arm64")]
         [ValidateScript({$Environment.IsWindows})]
         [string] $WindowsRuntime,
 
@@ -102,7 +102,7 @@ function Start-PSPackage {
         }
 
         if ($Environment.IsWindows) {
-            # Runtime will be one of win81-x64, win81-x86, "win-arm" and "win-arm64" on Windows.
+            # Runtime will be one of win7-x64, win7-x86, "win-arm" and "win-arm64" on Windows.
             # Build the name suffix for universal win-plat packages.
             switch ($Runtime) {
                 "win-arm"   { $NameSuffix = "win-arm32" }
@@ -3200,7 +3200,7 @@ function New-MSIPatch
         # This example shows how to produce a Debug-x64 installer for development purposes.
         cd $RootPathOfPowerShellRepo
         Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
-        New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win81-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
+        New-MSIPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
 #>
 function New-MSIPackage
 {
@@ -3591,7 +3591,7 @@ function Start-MsiBuild {
         # This example shows how to produce a Debug-x64 installer for development purposes.
         cd $RootPathOfPowerShellRepo
         Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1
-        New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win81-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
+        New-MSIXPackage -Verbose -ProductSourcePath '.\src\powershell-win-core\bin\Debug\net7.0\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3'
 #>
 function New-MSIXPackage
 {
diff --git a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
index 443f22bd859..ae0bc4f2b10 100644
--- a/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
+++ b/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1
@@ -11,8 +11,8 @@ param (
 
     [string] $destination = "$env:WORKSPACE",
 
-    [ValidateSet("win81-x64", "win81-x86", "win-arm", "win-arm64", "fxdependent", "fxdependent-win-desktop")]
-    [string] $Runtime = 'win81-x64',
+    [ValidateSet("win7-x64", "win7-x86", "win-arm", "win-arm64", "fxdependent", "fxdependent-win-desktop")]
+    [string] $Runtime = 'win7-x64',
 
     [switch] $ForMinimalSize,
 
diff --git a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
index 4d7111f94de..b75ade828a3 100644
--- a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
+++ b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
@@ -35,8 +35,8 @@ jobs:
 
         switch ($runtime)
         {
-          win81-x64 { $packageName = "TestPackage-win-x64.zip" }
-          win81-x86 { $packageName = "TestPackage-win-x86.zip" }
+          win7-x64 { $packageName = "TestPackage-win-x64.zip" }
+          win7-x86 { $packageName = "TestPackage-win-x86.zip" }
           win-arm64 { $packageName = "TestPackage-win-arm64.zip" }
           linux-x64 { $packageName = "TestPackage-linux-x64.zip" }
           linux-arm { $packageName = "TestPackage-linux-arm.zip" }
@@ -49,8 +49,8 @@ jobs:
         Write-Host "##vso[artifact.upload containerfolder=testArtifacts;artifactname=testArtifacts]$(System.ArtifactsDirectory)/$packageName"
       }
 
-      BuildTestPackage -runtime win81-x64
-      BuildTestPackage -runtime win81-x86
+      BuildTestPackage -runtime win7-x64
+      BuildTestPackage -runtime win7-x86
       BuildTestPackage -runtime win-arm64
       BuildTestPackage -runtime linux-x64
       BuildTestPackage -runtime linux-arm
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
index f5dfe4b75cf..1201edf98b7 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -50,8 +50,8 @@ jobs:
 
       $runtime = switch ($env:Architecture)
         {
-          "x64" { "win81-x64" }
-          "x86" { "win81-x86" }
+          "x64" { "win7-x64" }
+          "x86" { "win7-x86" }
           "arm" { "win-arm"}
           "arm64" { "win-arm64" }
           "fxdependent" { "fxdependent" }
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index 10870c8521a..befcebf3bd3 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -239,8 +239,8 @@ jobs:
   - pwsh: |
       $runtime = switch ($env:Architecture)
         {
-          "x64" { "win81-x64" }
-          "x86" { "win81-x86" }
+          "x64" { "win7-x64" }
+          "x86" { "win7-x86" }
           "arm" { "win-arm"}
           "arm64" { "win-arm64" }
           "fxdependent" { "fxdependent" }

From 476b0c5d12a0ab0076dddc888d151f47338c7af9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 12:45:42 -0700
Subject: [PATCH 588/645] [release/v7.3.0-rc.1] Remove the
 `ProcessorArchitecture` portion from the full name as it's obsolete (#18381)

---
 .../singleshell/config/MshSnapinInfo.cs       | 45 ++++++++-----------
 test/xUnit/csharp/test_MshSnapinInfo.cs       |  2 +-
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs b/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
index e3ce3a406d1..05f8991e4a9 100644
--- a/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
+++ b/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
@@ -865,7 +865,7 @@ internal static Version ReadVersionValue(RegistryKey mshsnapinKey, string name,
             return v;
         }
 
-        internal static void ReadRegistryInfo(out Version assemblyVersion, out string publicKeyToken, out string culture, out string architecture, out string applicationBase, out Version psVersion)
+        internal static void ReadRegistryInfo(out Version assemblyVersion, out string publicKeyToken, out string culture, out string applicationBase, out Version psVersion)
         {
             applicationBase = Utils.DefaultPowerShellAppBase;
             Dbg.Assert(
@@ -885,8 +885,7 @@ internal static void ReadRegistryInfo(out Version assemblyVersion, out string pu
             // culture, publickeytoken...This will break the scenarios where only one of
             // the assemblies is patched. ie., all monad assemblies should have the
             // same version number.
-            Assembly currentAssembly = typeof(PSSnapInReader).Assembly;
-            AssemblyName assemblyName = currentAssembly.GetName();
+            AssemblyName assemblyName = typeof(PSSnapInReader).Assembly.GetName();
             assemblyVersion = assemblyName.Version;
             byte[] publicTokens = assemblyName.GetPublicKeyToken();
             if (publicTokens.Length == 0)
@@ -899,11 +898,6 @@ internal static void ReadRegistryInfo(out Version assemblyVersion, out string pu
             // save some cpu cycles by hardcoding the culture to neutral
             // assembly should never be targeted to a particular culture
             culture = "neutral";
-
-            // Hardcoding the architecture MSIL as PowerShell assemblies are architecture neutral, this should
-            // be changed if the assumption is broken. Preferred hardcoded string to using (for perf reasons):
-            // string architecture = currentAssembly.GetName().ProcessorArchitecture.ToString()
-            architecture = "MSIL";
         }
 
         /// <summary>
@@ -931,13 +925,12 @@ internal static string ConvertByteArrayToString(byte[] tokens)
         /// </returns>
         internal static PSSnapInInfo ReadCoreEngineSnapIn()
         {
-            Version assemblyVersion, psVersion;
-            string publicKeyToken = null;
-            string culture = null;
-            string architecture = null;
-            string applicationBase = null;
-
-            ReadRegistryInfo(out assemblyVersion, out publicKeyToken, out culture, out architecture, out applicationBase, out psVersion);
+            ReadRegistryInfo(
+                out Version assemblyVersion,
+                out string publicKeyToken,
+                out string culture,
+                out string applicationBase,
+                out Version psVersion);
 
             // System.Management.Automation formats & types files
             Collection<string> types = new Collection<string>(new string[] { "types.ps1xml", "typesv3.ps1xml" });
@@ -946,8 +939,8 @@ internal static PSSnapInInfo ReadCoreEngineSnapIn()
                          "Help.format.ps1xml", "HelpV3.format.ps1xml", "PowerShellCore.format.ps1xml", "PowerShellTrace.format.ps1xml",
                          "Registry.format.ps1xml"});
 
-            string strongName = string.Format(CultureInfo.InvariantCulture, "{0}, Version={1}, Culture={2}, PublicKeyToken={3}, ProcessorArchitecture={4}",
-                s_coreSnapin.AssemblyName, assemblyVersion, culture, publicKeyToken, architecture);
+            string strongName = string.Format(CultureInfo.InvariantCulture, "{0}, Version={1}, Culture={2}, PublicKeyToken={3}",
+                s_coreSnapin.AssemblyName, assemblyVersion, culture, publicKeyToken);
 
             string moduleName = Path.Combine(applicationBase, s_coreSnapin.AssemblyName + ".dll");
 
@@ -985,13 +978,12 @@ internal static PSSnapInInfo ReadCoreEngineSnapIn()
         /// </returns>
         internal static Collection<PSSnapInInfo> ReadEnginePSSnapIns()
         {
-            Version assemblyVersion, psVersion;
-            string publicKeyToken = null;
-            string culture = null;
-            string architecture = null;
-            string applicationBase = null;
-
-            ReadRegistryInfo(out assemblyVersion, out publicKeyToken, out culture, out architecture, out applicationBase, out psVersion);
+            ReadRegistryInfo(
+                out Version assemblyVersion,
+                out string publicKeyToken,
+                out string culture,
+                out string applicationBase,
+                out Version psVersion);
 
             // System.Management.Automation formats & types files
             Collection<string> smaFormats = new Collection<string>(new string[]
@@ -1010,12 +1002,11 @@ internal static Collection<PSSnapInInfo> ReadEnginePSSnapIns()
 
                 string strongName = string.Format(
                     CultureInfo.InvariantCulture,
-                    "{0}, Version={1}, Culture={2}, PublicKeyToken={3}, ProcessorArchitecture={4}",
+                    "{0}, Version={1}, Culture={2}, PublicKeyToken={3}",
                     defaultMshSnapinInfo.AssemblyName,
                     assemblyVersionString,
                     culture,
-                    publicKeyToken,
-                    architecture);
+                    publicKeyToken);
 
                 Collection<string> formats = null;
                 Collection<string> types = null;
diff --git a/test/xUnit/csharp/test_MshSnapinInfo.cs b/test/xUnit/csharp/test_MshSnapinInfo.cs
index 2742ba71c09..039825025d1 100644
--- a/test/xUnit/csharp/test_MshSnapinInfo.cs
+++ b/test/xUnit/csharp/test_MshSnapinInfo.cs
@@ -17,7 +17,7 @@ public void TestReadRegistryInfo()
             Skip.IfNot(Platform.IsWindows);
             Version someVersion = null;
             string someString = null;
-            PSSnapInReader.ReadRegistryInfo(out someVersion, out someString, out someString, out someString, out someString, out someVersion);
+            PSSnapInReader.ReadRegistryInfo(out someVersion, out someString, out someString, out someString, out someVersion);
         }
 
         // PublicKeyToken is null on Linux

From 63281ec146d218a7de59e866c7b5482d77aa6c42 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 25 Oct 2022 15:16:00 -0700
Subject: [PATCH 589/645] Bump to .NET 7 to version `7.0.100-rc.2.22477.20`
 (#18286) (#18378)

---
 DotnetRuntimeMetadata.json                    |  8 ++++----
 assets/wix/files.wxs                          | 20 ++++---------------
 global.json                                   |  2 +-
 ...soft.PowerShell.Commands.Management.csproj |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj |  6 +++---
 ...crosoft.PowerShell.CoreCLR.Eventing.csproj |  2 +-
 .../Microsoft.PowerShell.SDK.csproj           |  8 ++++----
 .../Microsoft.WSMan.Management.csproj         |  2 +-
 .../System.Management.Automation.csproj       | 14 ++++++-------
 test/tools/TestService/TestService.csproj     |  2 +-
 test/tools/WebListener/WebListener.csproj     |  4 ++--
 11 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index c13bf52cd59..2f4b4442efc 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,13 +1,13 @@
 {
   "sdk": {
-    "channel": "7.0.1xx-rc1",
+    "channel": "7.0.1xx-rc2",
     "quality": "daily",
     "qualityFallback": "preview",
-    "packageVersionPattern": "7.0.0-rc.1",
+    "packageVersionPattern": "7.0.0-rc.2",
     "sdkImageVersion": "7.0.100",
-    "nextChannel": "7.0.1xx-rc1",
+    "nextChannel": "7.0.1xx-rc2",
     "azureFeed": "",
-    "sdkImageOverride": "7.0.100-rc.1.22431.12"
+    "sdkImageOverride": ""
   },
   "internalfeed": {
     "url": ""
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index ae7d69c9326..d4427021a56 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1221,15 +1221,6 @@
         <Component Id="cmpF3EB02BB62A34F509B22CC370C430A20">
           <File Id="fil489339762CDF41AE97538C020401BEC6" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Net.Quic.dll" />
         </Component>
-        <Component Id="cmp2BB1C07A912442B0BB6270D7EB3185F3">
-          <File Id="fil2D6E6E560F1743729D90C204D69C369C" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
-        </Component>
-        <Component Id="cmpF5FD2E392BD94BCD957480F128A38E10">
-          <File Id="fil9C11C1DAFDC94C0588965EA6EAAA7592" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
-        </Component>
-        <Component Id="cmp28DEAACC47FD4B04A95521A375761643">
-          <File Id="filE0DD0282CF6C440C99209B0B7495422C" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
-        </Component>
       </Directory>
       <Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
         <Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
@@ -2772,12 +2763,12 @@
       <Component Id="cmp42A739F2AAC24D729DDBCAA096B8C55A">
         <File Id="fil48314E2AC49B4E208C5667CEC50CA78C" KeyPath="yes" Source="$(var.ProductSourcePath)\RegisterMicrosoftUpdate.ps1" />
       </Component>
-      <Component Id="cmp76EB2749D0464D41AD1D2BA2C51CF4C9">
-        <File Id="filDC81A93ACA6045E4A22C108F59D69083" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.42610.dll" />
-      </Component>
       <Component Id="cmp6986F8B66C514347A25E03DD3096B5AE">
         <File Id="fil9276D1BDBF8B4C91B90761633720A419" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationNative_cor3.dll" />
       </Component>
+      <Component Id="cmp0AA648ADA42C4862B34099DB4C05C170">
+        <File Id="fil35F9A9F617154631855B83DACFC9DAD6" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.46401.dll" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -3661,11 +3652,8 @@
       <ComponentRef Id="cmp0721DF55B34849B78C98AE00D863CBFF" />
       <ComponentRef Id="cmpF3EB02BB62A34F509B22CC370C430A20" />
       <ComponentRef Id="cmp42A739F2AAC24D729DDBCAA096B8C55A" />
-      <ComponentRef Id="cmp2BB1C07A912442B0BB6270D7EB3185F3" />
-      <ComponentRef Id="cmp76EB2749D0464D41AD1D2BA2C51CF4C9" />
-      <ComponentRef Id="cmpF5FD2E392BD94BCD957480F128A38E10" />
-      <ComponentRef Id="cmp28DEAACC47FD4B04A95521A375761643" />
       <ComponentRef Id="cmp6986F8B66C514347A25E03DD3096B5AE" />
+      <ComponentRef Id="cmp0AA648ADA42C4862B34099DB4C05C170" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index fa6c98cbf9e..0ad5fa427db 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100-rc.1.22431.12"
+    "version": "7.0.100-rc.2.22477.20"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 48fcd1861c4..414c338a2c4 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-rc.2.22472.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 18f9c39df02..d502b7048e3 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-1.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-rc.1.22426.10" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-2.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0-rc.2.22472.3" />
     <PackageReference Include="NJsonSchema" Version="10.7.2" />
   </ItemGroup>
 
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 36317ba86ee..c33fc10ccd1 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-rc.2.22472.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 682511ffba9..4159ee8e569 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="7.0.0-rc.1.22426.10" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-rc.1.22426.10" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="System.IO.Packaging" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-rc.2.22472.3" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.10.0" />
@@ -29,7 +29,7 @@
     <PackageReference Include="System.ServiceModel.Security" Version="4.10.0" />
     <PackageReference Include="System.Private.ServiceModel" Version="4.10.0" />
     <!-- the source could not be found for the following package(s) -->
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.2.22472.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 0ac640d196e..3b45803af9d 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-rc.2.22472.3" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 75deb301ba1..b292b3e1a69 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-rc.1.22426.10" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-rc.1.22426.10" />
-    <PackageReference Include="System.DirectoryServices" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.DirectoryServices" Version="7.0.0-rc.2.22472.3" />
     <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
-    <PackageReference Include="System.Management" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="System.Management" Version="7.0.0-rc.2.22472.3" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-rc.1.22426.10" />
-    <PackageReference Include="System.Security.Permissions" Version="7.0.0-rc.1.22426.10" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.Security.Permissions" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.2.22472.3" />
     <!-- 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.3.0-rc.1" />
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 3b8ded97a05..aeb87b00ad1 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.2.22472.3" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 972638cbba0..a80dcd0d97b 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-rc.1.22427.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.1.22426.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-rc.2.22476.1" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.2.22472.3" />
   </ItemGroup>
 
   <ItemGroup>

From b6ed99dee864f3621639784e593cd28c351b31da Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 25 Oct 2022 16:20:19 -0700
Subject: [PATCH 590/645] [release/v7.3.0-rc.1] Bump to .NET 7 RC2 official
 version (#18328) (#18377)

---
 assets/wix/files.wxs | 102 ++++++++++++++++++++++++-------------------
 global.json          |   2 +-
 2 files changed, 58 insertions(+), 46 deletions(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index d4427021a56..c76cb49677c 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1221,6 +1221,15 @@
         <Component Id="cmpF3EB02BB62A34F509B22CC370C430A20">
           <File Id="fil489339762CDF41AE97538C020401BEC6" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Net.Quic.dll" />
         </Component>
+        <Component Id="cmp4CBF50D9098D4CB491FF5A3FD6BD0531">
+          <File Id="filDB94307E06E541FF9CE7A0A17A34B6D0" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
+        </Component>
+        <Component Id="cmpB57C7D1B8B4D41229C7AEA53A2E1FC7C">
+          <File Id="filEE2EB55DA1604D0C8E5F3B11E6C7062B" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
+        </Component>
+        <Component Id="cmpD1CDA13235324E4EA90A9CFB3EABB34C">
+          <File Id="filCE609F31411E4EFF8775099BB72D7803" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
+        </Component>
       </Directory>
       <Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
         <Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
@@ -2766,8 +2775,8 @@
       <Component Id="cmp6986F8B66C514347A25E03DD3096B5AE">
         <File Id="fil9276D1BDBF8B4C91B90761633720A419" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationNative_cor3.dll" />
       </Component>
-      <Component Id="cmp0AA648ADA42C4862B34099DB4C05C170">
-        <File Id="fil35F9A9F617154631855B83DACFC9DAD6" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.46401.dll" />
+      <Component Id="cmp6DA0E2825D9646A6959358D042DBC4FE">
+        <File Id="fil55E2580F30F241F1AC58435689E7E1F7" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.47203.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -3167,6 +3176,21 @@
       <ComponentRef Id="cmp859A3876902946E7B5B4965F90664C5D" />
       <ComponentRef Id="cmp25A144CC34E545378735B06794A02F90" />
       <ComponentRef Id="cmp19ADFEFDD03047828CF493B5B5CE7B6E" />
+      <ComponentRef Id="cmp834F3E0C83664E92B0D115A39A8FAACB" />
+      <ComponentRef Id="cmp690F24F04C044127A61754363A4D63E3" />
+      <ComponentRef Id="cmpFAD6557C4AEC48B89DDC4E6485C020C4" />
+      <ComponentRef Id="cmpB5458B36303A472B80582AF1C2E7FB94" />
+      <ComponentRef Id="cmp0EBD333D501A45089F58504074E229E7" />
+      <ComponentRef Id="cmpD11E9CA5069045578BA5D89C86F7FDEF" />
+      <ComponentRef Id="cmp708913639F7A46E784CC0FA862A1A2CE" />
+      <ComponentRef Id="cmpA75DEF5617C54DA1937CB37D5824BF79" />
+      <ComponentRef Id="cmpE5993DB9118640FD8C180A2D61C89C01" />
+      <ComponentRef Id="cmp044F67223E6D490D8533691BF50B2B86" />
+      <ComponentRef Id="cmp7C72179331DD48BCB12BF205F34B76AD" />
+      <ComponentRef Id="cmpF3EB02BB62A34F509B22CC370C430A20" />
+      <ComponentRef Id="cmp4CBF50D9098D4CB491FF5A3FD6BD0531" />
+      <ComponentRef Id="cmpB57C7D1B8B4D41229C7AEA53A2E1FC7C" />
+      <ComponentRef Id="cmpD1CDA13235324E4EA90A9CFB3EABB34C" />
       <ComponentRef Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B" />
       <ComponentRef Id="cmpA620CA71E6FF4F50B6D7BB0761D17036" />
       <ComponentRef Id="cmp2DF9FE0BD560EB7DC8489A259330C2C6" />
@@ -3180,6 +3204,7 @@
       <ComponentRef Id="cmp9451F72F30580C1268817EBEF06429CE" />
       <ComponentRef Id="cmp8C5204B533E790983072FC17EF32FB20" />
       <ComponentRef Id="cmpDEDA23DDAB66342DB2C554F6B963C617" />
+      <ComponentRef Id="cmp97D2E588E938462194C7549B3A0084FE" />
       <ComponentRef Id="cmpF79A92F228AF5EA2BA60CC33BE9DC6A0" />
       <ComponentRef Id="cmp603C5B38651EE30C8E23FD7C8A4B828D" />
       <ComponentRef Id="cmpDDD9F623B3DC4A6DB15A013734FFFACB" />
@@ -3212,10 +3237,11 @@
       <ComponentRef Id="cmp6DDBFA3A9FED42B3AFDCDD4BE0416533" />
       <ComponentRef Id="cmp84599819161549BC82898469571ADE7B" />
       <ComponentRef Id="cmpC0582B8F392548248FA3DE3080069F68" />
+      <ComponentRef Id="cmp3F48AB8F48674965B721E9D5DE5AC19F" />
       <ComponentRef Id="cmp9207ABECCDB7479392AFC35A6133994E" />
       <ComponentRef Id="cmp6BFA61E2CB7C40E2A92575EBFC772B96" />
       <ComponentRef Id="cmp0F6EADB772B844B48C250D8F0469A19B" />
-      <ComponentRef Id="cmp3F48AB8F48674965B721E9D5DE5AC19F" />
+      <ComponentRef Id="cmpF735DF855B6A444E8874E7FD15796C37" />
       <ComponentRef Id="cmpB9EF9DAB25064D92A757E7D390CC8922" />
       <ComponentRef Id="cmp092D1859608844F78D3211718ED31171" />
       <ComponentRef Id="cmpDCFC0B0822274CA2A1C954DF2E407911" />
@@ -3257,6 +3283,8 @@
       <ComponentRef Id="cmpF429A622BF26430592ECE6BFD1EBE61A" />
       <ComponentRef Id="cmp38D8A48C68FB4CB399A0A7677FA428E4" />
       <ComponentRef Id="cmp57D197B18F1F4A6AAB704B28CF61B535" />
+      <ComponentRef Id="cmp690BAC3241424F59B5D30DE0E846D03E" />
+      <ComponentRef Id="cmp5B67AE2852E04C26970FD2016CA76E07" />
       <ComponentRef Id="cmpF2941A91B17EEA22CD6DAB34693D9AC0" />
       <ComponentRef Id="cmp0E8354647101C56EF81E9BDB164B586E" />
       <ComponentRef Id="cmpDCAA22865EF8486AB7526E046A51DBF6" />
@@ -3276,6 +3304,8 @@
       <ComponentRef Id="cmp775BF8C154D047B5AE4779F4AD2727BE" />
       <ComponentRef Id="cmp9C5650D758FC401F8C785A0F979A9505" />
       <ComponentRef Id="cmpB40EE0CC916B4928987F62F5909AE709" />
+      <ComponentRef Id="cmpB43ED7BA30C844E2B5C38F7B747EEFDC" />
+      <ComponentRef Id="cmp777DF202EF2542F2ACFCCF0481E8D6EE" />
       <ComponentRef Id="cmpBEB5F3CF75675537751F0D0B32125BF1" />
       <ComponentRef Id="cmpFB3B0ED1FFF7496CAF70B2F12EBC5CAE" />
       <ComponentRef Id="cmp726DCF2BD14F471AAE8C088A527A1B21" />
@@ -3295,6 +3325,8 @@
       <ComponentRef Id="cmpC6C53A5B540B4A3C9624A0D14D5A9790" />
       <ComponentRef Id="cmp2868115863264407B40346B27ABE3E4D" />
       <ComponentRef Id="cmpB944176DE7924A268269903DC0B5D510" />
+      <ComponentRef Id="cmpCC4A42AA70EE4418926986F5A4B8D3FA" />
+      <ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
       <ComponentRef Id="cmp1DEB513A065956086898BCDACC5887B6" />
       <ComponentRef Id="cmpBAF5257E7B0B1D023F465B43792BC250" />
       <ComponentRef Id="cmp5C9DD1C2D13D443FBC9C74883439DD56" />
@@ -3314,6 +3346,8 @@
       <ComponentRef Id="cmpCC41F040CB1B4D0487DD193036A9DD1A" />
       <ComponentRef Id="cmp5359C8369744482FBB5D56CDF3FA0DB0" />
       <ComponentRef Id="cmp7B5948A1A366409F99B871F0E772B945" />
+      <ComponentRef Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5" />
+      <ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
       <ComponentRef Id="cmp3EC91B8BF4282E77113321E5D1ED27B2" />
       <ComponentRef Id="cmp6E798DAF34F45B4588AEA3E3F33A3FAE" />
       <ComponentRef Id="cmpAF881D0D194F4D6984F92E8386E67445" />
@@ -3333,6 +3367,8 @@
       <ComponentRef Id="cmpEB0B8586AAC24EACA2867506D39669C5" />
       <ComponentRef Id="cmp11087C190382415AB1DC1DFBD78DF348" />
       <ComponentRef Id="cmp28349C4ACD6D42D3967853E0A1D7DC4E" />
+      <ComponentRef Id="cmp166B17F72C954B0087DF991E560B399A" />
+      <ComponentRef Id="cmp0173AE0CBFA44C269D93361F6C98F99B" />
       <ComponentRef Id="cmp867E4E51FE7BC09AAD5D59FD76716FBC" />
       <ComponentRef Id="cmpD7A394A1A96413EC3644F59D3099C0F5" />
       <ComponentRef Id="cmpA0A01F4E746F4F3C90E0AE3895336E24" />
@@ -3352,6 +3388,8 @@
       <ComponentRef Id="cmp58AA8F924CF74562A2D8A789B5EE8B97" />
       <ComponentRef Id="cmp1F2C85D1488B417F9F8FD96EA4A4D8B4" />
       <ComponentRef Id="cmp26335B5D1FE94E87A6B6EBD56A22C2B9" />
+      <ComponentRef Id="cmp529A2B5343FD466884FAF627E37C648D" />
+      <ComponentRef Id="cmp5492F78ACB1A4391BBED371FDFC06B9E" />
       <ComponentRef Id="cmpAA026CCA623F0E8FB5BAE9F201C5B89D" />
       <ComponentRef Id="cmp341C4F1E70E4484001218F1B20F62FCF" />
       <ComponentRef Id="cmp52513C1A98FF4241AC3588CCB18C5A1F" />
@@ -3371,6 +3409,8 @@
       <ComponentRef Id="cmpA3B2086013B5455D9D98B260493EC0B2" />
       <ComponentRef Id="cmp0DA1B3EF85234C7BBA6DE35BBD1B45D2" />
       <ComponentRef Id="cmpF4093A1E8AB94B43AB0F852EB647CE7F" />
+      <ComponentRef Id="cmp4EE1633EE4864CE5B9015BF76BD31D14" />
+      <ComponentRef Id="cmp3B07F4E4B6034F3284288C18F4638CA7" />
       <ComponentRef Id="cmpA656A18FE14D3C8EB02C31AE474054E3" />
       <ComponentRef Id="cmp070651CCF2761B3EF1985884AEB8AC64" />
       <ComponentRef Id="cmpFA35A2719CE343E1B41665922CC26AF4" />
@@ -3390,6 +3430,8 @@
       <ComponentRef Id="cmp74681822D78E49DB9E42A990DFDFB3A9" />
       <ComponentRef Id="cmpC3357D2F892347769141A20222683855" />
       <ComponentRef Id="cmp705598FEC8EA43D7A9B239787BA5DB09" />
+      <ComponentRef Id="cmpC8C68DB0DEE44CF49D98532D2C26395E" />
+      <ComponentRef Id="cmpA8A66545C44F428BB552B55EEE353BB0" />
       <ComponentRef Id="cmp3D20E940BDBF41630242C63011A80CE5" />
       <ComponentRef Id="cmp7C2E3035EE02569D9F11970586140F28" />
       <ComponentRef Id="cmp1E40E7911F29449487A42C55FFF9679B" />
@@ -3409,6 +3451,8 @@
       <ComponentRef Id="cmp6A48FC0DE86C41C297EC418A0E49CA2C" />
       <ComponentRef Id="cmp213F9BA38ED149468C656788A7ED847D" />
       <ComponentRef Id="cmpFAA0CCBA17FE4E8FAE5FE4B5F679DF52" />
+      <ComponentRef Id="cmpF3C18F07C6A148638CBC858EB02E3A6D" />
+      <ComponentRef Id="cmp0C4751F9D5C14419A45F234152D21DA9" />
       <ComponentRef Id="cmpFDCD51BD80926ABECCE27D0D66A47C8F" />
       <ComponentRef Id="cmp85FE3DB247B4FB3E04D8E4CED6D66853" />
       <ComponentRef Id="cmp50F3BA81002D443DBD8AA4A4A494A37D" />
@@ -3428,6 +3472,8 @@
       <ComponentRef Id="cmp38EEEBD629164D8FA34DBE11D92B5712" />
       <ComponentRef Id="cmp4CCDE73A2A9E4D7B90065639D9433178" />
       <ComponentRef Id="cmpA6FA5B27C61E482D8BBC5F1806D3B223" />
+      <ComponentRef Id="cmpBD958F4B8F9146499DE2CA6321C65F96" />
+      <ComponentRef Id="cmp6ADB50DF9F2D4BCA9E682AA6D1C7C03B" />
       <ComponentRef Id="cmp286FCD0B19BF06446A7274672A2491CA" />
       <ComponentRef Id="cmp137236E8DF48EE210ABFCB127CC1E46C" />
       <ComponentRef Id="cmpBA1EE6DA3429452BA3A1F3428C9CC942" />
@@ -3447,6 +3493,8 @@
       <ComponentRef Id="cmp363CFDFE64D94C5693BAB14FCD5FE78C" />
       <ComponentRef Id="cmpA34D56794B9144A2BE67E7CDABCF5B4E" />
       <ComponentRef Id="cmp10773057C33543FA93222022DEC0847D" />
+      <ComponentRef Id="cmp2B8239B905B146A69CD5D55A353AC131" />
+      <ComponentRef Id="cmp9FCFAEB797D9475C873E21B4B5A89E28" />
       <ComponentRef Id="cmp34C4A21743AC68583599BF2B139F39F2" />
       <ComponentRef Id="cmp2AB68868B57E7E15FCD69157375E39D1" />
       <ComponentRef Id="cmpBCFD31F785CB4246B79A3208D566B2F2" />
@@ -3466,6 +3514,8 @@
       <ComponentRef Id="cmp119D48233B3B479FBD8222BA060D65EB" />
       <ComponentRef Id="cmpEC0DB2C3A9C14F4E9FC6883357345CB5" />
       <ComponentRef Id="cmp33364765C98D4BE09BD26DC1E6B95B86" />
+      <ComponentRef Id="cmp582595AE8291444E837793472E0A259C" />
+      <ComponentRef Id="cmpF24D3B9F29F84B4D9C47577B7926FC2E" />
       <ComponentRef Id="cmpBC28FE8B65954B00AECA9C534639596D" />
       <ComponentRef Id="cmp16789176DD8EDBC99C26E1230DB2BDDF" />
       <ComponentRef Id="cmpBC7156375AC544C890A2F93727161B79" />
@@ -3485,6 +3535,8 @@
       <ComponentRef Id="cmp7E10BA8A64E1482BAD717A0A3DC0746E" />
       <ComponentRef Id="cmpD8CDC1F864664A33B6221A40F2BE8406" />
       <ComponentRef Id="cmpB9B22A80E70F414B8778B852E29D6492" />
+      <ComponentRef Id="cmp91C27D1766E84B8BB0F0C70888F03C2E" />
+      <ComponentRef Id="cmpD55F08F6CF51498E9E8551067BA57040" />
       <ComponentRef Id="cmp8A3254D57ABF4F828B08648187233EE4" />
       <ComponentRef Id="cmpC29B22A77B6341C88E4D6CD2876F3BCF" />
       <ComponentRef Id="cmpCBC6AAA9CB644B3C8FFE80E2339C8C62" />
@@ -3596,64 +3648,24 @@
       <ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
       <ComponentRef Id="cmpB92B70CEFC2F438386F97264FB436CDD" />
       <ComponentRef Id="cmp8635213A03B04AAE8E1BFB7EA85E0DB2" />
-      <ComponentRef Id="cmp834F3E0C83664E92B0D115A39A8FAACB" />
       <ComponentRef Id="cmp2BB002B115C247FFB3353C80CAAC10B3" />
       <ComponentRef Id="cmp3547A55EA9D04784B4CF2FC717447E16" />
-      <ComponentRef Id="cmp690F24F04C044127A61754363A4D63E3" />
-      <ComponentRef Id="cmpFAD6557C4AEC48B89DDC4E6485C020C4" />
-      <ComponentRef Id="cmpB5458B36303A472B80582AF1C2E7FB94" />
-      <ComponentRef Id="cmp0EBD333D501A45089F58504074E229E7" />
-      <ComponentRef Id="cmpD11E9CA5069045578BA5D89C86F7FDEF" />
-      <ComponentRef Id="cmp708913639F7A46E784CC0FA862A1A2CE" />
-      <ComponentRef Id="cmpA75DEF5617C54DA1937CB37D5824BF79" />
       <ComponentRef Id="cmp957498053E01454DA1E21E6D7317DCD6" />
       <ComponentRef Id="cmp408A3AF905EB47ADA35FBC5A6B1465A0" />
+      <ComponentRef Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9" />
       <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="cmpD55F08F6CF51498E9E8551067BA57040" />
-      <ComponentRef Id="cmp777DF202EF2542F2ACFCCF0481E8D6EE" />
-      <ComponentRef Id="cmpF24D3B9F29F84B4D9C47577B7926FC2E" />
-      <ComponentRef Id="cmp3B07F4E4B6034F3284288C18F4638CA7" />
-      <ComponentRef Id="cmp9FCFAEB797D9475C873E21B4B5A89E28" />
-      <ComponentRef Id="cmp0C4751F9D5C14419A45F234152D21DA9" />
-      <ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
-      <ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
-      <ComponentRef Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9" />
-      <ComponentRef Id="cmpE5993DB9118640FD8C180A2D61C89C01" />
       <ComponentRef Id="cmpE0DEAA289B2D4594A0C4791B2808C97C" />
       <ComponentRef Id="cmpFE56825F03274064A69AA43CA4B597C7" />
       <ComponentRef Id="cmp0AB1EF494922410AB17DC61097295172" />
-      <ComponentRef Id="cmpF735DF855B6A444E8874E7FD15796C37" />
       <ComponentRef Id="cmp8A466581FE0540CEB2210C64DA5F970B" />
-      <ComponentRef Id="cmp044F67223E6D490D8533691BF50B2B86" />
-      <ComponentRef Id="cmp97D2E588E938462194C7549B3A0084FE" />
       <ComponentRef Id="cmp41C949169E9341CC9297641456FEE2CC" />
-      <ComponentRef Id="cmp7C72179331DD48BCB12BF205F34B76AD" />
       <ComponentRef Id="cmp0721DF55B34849B78C98AE00D863CBFF" />
-      <ComponentRef Id="cmpF3EB02BB62A34F509B22CC370C430A20" />
       <ComponentRef Id="cmp42A739F2AAC24D729DDBCAA096B8C55A" />
       <ComponentRef Id="cmp6986F8B66C514347A25E03DD3096B5AE" />
-      <ComponentRef Id="cmp0AA648ADA42C4862B34099DB4C05C170" />
+      <ComponentRef Id="cmp6DA0E2825D9646A6959358D042DBC4FE" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 0ad5fa427db..76bca39fb4f 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100-rc.2.22477.20"
+    "version": "7.0.100-rc.2.22477.23"
   }
 }

From cf93bdc363aa72a405ff80e2185597cec1f5fd9c Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 26 Oct 2022 02:11:52 +0000
Subject: [PATCH 591/645] Merged PR 22987: Update ThirdPartyNotices

Update ThirdPartyMotices
---
 ThirdPartyNotices.txt | 96 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index ceb1155c1b2..bc84f198b5b 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -20,6 +20,18 @@ required to debug changes to any libraries licensed under the GNU Lesser General
 Microsoft.Extensions.ObjectPool 5.0.10 - Apache-2.0
 
 
+(c) Microsoft Corporation
+Copyright (c) Andrew Arnott
+Copyright (c) 2019 David Fowler
+Copyright (c) 2016 Richard Morris
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
+Copyright (c) 2014-2018 Michael Daines
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019-2020 West Wind Technologies
+Copyright (c) 2010-2019 Google LLC. http://angular.io/license
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 
 Apache License
 
@@ -3024,6 +3036,48 @@ SOFTWARE.
 System.Security.Cryptography.Pkcs 6.0.1 - MIT
 
 
+(c) Microsoft Corporation
+Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
+Copyright 2018 Daniel Lemire
+Copyright (c) .NET Foundation
+Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
+Copyright (c) 1998 Microsoft. To
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2020 Unicode, Inc.
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 2011-2020 Microsoft Corp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
+Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
+Portions (c) International Organization
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
+Copyright (c) .NET Foundation Contributors
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -3127,6 +3181,48 @@ SOFTWARE.
 System.Security.Cryptography.Xml 6.0.1 - MIT
 
 
+(c) Microsoft Corporation
+Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
+Copyright 2018 Daniel Lemire
+Copyright (c) .NET Foundation
+Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
+Copyright (c) 1998 Microsoft. To
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2020 Unicode, Inc.
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 2011-2020 Microsoft Corp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
+Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
+Portions (c) International Organization
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
+Copyright (c) .NET Foundation Contributors
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 

From 082d49eb121df172ebbc139561c3231218b08635 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 26 Oct 2022 21:10:00 +0000
Subject: [PATCH 592/645] Merged PR 22996: Change log for v7.3.0-rc.1

Change log for v7.3.0-rc.1
---
 .spelling            |  4 ++++
 CHANGELOG/preview.md | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/.spelling b/.spelling
index 08cddf17bbd..ef8308796e3 100644
--- a/.spelling
+++ b/.spelling
@@ -726,6 +726,7 @@ preview.8
 preview1-24530-04
 preview1.22217.1
 preview7
+ProcessorArchitecture
 productversion
 program.cs
 prototyyppi
@@ -759,6 +760,7 @@ pvs-studio
 pwd
 pwrshplughin.dll
 pwsh
+pwsh.deps.json
 qmfrederik
 raghav710
 RandomNoun7
@@ -768,6 +770,7 @@ rc.1
 rc.1.21455.2
 rc.1.21458.32
 rc.2
+rc.2.22477.20
 rc.3
 rc2-24027
 rc3-24011
@@ -1073,6 +1076,7 @@ wildcards
 win32
 win32-openssh
 win7
+win8
 windos
 windowspsmodulepath
 windowsversion
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index 41a27232a2b..be2097ee0fb 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,5 +1,49 @@
 # Current preview release
 
+## [7.3.0-rc.1] - 2022-10-26
+
+## Breaking Change
+
+- Update to use `ComputeCore.dll` for PowerShell Direct (#18194)
+
+### Engine Updates and Fixes
+
+- On Unix, explicitly terminate the native process during cleanup only if it's not running in background (#18215)
+
+### General Cmdlet Updates and Fixes
+
+- Remove the `ProcessorArchitecture` portion from the full name as it's obsolete (#18320)
+
+### Tests
+
+- Add missing `-Tag 'CI'` to describe blocks. (#18317)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+<p>Bump to .NET 7 to <code>7.0.100-rc.2.22477.20</code> (#18328)(#18286)</p>
+</summary>
+
+<ul>
+<li>Update ThirdPartyNotices (Internal 22987)</li>
+<li>Remove API sets (#18304) (#18376)</li>
+<li>Do not cleanup <code>pwsh.deps.json</code> for framework dependent packages (#18300)</li>
+<li>Bump <code>Microsoft.PowerShell.Native</code> from <code>7.3.0-preview.1</code> to <code>7.3.0-rc.1</code> (#18217)</li>
+<li>Remove unnecessary native dependencies from the package (#18213)</li>
+<li>Make the link to minimal package blob public during release (#18158)</li>
+<li>Create tasks to collect and publish hashes for build files. (#18276)(#18277)</li>
+<li>Add branch counter to compliance build (#18214)</li>
+<li>Move APIScan to compliance build (#18191)</li>
+<li>Update MSI exit message (#18137)</li>
+<li>Remove XML files for min-size package (#18189)</li>
+</ul>
+
+</details>
+
+[7.3.0-rc.1]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.8...v7.3.0-rc.1
+
 ## [7.3.0-preview.8] - 2022-09-20
 
 ### General Cmdlet Updates and Fixes

From f404e39bc9215c0577a7a5220be16b25ae3ea51a Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 26 Oct 2022 15:06:03 -0700
Subject: [PATCH 593/645] Fix header level in change log

---
 CHANGELOG/preview.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index be2097ee0fb..96163085408 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -2,7 +2,7 @@
 
 ## [7.3.0-rc.1] - 2022-10-26
 
-## Breaking Change
+### Breaking Change
 
 - Update to use `ComputeCore.dll` for PowerShell Direct (#18194)
 

From 9ec59ff542b99b374cdcd74878b55fda288d574c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 29 Oct 2022 16:18:01 +0000
Subject: [PATCH 594/645] Bump `Microsoft.PowerShell.Native` from `7.3.0-rc.1`
 to `7.3.0` (#18413)

---
 .../System.Management.Automation.csproj                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index b292b3e1a69..b1f552439ac 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.2.22472.3" />
     <!-- 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.3.0-rc.1" />
+    <PackageReference Include="Microsoft.PowerShell.Native" Version="7.3.0" />
     <!-- Signing APIs -->
     <PackageReference Include="Microsoft.Security.Extensions" Version="1.2.0" />
   </ItemGroup>

From e2e9572b12350a0ede587e5b8e13955765129e55 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 10:25:18 -0700
Subject: [PATCH 595/645] [release/v7.3.0] Allow two-digit revisions in vPack
 package validation pattern (#18444)

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
index c8988b90106..a51818e4acb 100644
--- a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+++ b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@@ -59,7 +59,7 @@ jobs:
 
   - pwsh: |
       Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -include *.zip, *.msi | ForEach-Object {
-          if($_.Name -match 'PowerShell-\d\.\d\.\d\-([a-z]*.\d+\-)?win\-(${{ parameters.architecture }})\.(zip){1}')
+          if($_.Name -match 'PowerShell-\d+\.\d+\.\d+\-([a-z]*.\d+\-)?win\-(${{ parameters.architecture }})\.(zip){1}')
           {
               $destDir = "$(System.ArtifactsDirectory)\vpack${{ parameters.architecture }}"
               $null = new-item -ItemType Directory -Path $destDir

From 000edb89fb5ac47034de972552a2b3004ee3e432 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 14:51:19 -0700
Subject: [PATCH 596/645] [release/v7.3.0] Correct incorrect cmdlet name in
 script (#18445)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Nicklas Bjälemark <nicklas.bjalemark@aditro.com>
---
 .../commands/management/Computer.cs                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
index e7e185ff8fb..e1b06c0bc94 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
@@ -306,7 +306,7 @@ public short Delay
         ComputerName = $computerName
         ScriptBlock = { $true }
 
-        SessionOption = NewPSSessionOption -NoMachineProfile
+        SessionOption = New-PSSessionOption -NoMachineProfile
         ErrorAction = 'SilentlyContinue'
     }
 

From 8f5db72d9ad9d89e74cdcde26ad931e539f32bc5 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 2 Nov 2022 17:24:45 -0700
Subject: [PATCH 597/645] Do not remove `penimc_cor3.dll` from build (#18438)
 (#18441)

---
 assets/wix/files.wxs | 4 ++++
 build.psm1           | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index c76cb49677c..a9631281444 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -2778,6 +2778,9 @@
       <Component Id="cmp6DA0E2825D9646A6959358D042DBC4FE">
         <File Id="fil55E2580F30F241F1AC58435689E7E1F7" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.47203.dll" />
       </Component>
+      <Component Id="cmp96588875574749E295496861FFC1DB58">
+        <File Id="filF931B05A25224A188D08E09A9FDC3A58" KeyPath="yes" Source="$(var.ProductSourcePath)\PenImc_cor3.dll" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -3666,6 +3669,7 @@
       <ComponentRef Id="cmp42A739F2AAC24D729DDBCAA096B8C55A" />
       <ComponentRef Id="cmp6986F8B66C514347A25E03DD3096B5AE" />
       <ComponentRef Id="cmp6DA0E2825D9646A6959358D042DBC4FE" />
+      <ComponentRef Id="cmp96588875574749E295496861FFC1DB58" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/build.psm1 b/build.psm1
index 863dc0d2db9..509995e7d8d 100644
--- a/build.psm1
+++ b/build.psm1
@@ -3392,7 +3392,8 @@ function Clear-NativeDependencies
 
     $filesToDeleteCore = @($diasymFileName)
 
-    $filesToDeleteWinDesktop = @('penimc_cor3.dll')
+    ## Currently we do not need to remove any files from WinDesktop runtime.
+    $filesToDeleteWinDesktop = @()
 
     $deps = Get-Content "$PublishFolder/pwsh.deps.json" -Raw | ConvertFrom-Json -Depth 20
     $targetRuntime = ".NETCoreApp,Version=v7.0/$($script:Options.Runtime)"

From 383a918689f631a63bd827a6efb601849b87086f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 17:45:02 -0700
Subject: [PATCH 598/645] [release/v7.3.0] Add authenticode signing for
 assemblies on linux builds (#18449)

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
---
 .../releaseBuild/azureDevOps/releaseBuild.yml |  25 +-
 .../templates/linux-authenticode-sign.yml     | 127 ++++++
 .../azureDevOps/templates/linux-packaging.yml | 391 ++++++++++++++++++
 .../azureDevOps/templates/linux.yml           | 281 ++++---------
 .../azureDevOps/templates/signBuildFiles.yml  | 171 ++++++++
 5 files changed, 782 insertions(+), 213 deletions(-)
 create mode 100644 tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
 create mode 100644 tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
 create mode 100644 tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml

diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index 9eb2d62bbdc..e21b4fe0c4e 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -100,7 +100,7 @@ stages:
       - template: templates/linux.yml
         parameters:
           buildName: rpm
-          uploadDisplayName: Upload and Sign
+          parentJob: build_deb
 
       - template: templates/linux.yml
         parameters:
@@ -111,6 +111,29 @@ stages:
         parameters:
           buildName: alpine
 
+      - template: templates/linux-authenticode-sign.yml
+
+      - template: templates/linux-packaging.yml
+        parameters:
+          buildName: deb
+          parentJob: sign_linux_builds
+
+      - template: templates/linux-packaging.yml
+        parameters:
+          buildName: rpm
+          uploadDisplayName: Upload and Sign
+          parentJob: sign_linux_builds
+
+      - template: templates/linux-packaging.yml
+        parameters:
+          buildName: alpine
+          parentJob: sign_linux_builds
+
+      - template: templates/linux-packaging.yml
+        parameters:
+          buildName: fxdependent
+          parentJob: sign_linux_builds
+
   - stage: windows
     dependsOn: ['prep']
     jobs:
diff --git a/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml b/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
new file mode 100644
index 00000000000..d014cf74320
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
@@ -0,0 +1,127 @@
+jobs:
+- job: sign_linux_builds
+  displayName: Sign all linux builds
+  condition: succeeded()
+  pool:
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals PSMMS2019-Secure
+  dependsOn: ['build_fxdependent', 'build_rpm']
+  variables:
+    - name: runCodesignValidationInjection
+      value: false
+    - name: NugetSecurityAnalysisWarningLevel
+      value: none
+    - group: ESRP
+
+  steps:
+  - checkout: self
+    clean: true
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: pwshLinuxBuild
+      path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuild
+    displayName: Download deb build
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: pwshLinuxBuildMinSize
+      path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize
+    displayName: Download min-size build
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: pwshLinuxBuildArm32
+      path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32
+    displayName: Download arm32 build
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: pwshLinuxBuildArm64
+      path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64
+    displayName: Download arm64 build
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: pwshMarinerBuildAmd64
+      path: $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64
+    displayName: Download mariner build
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: pwshLinuxBuildAlpine
+      path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildAlpine
+    displayName: Download alpine build
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      artifact: pwshLinuxBuildFxdependent
+      path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildFxdependent
+    displayName: Download fxdependent build
+
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+
+  - template: cloneToOfficialPath.yml
+
+  - template: insert-nuget-config-azfeed.yml
+    parameters:
+      repoRoot: $(PowerShellRoot)
+
+  - powershell: |
+      Set-Location $env:POWERSHELLROOT
+      import-module "$env:POWERSHELLROOT/build.psm1"
+      Sync-PSTags -AddRemoteIfMissing
+    displayName: SyncTags
+    condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
+
+  - checkout: ComplianceRepo
+    clean: true
+
+  - template: shouldSign.yml
+
+  - template: signBuildFiles.yml
+    parameters:
+      binLocation: pwshLinuxBuild
+      buildPrefixName: 'PowerShell Linux'
+
+  - template: signBuildFiles.yml
+    parameters:
+      binLocation: pwshLinuxBuildMinSize
+      buildPrefixName: 'PowerShell Linux Minimum Size'
+
+  - template: signBuildFiles.yml
+    parameters:
+      binLocation: pwshLinuxBuildArm32
+      buildPrefixName: 'PowerShell Linux Arm32'
+
+  - template: signBuildFiles.yml
+    parameters:
+      binLocation: pwshLinuxBuildArm64
+      buildPrefixName: 'PowerShell Linux Arm64'
+
+  - template: signBuildFiles.yml
+    parameters:
+      binLocation: pwshMarinerBuildAmd64
+      buildPrefixName: 'PowerShell Linux x64 Framework Dependent'
+
+  - template: signBuildFiles.yml
+    parameters:
+      binLocation: pwshLinuxBuildAlpine
+      buildPrefixName: 'PowerShell Linux Alpine x64'
+
+  - template: signBuildFiles.yml
+    parameters:
+      binLocation: pwshLinuxBuildFxdependent
+      buildPrefixName: 'PowerShell Linux Framework Dependent'
+
+  #- template: Sbom.yml@ComplianceRepo
+  #  parameters:
+  #    BuildDropPath: '$(System.ArtifactsDirectory)/$(BIN_LOCATION)'
+  #    Build_Repository_Uri: $(Github_Build_Repository_Uri)
+  #    displayName: ${{ parameters.buildName }} SBOM
+  #    PackageName: $(PACKAGE_NAME)
+  #    PackageVersion: $(Version)
+  #    sourceScanPath: '$(PowerShellRoot)/tools'
diff --git a/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml b/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
new file mode 100644
index 00000000000..f5e298f7139
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
@@ -0,0 +1,391 @@
+parameters:
+  buildName: ''
+  uploadDisplayName: 'Upload'
+  parentJob: ''
+
+jobs:
+- job: pkg_${{ parameters.buildName }}
+  displayName: Package ${{ parameters.buildName }}
+  condition: succeeded()
+  pool:
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals PSMMSUbuntu20.04-Secure
+  dependsOn: sign_linux_builds
+  variables:
+    - name: runCodesignValidationInjection
+      value: false
+    - name: build
+      value: ${{ parameters.buildName }}
+    - name: NugetSecurityAnalysisWarningLevel
+      value: none
+    - group: ESRP
+
+  steps:
+  - ${{ if or(eq(variables.build,'deb'), eq(variables.build,'rpm')) }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshLinuxBuild-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuild
+      displayName: Download deb build
+
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshLinuxBuildMinSize-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize
+      displayName: Download min-size build
+
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshLinuxBuildArm32-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32
+      displayName: Download arm32 build
+
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshLinuxBuildArm64-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64
+      displayName: Download arm64 build
+
+  - ${{ if eq(variables.build,'rpm') }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshMarinerBuildAmd64-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64
+      displayName: Download mariner build
+
+  - ${{ if eq(variables.build,'alpine') }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshLinuxBuildAlpine-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuild
+      displayName: Download alpine build
+
+  - ${{ if eq(variables.build,'fxdependent') }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshLinuxBuildFxdependent-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuild
+      displayName: Download fxdependent build
+
+  - ${{ if or(eq(variables.build,'deb'), eq(variables.build,'rpm')) }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshLinuxBuild-meta
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuild-meta
+      displayName: Download deb build meta
+
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshLinuxBuildMinSize-meta
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize-meta
+      displayName: Download min-size build meta
+
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshLinuxBuildArm32-meta
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32-meta
+      displayName: Download arm32 build meta
+
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshLinuxBuildArm64-meta
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64-meta
+      displayName: Download arm64 build meta
+
+  - ${{ if eq(variables.build,'rpm') }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshMarinerBuildAmd64-meta
+        path: $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64-meta
+      displayName: Download mariner build meta
+
+  - ${{ if eq(variables.build,'alpine') }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshLinuxBuildAlpine-meta
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuild-meta
+      displayName: Download alpine build meta
+
+  - ${{ if eq(variables.build,'fxdependent') }} :
+    - task: DownloadPipelineArtifact@2
+      inputs:
+        artifact: pwshLinuxBuildFxdependent-meta
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuild-meta
+      displayName: Download fxdependent build meta
+
+  - pwsh: |
+      Get-ChildItem '$(Build.ArtifactStagingDirectory)' | Select-Object -Property 'unixmode', 'size', 'name'
+    displayName: Capture downloads
+
+  - checkout: self
+    clean: true
+
+  - checkout: ComplianceRepo
+    clean: true
+
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+
+  - pwsh: |
+      # create folder
+      sudo mkdir /PowerShell
+
+      # make the current user the owner
+      sudo chown $env:USER /PowerShell
+    displayName: 'Create /PowerShell'
+
+  - template: cloneToOfficialPath.yml
+
+  - template: insert-nuget-config-azfeed.yml
+    parameters:
+      repoRoot: $(PowerShellRoot)
+
+  - powershell: |
+      import-module "$env:POWERSHELLROOT/build.psm1"
+      Sync-PSTags -AddRemoteIfMissing
+    displayName: SyncTags
+    condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
+    workingDirectory: $(PowerShellRoot)
+
+  - powershell: |
+      Import-Module "$env:POWERSHELLROOT/build.psm1"
+
+      Start-PSBootstrap -Package
+    displayName: 'Bootstrap'
+    condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
+    workingDirectory: $(PowerShellRoot)
+
+  - powershell: |
+      try {
+        Import-Module "$env:POWERSHELLROOT/build.psm1"
+        Import-Module "$env:POWERSHELLROOT/tools/packaging"
+
+        $metadata = Get-Content "$env:POWERSHELLROOT/tools/metadata.json" -Raw | ConvertFrom-Json
+
+        # LTSRelease.Package indicates that the release should be packaged as an LTS
+        $LTS = $metadata.LTSRelease.Package
+        Write-Verbose -Verbose -Message "LTS is set to: $LTS"
+
+        Invoke-AzDevOpsLinuxPackageCreation -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
+
+        if ($LTS) {
+            Write-Verbose -Verbose "Packaging LTS"
+            Invoke-AzDevOpsLinuxPackageCreation -LTS  -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
+        }
+      } catch {
+        Get-Error
+        throw
+      }
+    displayName: 'Package'
+    condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
+    workingDirectory: $(PowerShellRoot)
+
+  - powershell: |
+      $linuxPackages = Get-ChildItem "$env:POWERSHELLROOT/powershell*" -Include *.deb,*.rpm,*.tar.gz
+
+      $bucket = 'release'
+      foreach ($linuxPackage in $linuxPackages)
+      {
+          $filePath = $linuxPackage.FullName
+          Write-Verbose "Publishing $filePath to $bucket" -Verbose
+          Write-Host "##vso[artifact.upload containerfolder=$bucket;artifactname=$bucket]$filePath"
+      }
+    displayName: Publish artifacts
+    condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
+    workingDirectory: $(PowerShellRoot)
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
+
+- job: upload_${{ parameters.buildName }}
+  displayName: ${{ parameters.uploadDisplayName }} ${{ parameters.buildName }}
+  dependsOn: pkg_${{ parameters.buildName }}
+  condition: succeeded()
+  pool:
+    name: PowerShell1ES
+    demands:
+    - ImageOverride -equals PSMMS2019-Secure
+  variables:
+    - name: buildName
+      value: ${{ parameters.buildName }}
+    - group: ESRP
+    - name: runCodesignValidationInjection
+      value: false
+    - name: NugetSecurityAnalysisWarningLevel
+      value: none
+    - name: skipComponentGovernanceDetection
+      value: true
+
+  steps:
+  - checkout: self
+    clean: true
+
+  - checkout: ComplianceRepo
+    clean: true
+
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+  - template: shouldSign.yml
+
+  - task: DownloadBuildArtifacts@0
+    displayName: 'Download Deb Artifacts'
+    inputs:
+      downloadType: specific
+      itemPattern: '**/*.deb'
+      downloadPath: '$(System.ArtifactsDirectory)\finished'
+    condition: and(eq(variables['buildName'], 'DEB'), succeeded())
+
+  - task: DownloadBuildArtifacts@0
+    displayName: 'Download tar.gz Artifacts copy'
+    inputs:
+      downloadType: specific
+      itemPattern: '**/*.tar.gz'
+      downloadPath: '$(System.ArtifactsDirectory)\finished'
+
+  - powershell: |
+      Write-Host 'We handle the min-size package only when uploading for deb build.'
+      Write-Host '- For deb build, the min-size package is moved to a separate folder "finished\minSize",'
+      Write-Host '  so that the min-size package can be uploaded to a different Az Blob container.'
+      Write-Host '- For other builds, the min-size package is removed after being downloaded, so that it'
+      Write-Host '  does not get accidentally uploaded to the wrong Az Blob container.'
+
+      $minSizePkg = '$(System.ArtifactsDirectory)\finished\release\*-gc.tar.gz'
+      if (Test-Path -Path $minSizePkg)
+      {
+          if ('$(buildName)' -eq 'DEB')
+          {
+              $minSizeDir = '$(System.ArtifactsDirectory)\finished\minSize'
+              New-Item -Path $minSizeDir -Type Directory -Force > $null
+              Move-Item -Path $minSizePkg -Destination $minSizeDir
+
+              Write-Host "`nCapture the min-size package moved to the target folder."
+              Get-ChildItem -Path $minSizeDir
+          }
+          else
+          {
+              Write-Host '$(buildName): Remove the min-size package.'
+              Remove-Item -Path $minSizePkg -Force
+          }
+      }
+      else
+      {
+          Write-Host 'min-size package not found, so skip this step.'
+      }
+    displayName: 'Move minSize package to separate folder'
+
+  - task: DownloadBuildArtifacts@0
+    displayName: 'Download rpm Artifacts copy'
+    inputs:
+      downloadType: specific
+      itemPattern: '**/*.rpm'
+      downloadPath: '$(System.ArtifactsDirectory)\rpm'
+    condition: and(eq(variables['buildName'], 'RPM'), succeeded())
+
+  - template: EsrpScan.yml@ComplianceRepo
+    parameters:
+        scanPath: $(System.ArtifactsDirectory)
+        pattern: |
+          **\*.rpm
+          **\*.deb
+          **\*.tar.gz
+
+  - ${{ if eq(variables['buildName'], 'RPM') }}:
+    - template: EsrpSign.yml@ComplianceRepo
+      parameters:
+          buildOutputPath: $(System.ArtifactsDirectory)\rpm
+          signOutputPath: $(Build.StagingDirectory)\signedPackages
+          certificateId: "CP-450779-Pgp"
+          pattern: |
+            **\*.rh.*.rpm
+          useMinimatch: true
+          shouldSign: $(SHOULD_SIGN)
+          displayName: Sign RedHat RPM
+          OutputMode: AlwaysCopy
+
+  - ${{ if eq(variables['buildName'], 'RPM') }}:
+    - template: EsrpSign.yml@ComplianceRepo
+      parameters:
+          # Sign in-place, previous task copied the files to this folder
+          buildOutputPath: $(Build.StagingDirectory)\signedPackages
+          signOutputPath: $(Build.StagingDirectory)\signedPackages
+          certificateId: "CP-459159-Pgp"
+          pattern: |
+            **\*.cm.*.rpm
+            **\*.cm?.*.rpm
+          useMinimatch: true
+          shouldSign: $(SHOULD_SIGN)
+          displayName: Sign Mariner RPM
+          OutputMode: NeverCopy
+
+  # requires windows
+  - ${{ if ne(variables['buildName'], 'RPM') }}:
+    - task: AzureFileCopy@4
+      displayName: 'Upload to Azure - DEB and tar.gz'
+      inputs:
+        SourcePath: '$(System.ArtifactsDirectory)\finished\release\*'
+        azureSubscription: '$(AzureFileCopySubscription)'
+        Destination: AzureBlob
+        storage: '$(StorageAccount)'
+        ContainerName: '$(AzureVersion)'
+
+  - template: upload-final-results.yml
+    parameters:
+      artifactPath: $(System.ArtifactsDirectory)\finished\release
+
+  # requires windows
+  - task: AzureFileCopy@4
+    displayName: 'Upload to Azure - min-size package for Guest Config'
+    inputs:
+      SourcePath: '$(System.ArtifactsDirectory)\finished\minSize\*'
+      azureSubscription: '$(AzureFileCopySubscription)'
+      Destination: AzureBlob
+      storage: '$(StorageAccount)'
+      ContainerName: '$(AzureVersion)-gc'
+    condition: and(eq(variables['buildName'], 'DEB'), succeeded())
+
+  - template: upload-final-results.yml
+    parameters:
+      artifactPath: $(System.ArtifactsDirectory)\finished\minSize
+      condition: and(eq(variables['buildName'], 'DEB'), succeeded())
+
+  # requires windows
+  - task: AzureFileCopy@4
+    displayName: 'Upload to Azure - RPM - Unsigned'
+    inputs:
+      SourcePath: '$(System.ArtifactsDirectory)\rpm\release\*'
+      azureSubscription: '$(AzureFileCopySubscription)'
+      Destination: AzureBlob
+      storage: '$(StorageAccount)'
+      ContainerName: '$(AzureVersion)'
+    condition: and(and(succeeded(), ne(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
+
+  # requires windows
+  - task: AzureFileCopy@4
+    displayName: 'Upload to Azure - RPM - Signed'
+    inputs:
+      SourcePath: '$(Build.StagingDirectory)\signedPackages\release\*'
+      azureSubscription: '$(AzureFileCopySubscription)'
+      Destination: AzureBlob
+      storage: '$(StorageAccount)'
+      ContainerName: '$(AzureVersion)'
+    condition: and(and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
+
+  - template: upload-final-results.yml
+    parameters:
+      artifactPath: $(System.ArtifactsDirectory)\rpm\release
+      condition: and(and(succeeded(), ne(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
+
+  - template: upload-final-results.yml
+    parameters:
+      artifactPath: '$(Build.StagingDirectory)\signedPackages\release'
+      condition: and(and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
+
+  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index 53057fec716..e7caa41bc30 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -124,229 +124,86 @@ jobs:
         PackageVersion: $(Version)
         sourceScanPath: '$(PowerShellRoot)/tools'
 
-  - powershell: |
-      try {
-        Import-Module "$env:POWERSHELLROOT/build.psm1"
-        Import-Module "$env:POWERSHELLROOT/tools/packaging"
-
-        $metadata = Get-Content "$env:POWERSHELLROOT/tools/metadata.json" -Raw | ConvertFrom-Json
-
-        # LTSRelease.Package indicates that the release should be packaged as an LTS
-        $LTS = $metadata.LTSRelease.Package
-        Write-Verbose -Verbose -Message "LTS is set to: $LTS"
-
-        Invoke-AzDevOpsLinuxPackageCreation -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild'
+        artifactName: pwshLinuxBuild
 
-        if ($LTS) {
-            Write-Verbose -Verbose "Packaging LTS"
-            Invoke-AzDevOpsLinuxPackageCreation -LTS  -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
-        }
-      } catch {
-        Get-Error
-        throw
-      }
-    displayName: 'Package'
-    condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
-    workingDirectory: $(PowerShellRoot)
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild-meta'
+        artifactName: pwshLinuxBuild-meta
 
-  - powershell: |
-      $linuxPackages = Get-ChildItem "$env:POWERSHELLROOT/powershell*" -Include *.deb,*.rpm,*.tar.gz
-
-      $bucket = 'release'
-      foreach ($linuxPackage in $linuxPackages)
-      {
-          $filePath = $linuxPackage.FullName
-          Write-Verbose "Publishing $filePath to $bucket" -Verbose
-          Write-Host "##vso[artifact.upload containerfolder=$bucket;artifactname=$bucket]$filePath"
-      }
-    displayName: Publish artifacts
-    condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
-    workingDirectory: $(PowerShellRoot)
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildMinSize'
+        artifactName: pwshLinuxBuildMinSize
 
-  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildMinSize-meta'
+        artifactName: pwshLinuxBuildMinSize-meta
 
-- job: upload_${{ parameters.buildName }}
-  displayName: ${{ parameters.uploadDisplayName }} ${{ parameters.buildName }}
-  dependsOn: build_${{ parameters.buildName }}
-  condition: succeeded()
-  pool:
-    name: PowerShell1ES
-    demands:
-    - ImageOverride -equals PSMMS2019-Secure
-  variables:
-    - name: buildName
-      value: ${{ parameters.buildName }}
-    - group: ESRP
-    - name: runCodesignValidationInjection
-      value: false
-    - name: NugetSecurityAnalysisWarningLevel
-      value: none
-    - name: skipComponentGovernanceDetection
-      value: true
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm32'
+        artifactName: pwshLinuxBuildArm32
 
-  steps:
-  - checkout: self
-    clean: true
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm32-meta'
+        artifactName: pwshLinuxBuildArm32-meta
 
-  - checkout: ComplianceRepo
-    clean: true
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm64'
+        artifactName: pwshLinuxBuildArm64
 
-  - template: SetVersionVariables.yml
-    parameters:
-      ReleaseTagVar: $(ReleaseTagVar)
-  - template: shouldSign.yml
-
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download Deb Artifacts'
-    inputs:
-      downloadType: specific
-      itemPattern: '**/*.deb'
-      downloadPath: '$(System.ArtifactsDirectory)\finished'
-    condition: and(eq(variables['buildName'], 'DEB'), succeeded())
-
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download tar.gz Artifacts copy'
-    inputs:
-      downloadType: specific
-      itemPattern: '**/*.tar.gz'
-      downloadPath: '$(System.ArtifactsDirectory)\finished'
+  - ${{ if eq(variables.build,'deb') }} :
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm64-meta'
+        artifactName: pwshLinuxBuildArm64-meta
 
-  - powershell: |
-      Write-Host 'We handle the min-size package only when uploading for deb build.'
-      Write-Host '- For deb build, the min-size package is moved to a separate folder "finished\minSize",'
-      Write-Host '  so that the min-size package can be uploaded to a different Az Blob container.'
-      Write-Host '- For other builds, the min-size package is removed after being downloaded, so that it'
-      Write-Host '  does not get accidentally uploaded to the wrong Az Blob container.'
-
-      $minSizePkg = '$(System.ArtifactsDirectory)\finished\release\*-gc.tar.gz'
-      if (Test-Path -Path $minSizePkg)
-      {
-          if ('$(buildName)' -eq 'DEB')
-          {
-              $minSizeDir = '$(System.ArtifactsDirectory)\finished\minSize'
-              New-Item -Path $minSizeDir -Type Directory -Force > $null
-              Move-Item -Path $minSizePkg -Destination $minSizeDir
-
-              Write-Host "`nCapture the min-size package moved to the target folder."
-              Get-ChildItem -Path $minSizeDir
-          }
-          else
-          {
-              Write-Host '$(buildName): Remove the min-size package.'
-              Remove-Item -Path $minSizePkg -Force
-          }
-      }
-      else
-      {
-          Write-Host 'min-size package not found, so skip this step.'
-      }
-    displayName: 'Move minSize package to separate folder'
+  - ${{ if eq(variables.build,'rpm') }} :
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: '$(System.ArtifactsDirectory)/pwshMarinerBuildAmd64'
+        artifactName: pwshMarinerBuildAmd64
 
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download rpm Artifacts copy'
-    inputs:
-      downloadType: specific
-      itemPattern: '**/*.rpm'
-      downloadPath: '$(System.ArtifactsDirectory)\rpm'
-    condition: and(eq(variables['buildName'], 'RPM'), succeeded())
+  - ${{ if eq(variables.build,'rpm') }} :
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: '$(System.ArtifactsDirectory)/pwshMarinerBuildAmd64-meta'
+        artifactName: pwshMarinerBuildAmd64-meta
 
-  - template: EsrpScan.yml@ComplianceRepo
-    parameters:
-        scanPath: $(System.ArtifactsDirectory)
-        pattern: |
-          **\*.rpm
-          **\*.deb
-          **\*.tar.gz
-
-  - ${{ if eq(variables['buildName'], 'RPM') }}:
-    - template: EsrpSign.yml@ComplianceRepo
-      parameters:
-          buildOutputPath: $(System.ArtifactsDirectory)\rpm
-          signOutputPath: $(Build.StagingDirectory)\signedPackages
-          certificateId: "CP-450779-Pgp"
-          pattern: |
-            **\*.rh.*.rpm
-          useMinimatch: true
-          shouldSign: $(SHOULD_SIGN)
-          displayName: Sign RedHat RPM
-          OutputMode: AlwaysCopy
-
-  - ${{ if eq(variables['buildName'], 'RPM') }}:
-    - template: EsrpSign.yml@ComplianceRepo
-      parameters:
-          # Sign in-place, previous task copied the files to this folder
-          buildOutputPath: $(Build.StagingDirectory)\signedPackages
-          signOutputPath: $(Build.StagingDirectory)\signedPackages
-          certificateId: "CP-459159-Pgp"
-          pattern: |
-            **\*.cm.*.rpm
-            **\*.cm?.*.rpm
-          useMinimatch: true
-          shouldSign: $(SHOULD_SIGN)
-          displayName: Sign Mariner RPM
-          OutputMode: NeverCopy
-
-  # requires windows
-  - ${{ if ne(variables['buildName'], 'RPM') }}:
-    - task: AzureFileCopy@4
-      displayName: 'Upload to Azure - DEB and tar.gz'
+  - ${{ if eq(variables.build,'alpine') }} :
+    - task: PublishPipelineArtifact@1
       inputs:
-        SourcePath: '$(System.ArtifactsDirectory)\finished\release\*'
-        azureSubscription: '$(AzureFileCopySubscription)'
-        Destination: AzureBlob
-        storage: '$(StorageAccount)'
-        ContainerName: '$(AzureVersion)'
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild'
+        artifactName: pwshLinuxBuildAlpine
 
-  - template: upload-final-results.yml
-    parameters:
-      artifactPath: $(System.ArtifactsDirectory)\finished\release
-
-  # requires windows
-  - task: AzureFileCopy@4
-    displayName: 'Upload to Azure - min-size package for Guest Config'
-    inputs:
-      SourcePath: '$(System.ArtifactsDirectory)\finished\minSize\*'
-      azureSubscription: '$(AzureFileCopySubscription)'
-      Destination: AzureBlob
-      storage: '$(StorageAccount)'
-      ContainerName: '$(AzureVersion)-gc'
-    condition: and(eq(variables['buildName'], 'DEB'), succeeded())
-
-  - template: upload-final-results.yml
-    parameters:
-      artifactPath: $(System.ArtifactsDirectory)\finished\minSize
-      condition: and(eq(variables['buildName'], 'DEB'), succeeded())
-
-  # requires windows
-  - task: AzureFileCopy@4
-    displayName: 'Upload to Azure - RPM - Unsigned'
-    inputs:
-      SourcePath: '$(System.ArtifactsDirectory)\rpm\release\*'
-      azureSubscription: '$(AzureFileCopySubscription)'
-      Destination: AzureBlob
-      storage: '$(StorageAccount)'
-      ContainerName: '$(AzureVersion)'
-    condition: and(and(succeeded(), ne(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
-
-  # requires windows
-  - task: AzureFileCopy@4
-    displayName: 'Upload to Azure - RPM - Signed'
-    inputs:
-      SourcePath: '$(Build.StagingDirectory)\signedPackages\release\*'
-      azureSubscription: '$(AzureFileCopySubscription)'
-      Destination: AzureBlob
-      storage: '$(StorageAccount)'
-      ContainerName: '$(AzureVersion)'
-    condition: and(and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
-
-  - template: upload-final-results.yml
-    parameters:
-      artifactPath: $(System.ArtifactsDirectory)\rpm\release
-      condition: and(and(succeeded(), ne(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
+  - ${{ if eq(variables.build,'alpine') }} :
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild-meta'
+        artifactName: pwshLinuxBuildAlpine-meta
 
-  - template: upload-final-results.yml
-    parameters:
-      artifactPath: '$(Build.StagingDirectory)\signedPackages\release'
-      condition: and(and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
+  - ${{ if eq(variables.build,'fxdependent') }} :
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild'
+        artifactName: pwshLinuxBuildFxdependent
 
-  - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml
+  - ${{ if eq(variables.build,'fxdependent') }} :
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild-meta'
+        artifactName: pwshLinuxBuildFxdependent-meta
diff --git a/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml b/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml
new file mode 100644
index 00000000000..e628f2ca81d
--- /dev/null
+++ b/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml
@@ -0,0 +1,171 @@
+parameters:
+  binLocation: ''
+  buildPrefixName: ''
+  addWindowsModules: 'false'
+
+steps:
+- pwsh: |
+    $fullSymbolsFolder = Join-Path $(System.ArtifactsDirectory) "${{ parameters.binLocation }}"
+
+    Write-Verbose -Verbose "fullSymbolsFolder == $fullSymbolsFolder"
+
+    Get-ChildItem -Recurse $fullSymbolsFolder | out-string | Write-Verbose -Verbose
+
+    $filesToSignDirectory = "$(System.ArtifactsDirectory)\toBeSigned"
+
+    if ((Test-Path -Path $filesToSignDirectory))  {
+      Remove-Item -Path $filesToSignDirectory -Recurse -Force
+    }
+
+    $null = New-Item -ItemType Directory -Path $filesToSignDirectory -Force
+
+    $signedFilesDirectory = "$(System.ArtifactsDirectory)\signed"
+
+    if ((Test-Path -Path $signedFilesDirectory))  {
+      Remove-Item -Path $signedFilesDirectory -Recurse -Force
+    }
+
+    $null = New-Item -ItemType Directory -Path $signedFilesDirectory -Force
+
+    $itemsToCopyWithRecurse = @(
+      "$($fullSymbolsFolder)\*.ps1"
+      "$($fullSymbolsFolder)\Microsoft.PowerShell*.dll"
+    )
+
+    $itemsToCopy = @{
+      "$($fullSymbolsFolder)\*.ps1" = ""
+      "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Host\Microsoft.PowerShell.Host.psd1" = "Modules\Microsoft.PowerShell.Host"
+      "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Management\Microsoft.PowerShell.Management.psd1" = "Modules\Microsoft.PowerShell.Management"
+      "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Security\Microsoft.PowerShell.Security.psd1" = "Modules\Microsoft.PowerShell.Security"
+      "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Utility\Microsoft.PowerShell.Utility.psd1" = "Modules\Microsoft.PowerShell.Utility"
+      "$($fullSymbolsFolder)\pwsh.dll" = ""
+      "$($fullSymbolsFolder)\System.Management.Automation.dll" = ""
+    }
+
+    ## Windows only modules
+
+    if('${{ parameters.addWindowsModules }}' -ne 'false') {
+      $itemsToCopy += @{
+        "$($fullSymbolsFolder)\pwsh.exe" = ""
+        "$($fullSymbolsFolder)\Microsoft.Management.Infrastructure.CimCmdlets.dll" = ""
+        "$($fullSymbolsFolder)\Microsoft.WSMan.*.dll" = ""
+        "$($fullSymbolsFolder)\Modules\CimCmdlets\CimCmdlets.psd1" = "Modules\CimCmdlets"
+        "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Diagnostics\Diagnostics.format.ps1xml" = "Modules\Microsoft.PowerShell.Diagnostics"
+        "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Diagnostics\Event.format.ps1xml" = "Modules\Microsoft.PowerShell.Diagnostics"
+        "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Diagnostics\GetEvent.types.ps1xml" = "Modules\Microsoft.PowerShell.Diagnostics"
+        "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Security\Security.types.ps1xml" = "Modules\Microsoft.PowerShell.Security"
+        "$($fullSymbolsFolder)\Modules\Microsoft.PowerShell.Diagnostics\Microsoft.PowerShell.Diagnostics.psd1" = "Modules\Microsoft.PowerShell.Diagnostics"
+        "$($fullSymbolsFolder)\Modules\Microsoft.WSMan.Management\Microsoft.WSMan.Management.psd1" = "Modules\Microsoft.WSMan.Management"
+        "$($fullSymbolsFolder)\Modules\Microsoft.WSMan.Management\WSMan.format.ps1xml" = "Modules\Microsoft.WSMan.Management"
+        "$($fullSymbolsFolder)\Modules\PSDiagnostics\PSDiagnostics.ps?1" = "Modules\PSDiagnostics"
+      }
+    }
+    else {
+      $itemsToCopy += @{
+        "$($fullSymbolsFolder)\pwsh" = ""
+      }
+    }
+
+    $itemsToExclude = @(
+      # This package is retrieved from https://www.github.com/powershell/MarkdownRender
+      "$($fullSymbolsFolder)\Microsoft.PowerShell.MarkdownRender.dll"
+    )
+
+    Write-Verbose -verbose "recusively copying $($itemsToCopyWithRecurse | out-string) to $filesToSignDirectory"
+    Copy-Item -Path $itemsToCopyWithRecurse -Destination $filesToSignDirectory -Recurse -verbose -exclude $itemsToExclude
+
+    foreach($pattern in $itemsToCopy.Keys) {
+      $destinationFolder = Join-Path $filesToSignDirectory -ChildPath $itemsToCopy.$pattern
+      $null = New-Item -ItemType Directory -Path $destinationFolder -Force
+      Write-Verbose -verbose "copying $pattern to $destinationFolder"
+      Copy-Item -Path $pattern -Destination $destinationFolder -Recurse -verbose
+    }
+  displayName: '${{ parameters.buildPrefixName }} - Prepare files to be signed'
+
+- template: EsrpSign.yml@ComplianceRepo
+  parameters:
+      buildOutputPath: $(System.ArtifactsDirectory)\toBeSigned
+      signOutputPath: $(System.ArtifactsDirectory)\signed
+      certificateId: "$(AUTHENTICODE_CERT)"
+      pattern: |
+        **\*.dll
+        **\*.psd1
+        **\*.psm1
+        **\*.ps1xml
+        **\*.ps1
+        **\*.exe
+      useMinimatch: true
+      shouldSign: $(SHOULD_SIGN)
+      displayName: ${{ parameters.buildPrefixName }} - Authenticode
+
+- pwsh: |
+    Import-Module $(PowerShellRoot)/build.psm1 -Force
+    Import-Module $(PowerShellRoot)/tools/packaging -Force
+    $signedFilesPath = '$(System.ArtifactsDirectory)\signed\'
+    $BuildPath = Join-Path $(System.ArtifactsDirectory) '${{ parameters.binLocation }}'
+    Write-Verbose -Verbose -Message "BuildPath: $BuildPath"
+
+    Update-PSSignedBuildFolder -BuildPath $BuildPath -SignedFilesPath $SignedFilesPath
+    $dlls = Get-ChildItem $BuildPath\*.dll, $BuildPath\*.exe -Recurse
+    $signatures = $dlls | Get-AuthenticodeSignature
+    $missingSignatures = $signatures | Where-Object { $_.status -eq 'notsigned' -or $_.SignerCertificate.Issuer -notmatch '^CN=Microsoft.*'}| select-object -ExpandProperty Path
+
+    Write-Verbose -verbose "to be signed:`r`n $($missingSignatures | Out-String)"
+
+    $filesToSignDirectory = "$(System.ArtifactsDirectory)\thirdPartyToBeSigned"
+    $null = New-Item -ItemType Directory -Path $filesToSignDirectory -Force -Verbose
+
+    $signedFilesDirectory = "$(System.ArtifactsDirectory)\thirdPartySigned"
+    $null = New-Item -ItemType Directory -Path $signedFilesDirectory -Force -Verbose
+
+    $missingSignatures | ForEach-Object {
+      $pathWithoutLeaf = Split-Path $_
+      $relativePath = $pathWithoutLeaf.replace($BuildPath,'')
+      Write-Verbose -Verbose -Message "relativePath: $relativePath"
+      $targetDirectory = Join-Path -Path $filesToSignDirectory -ChildPath $relativePath
+      Write-Verbose -Verbose -Message "targetDirectory: $targetDirectory"
+      if(!(Test-Path $targetDirectory))
+      {
+        $null = New-Item -ItemType Directory -Path $targetDirectory -Force -Verbose
+      }
+      Copy-Item -Path $_ -Destination $targetDirectory
+    }
+
+  displayName: ${{ parameters.buildPrefixName }} - Create ThirdParty Signing Folder
+  condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
+
+- template: EsrpSign.yml@ComplianceRepo
+  parameters:
+      buildOutputPath: $(System.ArtifactsDirectory)\thirdPartyToBeSigned
+      signOutputPath: $(System.ArtifactsDirectory)\thirdPartySigned
+      certificateId: "CP-231522"
+      pattern: |
+        **\*.dll
+      useMinimatch: true
+      shouldSign: $(SHOULD_SIGN)
+      displayName: Sign ThirdParty binaries
+
+- pwsh: |
+    Get-ChildItem '$(System.ArtifactsDirectory)\thirdPartySigned\*'
+  displayName: ${{ parameters.buildPrefixName }} - Capture ThirdParty Signed files
+  condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
+
+- pwsh: |
+    Import-Module $(PowerShellRoot)/build.psm1 -Force
+    Import-Module $(PowerShellRoot)/tools/packaging -Force
+    $signedFilesPath = '$(System.ArtifactsDirectory)\thirdPartySigned'
+    $BuildPath = Join-Path $(System.ArtifactsDirectory) '${{ parameters.binLocation }}'
+
+    Update-PSSignedBuildFolder -BuildPath $BuildPath -SignedFilesPath $SignedFilesPath
+    if ($env:BuildConfiguration -eq 'minSize') {
+      ## Remove XML files when making a min-size package.
+      Remove-Item "$BuildPath/*.xml" -Force
+    }
+  displayName: ${{ parameters.buildPrefixName }} - Merge ThirdParty signed files with Build
+  condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
+
+- pwsh: |
+      $uploadFolder = '$(System.ArtifactsDirectory)/${{ parameters.binLocation }}'
+      $containerName = '${{ parameters.binLocation }}-signed'
+      Write-Host "##vso[artifact.upload containerfolder=$containerName;artifactname=$containerName]$uploadFolder"
+  displayName: ${{ parameters.buildPrefixName }} - Upload signed files to artifacts

From 1edb3fe87ecc118fef822359eeb7b4c099fb1fad Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 3 Nov 2022 09:37:50 -0700
Subject: [PATCH 599/645] [release/v7.3.0] Add TSAUpload for APIScan (#18451)

---
 tools/guardian/tsaconfig-apiscan.json         |  6 ++++++
 tools/guardian/tsaconfig-others.json          |  7 +++++++
 .../templates/compliance/apiscan.yml          |  6 ++++++
 .../templates/compliance/compliance.yml       | 21 ++++++-------------
 4 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 tools/guardian/tsaconfig-apiscan.json
 create mode 100644 tools/guardian/tsaconfig-others.json

diff --git a/tools/guardian/tsaconfig-apiscan.json b/tools/guardian/tsaconfig-apiscan.json
new file mode 100644
index 00000000000..3cadeccff3f
--- /dev/null
+++ b/tools/guardian/tsaconfig-apiscan.json
@@ -0,0 +1,6 @@
+{
+  "codebaseName": "PowerShellCore_201906",
+  "tools": [
+      "APIScan"
+  ]
+}
diff --git a/tools/guardian/tsaconfig-others.json b/tools/guardian/tsaconfig-others.json
new file mode 100644
index 00000000000..1f44978032e
--- /dev/null
+++ b/tools/guardian/tsaconfig-others.json
@@ -0,0 +1,7 @@
+{
+  "codebaseName": "PowerShellCore_201906",
+  "tools": [
+      "CredScan",
+      "PoliCheck"
+  ]
+}
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
index c972106195d..aa81407e3e8 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
@@ -121,6 +121,12 @@ jobs:
         GdnExportGdnToolApiScan: true
         #this didn't do anything GdnExportCustomLogsFolder: '$(Build.ArtifactStagingDirectory)/Guardian'
 
+    - task: TSAUpload@2
+      displayName: 'TSA upload'
+      inputs:
+        GdnPublishTsaOnboard: false
+        GdnPublishTsaConfigFile: '$(Build.SourcesDirectory)\tools\guardian\tsaconfig-APIScan.json'
+
     - pwsh: |
         Get-ChildItem -Path env:
       displayName: Capture Environment
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
index eb0400bc3fe..13603a0c808 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/compliance.yml
@@ -35,7 +35,7 @@ jobs:
       debugMode: false
     continueOnError: true
 
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@1
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@2
     displayName: 'Run PoliCheck'
     inputs:
       # targetType F means file or folder and is the only applicable value and the default
@@ -54,24 +54,15 @@ jobs:
       optionsUEPath: $(Build.SourcesDirectory)\tools\terms\TermsExclusion.xml
     continueOnError: true
 
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@3
     displayName: 'Publish Security Analysis Logs to Build Artifacts'
     continueOnError: true
 
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-uploadtotsa.TSAUpload@1
-    displayName: 'TSA upload to Codebase: PowerShellCore_201906'
+  - task: TSAUpload@2
+    displayName: 'TSA upload'
     inputs:
-      tsaVersion: TsaV2
-      codeBaseName: 'PowerShellCore_201906'
-      uploadFortifySCA: false
-      uploadFxCop: false
-      uploadModernCop: false
-      uploadPREfast: false
-      uploadRoslyn: false
-      uploadTSLint: false
-      uploadCredScan: true
-      uploadPoliCheck: true
-      uploadBinSkim: false
+      GdnPublishTsaOnboard: false
+      GdnPublishTsaConfigFile: '$(Build.SourcesDirectory)\tools\guardian\tsaconfig-others.json'
 
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-report.SdtReport@1
     displayName: 'Create Security Analysis Report'

From 2c057c257e76bcc684ebe01c92bbd36636da9054 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 4 Nov 2022 04:45:33 +0000
Subject: [PATCH 600/645] Merged PR 23096: Bump to use internal .NET 7 GA build

---
 DotnetRuntimeMetadata.json                        |  6 +++---
 assets/wix/files.wxs                              |  8 ++++----
 build.psm1                                        |  8 +++++---
 global.json                                       |  2 +-
 ...icrosoft.PowerShell.Commands.Management.csproj |  2 +-
 .../Microsoft.PowerShell.Commands.Utility.csproj  |  9 +++++----
 .../Microsoft.PowerShell.CoreCLR.Eventing.csproj  |  2 +-
 .../Microsoft.PowerShell.SDK.csproj               | 15 ++++++++++-----
 .../Microsoft.WSMan.Management.csproj             |  2 +-
 .../System.Management.Automation.csproj           | 15 ++++++++-------
 test/tools/TestService/TestService.csproj         |  2 +-
 test/tools/WebListener/WebListener.csproj         |  4 ++--
 .../azureDevOps/templates/compliance/apiscan.yml  |  4 ++++
 .../templates/linux-authenticode-sign.yml         |  2 +-
 .../azureDevOps/templates/linux-packaging.yml     |  4 ++++
 .../releaseBuild/azureDevOps/templates/linux.yml  |  4 ++++
 .../azureDevOps/templates/mac-package-build.yml   |  7 +++++++
 tools/releaseBuild/azureDevOps/templates/mac.yml  |  7 +++++++
 .../releaseBuild/azureDevOps/templates/nuget.yml  |  4 ++++
 .../templates/release-GlobalToolTest.yml          | 12 ++++++++++++
 .../azureDevOps/templates/release-SDKTests.yml    |  7 +++++++
 .../azureDevOps/templates/testartifacts.yml       |  4 ++++
 .../templates/windows-hosted-build.yml            |  4 ++++
 .../azureDevOps/templates/windows-packaging.yml   |  4 ++++
 24 files changed, 104 insertions(+), 34 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 2f4b4442efc..3e84f733c4d 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,13 +1,13 @@
 {
   "sdk": {
-    "channel": "7.0.1xx-rc2",
+    "channel": "7.0.1xx",
     "quality": "daily",
     "qualityFallback": "preview",
-    "packageVersionPattern": "7.0.0-rc.2",
+    "packageVersionPattern": "7.0.0",
     "sdkImageVersion": "7.0.100",
     "nextChannel": "7.0.1xx-rc2",
     "azureFeed": "",
-    "sdkImageOverride": ""
+    "sdkImageOverride": "7.0.100-rtm.22521.12"
   },
   "internalfeed": {
     "url": ""
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index a9631281444..88316f578c6 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -2775,12 +2775,12 @@
       <Component Id="cmp6986F8B66C514347A25E03DD3096B5AE">
         <File Id="fil9276D1BDBF8B4C91B90761633720A419" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationNative_cor3.dll" />
       </Component>
-      <Component Id="cmp6DA0E2825D9646A6959358D042DBC4FE">
-        <File Id="fil55E2580F30F241F1AC58435689E7E1F7" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.47203.dll" />
-      </Component>
       <Component Id="cmp96588875574749E295496861FFC1DB58">
         <File Id="filF931B05A25224A188D08E09A9FDC3A58" KeyPath="yes" Source="$(var.ProductSourcePath)\PenImc_cor3.dll" />
       </Component>
+      <Component Id="cmp11BF5670AA094889995355E2413888C1">
+        <File Id="fil47F94DFC9B1F403997D9913B28B69807" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.51805.dll" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -3668,8 +3668,8 @@
       <ComponentRef Id="cmp0721DF55B34849B78C98AE00D863CBFF" />
       <ComponentRef Id="cmp42A739F2AAC24D729DDBCAA096B8C55A" />
       <ComponentRef Id="cmp6986F8B66C514347A25E03DD3096B5AE" />
-      <ComponentRef Id="cmp6DA0E2825D9646A6959358D042DBC4FE" />
       <ComponentRef Id="cmp96588875574749E295496861FFC1DB58" />
+      <ComponentRef Id="cmp11BF5670AA094889995355E2413888C1" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/build.psm1 b/build.psm1
index 509995e7d8d..5ded8eec0c4 100644
--- a/build.psm1
+++ b/build.psm1
@@ -19,7 +19,8 @@ $script:Options = $null
 $dotnetMetadata = Get-Content $PSScriptRoot/DotnetRuntimeMetadata.json | ConvertFrom-Json
 $dotnetCLIChannel = $dotnetMetadata.Sdk.Channel
 $dotnetCLIQuality = $dotnetMetadata.Sdk.Quality
-$dotnetAzureFeed = $dotnetMetadata.Sdk.azureFeed
+$dotnetAzureFeed = $env:__DONET_RUNTIME_FEED ?? $dotnetMetadata.Sdk.azureFeed
+$dotnetAzureFeedSecret = $env:__DONET_RUNTIME_FEED_KEY
 $dotnetSDKVersionOveride = $dotnetMetadata.Sdk.sdkImageOverride
 $dotnetCLIRequiredVersion = $(Get-Content $PSScriptRoot/global.json | ConvertFrom-Json).Sdk.Version
 
@@ -1960,7 +1961,8 @@ function Install-Dotnet {
 
             $psArgs += @('-SkipNonVersionedFiles')
 
-            $psArgs -join ' ' | Write-Verbose -Verbose
+            # Removing the verbose message to not expose the secret
+            # $psArgs -join ' ' | Write-Verbose -Verbose
 
             Start-NativeExecution {
                 & $fullPSPath @psArgs
@@ -2180,7 +2182,7 @@ function Start-PSBootstrap {
 
             if ($dotnetAzureFeed) {
                 $null = $DotnetArguments.Add("AzureFeed", $dotnetAzureFeed)
-                $null = $DotnetArguments.Add("FeedCredential", $null)
+                $null = $DotnetArguments.Add("FeedCredential", $dotnetAzureFeedSecret)
             }
 
             Install-Dotnet @DotnetArguments
diff --git a/global.json b/global.json
index 76bca39fb4f..70e3dcc5080 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100-rc.2.22477.23"
+    "version": "7.0.100"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index 414c338a2c4..06bd7872cbe 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/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="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index d502b7048e3..ad1269ae241 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
+    <PackageReference Include="Markdig.Signed" Version="0.30.4" />
     <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
   </ItemGroup>
 
@@ -31,10 +32,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-2.final" />
-    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="NJsonSchema" Version="10.7.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-4.final" />
+    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+    <PackageReference Include="NJsonSchema" Version="10.8.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index c33fc10ccd1..26376c5609f 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/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="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 4159ee8e569..da8b9b24b9d 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -15,12 +15,17 @@
   </ItemGroup>
 
   <ItemGroup>
+    <!-- This section is to force the version of non-direct dependencies --!>
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageReference Include="System.Web.Services.Description" Version="4.10.0" />
     <!-- 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.4" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="System.IO.Packaging" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.IO.Packaging" Version="7.0.0" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
     <!-- the following package(s) are from https://github.com/dotnet/wcf -->
     <PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0" />
     <PackageReference Include="System.ServiceModel.Http" Version="4.10.0" />
@@ -29,7 +34,7 @@
     <PackageReference Include="System.ServiceModel.Security" Version="4.10.0" />
     <PackageReference Include="System.Private.ServiceModel" Version="4.10.0" />
     <!-- the source could not be found for the following package(s) -->
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 3b45803af9d..94a13515348 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/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="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index b1f552439ac..6198ff5a84c 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,17 @@
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.DirectoryServices" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
+    <PackageReference Include="System.DirectoryServices" Version="7.0.0" />
     <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
-    <PackageReference Include="System.Management" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.Management" Version="7.0.0" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.Security.Permissions" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0" />
+    <PackageReference Include="System.Security.Permissions" Version="7.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
     <!-- 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.3.0" />
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index aeb87b00ad1..2ab58a57ddf 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index a80dcd0d97b..3977af31fba 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-rc.2.22476.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-rc.2.22472.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
index aa81407e3e8..cae5e0e0231 100644
--- a/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
+++ b/tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
@@ -16,6 +16,7 @@ jobs:
         value: $[format('{0:yyyyMMdd}-{1}', pipeline.startTime,variables['Build.SourceBranch'])]
       - name: branchCounter
         value: $[counter(variables['branchCounterKey'], 1)]
+      - group: DotNetPrivateBuildAccess
 
     pool:
       name: PowerShell1ES
@@ -38,6 +39,9 @@ jobs:
       workingDirectory: '$(Build.SourcesDirectory)'
       retryCountOnTaskFailure: 2
       displayName: 'Bootstrap'
+      env:
+        __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+        __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
     - pwsh: |
         Import-Module .\build.psm1 -force
diff --git a/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml b/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
index d014cf74320..39eeb7dd5fa 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
@@ -70,7 +70,7 @@ jobs:
     parameters:
       repoRoot: $(PowerShellRoot)
 
-  - powershell: |
+  - pwsh: |
       Set-Location $env:POWERSHELLROOT
       import-module "$env:POWERSHELLROOT/build.psm1"
       Sync-PSTags -AddRemoteIfMissing
diff --git a/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml b/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
index f5e298f7139..f75ca3971a8 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
@@ -20,6 +20,7 @@ jobs:
     - name: NugetSecurityAnalysisWarningLevel
       value: none
     - group: ESRP
+    - group: DotNetPrivateBuildAccess
 
   steps:
   - ${{ if or(eq(variables.build,'deb'), eq(variables.build,'rpm')) }} :
@@ -162,6 +163,9 @@ jobs:
     displayName: 'Bootstrap'
     condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
     workingDirectory: $(PowerShellRoot)
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
   - powershell: |
       try {
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index e7caa41bc30..ab551a16dd0 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -20,6 +20,7 @@ jobs:
     - name: NugetSecurityAnalysisWarningLevel
       value: none
     - group: ESRP
+    - group: DotNetPrivateBuildAccess
 
   steps:
   - checkout: self
@@ -60,6 +61,9 @@ jobs:
     displayName: 'Bootstrap'
     condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
     workingDirectory: $(PowerShellRoot)
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
   - pwsh: |
       try {
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
index e61ea99004f..0f5b9acbc13 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
@@ -17,6 +17,7 @@ jobs:
       value: false
     - name: NugetSecurityAnalysisWarningLevel
       value: none
+    - group: DotNetPrivateBuildAccess
   steps:
   - checkout: self
     clean: true
@@ -116,6 +117,9 @@ jobs:
         throw
       }
     displayName: 'Bootstrap VM'
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
   - pwsh: |
       # Add -SkipReleaseChecks as a mitigation to unblock release.
@@ -127,6 +131,9 @@ jobs:
         throw
       }
     displayName: 'Package'
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
diff --git a/tools/releaseBuild/azureDevOps/templates/mac.yml b/tools/releaseBuild/azureDevOps/templates/mac.yml
index 776382c952d..7bf1a2121df 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac.yml
@@ -15,6 +15,7 @@ jobs:
       value: false
     - name: NugetSecurityAnalysisWarningLevel
       value: none
+    - group: DotNetPrivateBuildAccess
   steps:
   #- task: <task type name>@<version>
   #  inputs:
@@ -41,6 +42,9 @@ jobs:
   - pwsh: |
       tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -location $(PowerShellRoot) -BootStrap
     displayName: 'Bootstrap VM'
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
   - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
     parameters:
@@ -53,6 +57,9 @@ jobs:
       $(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -Symbols -location $(PowerShellRoot) -Build -ArtifactName macosBinResults -Runtime 'osx-${{ parameters.buildArchitecture }}' -SkipReleaseChecks
       $env:AzDevOpsFeedPAT2 = $null
     displayName: 'Build'
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index f514ca7741b..f38e1a718c6 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -32,6 +32,7 @@ jobs:
       value: '$(System.ArtifactsDirectory)/winFxdWinDesktop'
     - name: linuxFxdPath
       value: '$(System.ArtifactsDirectory)/linuxFxd'
+    - group: DotNetPrivateBuildAccess
 
   steps:
   - checkout: self
@@ -56,6 +57,9 @@ jobs:
       # We just need .NET but we fixed this in an urgent situation.
       Start-PSBootStrap -Verbose
     displayName: Bootstrap
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
   - task: DownloadBuildArtifacts@0
     displayName: 'Download PowerShell build artifacts - finalResults'
diff --git a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
index 8ac318db921..bd353baaec8 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
@@ -12,6 +12,9 @@ jobs:
   pool:
     # test
     vmImage: ${{ parameters.imageName }}
+  variables:
+    - group: DotNetPrivateBuildAccess
+
   steps:
     - checkout: self
       clean: true
@@ -57,6 +60,9 @@ jobs:
         Write-Verbose -Message "Installing .NET SDK completed." -Verbose
 
       displayName: Install .NET
+      env:
+        __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+        __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
     - pwsh: |
         $branch = $ENV:BUILD_SOURCEBRANCH
@@ -78,6 +84,9 @@ jobs:
         Get-ChildItem -Path $toolPath
 
       displayName: Install global tool
+      env:
+        __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+        __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
     - pwsh: |
         $toolPath = "$(System.DefaultWorkingDirectory)/toolPath/${{ parameters.globalToolExeName }}"
@@ -138,3 +147,6 @@ jobs:
             write-verbose -verbose "Got expected year: $dateYear"
         }
       displayName: Basic validation
+      env:
+        __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+        __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
index b417df7da08..0efffbee99e 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@@ -11,6 +11,7 @@ jobs:
     vmImage: ${{ parameters.imageName }}
   variables:
   - group: AzDevOpsArtifacts
+  - group: DotNetPrivateBuildAccess
   steps:
     - checkout: self
       clean: true
@@ -95,6 +96,9 @@ jobs:
         Write-Verbose -Message "Installing .NET SDK completed." -Verbose
 
       displayName: Install .NET
+      env:
+        __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+        __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
     - pwsh: |
         $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
@@ -131,6 +135,9 @@ jobs:
         dotnet test /property:RELEASE_VERSION=$releaseVersion --test-adapter-path:. "--logger:xunit;LogFilePath=$(System.DefaultWorkingDirectory)/test-hosting.xml"
 
       displayName: Restore and execute tests
+      env:
+        __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+        __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
     - task: PublishTestResults@2
       displayName: 'Publish Test Results **\test-hosting.xml'
diff --git a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
index b75ade828a3..009723c8803 100644
--- a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
+++ b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
@@ -5,6 +5,7 @@ jobs:
       value: false
     - name: NugetSecurityAnalysisWarningLevel
       value: none
+    - group: DotNetPrivateBuildAccess
   displayName: Build test artifacts
   condition: succeeded()
   pool:
@@ -18,6 +19,9 @@ jobs:
       Import-Module ./build.psm1
       Start-PSBootstrap
     displayName: Bootstrap
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
   - pwsh: |
       Import-Module ./build.psm1
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
index 1201edf98b7..fd04f5ba5f7 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -30,6 +30,7 @@ jobs:
       value: ${{ parameters.Architecture }}
     - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
       value: 1
+    - group: DotNetPrivateBuildAccess
 
   steps:
 
@@ -65,6 +66,9 @@ jobs:
 
       tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 -location '$(PowerShellRoot)' -destination '$(Build.ArtifactStagingDirectory)/Symbols_$(Architecture)' -Runtime $runtime -ReleaseTag '$(ReleaseTagVar)' -Symbols @params
     displayName: 'Build Windows Universal - $(Architecture)-$(BuildConfiguration) Symbols zip'
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
   - pwsh: |
       $packageName = (Get-ChildItem '$(Build.ArtifactStagingDirectory)\Symbols_$(Architecture)').FullName
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index befcebf3bd3..0b9ff979ef0 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -27,6 +27,7 @@ jobs:
     - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
       value: 1
     - group: ESRP
+    - group: DotNetPrivateBuildAccess
 
   steps:
 
@@ -257,6 +258,9 @@ jobs:
 
       $(PowerShellRoot)/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 -BuildZip $signedPkg -location '$(PowerShellRoot)' -destination '$(System.ArtifactsDirectory)\pkgSigned' -Runtime $runtime -ReleaseTag '$(ReleaseTagVar)' @params
     displayName: 'Build Windows Universal - $(Architecture) Package'
+    env:
+      __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+      __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
 
   - pwsh: |
       Get-ChildItem '$(System.ArtifactsDirectory)\pkgSigned' | ForEach-Object {

From 1aa79014004e15a5855c014fa8bcbf9f6aeccc1d Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 3 Nov 2022 22:05:51 -0700
Subject: [PATCH 601/645] Fix malformed xml

---
 src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index da8b9b24b9d..bd26318a6b1 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- This section is to force the version of non-direct dependencies --!>
+    <!-- This section is to force the version of non-direct dependencies -->
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.0" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />

From 7579382571eef640bec11e0a929d3defc2097a65 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 4 Nov 2022 11:21:25 -0700
Subject: [PATCH 602/645] Add search path for azcopy

---
 build.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index 5ded8eec0c4..d486451dee0 100644
--- a/build.psm1
+++ b/build.psm1
@@ -3349,7 +3349,7 @@ function Install-AzCopy {
 }
 
 function Find-AzCopy {
-    $searchPaths = "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe"
+    $searchPaths = @("C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe", "C:\azcopy10\AzCopy.exe")
 
     foreach ($filter in $searchPaths) {
         $azCopy = Get-ChildItem -Path $filter -Recurse -ErrorAction SilentlyContinue | Select-Object -ExpandProperty FullName -First 1

From 14c0eab38bac4f34c379879f2fa1c460e70f4f09 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 4 Nov 2022 11:27:04 -0700
Subject: [PATCH 603/645] Remove AzCopy installation from msixbundle step

---
 .../azureDevOps/templates/release-MsixBundle.yml         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
index c883bc0ff0b..11d996e9ef6 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
@@ -65,10 +65,11 @@ jobs:
         Write-Host "##$vstsCommandString"
       displayName: Create MsixBundle
 
-    - pwsh: |
-        Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-        Install-AzCopy
-      displayName: Install AzCopy
+    # Removing install as AzCopy is expected to be on the image
+    #- pwsh: |
+    #    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
+    #    Install-AzCopy
+    #  displayName: Install AzCopy
 
     - pwsh: |
         ## We use AzCopy v8.1 in our release pipeline, see the documentation at:

From 316da9b8570406c481e14c855d45256a5be64f0b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 4 Nov 2022 11:57:21 -0700
Subject: [PATCH 604/645] Use AzFileCopy task instead of AzCopy.exe

---
 .../templates/release-MsixBundle.yml          | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
index 11d996e9ef6..6f3957d0815 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
@@ -65,17 +65,13 @@ jobs:
         Write-Host "##$vstsCommandString"
       displayName: Create MsixBundle
 
-    # Removing install as AzCopy is expected to be on the image
-    #- pwsh: |
-    #    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-    #    Install-AzCopy
-    #  displayName: Install AzCopy
-
-    - pwsh: |
-        ## We use AzCopy v8.1 in our release pipeline, see the documentation at:
-        ## https://docs.microsoft.com/en-us/previous-versions/azure/storage/storage-use-azcopy
-
-        Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-        $azcopy = Find-AzCopy
-        & $azcopy /Source:$(BundleDir) /Dest:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion)-private /DestKey:$(StorageAccountKey) /Pattern:*.msixbundle /Y
-      displayName: Upload MSIX Bundle package to Az Blob
+    - task: AzureFileCopy@4
+      displayName: 'Upload MSIX Bundle package to Az Blob'
+      inputs:
+        SourcePath: '$(BundleDir)/*.msixbundle'
+        azureSubscription: '$(AzureFileCopySubscription)'
+        Destination: AzureBlob
+        storage: '$(StorageAccount)'
+        ContainerName: '$(AzureVersion)-private'
+        resourceGroup: '$(StorageResourceGroup)'
+      condition: succeeded()

From c01c027f4a6b234d142923e235e773737fb7e0fc Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 4 Nov 2022 20:01:55 +0000
Subject: [PATCH 605/645] Merged PR 23116: Fix issues with building test
 artifacts

Insert the pre-release nuget feed before building test artifacts
---
 build.psm1                                            | 11 ++++++++++-
 test/Test.Common.props                                |  2 +-
 .../azureDevOps/templates/testartifacts.yml           |  5 +++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/build.psm1 b/build.psm1
index d486451dee0..8fac6c4f04c 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1141,7 +1141,16 @@ function Publish-PSTestTools {
                 $runtime = $Options.Runtime
             }
 
-            dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $runtime --self-contained
+            Write-Verbose -Verbose -Message "Starting dotnet publish for $toolPath with runtime $runtime"
+
+            dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $runtime --self-contained | Out-String | Write-Verbose -Verbose
+
+            $dll = $null
+            $dll = Get-ChildItem -Path bin -Recurse -Filter "*.dll"
+
+            if (-not $dll) {
+                throw "Failed to find exe in $toolPath"
+            }
 
             if ( -not $env:PATH.Contains($toolPath) ) {
                 $env:PATH = $toolPath+$TestModulePathSeparator+$($env:PATH)
diff --git a/test/Test.Common.props b/test/Test.Common.props
index cdfe931012c..84424241e72 100644
--- a/test/Test.Common.props
+++ b/test/Test.Common.props
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(IsWindows)' != 'true' ">
diff --git a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
index 009723c8803..b76ec0514be 100644
--- a/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
+++ b/tools/releaseBuild/azureDevOps/templates/testartifacts.yml
@@ -15,6 +15,10 @@ jobs:
   - checkout: self
     clean: true
 
+  - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+    parameters:
+      repoRoot: $(Build.SourcesDirectory)
+
   - pwsh: |
       Import-Module ./build.psm1
       Start-PSBootstrap
@@ -63,5 +67,6 @@ jobs:
       BuildTestPackage -runtime linux-musl-x64
 
     displayName: Build test package and upload
+    retryCountOnTaskFailure: 1
 
   - template: /tools/releaseBuild/azureDevOps/templates/step/finalize.yml

From cfe2352883325a5c6334de2f5c3f5e9c838e2d67 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 7 Nov 2022 21:12:07 +0000
Subject: [PATCH 606/645] Merged PR 23139: Add test for framework dependent
 package in release pipeline

- Fix fxd tests
- Remove directories before re-using in third party signing.
---
 build.psm1                                    | 14 +++++++-
 .../azureDevOps/releasePipeline.yml           |  8 +++++
 .../templates/release-ValidateFxdPackage.yml  | 36 +++++++++++++++++--
 .../release-ValidatePackageNames.yml          | 13 +++----
 .../azureDevOps/templates/signBuildFiles.yml  |  8 +++++
 5 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 8fac6c4f04c..04298c61b46 100644
--- a/build.psm1
+++ b/build.psm1
@@ -2372,7 +2372,11 @@ function Start-ResGen
     }
 }
 
-function Find-Dotnet() {
+function Find-Dotnet {
+    param (
+        [switch] $SetDotnetRoot
+    )
+
     Write-Verbose "In Find-DotNet"
 
     $originalPath = $env:PATH
@@ -2399,6 +2403,14 @@ function Find-Dotnet() {
             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
+
+            if ($SetDotnetRoot) {
+                Write-Verbose -Verbose "Setting DOTNET_ROOT to $dotnetPath"
+                $env:DOTNET_ROOT = $dotnetPath
+            }
+        } elseif ($SetDotnetRoot) {
+            Write-Verbose -Verbose "Expected dotnet version found, setting DOTNET_ROOT to $dotnetPath"
+            $env:DOTNET_ROOT = $dotnetPath
         }
     }
     else {
diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index 39e0902f026..148b27d7a38 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -113,6 +113,14 @@ stages:
       imageName: ubuntu-latest
       packageNamePattern: '**/*fxdependent.tar.gz'
 
+  - template: templates/release-ValidateFxdPackage.yml
+    parameters:
+      jobName: FxdPackageLinuxonARM
+      displayName: Fxd Package Test Linux ARM64
+      imageName: 'PSMMSUbuntu20.04-ARM64-secure'
+      packageNamePattern: '**/*fxdependent.tar.gz'
+      use1ES: true
+
 - stage: StaticPkgValidation
   dependsOn: []
   displayName: Static package validation
diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml
index a4d473cf3b8..6843cf2a2dd 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml
@@ -3,13 +3,18 @@ parameters:
   displayName: ""
   imageName: ""
   packageNamePattern: ""
+  use1ES: false
 
 jobs:
 - job: ${{ parameters.jobName }}
   displayName: ${{ parameters.displayName }}
+  variables:
+  - group: DotNetPrivateBuildAccess
   pool:
-    # testing
-    vmImage: ${{ parameters.imageName }}
+    ${{ if eq(parameters.use1ES, 'false') }}:
+      vmImage: ${{ parameters.imageName }}
+    ${{ else }}:
+      name: 'PS-MSCodeHub-ARM' # add ImageOverride to select image
   steps:
     - checkout: self
       clean: true
@@ -26,6 +31,16 @@ jobs:
         patterns: '${{ parameters.packageNamePattern }}'
         path: '$(Pipeline.Workspace)/releasePipeline/finalResults'
 
+    - pwsh: |
+        $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+        Import-Module "$(Build.SourcesDirectory)/build.psm1" -Force
+        Start-PSBootstrap
+        Write-Verbose -Message "Installing .NET SDK completed." -Verbose
+      displayName: Install .NET
+      env:
+        __DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
+        __DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
+
     - pwsh: |
         Get-ChildItem -Path '$(Pipeline.Workspace)/releasePipeline/finalResults' -Recurse
       displayName: Capture downloaded package
@@ -53,9 +68,24 @@ jobs:
       displayName: Expand fxd package
 
     - pwsh: |
+        $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+        Import-Module "$(Build.SourcesDirectory)/build.psm1" -Force
+        Find-Dotnet -SetDotnetRoot
+        Write-Verbose -Verbose "DOTNET_ROOT: $env:DOTNET_ROOT"
+        Write-Verbose -Verbose "Check dotnet install"
+        dotnet --info
+        Write-Verbose -Verbose "Start test"
         $packageNameFilter = '${{ parameters.packageNamePattern }}'
         $pwshExeName = if ($packageNameFilter.EndsWith('tar.gz')) { 'pwsh' } else { 'pwsh.exe' }
-        $actualOutput = & $pwshExeName -c 'Start-Job -ScriptBlock { "1" } | Wait-Job | Receive-Job'
+        $pwshPath = Join-Path '$(Pipeline.Workspace)/releasePipeline/finalResults/fxd' $pwshExeName
+
+        if ($IsLinux) {
+          chmod u+x $pwshPath
+        }
+
+        $pwshDllPath = Join-Path '$(Pipeline.Workspace)/releasePipeline/finalResults/fxd' 'pwsh.dll'
+
+        $actualOutput = & dotnet $pwshDllPath -c 'Start-ThreadJob -ScriptBlock { "1" } | Wait-Job | Receive-Job'
         Write-Verbose -Verbose "Actual output: $actualOutput"
         if ($actualOutput -ne 1) {
             throw "Actual output is not as expected"
diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
index c6925ba8a0e..8a95ab82015 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
@@ -11,17 +11,18 @@ steps:
     Write-Host "##vso[build.updatebuildnumber]$name"
   displayName: Set Release Name
 
-- pwsh: |
-    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-    Install-AzCopy
-  displayName: Install AzCopy
-
 - pwsh: |
     Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
     $azcopy = Find-AzCopy
+    Write-Verbose -Verbose "Found AzCopy: $azcopy"
+
+    & $azcopy login --service-principal --application-id $(PowerShellReleaseSPN)
+
+    & $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion)/* $(System.ArtifactsDirectory) --recursive
 
-    & $azcopy /Source:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) /Dest:$(System.ArtifactsDirectory) /S /SourceKey:$(StorageAccountKey)
   displayName: Download Azure Artifacts
+  env:
+    AZCOPY_SPA_CLIENT_SECRET: $(PowerShellReleaseSPNSecret)
 
 - pwsh: |
     Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty Name
diff --git a/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml b/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml
index e628f2ca81d..8e4d86e3b51 100644
--- a/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml
+++ b/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml
@@ -113,9 +113,17 @@ steps:
     Write-Verbose -verbose "to be signed:`r`n $($missingSignatures | Out-String)"
 
     $filesToSignDirectory = "$(System.ArtifactsDirectory)\thirdPartyToBeSigned"
+    if (Test-Path $filesToSignDirectory) {
+      Remove-Item -Path $filesToSignDirectory -Recurse -Force
+    }
+
     $null = New-Item -ItemType Directory -Path $filesToSignDirectory -Force -Verbose
 
     $signedFilesDirectory = "$(System.ArtifactsDirectory)\thirdPartySigned"
+    if (Test-Path $signedFilesDirectory) {
+      Remove-Item -Path $signedFilesDirectory -Recurse -Force
+    }
+
     $null = New-Item -ItemType Directory -Path $signedFilesDirectory -Force -Verbose
 
     $missingSignatures | ForEach-Object {

From 3b84707298187eaad6f5e53987a180171c667941 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 8 Nov 2022 19:40:33 +0000
Subject: [PATCH 607/645] Merged PR 23161: Change log for v7.3.0

---
 .spelling            |   4 +-
 CHANGELOG/7.3.md     | 932 +++++++++++++++++++++++++++++++++++++++++++
 CHANGELOG/preview.md | 896 -----------------------------------------
 3 files changed, 935 insertions(+), 897 deletions(-)
 create mode 100644 CHANGELOG/7.3.md

diff --git a/.spelling b/.spelling
index ef8308796e3..48d711a2587 100644
--- a/.spelling
+++ b/.spelling
@@ -1538,8 +1538,9 @@ kilasuit
 michaeltlombardi
 SeeminglyScience
 TobiasPSP
- - CHANGELOG/preview.md
+ - CHANGELOG/7.3.md
 ayousuf23
+AzCopy.exe
 hammy3502
 PowerShellExecutionHelper.cs
 ClientRemotePowerShell
@@ -1557,6 +1558,7 @@ vmImage
 NoLanguage
 GetValueOrDefault
 kondratyev-nv
+penimc_cor3.dll
 PkgES
 v7.2.0
 preview.9
diff --git a/CHANGELOG/7.3.md b/CHANGELOG/7.3.md
new file mode 100644
index 00000000000..66516873ae3
--- /dev/null
+++ b/CHANGELOG/7.3.md
@@ -0,0 +1,932 @@
+# 7.3 Changelog
+
+## [7.3.0] - 2022-11-08
+
+### General Cmdlet Updates and Fixes
+
+- Correct calling cmdlet `New-PSSessionOption` in script for `Restart-Computer` (#18374)
+
+### Tests
+
+- Add test for framework dependent package in release pipeline (Internal 23139)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump to use internal .NET 7 GA build (Internal 23096)</p>
+
+</summary>
+
+<ul>
+<li>Fix issues with building test artifacts (Internal 23116)</li>
+<li>Use <code>AzFileCopy</code> task instead of <code>AzCopy.exe</code></li>
+<li>Remove <code>AzCopy</code> installation from msixbundle step</li>
+<li>Add TSAUpload for APIScan (#18446)</li>
+<li>Add authenticode signing for assemblies on Linux builds (#18440)</li>
+<li>Do not remove <code>penimc_cor3.dll</code> from build (#18438)</li>
+<li>Allow two-digit revisions in vPack package validation pattern (#18392)</li>
+<li>Bump <code>Microsoft.PowerShell.Native</code> from <code>7.3.0-rc.1</code> to <code>7.3.0</code> (#18413)</li>
+</ul>
+
+</details>
+
+[7.3.0]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-rc.1...v7.3.0
+
+## [7.3.0-rc.1] - 2022-10-26
+
+### Breaking Change
+
+- Update to use `ComputeCore.dll` for PowerShell Direct (#18194)
+
+### Engine Updates and Fixes
+
+- On Unix, explicitly terminate the native process during cleanup only if it's not running in background (#18215)
+
+### General Cmdlet Updates and Fixes
+
+- Remove the `ProcessorArchitecture` portion from the full name as it's obsolete (#18320)
+
+### Tests
+
+- Add missing `-Tag 'CI'` to describe blocks. (#18317)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+<p>Bump to .NET 7 to <code>7.0.100-rc.2.22477.20</code> (#18328)(#18286)</p>
+</summary>
+
+<ul>
+<li>Update ThirdPartyNotices (Internal 22987)</li>
+<li>Remove API sets (#18304) (#18376)</li>
+<li>Do not cleanup <code>pwsh.deps.json</code> for framework dependent packages (#18300)</li>
+<li>Bump <code>Microsoft.PowerShell.Native</code> from <code>7.3.0-preview.1</code> to <code>7.3.0-rc.1</code> (#18217)</li>
+<li>Remove unnecessary native dependencies from the package (#18213)</li>
+<li>Make the link to minimal package blob public during release (#18158)</li>
+<li>Create tasks to collect and publish hashes for build files. (#18276)(#18277)</li>
+<li>Add branch counter to compliance build (#18214)</li>
+<li>Move APIScan to compliance build (#18191)</li>
+<li>Update MSI exit message (#18137)</li>
+<li>Remove XML files for min-size package (#18189)</li>
+</ul>
+
+</details>
+
+[7.3.0-rc.1]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.8...v7.3.0-rc.1
+
+## [7.3.0-preview.8] - 2022-09-20
+
+### General Cmdlet Updates and Fixes
+
+- Filter out compiler generated types for `Add-Type -PassThru` (#18095)
+- Fix error formatting to use color defined in `$PSStyle.Formatting` (#17987)
+- Handle `PSObject` argument specially in method invocation logging (#18060)
+- Revert the experimental feature `PSStrictModeAssignment` (#18040)
+- Make experimental feature `PSAMSIMethodInvocationLogging` stable (#18041)
+- Make experimental feature `PSAnsiRenderingFileInfo` stable (#18042)
+- Make experimental feature `PSCleanBlock` stable (#18043)
+- Make experimental feature `PSNativeCommandArgumentPassing` stable (#18044)
+- Make experimental feature `PSExec` stable (#18045)
+- Make experimental feature `PSRemotingSSHTransportErrorHandling` stable (#18046)
+- Add the `ConfigurationFile` option to the PowerShell help content (#18093)
+
+### Build and Packaging Improvements
+
+<summary>
+<p>Bump .NET SDK to version `7.0.100-rc.1`</p>
+</summary>
+
+<details>
+<ul>
+<li>Update ThirdPartyNotices.txt for 7.3.0-preview.8 (Internal 22553)</li>
+<li>Update cgmanifest.json for 7.3.0-preview.8 (Internal 22551)</li>
+<li>Re-enable building with Ready-to-Run (#18107)</li>
+<li>Make sure <code>Security.types.ps1xml</code> gets signed in release build (#17930)</li>
+<li>Update <code>DotnetRuntimeMetadata.json</code> for .NET 7 RC1 build (#18106)</li>
+<li>Add XML reference documents to NuPkg files for SDK (#18017)</li>
+<li>Make Register MU timeout (#17995)</li>
+<li>Bump Microsoft.NET.Test.Sdk from 17.2.0 to 17.3.0 (#17924)</li>
+<li>Update list of PS team members in release tools (#17928)</li>
+<li>Update to use version 2.21.0 of Application Insights (#17927)</li>
+<li>Complete ongoing <code>Write-Progress</code> in test (#17922)</li>
+</ul>
+</details>
+
+[7.3.0-preview.8]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.7...v7.3.0-preview.8
+
+## [7.3.0-preview.7] - 2022-08-09
+
+### Breaking Changes
+
+- Move the type data definition of `System.Security.AccessControl.ObjectSecurity` to the `Microsoft.PowerShell.Security` module (#16355) (Thanks @iSazonov!)
+
+### Engine Updates and Fixes
+
+- Enable searching for assemblies in `GAC_Arm64` on Windows (#17816)
+- Fix parser exception in using statements with empty aliases (#16745) (Thanks @MartinGC94!)
+- Do not always collapse space between parameter and value for native arguments. (#17708)
+- Remove `PSNativePSPathResolution` experimental feature (#17670)
+
+### General Cmdlet Updates and Fixes
+
+- Fix for deserializing imported ordered dictionary (#15545) (Thanks @davidBar-On!)
+- Make generated implicit remoting modules backwards compatible with PowerShell 5.1 (#17227) (Thanks @Tadas!)
+- Re-enable IDE0031: Use Null propagation (#17811) (Thanks @fflaten!)
+- Allow commands to still be executed even if the current working directory no longer exists (#17579)
+- Stop referencing `Microsoft.PowerShell.Security` when the core snapin is used (#17771)
+- Add support for HTTPS with `Set-AuthenticodeSignature -TimeStampServer` (#16134) (Thanks @Ryan-Hutchison-USAF!)
+- Add type accelerator `ordered` for `OrderedDictionary` (#17804) (Thanks @fflaten!)
+- Fix the definition of the `PDH_COUNTER_INFO` struct (#17779)
+- Adding Virtualization Based Security feature names to Get-ComputerInfo (#16415) (Thanks @mattifestation!)
+- Fix `FileSystemProvider` to work with volume and pipe paths (#15873)
+- Remove pre-parse for array-based JSON (#15684) (Thanks @strawgate!)
+- Improve type inference for `$_` (#17716) (Thanks @MartinGC94!)
+- Prevent braces from being removed when completing variables (#17751) (Thanks @MartinGC94!)
+- Fix type inference for `ICollection` (#17752) (Thanks @MartinGC94!)
+- Fix `Test-Json` not handling non-object types at root (#17741) (Thanks @dkaszews!)
+- Change `Get-ChildItem` to treat trailing slash in path as indicating a directory when used with `-Recurse` (#17704)
+- Add `find.exe` to legacy argument binding behavior for Windows (#17715)
+- Add completion for index expressions for dictionaries (#17619) (Thanks @MartinGC94!)
+- Fix enum-ranges for `ValidateRange` in proxy commands (#17572) (Thanks @fflaten!)
+- Fix type completion for attribute tokens (#17484) (Thanks @MartinGC94!)
+- Add `-noprofileloadtime` switch to `pwsh` (#17535) (Thanks @rkeithhill!)
+- Fix legacy `ErrorView` types to use `$host.PrivateData` colors (#17705)
+- Improve dynamic parameter tab completion (#17661) (Thanks @MartinGC94!)
+- Avoid binding positional parameters when completing parameter in front of value (#17693) (Thanks @MartinGC94!)
+- Render decimal numbers in a table using current culture (#17650)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@fflaten, @Molkree, @eltociear</p>
+
+</summary>
+
+<ul>
+<li>Fix other path constructions using <code>Path.Join</code> (#17825)</li>
+<li>Use null propagation (#17787)(#17789)(#17790)(#17791)(#17792)(#17795) (Thanks @fflaten!)</li>
+<li>Re-enable compound assignment preference (#17784) (Thanks @Molkree!)</li>
+<li>Use null-coalescing assignment (#17719)(#17720)(#17721)(#17722)(#17723)(#17724)(#17725)(#17726)(#17727)(#17728)(#17729) (Thanks @Molkree!)</li>
+<li>Disable the warning <code>IDE0031</code> to take .NET 7 Preview 7 (#17770)</li>
+<li>Fix typo in <ode>ModuleCmdletBase.cs</code> (#17714) (Thanks @eltociear!)</li>
+</ul>
+
+</details>
+
+### Tests
+
+- Re-enable tests because the corresponding dotnet issues were fixed (#17839)
+- Add test for `LanguageMode` using remoting (#17803) (Thanks @fflaten!)
+- Fix test perf by stopping ongoing `write-progress` (#17749) (Thanks @fflaten!)
+- Re-enable the test `TestLoadNativeInMemoryAssembly` (#17738)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@varunsh-coder, @dkaszews, @Molkree, @ChuckieChen945</p>
+
+</summary>
+
+<ul>
+<li>Update release pipeline to use Approvals and automate some manual tasks (#17837)</li>
+<li>Add GitHub token permissions for workflows (#17781) (Thanks @varunsh-coder!)</li>
+<li>Bump actions/github-script from 3 to 6 (#17842)</li>
+<li>Bump cirrus-actions/rebase from 1.6 to 1.7 (#17843)</li>
+<li>Remove unneeded verbose message in build (#17840)</li>
+<li>Detect default runtime using dotnet --info in build.psm1 (#17818) (Thanks @dkaszews!)</li>
+<li>Bump <code>actions/checkout</code> from 2 to 3 (#17828)</li>
+<li>Bump <code>actions/download-artifact</code> from 2 to 3 (#17829)</li>
+<li>Bump <code>github/codeql-action</code> from 1 to 2 (#17830)</li>
+<li>Bump <code>peter-evans/create-pull-request</code> from 3 to 4 (#17831)</li>
+<li>Bump <code>actions/upload-artifact</code> from 2 to 3 (#17832)</li>
+<li>Enable Dependabot for GitHub Actions (#17775) (Thanks @Molkree!)</li>
+<li>Update .NET SDK version from <code>7.0.100-preview.6.22352.1</code> to <code>7.0.100-preview.7.22377.5</code> (#17776)</li>
+<li>Fix a bug in <code>install-powershell.ps1</code> (#17794) (Thanks @ChuckieChen945!)</li>
+<li>Bump xunit from 2.4.1 to 2.4.2 (#17817)</li>
+<li>Update how to update homebrew (#17798)</li>
+<li>Don't run link check on forks (#17797)</li>
+<li>Update dotnetmetadata.json to start consuming .NET 7 preview 7 builds (#17736)</li>
+<li>Bump PackageManagement from 1.4.7 to 1.4.8.1 (#17709)</li>
+<li>Exclude ARM images from running in CI (#17713)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update the comment about why R2R is disabled (#17850)
+- Update changelog and `.spelling` for `7.3.0-preview.6` release (#17835)
+- Updated `ADOPTERS.md` for Power BI (#17766)
+- Update README.md with the current Fedora version (#15717) (Thanks @ananya26-vishnoi!)
+- Update `README` and `metadata.json` for next release (#17676) (Thanks @SeeminglyScience!)
+
+[7.3.0-preview.7]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.6...v7.3.0-preview.7
+
+## [7.3.0-preview.6] - 2022-07-18
+
+### General Cmdlet Updates and Fixes
+
+- Fix `Export-PSSession` to not throw error when a rooted path is specified for `-OutputModule` (#17671)
+- Change `ConvertFrom-Json -AsHashtable` to use ordered hashtable (#17405)
+- Remove potential ANSI escape sequences in strings before using in `Out-GridView` (#17664)
+- Add the `-Milliseconds` parameter to `New-TimeSpan` (#17621) (Thanks @NoMoreFood!)
+- Update `Set-AuthenticodeSignature` to use `SHA256` as the default (#17560) (Thanks @jborean93!)
+- Fix tab completion regression when completing `ValidateSet` values (#17628) (Thanks @MartinGC94!)
+- Show optional parameters as such when displaying method definition and overloads (#13799) (Thanks @eugenesmlv!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@sethvs, @MartinGC94, @eltociear</p>
+
+</summary>
+
+<ul>
+<li>Fix comment in InternalCommands.cs (#17669) (Thanks @sethvs!)</li>
+<li>Use discards for unused variables (#17620) (Thanks @MartinGC94!)</li>
+<li>Fix typo in CommonCommandParameters.cs (#17524) (Thanks @eltociear!)</li>
+</ul>
+
+</details>
+
+### Tests
+
+- Fix SDK tests for release build (#17678)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@tamasvajk</p>
+
+</summary>
+
+<ul>
+<li>Create test artifacts for Windows ARM64 (#17675)</li>
+<li>Update to the latest NOTICES file (#17607)</li>
+<li>Update .NET SDK version from <code>7.0.100-preview.5.22307.18</code> to <code>7.0.100-preview.6.22352.1</code> (#17634)</li>
+<li>Set the compound assignment preference to false (#17632)</li>
+<li>Update DotnetMetadata.json to start consuming .NET 7 Preview 6 builds (#17630)</li>
+<li>Install .NET 3.1 as it is required by the vPack task (#17600)</li>
+<li>Update to use PSReadLine <code>v2.2.6</code> (#17595)</li>
+<li>Fix <code>build.psm1</code> to not specify both version and quality for <code>dotnet-install</code> (#17589) (Thanks @tamasvajk!)</li>
+<li>Bump Newtonsoft.Json in /test/perf/dotnet-tools/Reporting (#17592)</li>
+<li>Bump Newtonsoft.Json in /test/perf/dotnet-tools/ResultsComparer (#17566)</li>
+<li>Disable RPM SBOM test. (#17532)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Remove `katacoda.com` from doc as it now returns 404 (#17625)
+- Update change log for `v7.2.5` and `v7.3.0-preview.5` (#17565)
+- Update `README.md` and `metadata.json` for upcoming releases (#17526)
+
+[7.3.0-preview.6]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.5...v7.3.0-preview.6
+
+## [7.3.0-preview.5] - 2022-06-21
+
+### Engine Updates and Fixes
+
+- Improve type inference and completions (#16963) (Thanks @MartinGC94!)
+- Make `Out-String` and `Out-File` keep string input unchanged (#17455)
+- Make `AnsiRegex` able to capture Hyperlink ANSI sequences (#17442)
+- Add the `-ConfigurationFile` command line parameter to `pwsh` to support local session configuration (#17447)
+- Fix native library loading for `osx-arm64` (#17365) (Thanks @awakecoding!)
+- Fix formatting to act appropriately when the style of table header or list label is empty string (#17463)
+
+### General Cmdlet Updates and Fixes
+
+- Fix various completion issues inside the `param` block (#17489) (Thanks @MartinGC94!)
+- Add Amended switch to `Get-CimClass` cmdlet (#17477) (Thanks @iSazonov!)
+- Improve completion on operators (#17486) (Thanks @MartinGC94!)
+- Improve array element completion for command arguments (#17078) (Thanks @matt9ucci!)
+- Use AST extent for `PSScriptRoot` path completion (#17376)
+- Add type inference support for generic methods with type parameters (#16951) (Thanks @MartinGC94!)
+- Write out OSC indicator only if the `stdout` is not redirected (#17419)
+- Remove the assert and use a relatively larger capacity to cover possible increase of .NET reference assemblies (#17423)
+- Increase reference assembly count to 161 (#17420)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@Yulv-git, @eltociear</p>
+
+</summary>
+
+<ul>
+<li>Fix some typos in source code (#17481) (Thanks @Yulv-git!)</li>
+<li>Fix typo in `AsyncResult.cs` (#17396) (Thanks @eltociear!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Update script to pin to .NET 7 preview 5 version (#17448)
+- Start-PSPester: argument completer for `-Path` (#17334) (Thanks @powercode!)
+- Add reminder workflows (#17387)
+- Move to configuring the fabric bot via JSON (#17411)
+- Update Documentation Issue Template URL (#17410) (Thanks @michaeltlombardi!)
+- Update script to automatically take new preview pre-release builds (#17375)
+
+### Tests
+
+- Make Assembly Load Native test work on a FX Dependent Linux Install (#17380)
+- Update `Get-Error` test to not depend on DNS APIs (#17471)
+
+### Build and Packaging Improvements
+
+<details>
+
+<ul>
+<li>Update .NET SDK version from <code>7.0.100-preview.4.22252.9</code> to <code>7.0.100-preview.5.22307.18</code> (#17402)</li>
+<li>Downgrade the <code>Microsoft.CodeAnalysis.NetAnalyzers</code> package to <code>7.0.0-preview1.22217.1</code> (#17515)</li>
+<li>Rename mariner package to cm (#17505)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#17476)</li>
+<li>Bump <code>NJsonSchema</code> from 10.7.1 to 10.7.2 (#17475)</li>
+<li>Publish preview versions of mariner to preview repo (#17451)</li>
+<li>Update to the latest NOTICES file (#17421)</li>
+<li>Do not publish package for Mariner 1.0 (#17415)</li>
+<li>Add <code>AppX</code> capabilities in MSIX manifest so that PS7 can call the <code>AppX</code> APIs (#17416)</li>
+<li>Update to the latest NOTICES file (#17401)</li>
+<li>Fix mariner mappings (#17413)</li>
+<li>Update the cgmanifest (#17393)</li>
+<li>Bump `NJsonSchema` from `10.7.0` to `10.7.1` (#17381)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update to the latest NOTICES file (#17493) (Thanks @github-actions[bot]!)
+- Update the cgmanifest (#17478) (Thanks @github-actions[bot]!)
+- Correct spelling in Comments and tests (#17480) (Thanks @Yulv-git!)
+- Fix spelling errors introduced in changelog (#17414)
+- Update change log for v7.3.0-preview.4 release (#17412)
+- Update readme and metadata for 7.3.0-preview.4 release (#17378)
+
+[7.3.0-preview.5]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.4...v7.3.0-preview.5
+
+## [7.3.0-preview.4] - 2022-05-23
+
+### Engine Updates and Fixes
+
+<ul>
+<li>Remove the use of <code>BinaryFormatter</code> in PSRP serialization (#17133) (Thanks @jborean93!)</li>
+<li>Update telemetry collection removing unused data and adding some new data (#17304)</li>
+<li>Fix the word wrapping in formatting to handle escape sequences properly (#17316)</li>
+<li>Fix the error message in Hashtable-to-object conversion (#17329)</li>
+<li>Add support for new WDAC API (#17247)</li>
+<li>On Windows, reset cursor visibility back to previous state when rendering progress (#16782)</li>
+<li>Fix the list view to not leak VT decorations (#17262)</li>
+<li>Fix formatting truncation to handle strings with VT sequences (#17251)</li>
+<li>Fix line breakpoints for <code>return</code> statements without a value (#17179)</li>
+<li>Fix for partial PowerShell module search paths, that can be resolved to CWD locations (#17231) (Internal 20126)</li>
+<li>Change logic in the testing helper module for determining whether <code>PSHOME</code> is writable (#17218)</li>
+<li>Make a variable assignment in a <code>ParenExpression</code> to return the variable value (#17174)</li>
+<li>Use new Windows signature APIs from <code>Microsoft.Security.Extensions</code> package (#17159)</li>
+<li>Do not include node names when sending telemetry. (#16981)</li>
+<li>Support forward slashes in network share (UNC path) completion (#17111) (#17117) (Thanks @sba923!)</li>
+<li>Do not generate clean block in proxy function when the feature is disabled (#17112)</li>
+<li>Ignore failure attempting to set console window title (#16948)</li>
+<li>Update regex used to remove ANSI escape sequences to be more specific to decoration and CSI sequences (#16811)</li>
+<li>Improve member auto completion (#16504) (Thanks @MartinGC94!)</li>
+<li>Prioritize <code>ValidateSet</code> completions over Enums for parameters (#15257) (Thanks @MartinGC94!)</li>
+<li>Add Custom Remote Connections Feature (#17011)</li>
+</ul>
+
+### General Cmdlet Updates and Fixes
+
+<ul>
+<li>Add check for <code>ScriptBlock</code> wrapped in <code>PSObject</code> to <code>$using</code> used in <code>ForEach-Object -Parallel</code> (#17234) (Thanks @ryneandal!)</li>
+<li>Fix <code>ForEach</code> method to set property on a scalar object (#17213)</li>
+<li>Fix <code>Sort-Object -Stable -Unique</code> to actually do stable sorting (#17189) (Thanks @m1k0net!)</li>
+<li>Add <code>OutputType</code> attribute to various commands (#16962) (Thanks @MartinGC94!)</li>
+<li>Make <code>Stop-Service</code> only request needed privileges when not setting SDDL. (#16663) (Thanks @kvprasoon!)</li>
+</ul>
+
+### Code Cleanup
+
+<ul>
+<li>Remove <code>EventLogLogProvider</code> and its related legacy code (#17027)</li>
+<li>Fix typos in names of method (#17003) (Thanks @al-cheb!)</li>
+<li>SemanticChecks: Avoid repeated type resolution of <code>[ordered]</code> (#17328) (Thanks IISResetMe!)</li>
+<li>Redo the change that was reverted by #15853 (#17357)</li>
+<li>Correct spelling of <code>pseudo</code> in <code>Compiler.cs</code> (#17285) (Thanks @eltociear!)</li>
+<li>Make<code>NameObscurerTelemetryInitializer</code> internal (#17214)</li>
+<li>Make <code>NameObscurerTelemetryInitializer</code> internal (#17167)</li>
+<li>Correct Typo in the resource string <code>PathResolvedToMultiple</code> (#17098) (Thanks @charltonstanley!)</li>
+<li>Fix typo in <code>ComRuntimeHelpers.cs</code> (#17104) (Thanks @eltociear!)</li>
+</ul>
+
+### Documentation and Help Content
+
+<ul>
+<li>Update link to PowerShell remoting in depth video (#17166)</li>
+</ul>
+
+### Tests
+
+<ul>
+<li>Add <code>-because</code> to the failing test to aid in debugging (#17030)</li>
+<li>Simplify Enum generator for the <code>-bnot</code> operator test (#17014)</li>
+<li>Improve unique naming for tests (#17043)</li>
+<li>Use a random string for the missing help topic to improve the chances that the help topic really won't be found. (#17042)</li>
+</ul>
+
+### Build and Packaging Improvements
+
+<ul>
+<li>Update <code>README.md</code> and <code>metadata.json</code> for v7.3.0-preview.3 release (#17029)</li>
+<li>Do not pull dotnet updates from internal feed (#17007)</li>
+<li>Simplify <code>Get-WSManSupport</code> based on current .NET Distro Support (#17356)</li>
+<li>Update to the latest NOTICES file (#17372, #17332, #17311, #17275)</li>
+<li>Run on every PR and let the action skip (#17366)</li>
+<li>Make sure verbose message is not null (#17363)</li>
+<li>Release changelogs (#17364)</li>
+<li>Update build versions (#17318)</li>
+<li>Add Daily Link Check GitHub Workflow (#17351)</li>
+<li>Update the cgmanifest (#17361, #17344, #17324, #17302, #17268)</li>
+<li>Bump <code>NJsonSchema</code> from <code>10.6.10</code> to <code>10.7.0</code> (#17350)</li>
+<li>Disable broken macOS CI job, which is unused (#17221)</li>
+<li>Have rebase workflow Post a message when it starts (#17341)</li>
+<li>Update <code>DotnetRuntimeMetadata.json</code> for .NET 7 Preview 4 (#17336)</li>
+<li>Update Ubuntu 22 to be detected as not supported WSMan (#17338)</li>
+<li>Bump xunit.runner.visualstudio from 2.4.3 to 2.4.5 (#17274)</li>
+<li>Make sure we execute tests on LTS package for older LTS releases (#17326)</li>
+<li>Bump Microsoft.NET.Test.Sdk from 17.1.0 to 17.2.0 (#17320)</li>
+<li>Add fedora to the OS's that can't run WSMan (#17325)</li>
+<li>Add sles15 support to <code>install-powershell.sh</code> (#16984)</li>
+<li>Start rotating through all images (#17315)</li>
+<li>Update .NET SDK version from <code>7.0.100-preview.2.22153.17</code> to <code>7.0.100-preview.4.22252.9</code> (#17061)</li>
+<li>Disable release security analysis for SSH CI (#17303)</li>
+<li>Add a finalize template which causes jobs with issues to fail (#17314)</li>
+<li>Add mapping for ubuntu22.04 jammy (#17317)</li>
+<li>Enable more tests to be run in a container. (#17294)</li>
+<li>Fix <code>build.psm1</code> to find the required .NET SDK version when a higher version is installed (#17299)</li>
+<li>Improve how Linux container CI builds are identified (#17295)</li>
+<li>Only inject NuGet security analysis if we are using secure <code>nuget.config</code> (#17293)</li>
+<li>Reduce unneeded verbose message from <code>build.psm1</code> (#17291)</li>
+<li>Switch to using GitHub action to verify markdown links for PRs (#17281)</li>
+<li>Put Secure supply chain analysis at correct place (#17273)</li>
+<li>Fix build id variable name when selecting CI container (#17279)</li>
+<li>Add rotation between the two mariner images (#17277)</li>
+<li>Update to use <code>mcr.microsoft.com</code> (#17272)</li>
+<li>Update engine working group members (#17271)</li>
+<li>Bump PSReadLine from 2.2.2 to 2.2.5 in /src/Modules (#17252)</li>
+<li>Update timeout for daily (#17263)</li>
+<li>Bump NJsonSchema from 10.6.9 to 10.6.10 (#16902)</li>
+<li>Update the <code>cgmanifest</code> (#17260)</li>
+<li>Fix Generate checksum file for packages build failure - v7.1.7 (#17219) (Internal 20274)</li>
+<li>Move <code>cgmanifest</code> generation to daily (#17258)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#17245)</li>
+<li>Update to the latest notice file (#17238)</li>
+<li>Add container to Linux CI (#17233)</li>
+<li>Mark <code>Microsoft.Management.Infrastructure.Runtime.Win</code> as a developer dependency to hide in notice file (#17230)</li>
+<li>Fixing dotnet SDK version parsing in <code>build.psm1</code> (#17198) (Thanks @powercode!)</li>
+<li>Fixed package names verification to support multi-digit versions (#17220)</li>
+<li>Bump Microsoft.CodeAnalysis.CSharp from 4.2.0-1.final to 4.2.0-4.final (#17210)</li>
+<li>Add backport action (#17212)</li>
+<li>Updated change logs for v7.0.9 / v7.0.10 / v7.1.6 / v7.1.7 / v7.2.2 / v7.2.3  (#17207)</li>
+<li>Updated metadata.json and README.md for v7.2.3 and v7.0.10 (#17158)</li>
+<li>Update package fallback list for ubuntu (from those updated for ubuntu 22.04) (deb) (#17180)</li>
+<li>Update <code>wix</code> to include security extensions package (#17171)</li>
+<li>Update rebase.yml (#17170)</li>
+<li>Adds sha256 digests to RPM packages (#16896) (Thanks @ngharo!)</li>
+<li>Make mariner packages Framework dependent (#17151)</li>
+<li>Update to the latest notice file (#17169)</li>
+<li>Update to the latest notice file (#17146)</li>
+<li>Replace <code>.</code> in notices container name (#17154)</li>
+<li>Allow multiple installations of dotnet. (#17141)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#17105)</li>
+<li>Update to the latest notice file (#16437)</li>
+<li>Skip failing scriptblock tests (#17093)</li>
+<li>Update dotnet-install script download link (#17086)</li>
+<li>Fix the version of the <code>Microsoft.CodeAnalysis.NetAnalyzers</code> package (#17075)</li>
+<li>Update <code>dotnetmetadata.json</code> to accept .NET 7 preview 3 builds (#17063)</li>
+<li>Re-enable <code>PowerShellGet</code> tests targeting PowerShell gallery (#17062)</li>
+<li>Add mariner 1.0 amd64 package (#17057)</li>
+<li>Create checksum file for global tools (#17056)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#17065)</li>
+<li>Use new cask format (#17064)</li>
+</ul>
+
+[7.3.0-preview.4]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.3...v7.3.0-preview.4
+
+## [7.3.0-preview.3] - 2022-03-21
+
+### Engine Updates and Fixes
+
+- Fix the parsing code for .NET method generic arguments (#16937)
+- Allow the `PSGetMemberBinder` to get value of `ByRef` property (#16956)
+- Allow a collection that contains `Automation.Null` elements to be piped to pipeline (#16957)
+
+### General Cmdlet Updates and Fixes
+
+- Add the module `CompatPowerShellGet` to the allow-list of telemetry modules (#16935)
+- Fix `Enter-PSHostProcess` and `Get-PSHostProcessInfo` cmdlets by handling processes that have exited (#16946)
+- Improve Hashtable completion in multiple scenarios (#16498) (Thanks @MartinGC94!)
+
+### Code Cleanup
+
+- Fix a typo in `CommandHelpProvider.cs` (#16949) (Thanks @eltociear!)
+
+### Tests
+
+- Update a few tests to make them more stable in CI (#16944)
+- Roll back Windows images used in testing to Windows Server 2019 (#16958)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+<p>Update .NET SDK to 7.0.0-preview.2</p>
+</summary>
+
+<ul>
+<li>Update .NET to 7.0.0-preview.2 build (#16930)</li>
+<li>Update <code>AzureFileCopy</code> task and fix the syntax for specifying <code>pool</code> (#17013)</li>
+</ul>
+
+</details>
+
+[7.3.0-preview.3]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.2...v7.3.0-preview.3
+
+## [7.3.0-preview.2] - 2022-02-24
+
+### Engine Updates and Fixes
+
+- Fix the `clean` block for generated proxy function (#16827)
+- Add support to allow invoking method with generic type arguments (#12412 and #16822) (Thanks @vexx32!)
+- Report error when PowerShell built-in modules are missing (#16628)
+
+### General Cmdlet Updates and Fixes
+
+- Prevent command completion if the word to complete is a single dash (#16781) (Thanks @ayousuf23!)
+- Use `FindFirstFileW` instead of `FindFirstFileExW` to correctly handle Unicode file names on FAT32 (#16840) (Thanks @iSazonov!)
+- Add completion for loop labels after Break/Continue (#16438) (Thanks @MartinGC94!)
+- Support OpenSSH options for `PSRP` over SSH commands (#12802) (Thanks @BrannenGH!)
+- Adds a `.ResolvedTarget` Property to `File-System` Items to Reflect a Symlink's Target as `FileSystemInfo` (#16490) (Thanks @hammy3502!)
+- Use `NotifyEndApplication` to re-enable VT mode (#16612)
+- Add new parameter to `Start-Sleep`: `[-Duration] <timespan>` (#16185) (Thanks @IISResetMe!)
+- Add lock and null check to remoting internals (#16542) (#16683) (Thanks @SergeyZalyadeev!)
+- Make `Measure-Object` ignore missing properties unless running in strict mode (#16589) (Thanks @KiwiThePoodle!)
+- Add `-StrictMode` to `Invoke-Command` to allow specifying strict mode when invoking command locally (#16545) (Thanks @Thomas-Yu!)
+- Fix `$PSNativeCommandArgPassing` = `Windows` to handle empty args correctly (#16639)
+- Reduce the amount of startup banner text (#16516) (Thanks @rkeithhill!)
+- Add `exec` cmdlet for bash compatibility (#16462)
+- Add AMSI method invocation logging as experimental feature (#16496)
+- Fix web cmdlets so that an empty `Get` does not include a `content-length` header (#16587)
+- Update `HelpInfoUri` for 7.3 release (#16646)
+- Fix parsing `SemanticVersion` build label from version string (#16608)
+- Fix `ForEach-Object -Parallel` when passing in script block variable (#16564)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@eltociear, @iSazonov, @xtqqczze</p>
+
+</summary>
+
+<ul>
+<li>Fix typo in PowerShellExecutionHelper.cs (#16776) (Thanks @eltociear!)</li>
+<li>Use more efficient platform detection API (#16760) (Thanks @iSazonov!)</li>
+<li>Seal <code>ClientRemotePowerShell</code> (#15802) (Thanks @xtqqczze!)</li>
+<li>Fix the DSC overview URL in a markdown file and some small cleanup changes (#16629)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Fix automation to update experimental JSON files in GitHub action (#16837)
+
+### Tests
+
+- Update `markdownlint` to the latest version (#16825)
+- Bump the package `path-parse` from `1.0.6` to `1.0.7` (#16820)
+- Remove assert that is incorrect and affecting our tests (#16588)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@dahlia</p>
+
+</summary>
+
+<ul>
+<li>Update NuGet Testing to not re-install dotnet,
+when not needed and dynamically determine the DOTNET_ROOT (Internal 19268, 19269, 19272, 19273, and 19274)</li>
+<li>Remove SkipExperimentalFeatureGeneration when building alpine (Internal 19248)</li>
+<li>Revert .NET 7 changes, Update to the latest .NET 6 and Update WXS file due to blocking issue in .NET 7 Preview 1 </li>
+<li>Install and Find AzCopy</li>
+<li>Use Start-PSBootStrap for installing .NET during nuget packaging</li>
+<li>Fix pool syntax for deployments (Internal 19189)</li>
+<li>Bump NJsonSchema from 10.5.2 to 10.6.9 (#16888)</li>
+<li>Update projects and scripts to use .NET 7 preview 1 pre-release builds (#16856)</li>
+<li>Add warning messages when package precheck fails (#16867)</li>
+<li>Refactor Global Tool packaging to include SBOM generation (#16860)</li>
+<li>Update to use <code>windows-latest</code> as the build agent image (#16831)</li>
+<li>Ensure alpine and arm SKUs have <code>powershell.config.json</code> file with experimental features enabled (#16823)</li>
+<li>Update experimental feature json files (#16838) (Thanks @github-actions[bot]!)</li>
+<li>Remove WiX install (#16834)</li>
+<li>Add experimental json update automation (#16833)</li>
+<li>Update .NET SDK to 6.0.101 and fix <code>Microsoft.PowerShell.GlobalTool.Shim.csproj</code> (#16821)</li>
+<li>Add SBOM manifest to nuget packages (#16711)</li>
+<li>Improve logic for updating .NET in CI (#16808)</li>
+<li>Add Linux package dependencies for packaging (#16807)</li>
+<li>Switch to our custom images for build and release (#16801)</li>
+<li>Remove all references to <code>cmake</code> for the builds in this repo (#16578)</li>
+<li>Fix build for new <code>InvokeCommand</code> attributes (#16800)</li>
+<li>Let macOS installer run without Rosetta on Apple Silicon (#16742) (Thanks @dahlia!)</li>
+<li>Update the expect .NET SDK quality to GA for installing dotnet (#16784)</li>
+<li>Change nuget release yaml to use <code>UseDotNet</code> task (#16701)</li>
+<li>Bump Microsoft.ApplicationInsights from 2.19.0 to 2.20.0 (#16642)</li>
+<li>Register NuGet source when generating <code>CGManifest</code> (#16570)</li>
+<li>Update Images used for release (#16580)</li>
+<li>Update SBOM generation (#16641)</li>
+<li>Bring changes from 7.3.0-preview.1 (#16640)</li>
+<li>Update the <code>vmImage</code> and PowerShell root directory for macOS builds (#16611)</li>
+<li>Update macOS build image and root folder for build (#16609)</li>
+<li>Disabled Yarn cache in markdown.yml (#16599)</li>
+<li>Update cgmanifest (#16600)</li>
+<li>Fix broken links in markdown (#16598)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Add newly joined members to their respective Working Groups (#16849)
+- Update Engine Working Group members (#16780)
+- Replace the broken link about pull request (#16771)
+- Update change log to remove a broken URL (#16735)
+- Updated `README.md` and `metadata.json` for `v7.3.0-preview.1` release (#16627)
+- Updating changelog for `7.2.1` (#16616)
+- Updated `README.md` and `metadata.json` for `7.2.1` release (#16586)
+
+[7.3.0-preview.2]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.1...v7.3.0-preview.2
+
+## [7.3.0-preview.1] - 2021-12-16
+
+### Breaking Changes
+
+- Add `clean` block to script block as a peer to `begin`, `process`, and `end` to allow easy resource cleanup (#15177)
+- Change default for `$PSStyle.OutputRendering` to `Ansi` (Internal 18449)
+
+### Engine Updates and Fixes
+
+- Remove duplicate remote server mediator code (#16027)
+- Fix `PSVersion` parameter version checks and error messages for PowerShell 7 remoting (#16228)
+- Use the same temporary home directory when `HOME` env variable is not set (#16263)
+- Fix parser to generate error when array has more than 32 dimensions (#16276)
+
+### Performance
+
+- Avoid validation for built-in file extension and color VT sequences (#16320) (Thanks @iSazonov!)
+
+### General Cmdlet Updates and Fixes
+
+- Update `README.md` and `metadata.json` for next preview release (#16107)
+- Use `PlainText` when writing to a host that doesn't support VT (#16092)
+- Remove support for `AppExeCLinks` to retrieve target (#16044)
+- Move `GetOuputString()` and `GetFormatStyleString()` to `PSHostUserInterface` as public API (#16075)
+- Fix `ConvertTo-SecureString` with key regression due to .NET breaking change (#16068)
+- Fix regression in `Move-Item` to only fallback to `copy and delete` in specific cases (#16029)
+- Set `$?` correctly for command expression with redirections (#16046)
+- Use `CurrentCulture` when handling conversions to `DateTime` in `Add-History` (#16005) (Thanks @vexx32!)
+- Fix link header parsing to handle unquoted `rel` types (#15973) (Thanks @StevenLiekens!)
+- Fix a casting error when using `$PSNativeCommandUsesErrorActionPreference` (#15993)
+- Format-Wide: Fix `NullReferenceException` (#15990) (Thanks @DarylGraves!)
+- Make the native command error handling optionally honor `ErrorActionPreference` (#15897)
+- Remove declaration of experimental features in Utility module manifest as they are stable (#16460)
+- Fix race condition between `DisconnectAsync` and `Dispose` (#16536) (Thanks @i3arnon!)
+- Fix the `Max_PATH` condition check to handle long path correctly (#16487) (Thanks @Shriram0908!)
+- Update `HelpInfoUri` for 7.2 release (#16456)
+- Fix tab completion within the script block specified for the `ValidateScriptAttribute`. (#14550) (Thanks @MartinGC94!)
+- Update `README.md` to specify gathered telemetry (#16379)
+- Fix typo for "privacy" in MSI installer (#16407)
+- Remove unneeded call to `File.ResolveLinkTarget` from `IsWindowsApplication` (#16371) (Thanks @iSazonov!)
+- Add `-HttpVersion` parameter to web cmdlets (#15853) (Thanks @hayhay27!)
+- Add support to web cmdlets for open-ended input tags (#16193) (Thanks @farmerau!)
+- Add more tests to `Tee-Object -Encoding` (#14539) (Thanks @rpolley!)
+- Don't throw exception when trying to resolve a possible link path (#16310)
+- Fix `ConvertTo-Json -Depth` to allow 100 at maximum (#16197) (Thanks @KevRitchie!)
+- Fix for SSH remoting when banner is enabled on SSHD endpoint (#16205)
+- Disallow all COM for AppLocker system lock down (#16268)
+- Configure `ApplicationInsights` to not send cloud role name (#16246)
+- Disallow `Add-Type` in NoLanguage mode on a locked down machine (#16245)
+- Specify the executable path as `TargetObect` for non-zero exit code `ErrorRecord` (#16108) (Thanks @rkeithhill!)
+- Don't allow `Move-Item` with FileSystemProvider to move a directory into itself (#16198)
+- Make property names for the color VT sequences consistent with documentations (#16212)
+- Fix `PipelineVariable` to set variable in the right scope (#16199)
+- Invoke-Command: improve handling of variables with $using: expression (#16113) (Thanks @dwtaber!)
+- Change `Target` from a `CodeProperty` to be an `AliasProperty` that points to `FileSystemInfo.LinkTarget` (#16165)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze, @eltociear, @iSazonov</p>
+
+</summary>
+
+<ul>
+<li>Improve <code>CommandInvocationIntrinsics</code> API documentation and style (#14369)</li>
+<li>Use <code>bool?.GetValueOrDefault()</code> in <code>FormatWideCommand</code> (#15988) (Thanks @xtqqczze!)</li>
+<li>Remove 4 assertions which cause debug build test runs to fail (#15963)</li>
+<li>Fix typo in `Job.cs` (#16454) (Thanks @eltociear!)</li>
+<li>Remove unnecessary call to `ToArray` (#16307) (Thanks @iSazonov!)</li>
+<li>Remove the unused `FollowSymLink` function (#16231)</li>
+<li>Fix typo in `TypeTable.cs` (#16220) (Thanks @eltociear!)</li>
+<li>Fixes #16176 - replace snippet tag with code tag in comments (#16177)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Fix typo in build.psm1 (#16038) (Thanks @eltociear!)
+- Add `.stylecop` to `filetypexml` and format it (#16025)
+- Enable sending Teams notification when workflow fails (#15982)
+- Use `Convert-Path` for unknown drive in `Build.psm1` (#16416) (Thanks @matt9ucci!)
+
+### Tests
+
+- Add benchmark to test compiler performance (#16083)
+- Enable two previously disabled `Get-Process` tests (#15845) (Thanks @iSazonov!)
+- Set clean state before testing `UseMU` in the MSI (#16543)
+- Fix global tool and SDK tests in release pipeline (#16342)
+- Remove the outdated test (#16269)
+- Removed old not-used-anymore docker-based tests for PS release packages (#16224)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@github-actions[bot], @kondratyev-nv</p>
+
+</summary>
+
+<ul>
+<li>fix issue with hash file getting created before we have finished get-childitem (#16170)</li>
+<li>Add sha256 hashes to release (#16147)</li>
+<li>Change path for Component Governance for build to the path we actually use to build (#16137)</li>
+<li>Update <code>Microsoft.CodeAnalysis.CSharp</code> version (#16138)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#16070)</li>
+<li>Update .NET to <code>6.0.100-rc.1.21458.32</code> (#16066)</li>
+<li>Update minimum required OS version for macOS (#16088)</li>
+<li>Set locale correctly on Linux CI (#16073)</li>
+<li>Ensure locale is set correctly on Ubuntu 20.04 in CI (#16067)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#16045)</li>
+<li>Update .NET SDK version from `6.0.100-rc.1.21430.44` to `6.0.100-rc.1.21455.2` (#16041) (Thanks @github-actions[bot]!)</li>
+<li>Fix the GitHub Action for updating .NET daily builds (#16042)</li>
+<li>Bump Microsoft.CodeAnalysis.CSharp from 4.0.0-3.final to 4.0.0-4.21430.4 (#16036)</li>
+<li>Bump .NET to `6.0.100-rc.1.21430.44` (#16028)</li>
+<li>Move from <code>PkgES</code> hosted agents to 1ES hosted agents (#16023)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#16021)</li>
+<li>Update Ubuntu images to use Ubuntu 20.04 (#15906)</li>
+<li>Fix the mac build by updating the pool image name (#16010)</li>
+<li>Use Alpine 3.12 for building PowerShell for alpine (#16008)</li>
+<li>Update .NET SDK version from `6.0.100-preview.6.21355.2` to `6.0.100-rc.1.21426.1` (#15648) (Thanks @github-actions[bot]!)</li>
+<li>Ignore error from <code>Find-Package</code> (#15999)</li>
+<li>Find packages separately for each source in <code>UpdateDotnetRuntime.ps1</code> script (#15998)</li>
+<li>Update metadata to start using .NET 6 RC1 builds (#15981)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#15985)</li>
+<li>Merge the v7.2.0-preview.9 release branch back to GitHub master (#15983)</li>
+<li>Publish global tool package for stable releases (#15961)</li>
+<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> to newer version (#15962)</li>
+<li>Disabled Yarn cache in markdown.yml (#16599)</li>
+<li>Update cgmanifest (#16600)</li>
+<li>Fix broken links in markdown (#16598)</li>
+<li>Add explicit job name for approval tasks in Snap stage (#16579)</li>
+<li>Bring back <code>pwsh.exe</code> for framework dependent packages to support Start-Job (#16535)</li>
+<li>Fix NuGet package generation in release build (#16509)</li>
+<li>Add `Microsoft.PowerShell.Commands.SetStrictModeCommand.ArgumentToPSVersionTransformationAttribute` to list of patterns to remove for generated ref assembly (#16489)</li>
+<li>Bump Microsoft.CodeAnalysis.CSharp from `4.0.0-6.final` to `4.0.1` (#16423)</li>
+<li>use different containers for different branches (#16434)</li>
+<li>Add import so we can use common GitHub workflow function. (#16433)</li>
+<li>Remove pre-release .NET 6 build sources (#16418)</li>
+<li>Update release instructions with link to new build (#16419)</li>
+<li>Bump <code>Microsoft.ApplicationInsights</code> from <code>2.18.0</code> to <code>2.19.0</code> (#16413)</li>
+<li>Update <code>metadata.json</code> to make 7.2.0 the latest LTS (#16417)</li>
+<li>Make static CI a matrix (#16397)</li>
+<li>Update <code>metadata.json</code> in preparation on <code>7.3.0-preview.1</code> release (#16406)</li>
+<li>Update cgmanifest (#16405)</li>
+<li>Add diagnostics used to take corrective action when releasing `buildInfoJson` (#16404)</li>
+<li>`vPack` release should use `buildInfoJson` new to 7.2 (#16402)</li>
+<li>Update the usage of metadata.json for getting LTS information (#16381)</li>
+<li>Add checkout to build json stage to get `ci.psm1` (#16399)</li>
+<li>Update CgManifest.json for 6.0.0 .NET packages (#16398)</li>
+<li>Add current folder to the beginning of the module import (#16353)</li>
+<li>Increment RC MSI build number by 100 (#16354)</li>
+<li>Bump <code>XunitXml.TestLogger</code> from 3.0.66 to 3.0.70 (#16356)</li>
+<li>Move PR Quantifier config to subfolder (#16352)</li>
+<li>Release build info json when it is preview (#16335)</li>
+<li>Add an approval for releasing build-info json (#16351)</li>
+<li>Generate manifest with latest public version of the packages (#16337)</li>
+<li>Update to the latest notices file (#16339) (Thanks @github-actions[bot]!)</li>
+<li>Use notice task to generate license assuming cgmanifest contains all components (#16340)</li>
+<li>Refactor cgmanifest generator to include all components (#16326)</li>
+<li>Fix issues in release build (#16332)</li>
+<li>Update feed and analyzer dependency (#16327)</li>
+<li>Bump <code>Microsoft.NET.Test.Sdk</code> from 16.11.0 to 17.0.0 (#16312)</li>
+<li>Update license and cgmanifest (#16325) (Thanks @github-actions[bot]!)</li>
+<li>Fix condition in cgmanifest logic (#16324)</li>
+<li>Add GitHub Workflow to keep notices up to date (#16284)</li>
+<li>Update to latest .NET 6 GA build <code> 6.0.100-rtm.21527.11</code> (#16309)</li>
+<li>Create compliance build (#16286)</li>
+<li>Move mapping file into product repo and add Debian 11  (#16316)</li>
+<li>Add a major-minor build info JSON file (#16301)</li>
+<li>Clean up <code>crossgen</code> related build scripts also generate native symbols for <code>R2R</code> images (#16297)</li>
+<li>Fix Windows build ZIP packaging (#16299) (Thanks @kondratyev-nv!)</li>
+<li>Revert &quot;Update to use .NET 6 GA build (#16296)&quot; (#16308)</li>
+<li>Add <code>wget</code> as a dependency for Bootstrap script (#16303) (Thanks @kondratyev-nv!)</li>
+<li>Fix issues reported by code signing verification tool (#16291)</li>
+<li>Update to use .NET 6 GA build (#16296)</li>
+<li>Revert &quot;add GH workflow to keep the cgmanifest up to date.&quot; (#16294)</li>
+<li>Update ChangeLog for 7.2.0-rc.1 and also fix RPM packaging (#16290)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#16271)</li>
+<li>add GH workflow to keep the cgmanifest up to date.</li>
+<li>Update <code>ThirdPartyNotices.txt</code> (#16283)</li>
+<li>Update `testartifacts.yml` to use <code>ubuntu-latest</code> image (#16279)</li>
+<li>Update version of <code>Microsoft.PowerShell.Native</code> and <code>Microsoft.PowerShell.MarkdownRender</code> packages (#16277)</li>
+<li>Add script to generate <code>cgmanifest.json</code> (#16278)</li>
+<li>Add <code>cgmanifest.json</code> for generating correct third party notice file (#16266)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers from `6.0.0-rtm.21504.2` to `6.0.0-rtm.21516.1` (#16264)</li>
+<li>Only upload stable <code>buildinfo</code> for stable releases (#16251)</li>
+<li>Make RPM license recognized (#16189)</li>
+<li>Don't upload dep or tar.gz for RPM because there are none. (#16230)</li>
+<li>Add condition to generate release files in local dev build only (#16259)</li>
+<li>Update .NET 6 to version 6.0.100-rc.2.21505.57 (#16249)</li>
+<li>change order of try-catch-finally and split out arm runs (#16252)</li>
+<li>Ensure <code>psoptions.json</code> and <code>manifest.spdx.json</code> files always exist in packages (#16258)</li>
+<li>Update to vPack task version to 12 (#16250)</li>
+<li>Remove unneeded `NuGetConfigFile` resource string (#16232)</li>
+<li>Add Software Bill of Materials to the main packages (#16202)</li>
+<li>Sign third party exes (#16229)</li>
+<li>Upgrade <code>set-value</code> package for markdown test (#16196)</li>
+<li>Use Ubuntu 20.04 for SSH remoting test (#16225)</li>
+<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#16194)</li>
+<li>Bump `Microsoft.CodeAnalysis.NetAnalyzers` from `6.0.0-rc2.21458.5` to `6.0.0-rtm.21480.8` (#16183)</li>
+<li>Move vPack build to 1ES Pool (#16169)</li>
+<li>Fix Microsoft update spelling issue. (#16178)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update Windows PowerShell issues link (#16105) (Thanks @andschwa!)
+- Remove Joey from Committee and WG membership (#16119)
+- Update more docs for `net6.0` TFM (#16102) (Thanks @xtqqczze!)
+- Change `snippet` tag to `code` tag in XML comments (#16106)
+- Update build documentation to reflect .NET 6 (#15751) (Thanks @Kellen-Stuart!)
+- Update `README.md` about the change logs (#16471) (Thanks @powershellpr0mpt!)
+- Update change log for 7.2.0 (#16401)
+- Update `metadata.json` and `README.md` for 7.2.0 release (#16395)
+- Update `README.md` and `metadata.json` files for `v7.2.0-rc.1` release (#16285)
+- Update the change logs for `v7.0.8` and `v7.1.5` releases (#16248)
+
+[7.3.0-preview.1]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.10...v7.3.0-preview.1
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index 96163085408..035db721385 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,897 +1 @@
 # Current preview release
-
-## [7.3.0-rc.1] - 2022-10-26
-
-### Breaking Change
-
-- Update to use `ComputeCore.dll` for PowerShell Direct (#18194)
-
-### Engine Updates and Fixes
-
-- On Unix, explicitly terminate the native process during cleanup only if it's not running in background (#18215)
-
-### General Cmdlet Updates and Fixes
-
-- Remove the `ProcessorArchitecture` portion from the full name as it's obsolete (#18320)
-
-### Tests
-
-- Add missing `-Tag 'CI'` to describe blocks. (#18317)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-<p>Bump to .NET 7 to <code>7.0.100-rc.2.22477.20</code> (#18328)(#18286)</p>
-</summary>
-
-<ul>
-<li>Update ThirdPartyNotices (Internal 22987)</li>
-<li>Remove API sets (#18304) (#18376)</li>
-<li>Do not cleanup <code>pwsh.deps.json</code> for framework dependent packages (#18300)</li>
-<li>Bump <code>Microsoft.PowerShell.Native</code> from <code>7.3.0-preview.1</code> to <code>7.3.0-rc.1</code> (#18217)</li>
-<li>Remove unnecessary native dependencies from the package (#18213)</li>
-<li>Make the link to minimal package blob public during release (#18158)</li>
-<li>Create tasks to collect and publish hashes for build files. (#18276)(#18277)</li>
-<li>Add branch counter to compliance build (#18214)</li>
-<li>Move APIScan to compliance build (#18191)</li>
-<li>Update MSI exit message (#18137)</li>
-<li>Remove XML files for min-size package (#18189)</li>
-</ul>
-
-</details>
-
-[7.3.0-rc.1]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.8...v7.3.0-rc.1
-
-## [7.3.0-preview.8] - 2022-09-20
-
-### General Cmdlet Updates and Fixes
-
-- Filter out compiler generated types for `Add-Type -PassThru` (#18095)
-- Fix error formatting to use color defined in `$PSStyle.Formatting` (#17987)
-- Handle `PSObject` argument specially in method invocation logging (#18060)
-- Revert the experimental feature `PSStrictModeAssignment` (#18040)
-- Make experimental feature `PSAMSIMethodInvocationLogging` stable (#18041)
-- Make experimental feature `PSAnsiRenderingFileInfo` stable (#18042)
-- Make experimental feature `PSCleanBlock` stable (#18043)
-- Make experimental feature `PSNativeCommandArgumentPassing` stable (#18044)
-- Make experimental feature `PSExec` stable (#18045)
-- Make experimental feature `PSRemotingSSHTransportErrorHandling` stable (#18046)
-- Add the `ConfigurationFile` option to the PowerShell help content (#18093)
-
-### Build and Packaging Improvements
-
-<summary>
-<p>Bump .NET SDK to version `7.0.100-rc.1`</p>
-</summary>
-
-<details>
-<ul>
-<li>Update ThirdPartyNotices.txt for 7.3.0-preview.8 (Internal 22553)</li>
-<li>Update cgmanifest.json for 7.3.0-preview.8 (Internal 22551)</li>
-<li>Re-enable building with Ready-to-Run (#18107)</li>
-<li>Make sure <code>Security.types.ps1xml</code> gets signed in release build (#17930)</li>
-<li>Update <code>DotnetRuntimeMetadata.json</code> for .NET 7 RC1 build (#18106)</li>
-<li>Add XML reference documents to NuPkg files for SDK (#18017)</li>
-<li>Make Register MU timeout (#17995)</li>
-<li>Bump Microsoft.NET.Test.Sdk from 17.2.0 to 17.3.0 (#17924)</li>
-<li>Update list of PS team members in release tools (#17928)</li>
-<li>Update to use version 2.21.0 of Application Insights (#17927)</li>
-<li>Complete ongoing <code>Write-Progress</code> in test (#17922)</li>
-</ul>
-</details>
-
-[7.3.0-preview.8]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.7...v7.3.0-preview.8
-
-## [7.3.0-preview.7] - 2022-08-09
-
-### Breaking Changes
-
-- Move the type data definition of `System.Security.AccessControl.ObjectSecurity` to the `Microsoft.PowerShell.Security` module (#16355) (Thanks @iSazonov!)
-
-### Engine Updates and Fixes
-
-- Enable searching for assemblies in `GAC_Arm64` on Windows (#17816)
-- Fix parser exception in using statements with empty aliases (#16745) (Thanks @MartinGC94!)
-- Do not always collapse space between parameter and value for native arguments. (#17708)
-- Remove `PSNativePSPathResolution` experimental feature (#17670)
-
-### General Cmdlet Updates and Fixes
-
-- Fix for deserializing imported ordered dictionary (#15545) (Thanks @davidBar-On!)
-- Make generated implicit remoting modules backwards compatible with PowerShell 5.1 (#17227) (Thanks @Tadas!)
-- Re-enable IDE0031: Use Null propagation (#17811) (Thanks @fflaten!)
-- Allow commands to still be executed even if the current working directory no longer exists (#17579)
-- Stop referencing `Microsoft.PowerShell.Security` when the core snapin is used (#17771)
-- Add support for HTTPS with `Set-AuthenticodeSignature -TimeStampServer` (#16134) (Thanks @Ryan-Hutchison-USAF!)
-- Add type accelerator `ordered` for `OrderedDictionary` (#17804) (Thanks @fflaten!)
-- Fix the definition of the `PDH_COUNTER_INFO` struct (#17779)
-- Adding Virtualization Based Security feature names to Get-ComputerInfo (#16415) (Thanks @mattifestation!)
-- Fix `FileSystemProvider` to work with volume and pipe paths (#15873)
-- Remove pre-parse for array-based JSON (#15684) (Thanks @strawgate!)
-- Improve type inference for `$_` (#17716) (Thanks @MartinGC94!)
-- Prevent braces from being removed when completing variables (#17751) (Thanks @MartinGC94!)
-- Fix type inference for `ICollection` (#17752) (Thanks @MartinGC94!)
-- Fix `Test-Json` not handling non-object types at root (#17741) (Thanks @dkaszews!)
-- Change `Get-ChildItem` to treat trailing slash in path as indicating a directory when used with `-Recurse` (#17704)
-- Add `find.exe` to legacy argument binding behavior for Windows (#17715)
-- Add completion for index expressions for dictionaries (#17619) (Thanks @MartinGC94!)
-- Fix enum-ranges for `ValidateRange` in proxy commands (#17572) (Thanks @fflaten!)
-- Fix type completion for attribute tokens (#17484) (Thanks @MartinGC94!)
-- Add `-noprofileloadtime` switch to `pwsh` (#17535) (Thanks @rkeithhill!)
-- Fix legacy `ErrorView` types to use `$host.PrivateData` colors (#17705)
-- Improve dynamic parameter tab completion (#17661) (Thanks @MartinGC94!)
-- Avoid binding positional parameters when completing parameter in front of value (#17693) (Thanks @MartinGC94!)
-- Render decimal numbers in a table using current culture (#17650)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@fflaten, @Molkree, @eltociear</p>
-
-</summary>
-
-<ul>
-<li>Fix other path constructions using <code>Path.Join</code> (#17825)</li>
-<li>Use null propagation (#17787)(#17789)(#17790)(#17791)(#17792)(#17795) (Thanks @fflaten!)</li>
-<li>Re-enable compound assignment preference (#17784) (Thanks @Molkree!)</li>
-<li>Use null-coalescing assignment (#17719)(#17720)(#17721)(#17722)(#17723)(#17724)(#17725)(#17726)(#17727)(#17728)(#17729) (Thanks @Molkree!)</li>
-<li>Disable the warning <code>IDE0031</code> to take .NET 7 Preview 7 (#17770)</li>
-<li>Fix typo in <ode>ModuleCmdletBase.cs</code> (#17714) (Thanks @eltociear!)</li>
-</ul>
-
-</details>
-
-### Tests
-
-- Re-enable tests because the corresponding dotnet issues were fixed (#17839)
-- Add test for `LanguageMode` using remoting (#17803) (Thanks @fflaten!)
-- Fix test perf by stopping ongoing `write-progress` (#17749) (Thanks @fflaten!)
-- Re-enable the test `TestLoadNativeInMemoryAssembly` (#17738)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@varunsh-coder, @dkaszews, @Molkree, @ChuckieChen945</p>
-
-</summary>
-
-<ul>
-<li>Update release pipeline to use Approvals and automate some manual tasks (#17837)</li>
-<li>Add GitHub token permissions for workflows (#17781) (Thanks @varunsh-coder!)</li>
-<li>Bump actions/github-script from 3 to 6 (#17842)</li>
-<li>Bump cirrus-actions/rebase from 1.6 to 1.7 (#17843)</li>
-<li>Remove unneeded verbose message in build (#17840)</li>
-<li>Detect default runtime using dotnet --info in build.psm1 (#17818) (Thanks @dkaszews!)</li>
-<li>Bump <code>actions/checkout</code> from 2 to 3 (#17828)</li>
-<li>Bump <code>actions/download-artifact</code> from 2 to 3 (#17829)</li>
-<li>Bump <code>github/codeql-action</code> from 1 to 2 (#17830)</li>
-<li>Bump <code>peter-evans/create-pull-request</code> from 3 to 4 (#17831)</li>
-<li>Bump <code>actions/upload-artifact</code> from 2 to 3 (#17832)</li>
-<li>Enable Dependabot for GitHub Actions (#17775) (Thanks @Molkree!)</li>
-<li>Update .NET SDK version from <code>7.0.100-preview.6.22352.1</code> to <code>7.0.100-preview.7.22377.5</code> (#17776)</li>
-<li>Fix a bug in <code>install-powershell.ps1</code> (#17794) (Thanks @ChuckieChen945!)</li>
-<li>Bump xunit from 2.4.1 to 2.4.2 (#17817)</li>
-<li>Update how to update homebrew (#17798)</li>
-<li>Don't run link check on forks (#17797)</li>
-<li>Update dotnetmetadata.json to start consuming .NET 7 preview 7 builds (#17736)</li>
-<li>Bump PackageManagement from 1.4.7 to 1.4.8.1 (#17709)</li>
-<li>Exclude ARM images from running in CI (#17713)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Update the comment about why R2R is disabled (#17850)
-- Update changelog and `.spelling` for `7.3.0-preview.6` release (#17835)
-- Updated `ADOPTERS.md` for Power BI (#17766)
-- Update README.md with the current Fedora version (#15717) (Thanks @ananya26-vishnoi!)
-- Update `README` and `metadata.json` for next release (#17676) (Thanks @SeeminglyScience!)
-
-[7.3.0-preview.7]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.6...v7.3.0-preview.7
-
-## [7.3.0-preview.6] - 2022-07-18
-
-### General Cmdlet Updates and Fixes
-
-- Fix `Export-PSSession` to not throw error when a rooted path is specified for `-OutputModule` (#17671)
-- Change `ConvertFrom-Json -AsHashtable` to use ordered hashtable (#17405)
-- Remove potential ANSI escape sequences in strings before using in `Out-GridView` (#17664)
-- Add the `-Milliseconds` parameter to `New-TimeSpan` (#17621) (Thanks @NoMoreFood!)
-- Update `Set-AuthenticodeSignature` to use `SHA256` as the default (#17560) (Thanks @jborean93!)
-- Fix tab completion regression when completing `ValidateSet` values (#17628) (Thanks @MartinGC94!)
-- Show optional parameters as such when displaying method definition and overloads (#13799) (Thanks @eugenesmlv!)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@sethvs, @MartinGC94, @eltociear</p>
-
-</summary>
-
-<ul>
-<li>Fix comment in InternalCommands.cs (#17669) (Thanks @sethvs!)</li>
-<li>Use discards for unused variables (#17620) (Thanks @MartinGC94!)</li>
-<li>Fix typo in CommonCommandParameters.cs (#17524) (Thanks @eltociear!)</li>
-</ul>
-
-</details>
-
-### Tests
-
-- Fix SDK tests for release build (#17678)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@tamasvajk</p>
-
-</summary>
-
-<ul>
-<li>Create test artifacts for Windows ARM64 (#17675)</li>
-<li>Update to the latest NOTICES file (#17607)</li>
-<li>Update .NET SDK version from <code>7.0.100-preview.5.22307.18</code> to <code>7.0.100-preview.6.22352.1</code> (#17634)</li>
-<li>Set the compound assignment preference to false (#17632)</li>
-<li>Update DotnetMetadata.json to start consuming .NET 7 Preview 6 builds (#17630)</li>
-<li>Install .NET 3.1 as it is required by the vPack task (#17600)</li>
-<li>Update to use PSReadLine <code>v2.2.6</code> (#17595)</li>
-<li>Fix <code>build.psm1</code> to not specify both version and quality for <code>dotnet-install</code> (#17589) (Thanks @tamasvajk!)</li>
-<li>Bump Newtonsoft.Json in /test/perf/dotnet-tools/Reporting (#17592)</li>
-<li>Bump Newtonsoft.Json in /test/perf/dotnet-tools/ResultsComparer (#17566)</li>
-<li>Disable RPM SBOM test. (#17532)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Remove `katacoda.com` from doc as it now returns 404 (#17625)
-- Update change log for `v7.2.5` and `v7.3.0-preview.5` (#17565)
-- Update `README.md` and `metadata.json` for upcoming releases (#17526)
-
-[7.3.0-preview.6]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.5...v7.3.0-preview.6
-
-## [7.3.0-preview.5] - 2022-06-21
-
-### Engine Updates and Fixes
-
-- Improve type inference and completions (#16963) (Thanks @MartinGC94!)
-- Make `Out-String` and `Out-File` keep string input unchanged (#17455)
-- Make `AnsiRegex` able to capture Hyperlink ANSI sequences (#17442)
-- Add the `-ConfigurationFile` command line parameter to `pwsh` to support local session configuration (#17447)
-- Fix native library loading for `osx-arm64` (#17365) (Thanks @awakecoding!)
-- Fix formatting to act appropriately when the style of table header or list label is empty string (#17463)
-
-### General Cmdlet Updates and Fixes
-
-- Fix various completion issues inside the `param` block (#17489) (Thanks @MartinGC94!)
-- Add Amended switch to `Get-CimClass` cmdlet (#17477) (Thanks @iSazonov!)
-- Improve completion on operators (#17486) (Thanks @MartinGC94!)
-- Improve array element completion for command arguments (#17078) (Thanks @matt9ucci!)
-- Use AST extent for `PSScriptRoot` path completion (#17376)
-- Add type inference support for generic methods with type parameters (#16951) (Thanks @MartinGC94!)
-- Write out OSC indicator only if the `stdout` is not redirected (#17419)
-- Remove the assert and use a relatively larger capacity to cover possible increase of .NET reference assemblies (#17423)
-- Increase reference assembly count to 161 (#17420)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@Yulv-git, @eltociear</p>
-
-</summary>
-
-<ul>
-<li>Fix some typos in source code (#17481) (Thanks @Yulv-git!)</li>
-<li>Fix typo in `AsyncResult.cs` (#17396) (Thanks @eltociear!)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Update script to pin to .NET 7 preview 5 version (#17448)
-- Start-PSPester: argument completer for `-Path` (#17334) (Thanks @powercode!)
-- Add reminder workflows (#17387)
-- Move to configuring the fabric bot via JSON (#17411)
-- Update Documentation Issue Template URL (#17410) (Thanks @michaeltlombardi!)
-- Update script to automatically take new preview pre-release builds (#17375)
-
-### Tests
-
-- Make Assembly Load Native test work on a FX Dependent Linux Install (#17380)
-- Update `Get-Error` test to not depend on DNS APIs (#17471)
-
-### Build and Packaging Improvements
-
-<details>
-
-<ul>
-<li>Update .NET SDK version from <code>7.0.100-preview.4.22252.9</code> to <code>7.0.100-preview.5.22307.18</code> (#17402)</li>
-<li>Downgrade the <code>Microsoft.CodeAnalysis.NetAnalyzers</code> package to <code>7.0.0-preview1.22217.1</code> (#17515)</li>
-<li>Rename mariner package to cm (#17505)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#17476)</li>
-<li>Bump <code>NJsonSchema</code> from 10.7.1 to 10.7.2 (#17475)</li>
-<li>Publish preview versions of mariner to preview repo (#17451)</li>
-<li>Update to the latest NOTICES file (#17421)</li>
-<li>Do not publish package for Mariner 1.0 (#17415)</li>
-<li>Add <code>AppX</code> capabilities in MSIX manifest so that PS7 can call the <code>AppX</code> APIs (#17416)</li>
-<li>Update to the latest NOTICES file (#17401)</li>
-<li>Fix mariner mappings (#17413)</li>
-<li>Update the cgmanifest (#17393)</li>
-<li>Bump `NJsonSchema` from `10.7.0` to `10.7.1` (#17381)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Update to the latest NOTICES file (#17493) (Thanks @github-actions[bot]!)
-- Update the cgmanifest (#17478) (Thanks @github-actions[bot]!)
-- Correct spelling in Comments and tests (#17480) (Thanks @Yulv-git!)
-- Fix spelling errors introduced in changelog (#17414)
-- Update change log for v7.3.0-preview.4 release (#17412)
-- Update readme and metadata for 7.3.0-preview.4 release (#17378)
-
-[7.3.0-preview.5]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.4...v7.3.0-preview.5
-
-## [7.3.0-preview.4] - 2022-05-23
-
-### Engine Updates and Fixes
-
-<ul>
-<li>Remove the use of <code>BinaryFormatter</code> in PSRP serialization (#17133) (Thanks @jborean93!)</li>
-<li>Update telemetry collection removing unused data and adding some new data (#17304)</li>
-<li>Fix the word wrapping in formatting to handle escape sequences properly (#17316)</li>
-<li>Fix the error message in Hashtable-to-object conversion (#17329)</li>
-<li>Add support for new WDAC API (#17247)</li>
-<li>On Windows, reset cursor visibility back to previous state when rendering progress (#16782)</li>
-<li>Fix the list view to not leak VT decorations (#17262)</li>
-<li>Fix formatting truncation to handle strings with VT sequences (#17251)</li>
-<li>Fix line breakpoints for <code>return</code> statements without a value (#17179)</li>
-<li>Fix for partial PowerShell module search paths, that can be resolved to CWD locations (#17231) (Internal 20126)</li>
-<li>Change logic in the testing helper module for determining whether <code>PSHOME</code> is writable (#17218)</li>
-<li>Make a variable assignment in a <code>ParenExpression</code> to return the variable value (#17174)</li>
-<li>Use new Windows signature APIs from <code>Microsoft.Security.Extensions</code> package (#17159)</li>
-<li>Do not include node names when sending telemetry. (#16981)</li>
-<li>Support forward slashes in network share (UNC path) completion (#17111) (#17117) (Thanks @sba923!)</li>
-<li>Do not generate clean block in proxy function when the feature is disabled (#17112)</li>
-<li>Ignore failure attempting to set console window title (#16948)</li>
-<li>Update regex used to remove ANSI escape sequences to be more specific to decoration and CSI sequences (#16811)</li>
-<li>Improve member auto completion (#16504) (Thanks @MartinGC94!)</li>
-<li>Prioritize <code>ValidateSet</code> completions over Enums for parameters (#15257) (Thanks @MartinGC94!)</li>
-<li>Add Custom Remote Connections Feature (#17011)</li>
-</ul>
-
-### General Cmdlet Updates and Fixes
-
-<ul>
-<li>Add check for <code>ScriptBlock</code> wrapped in <code>PSObject</code> to <code>$using</code> used in <code>ForEach-Object -Parallel</code> (#17234) (Thanks @ryneandal!)</li>
-<li>Fix <code>ForEach</code> method to set property on a scalar object (#17213)</li>
-<li>Fix <code>Sort-Object -Stable -Unique</code> to actually do stable sorting (#17189) (Thanks @m1k0net!)</li>
-<li>Add <code>OutputType</code> attribute to various commands (#16962) (Thanks @MartinGC94!)</li>
-<li>Make <code>Stop-Service</code> only request needed privileges when not setting SDDL. (#16663) (Thanks @kvprasoon!)</li>
-</ul>
-
-### Code Cleanup
-
-<ul>
-<li>Remove <code>EventLogLogProvider</code> and its related legacy code (#17027)</li>
-<li>Fix typos in names of method (#17003) (Thanks @al-cheb!)</li>
-<li>SemanticChecks: Avoid repeated type resolution of <code>[ordered]</code> (#17328) (Thanks IISResetMe!)</li>
-<li>Redo the change that was reverted by #15853 (#17357)</li>
-<li>Correct spelling of <code>pseudo</code> in <code>Compiler.cs</code> (#17285) (Thanks @eltociear!)</li>
-<li>Make<code>NameObscurerTelemetryInitializer</code> internal (#17214)</li>
-<li>Make <code>NameObscurerTelemetryInitializer</code> internal (#17167)</li>
-<li>Correct Typo in the resource string <code>PathResolvedToMultiple</code> (#17098) (Thanks @charltonstanley!)</li>
-<li>Fix typo in <code>ComRuntimeHelpers.cs</code> (#17104) (Thanks @eltociear!)</li>
-</ul>
-
-### Documentation and Help Content
-
-<ul>
-<li>Update link to PowerShell remoting in depth video (#17166)</li>
-</ul>
-
-### Tests
-
-<ul>
-<li>Add <code>-because</code> to the failing test to aid in debugging (#17030)</li>
-<li>Simplify Enum generator for the <code>-bnot</code> operator test (#17014)</li>
-<li>Improve unique naming for tests (#17043)</li>
-<li>Use a random string for the missing help topic to improve the chances that the help topic really won't be found. (#17042)</li>
-</ul>
-
-### Build and Packaging Improvements
-
-<ul>
-<li>Update <code>README.md</code> and <code>metadata.json</code> for v7.3.0-preview.3 release (#17029)</li>
-<li>Do not pull dotnet updates from internal feed (#17007)</li>
-<li>Simplify <code>Get-WSManSupport</code> based on current .NET Distro Support (#17356)</li>
-<li>Update to the latest NOTICES file (#17372, #17332, #17311, #17275)</li>
-<li>Run on every PR and let the action skip (#17366)</li>
-<li>Make sure verbose message is not null (#17363)</li>
-<li>Release changelogs (#17364)</li>
-<li>Update build versions (#17318)</li>
-<li>Add Daily Link Check GitHub Workflow (#17351)</li>
-<li>Update the cgmanifest (#17361, #17344, #17324, #17302, #17268)</li>
-<li>Bump <code>NJsonSchema</code> from <code>10.6.10</code> to <code>10.7.0</code> (#17350)</li>
-<li>Disable broken macOS CI job, which is unused (#17221)</li>
-<li>Have rebase workflow Post a message when it starts (#17341)</li>
-<li>Update <code>DotnetRuntimeMetadata.json</code> for .NET 7 Preview 4 (#17336)</li>
-<li>Update Ubuntu 22 to be detected as not supported WSMan (#17338)</li>
-<li>Bump xunit.runner.visualstudio from 2.4.3 to 2.4.5 (#17274)</li>
-<li>Make sure we execute tests on LTS package for older LTS releases (#17326)</li>
-<li>Bump Microsoft.NET.Test.Sdk from 17.1.0 to 17.2.0 (#17320)</li>
-<li>Add fedora to the OS's that can't run WSMan (#17325)</li>
-<li>Add sles15 support to <code>install-powershell.sh</code> (#16984)</li>
-<li>Start rotating through all images (#17315)</li>
-<li>Update .NET SDK version from <code>7.0.100-preview.2.22153.17</code> to <code>7.0.100-preview.4.22252.9</code> (#17061)</li>
-<li>Disable release security analysis for SSH CI (#17303)</li>
-<li>Add a finalize template which causes jobs with issues to fail (#17314)</li>
-<li>Add mapping for ubuntu22.04 jammy (#17317)</li>
-<li>Enable more tests to be run in a container. (#17294)</li>
-<li>Fix <code>build.psm1</code> to find the required .NET SDK version when a higher version is installed (#17299)</li>
-<li>Improve how Linux container CI builds are identified (#17295)</li>
-<li>Only inject NuGet security analysis if we are using secure <code>nuget.config</code> (#17293)</li>
-<li>Reduce unneeded verbose message from <code>build.psm1</code> (#17291)</li>
-<li>Switch to using GitHub action to verify markdown links for PRs (#17281)</li>
-<li>Put Secure supply chain analysis at correct place (#17273)</li>
-<li>Fix build id variable name when selecting CI container (#17279)</li>
-<li>Add rotation between the two mariner images (#17277)</li>
-<li>Update to use <code>mcr.microsoft.com</code> (#17272)</li>
-<li>Update engine working group members (#17271)</li>
-<li>Bump PSReadLine from 2.2.2 to 2.2.5 in /src/Modules (#17252)</li>
-<li>Update timeout for daily (#17263)</li>
-<li>Bump NJsonSchema from 10.6.9 to 10.6.10 (#16902)</li>
-<li>Update the <code>cgmanifest</code> (#17260)</li>
-<li>Fix Generate checksum file for packages build failure - v7.1.7 (#17219) (Internal 20274)</li>
-<li>Move <code>cgmanifest</code> generation to daily (#17258)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#17245)</li>
-<li>Update to the latest notice file (#17238)</li>
-<li>Add container to Linux CI (#17233)</li>
-<li>Mark <code>Microsoft.Management.Infrastructure.Runtime.Win</code> as a developer dependency to hide in notice file (#17230)</li>
-<li>Fixing dotnet SDK version parsing in <code>build.psm1</code> (#17198) (Thanks @powercode!)</li>
-<li>Fixed package names verification to support multi-digit versions (#17220)</li>
-<li>Bump Microsoft.CodeAnalysis.CSharp from 4.2.0-1.final to 4.2.0-4.final (#17210)</li>
-<li>Add backport action (#17212)</li>
-<li>Updated change logs for v7.0.9 / v7.0.10 / v7.1.6 / v7.1.7 / v7.2.2 / v7.2.3  (#17207)</li>
-<li>Updated metadata.json and README.md for v7.2.3 and v7.0.10 (#17158)</li>
-<li>Update package fallback list for ubuntu (from those updated for ubuntu 22.04) (deb) (#17180)</li>
-<li>Update <code>wix</code> to include security extensions package (#17171)</li>
-<li>Update rebase.yml (#17170)</li>
-<li>Adds sha256 digests to RPM packages (#16896) (Thanks @ngharo!)</li>
-<li>Make mariner packages Framework dependent (#17151)</li>
-<li>Update to the latest notice file (#17169)</li>
-<li>Update to the latest notice file (#17146)</li>
-<li>Replace <code>.</code> in notices container name (#17154)</li>
-<li>Allow multiple installations of dotnet. (#17141)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#17105)</li>
-<li>Update to the latest notice file (#16437)</li>
-<li>Skip failing scriptblock tests (#17093)</li>
-<li>Update dotnet-install script download link (#17086)</li>
-<li>Fix the version of the <code>Microsoft.CodeAnalysis.NetAnalyzers</code> package (#17075)</li>
-<li>Update <code>dotnetmetadata.json</code> to accept .NET 7 preview 3 builds (#17063)</li>
-<li>Re-enable <code>PowerShellGet</code> tests targeting PowerShell gallery (#17062)</li>
-<li>Add mariner 1.0 amd64 package (#17057)</li>
-<li>Create checksum file for global tools (#17056)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#17065)</li>
-<li>Use new cask format (#17064)</li>
-</ul>
-
-[7.3.0-preview.4]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.3...v7.3.0-preview.4
-
-## [7.3.0-preview.3] - 2022-03-21
-
-### Engine Updates and Fixes
-
-- Fix the parsing code for .NET method generic arguments (#16937)
-- Allow the `PSGetMemberBinder` to get value of `ByRef` property (#16956)
-- Allow a collection that contains `Automation.Null` elements to be piped to pipeline (#16957)
-
-### General Cmdlet Updates and Fixes
-
-- Add the module `CompatPowerShellGet` to the allow-list of telemetry modules (#16935)
-- Fix `Enter-PSHostProcess` and `Get-PSHostProcessInfo` cmdlets by handling processes that have exited (#16946)
-- Improve Hashtable completion in multiple scenarios (#16498) (Thanks @MartinGC94!)
-
-### Code Cleanup
-
-- Fix a typo in `CommandHelpProvider.cs` (#16949) (Thanks @eltociear!)
-
-### Tests
-
-- Update a few tests to make them more stable in CI (#16944)
-- Roll back Windows images used in testing to Windows Server 2019 (#16958)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-<p>Update .NET SDK to 7.0.0-preview.2</p>
-</summary>
-
-<ul>
-<li>Update .NET to 7.0.0-preview.2 build (#16930)</li>
-<li>Update <code>AzureFileCopy</code> task and fix the syntax for specifying <code>pool</code> (#17013)</li>
-</ul>
-
-</details>
-
-[7.3.0-preview.3]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.2...v7.3.0-preview.3
-
-## [7.3.0-preview.2] - 2022-02-24
-
-### Engine Updates and Fixes
-
-- Fix the `clean` block for generated proxy function (#16827)
-- Add support to allow invoking method with generic type arguments (#12412 and #16822) (Thanks @vexx32!)
-- Report error when PowerShell built-in modules are missing (#16628)
-
-### General Cmdlet Updates and Fixes
-
-- Prevent command completion if the word to complete is a single dash (#16781) (Thanks @ayousuf23!)
-- Use `FindFirstFileW` instead of `FindFirstFileExW` to correctly handle Unicode file names on FAT32 (#16840) (Thanks @iSazonov!)
-- Add completion for loop labels after Break/Continue (#16438) (Thanks @MartinGC94!)
-- Support OpenSSH options for `PSRP` over SSH commands (#12802) (Thanks @BrannenGH!)
-- Adds a `.ResolvedTarget` Property to `File-System` Items to Reflect a Symlink's Target as `FileSystemInfo` (#16490) (Thanks @hammy3502!)
-- Use `NotifyEndApplication` to re-enable VT mode (#16612)
-- Add new parameter to `Start-Sleep`: `[-Duration] <timespan>` (#16185) (Thanks @IISResetMe!)
-- Add lock and null check to remoting internals (#16542) (#16683) (Thanks @SergeyZalyadeev!)
-- Make `Measure-Object` ignore missing properties unless running in strict mode (#16589) (Thanks @KiwiThePoodle!)
-- Add `-StrictMode` to `Invoke-Command` to allow specifying strict mode when invoking command locally (#16545) (Thanks @Thomas-Yu!)
-- Fix `$PSNativeCommandArgPassing` = `Windows` to handle empty args correctly (#16639)
-- Reduce the amount of startup banner text (#16516) (Thanks @rkeithhill!)
-- Add `exec` cmdlet for bash compatibility (#16462)
-- Add AMSI method invocation logging as experimental feature (#16496)
-- Fix web cmdlets so that an empty `Get` does not include a `content-length` header (#16587)
-- Update `HelpInfoUri` for 7.3 release (#16646)
-- Fix parsing `SemanticVersion` build label from version string (#16608)
-- Fix `ForEach-Object -Parallel` when passing in script block variable (#16564)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@eltociear, @iSazonov, @xtqqczze</p>
-
-</summary>
-
-<ul>
-<li>Fix typo in PowerShellExecutionHelper.cs (#16776) (Thanks @eltociear!)</li>
-<li>Use more efficient platform detection API (#16760) (Thanks @iSazonov!)</li>
-<li>Seal <code>ClientRemotePowerShell</code> (#15802) (Thanks @xtqqczze!)</li>
-<li>Fix the DSC overview URL in a markdown file and some small cleanup changes (#16629)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Fix automation to update experimental JSON files in GitHub action (#16837)
-
-### Tests
-
-- Update `markdownlint` to the latest version (#16825)
-- Bump the package `path-parse` from `1.0.6` to `1.0.7` (#16820)
-- Remove assert that is incorrect and affecting our tests (#16588)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@dahlia</p>
-
-</summary>
-
-<ul>
-<li>Update NuGet Testing to not re-install dotnet,
-when not needed and dynamically determine the DOTNET_ROOT (Internal 19268, 19269, 19272, 19273, and 19274)</li>
-<li>Remove SkipExperimentalFeatureGeneration when building alpine (Internal 19248)</li>
-<li>Revert .NET 7 changes, Update to the latest .NET 6 and Update WXS file due to blocking issue in .NET 7 Preview 1 </li>
-<li>Install and Find AzCopy</li>
-<li>Use Start-PSBootStrap for installing .NET during nuget packaging</li>
-<li>Fix pool syntax for deployments (Internal 19189)</li>
-<li>Bump NJsonSchema from 10.5.2 to 10.6.9 (#16888)</li>
-<li>Update projects and scripts to use .NET 7 preview 1 pre-release builds (#16856)</li>
-<li>Add warning messages when package precheck fails (#16867)</li>
-<li>Refactor Global Tool packaging to include SBOM generation (#16860)</li>
-<li>Update to use <code>windows-latest</code> as the build agent image (#16831)</li>
-<li>Ensure alpine and arm SKUs have <code>powershell.config.json</code> file with experimental features enabled (#16823)</li>
-<li>Update experimental feature json files (#16838) (Thanks @github-actions[bot]!)</li>
-<li>Remove WiX install (#16834)</li>
-<li>Add experimental json update automation (#16833)</li>
-<li>Update .NET SDK to 6.0.101 and fix <code>Microsoft.PowerShell.GlobalTool.Shim.csproj</code> (#16821)</li>
-<li>Add SBOM manifest to nuget packages (#16711)</li>
-<li>Improve logic for updating .NET in CI (#16808)</li>
-<li>Add Linux package dependencies for packaging (#16807)</li>
-<li>Switch to our custom images for build and release (#16801)</li>
-<li>Remove all references to <code>cmake</code> for the builds in this repo (#16578)</li>
-<li>Fix build for new <code>InvokeCommand</code> attributes (#16800)</li>
-<li>Let macOS installer run without Rosetta on Apple Silicon (#16742) (Thanks @dahlia!)</li>
-<li>Update the expect .NET SDK quality to GA for installing dotnet (#16784)</li>
-<li>Change nuget release yaml to use <code>UseDotNet</code> task (#16701)</li>
-<li>Bump Microsoft.ApplicationInsights from 2.19.0 to 2.20.0 (#16642)</li>
-<li>Register NuGet source when generating <code>CGManifest</code> (#16570)</li>
-<li>Update Images used for release (#16580)</li>
-<li>Update SBOM generation (#16641)</li>
-<li>Bring changes from 7.3.0-preview.1 (#16640)</li>
-<li>Update the <code>vmImage</code> and PowerShell root directory for macOS builds (#16611)</li>
-<li>Update macOS build image and root folder for build (#16609)</li>
-<li>Disabled Yarn cache in markdown.yml (#16599)</li>
-<li>Update cgmanifest (#16600)</li>
-<li>Fix broken links in markdown (#16598)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Add newly joined members to their respective Working Groups (#16849)
-- Update Engine Working Group members (#16780)
-- Replace the broken link about pull request (#16771)
-- Update change log to remove a broken URL (#16735)
-- Updated `README.md` and `metadata.json` for `v7.3.0-preview.1` release (#16627)
-- Updating changelog for `7.2.1` (#16616)
-- Updated `README.md` and `metadata.json` for `7.2.1` release (#16586)
-
-[7.3.0-preview.2]: https://github.com/PowerShell/PowerShell/compare/v7.3.0-preview.1...v7.3.0-preview.2
-
-## [7.3.0-preview.1] - 2021-12-16
-
-### Breaking Changes
-
-- Add `clean` block to script block as a peer to `begin`, `process`, and `end` to allow easy resource cleanup (#15177)
-- Change default for `$PSStyle.OutputRendering` to `Ansi` (Internal 18449)
-
-### Engine Updates and Fixes
-
-- Remove duplicate remote server mediator code (#16027)
-- Fix `PSVersion` parameter version checks and error messages for PowerShell 7 remoting (#16228)
-- Use the same temporary home directory when `HOME` env variable is not set (#16263)
-- Fix parser to generate error when array has more than 32 dimensions (#16276)
-
-### Performance
-
-- Avoid validation for built-in file extension and color VT sequences (#16320) (Thanks @iSazonov!)
-
-### General Cmdlet Updates and Fixes
-
-- Update `README.md` and `metadata.json` for next preview release (#16107)
-- Use `PlainText` when writing to a host that doesn't support VT (#16092)
-- Remove support for `AppExeCLinks` to retrieve target (#16044)
-- Move `GetOuputString()` and `GetFormatStyleString()` to `PSHostUserInterface` as public API (#16075)
-- Fix `ConvertTo-SecureString` with key regression due to .NET breaking change (#16068)
-- Fix regression in `Move-Item` to only fallback to `copy and delete` in specific cases (#16029)
-- Set `$?` correctly for command expression with redirections (#16046)
-- Use `CurrentCulture` when handling conversions to `DateTime` in `Add-History` (#16005) (Thanks @vexx32!)
-- Fix link header parsing to handle unquoted `rel` types (#15973) (Thanks @StevenLiekens!)
-- Fix a casting error when using `$PSNativeCommandUsesErrorActionPreference` (#15993)
-- Format-Wide: Fix `NullReferenceException` (#15990) (Thanks @DarylGraves!)
-- Make the native command error handling optionally honor `ErrorActionPreference` (#15897)
-- Remove declaration of experimental features in Utility module manifest as they are stable (#16460)
-- Fix race condition between `DisconnectAsync` and `Dispose` (#16536) (Thanks @i3arnon!)
-- Fix the `Max_PATH` condition check to handle long path correctly (#16487) (Thanks @Shriram0908!)
-- Update `HelpInfoUri` for 7.2 release (#16456)
-- Fix tab completion within the script block specified for the `ValidateScriptAttribute`. (#14550) (Thanks @MartinGC94!)
-- Update `README.md` to specify gathered telemetry (#16379)
-- Fix typo for "privacy" in MSI installer (#16407)
-- Remove unneeded call to `File.ResolveLinkTarget` from `IsWindowsApplication` (#16371) (Thanks @iSazonov!)
-- Add `-HttpVersion` parameter to web cmdlets (#15853) (Thanks @hayhay27!)
-- Add support to web cmdlets for open-ended input tags (#16193) (Thanks @farmerau!)
-- Add more tests to `Tee-Object -Encoding` (#14539) (Thanks @rpolley!)
-- Don't throw exception when trying to resolve a possible link path (#16310)
-- Fix `ConvertTo-Json -Depth` to allow 100 at maximum (#16197) (Thanks @KevRitchie!)
-- Fix for SSH remoting when banner is enabled on SSHD endpoint (#16205)
-- Disallow all COM for AppLocker system lock down (#16268)
-- Configure `ApplicationInsights` to not send cloud role name (#16246)
-- Disallow `Add-Type` in NoLanguage mode on a locked down machine (#16245)
-- Specify the executable path as `TargetObect` for non-zero exit code `ErrorRecord` (#16108) (Thanks @rkeithhill!)
-- Don't allow `Move-Item` with FileSystemProvider to move a directory into itself (#16198)
-- Make property names for the color VT sequences consistent with documentations (#16212)
-- Fix `PipelineVariable` to set variable in the right scope (#16199)
-- Invoke-Command: improve handling of variables with $using: expression (#16113) (Thanks @dwtaber!)
-- Change `Target` from a `CodeProperty` to be an `AliasProperty` that points to `FileSystemInfo.LinkTarget` (#16165)
-
-### Code Cleanup
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@xtqqczze, @eltociear, @iSazonov</p>
-
-</summary>
-
-<ul>
-<li>Improve <code>CommandInvocationIntrinsics</code> API documentation and style (#14369)</li>
-<li>Use <code>bool?.GetValueOrDefault()</code> in <code>FormatWideCommand</code> (#15988) (Thanks @xtqqczze!)</li>
-<li>Remove 4 assertions which cause debug build test runs to fail (#15963)</li>
-<li>Fix typo in `Job.cs` (#16454) (Thanks @eltociear!)</li>
-<li>Remove unnecessary call to `ToArray` (#16307) (Thanks @iSazonov!)</li>
-<li>Remove the unused `FollowSymLink` function (#16231)</li>
-<li>Fix typo in `TypeTable.cs` (#16220) (Thanks @eltociear!)</li>
-<li>Fixes #16176 - replace snippet tag with code tag in comments (#16177)</li>
-</ul>
-
-</details>
-
-### Tools
-
-- Fix typo in build.psm1 (#16038) (Thanks @eltociear!)
-- Add `.stylecop` to `filetypexml` and format it (#16025)
-- Enable sending Teams notification when workflow fails (#15982)
-- Use `Convert-Path` for unknown drive in `Build.psm1` (#16416) (Thanks @matt9ucci!)
-
-### Tests
-
-- Add benchmark to test compiler performance (#16083)
-- Enable two previously disabled `Get-Process` tests (#15845) (Thanks @iSazonov!)
-- Set clean state before testing `UseMU` in the MSI (#16543)
-- Fix global tool and SDK tests in release pipeline (#16342)
-- Remove the outdated test (#16269)
-- Removed old not-used-anymore docker-based tests for PS release packages (#16224)
-
-### Build and Packaging Improvements
-
-<details>
-
-<summary>
-
-<p>We thank the following contributors!</p>
-<p>@github-actions[bot], @kondratyev-nv</p>
-
-</summary>
-
-<ul>
-<li>fix issue with hash file getting created before we have finished get-childitem (#16170)</li>
-<li>Add sha256 hashes to release (#16147)</li>
-<li>Change path for Component Governance for build to the path we actually use to build (#16137)</li>
-<li>Update <code>Microsoft.CodeAnalysis.CSharp</code> version (#16138)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#16070)</li>
-<li>Update .NET to <code>6.0.100-rc.1.21458.32</code> (#16066)</li>
-<li>Update minimum required OS version for macOS (#16088)</li>
-<li>Set locale correctly on Linux CI (#16073)</li>
-<li>Ensure locale is set correctly on Ubuntu 20.04 in CI (#16067)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#16045)</li>
-<li>Update .NET SDK version from `6.0.100-rc.1.21430.44` to `6.0.100-rc.1.21455.2` (#16041) (Thanks @github-actions[bot]!)</li>
-<li>Fix the GitHub Action for updating .NET daily builds (#16042)</li>
-<li>Bump Microsoft.CodeAnalysis.CSharp from 4.0.0-3.final to 4.0.0-4.21430.4 (#16036)</li>
-<li>Bump .NET to `6.0.100-rc.1.21430.44` (#16028)</li>
-<li>Move from <code>PkgES</code> hosted agents to 1ES hosted agents (#16023)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#16021)</li>
-<li>Update Ubuntu images to use Ubuntu 20.04 (#15906)</li>
-<li>Fix the mac build by updating the pool image name (#16010)</li>
-<li>Use Alpine 3.12 for building PowerShell for alpine (#16008)</li>
-<li>Update .NET SDK version from `6.0.100-preview.6.21355.2` to `6.0.100-rc.1.21426.1` (#15648) (Thanks @github-actions[bot]!)</li>
-<li>Ignore error from <code>Find-Package</code> (#15999)</li>
-<li>Find packages separately for each source in <code>UpdateDotnetRuntime.ps1</code> script (#15998)</li>
-<li>Update metadata to start using .NET 6 RC1 builds (#15981)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> (#15985)</li>
-<li>Merge the v7.2.0-preview.9 release branch back to GitHub master (#15983)</li>
-<li>Publish global tool package for stable releases (#15961)</li>
-<li>Bump <code>Microsoft.CodeAnalysis.NetAnalyzers</code> to newer version (#15962)</li>
-<li>Disabled Yarn cache in markdown.yml (#16599)</li>
-<li>Update cgmanifest (#16600)</li>
-<li>Fix broken links in markdown (#16598)</li>
-<li>Add explicit job name for approval tasks in Snap stage (#16579)</li>
-<li>Bring back <code>pwsh.exe</code> for framework dependent packages to support Start-Job (#16535)</li>
-<li>Fix NuGet package generation in release build (#16509)</li>
-<li>Add `Microsoft.PowerShell.Commands.SetStrictModeCommand.ArgumentToPSVersionTransformationAttribute` to list of patterns to remove for generated ref assembly (#16489)</li>
-<li>Bump Microsoft.CodeAnalysis.CSharp from `4.0.0-6.final` to `4.0.1` (#16423)</li>
-<li>use different containers for different branches (#16434)</li>
-<li>Add import so we can use common GitHub workflow function. (#16433)</li>
-<li>Remove pre-release .NET 6 build sources (#16418)</li>
-<li>Update release instructions with link to new build (#16419)</li>
-<li>Bump <code>Microsoft.ApplicationInsights</code> from <code>2.18.0</code> to <code>2.19.0</code> (#16413)</li>
-<li>Update <code>metadata.json</code> to make 7.2.0 the latest LTS (#16417)</li>
-<li>Make static CI a matrix (#16397)</li>
-<li>Update <code>metadata.json</code> in preparation on <code>7.3.0-preview.1</code> release (#16406)</li>
-<li>Update cgmanifest (#16405)</li>
-<li>Add diagnostics used to take corrective action when releasing `buildInfoJson` (#16404)</li>
-<li>`vPack` release should use `buildInfoJson` new to 7.2 (#16402)</li>
-<li>Update the usage of metadata.json for getting LTS information (#16381)</li>
-<li>Add checkout to build json stage to get `ci.psm1` (#16399)</li>
-<li>Update CgManifest.json for 6.0.0 .NET packages (#16398)</li>
-<li>Add current folder to the beginning of the module import (#16353)</li>
-<li>Increment RC MSI build number by 100 (#16354)</li>
-<li>Bump <code>XunitXml.TestLogger</code> from 3.0.66 to 3.0.70 (#16356)</li>
-<li>Move PR Quantifier config to subfolder (#16352)</li>
-<li>Release build info json when it is preview (#16335)</li>
-<li>Add an approval for releasing build-info json (#16351)</li>
-<li>Generate manifest with latest public version of the packages (#16337)</li>
-<li>Update to the latest notices file (#16339) (Thanks @github-actions[bot]!)</li>
-<li>Use notice task to generate license assuming cgmanifest contains all components (#16340)</li>
-<li>Refactor cgmanifest generator to include all components (#16326)</li>
-<li>Fix issues in release build (#16332)</li>
-<li>Update feed and analyzer dependency (#16327)</li>
-<li>Bump <code>Microsoft.NET.Test.Sdk</code> from 16.11.0 to 17.0.0 (#16312)</li>
-<li>Update license and cgmanifest (#16325) (Thanks @github-actions[bot]!)</li>
-<li>Fix condition in cgmanifest logic (#16324)</li>
-<li>Add GitHub Workflow to keep notices up to date (#16284)</li>
-<li>Update to latest .NET 6 GA build <code> 6.0.100-rtm.21527.11</code> (#16309)</li>
-<li>Create compliance build (#16286)</li>
-<li>Move mapping file into product repo and add Debian 11  (#16316)</li>
-<li>Add a major-minor build info JSON file (#16301)</li>
-<li>Clean up <code>crossgen</code> related build scripts also generate native symbols for <code>R2R</code> images (#16297)</li>
-<li>Fix Windows build ZIP packaging (#16299) (Thanks @kondratyev-nv!)</li>
-<li>Revert &quot;Update to use .NET 6 GA build (#16296)&quot; (#16308)</li>
-<li>Add <code>wget</code> as a dependency for Bootstrap script (#16303) (Thanks @kondratyev-nv!)</li>
-<li>Fix issues reported by code signing verification tool (#16291)</li>
-<li>Update to use .NET 6 GA build (#16296)</li>
-<li>Revert &quot;add GH workflow to keep the cgmanifest up to date.&quot; (#16294)</li>
-<li>Update ChangeLog for 7.2.0-rc.1 and also fix RPM packaging (#16290)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#16271)</li>
-<li>add GH workflow to keep the cgmanifest up to date.</li>
-<li>Update <code>ThirdPartyNotices.txt</code> (#16283)</li>
-<li>Update `testartifacts.yml` to use <code>ubuntu-latest</code> image (#16279)</li>
-<li>Update version of <code>Microsoft.PowerShell.Native</code> and <code>Microsoft.PowerShell.MarkdownRender</code> packages (#16277)</li>
-<li>Add script to generate <code>cgmanifest.json</code> (#16278)</li>
-<li>Add <code>cgmanifest.json</code> for generating correct third party notice file (#16266)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers from `6.0.0-rtm.21504.2` to `6.0.0-rtm.21516.1` (#16264)</li>
-<li>Only upload stable <code>buildinfo</code> for stable releases (#16251)</li>
-<li>Make RPM license recognized (#16189)</li>
-<li>Don't upload dep or tar.gz for RPM because there are none. (#16230)</li>
-<li>Add condition to generate release files in local dev build only (#16259)</li>
-<li>Update .NET 6 to version 6.0.100-rc.2.21505.57 (#16249)</li>
-<li>change order of try-catch-finally and split out arm runs (#16252)</li>
-<li>Ensure <code>psoptions.json</code> and <code>manifest.spdx.json</code> files always exist in packages (#16258)</li>
-<li>Update to vPack task version to 12 (#16250)</li>
-<li>Remove unneeded `NuGetConfigFile` resource string (#16232)</li>
-<li>Add Software Bill of Materials to the main packages (#16202)</li>
-<li>Sign third party exes (#16229)</li>
-<li>Upgrade <code>set-value</code> package for markdown test (#16196)</li>
-<li>Use Ubuntu 20.04 for SSH remoting test (#16225)</li>
-<li>Bump Microsoft.CodeAnalysis.NetAnalyzers (#16194)</li>
-<li>Bump `Microsoft.CodeAnalysis.NetAnalyzers` from `6.0.0-rc2.21458.5` to `6.0.0-rtm.21480.8` (#16183)</li>
-<li>Move vPack build to 1ES Pool (#16169)</li>
-<li>Fix Microsoft update spelling issue. (#16178)</li>
-</ul>
-
-</details>
-
-### Documentation and Help Content
-
-- Update Windows PowerShell issues link (#16105) (Thanks @andschwa!)
-- Remove Joey from Committee and WG membership (#16119)
-- Update more docs for `net6.0` TFM (#16102) (Thanks @xtqqczze!)
-- Change `snippet` tag to `code` tag in XML comments (#16106)
-- Update build documentation to reflect .NET 6 (#15751) (Thanks @Kellen-Stuart!)
-- Update `README.md` about the change logs (#16471) (Thanks @powershellpr0mpt!)
-- Update change log for 7.2.0 (#16401)
-- Update `metadata.json` and `README.md` for 7.2.0 release (#16395)
-- Update `README.md` and `metadata.json` files for `v7.2.0-rc.1` release (#16285)
-- Update the change logs for `v7.0.8` and `v7.1.5` releases (#16248)
-
-[7.3.0-preview.1]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.10...v7.3.0-preview.1

From 99f846d3834234e471d476b8e9a992b0ee96e5e4 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 8 Nov 2022 15:00:25 -0800
Subject: [PATCH 608/645] Update to use azcopy v10

---
 .../releaseBuild/azureDevOps/releasePipeline.yml  |  1 +
 .../templates/release-CreateGitHubDraft.yml       | 11 +++++------
 .../azureDevOps/templates/vpackReleaseJob.yml     | 15 ++++++++-------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index 148b27d7a38..05b86ff3d20 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -291,6 +291,7 @@ stages:
     variables:
     - group: 'Azure Blob variable group'
     - group: 'AzDevOpsArtifacts'
+    - group: ReleasePipelineSecrets
     dependsOn: AzureBlobPublic
     steps:
     - template: templates/release-CreateGitHubDraft.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
index 9e439db7366..5fcb186d38a 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
@@ -6,16 +6,15 @@ steps:
 
 - template: release-SetReleaseTagAndContainerName.yml
 
-- pwsh: |
-    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-    Install-AzCopy
-  displayName: Install AzCopy
-
 - pwsh: |
     Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
     $azcopy = Find-AzCopy
-    & $azcopy /Source:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) /Dest:$(System.ArtifactsDirectory) /S /SourceKey:$(StorageAccountKey)
+    Write-Verbose -Verbose "Found AzCopy: $azcopy"
+
+    & $azcopy login --service-principal --application-id $(PowerShellReleaseSPN)
+    & $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) $(System.ArtifactsDirectory) --recursive
   displayName: Download Azure Artifacts
+  retryCountOnTaskFailure: 2
 
 - pwsh: |
     Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty Name
diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
index a51818e4acb..7240b9984ee 100644
--- a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+++ b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@@ -5,6 +5,7 @@ jobs:
 - job: vpack_${{ parameters.architecture }}
   variables:
     - group: vPack
+    - group: ReleasePipelineSecrets
 
   displayName: Build and Publish VPack - ${{ parameters.architecture }}
   condition: succeeded()
@@ -27,18 +28,18 @@ jobs:
     parameters:
       ReleaseTagVar: $(ReleaseTagVar)
 
-  - pwsh: |
-      Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-      Install-AzCopy
-    displayName: Install AzCopy
-
   - pwsh: |
       Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
       $azcopy = Find-AzCopy
+      Write-Verbose -Verbose "Found AzCopy: $azcopy"
+
+      & $azcopy login --service-principal --application-id $(PowerShellReleaseSPN)
+
+      Write-Host "running: $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) $(System.ArtifactsDirectory) --include-pattern PowerShell-$(Version)-win-${{ parameters.architecture }}.zip"
 
-      Write-Host "running: $azcopy /Source:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) /Dest:$(System.ArtifactsDirectory) /S /SourceKey:****** /Pattern:PowerShell-$(Version)-win-${{ parameters.architecture }}.zip /Z:$(AGENT.TEMPDIRECTORY)"
-      & $azcopy /Source:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) /Dest:$(System.ArtifactsDirectory) /S /SourceKey:$(StorageAccountKey) /Pattern:PowerShell-$(Version)-win-${{ parameters.architecture }}.zip /Z:$(AGENT.TEMPDIRECTORY)
+      & $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) $(System.ArtifactsDirectory) --include-pattern PowerShell-$(Version)-win-${{ parameters.architecture }}.zip
     displayName: 'Download Azure Artifacts'
+    retryCountOnTaskFailure: 2
 
   - pwsh: 'Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty Name'
     displayName: 'Capture Artifact Listing'

From dab1f2dd8f677d8f2bb829dac088280691b7f9ad Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 8 Nov 2022 15:14:40 -0800
Subject: [PATCH 609/645] Add environment variable for SPN secret

---
 .../azureDevOps/templates/release-CreateGitHubDraft.yml         | 2 ++
 tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
index 5fcb186d38a..63a599d1431 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
@@ -15,6 +15,8 @@ steps:
     & $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) $(System.ArtifactsDirectory) --recursive
   displayName: Download Azure Artifacts
   retryCountOnTaskFailure: 2
+  env:
+    AZCOPY_SPA_CLIENT_SECRET: $(PowerShellReleaseSPNSecret)
 
 - pwsh: |
     Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty Name
diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
index 7240b9984ee..b6e53e99232 100644
--- a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+++ b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@@ -40,6 +40,8 @@ jobs:
       & $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) $(System.ArtifactsDirectory) --include-pattern PowerShell-$(Version)-win-${{ parameters.architecture }}.zip
     displayName: 'Download Azure Artifacts'
     retryCountOnTaskFailure: 2
+    env:
+      AZCOPY_SPA_CLIENT_SECRET: $(PowerShellReleaseSPNSecret)
 
   - pwsh: 'Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty Name'
     displayName: 'Capture Artifact Listing'

From 5e078cd9e2d2b3ab8eea4cbe6d9b8fbe42c28f2b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 8 Nov 2022 15:38:40 -0800
Subject: [PATCH 610/645] Add install az copy

---
 build.psm1                                             | 10 ++++++----
 .../templates/release-CreateGitHubDraft.yml            |  6 ++++++
 .../azureDevOps/templates/vpackReleaseJob.yml          |  6 ++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 04298c61b46..c57eab8aa12 100644
--- a/build.psm1
+++ b/build.psm1
@@ -3364,13 +3364,15 @@ function Install-AzCopy {
         return
     }
 
-    $destination = "$env:TEMP\azcopy81.msi"
-    Invoke-WebRequest "https://aka.ms/downloadazcopy" -OutFile $destination
-    Start-Process -FilePath $destination -ArgumentList "/quiet" -Wait
+    $destination = "$env:TEMP\azcopy10.zip"
+    $downloadLocation = (Invoke-WebRequest -Uri https://aka.ms/downloadazcopy-v10-windows -MaximumRedirection 0 -ErrorAction SilentlyContinue -SkipHttpErrorCheck).headers.location
+
+    Invoke-WebRequest -Uri $downloadLocation -OutFile $destination -Verbose
+    Expand-archive -Path $destination -Destinationpath '$(Agent.ToolsDirectory)\azcopy10'
 }
 
 function Find-AzCopy {
-    $searchPaths = @("C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe", "C:\azcopy10\AzCopy.exe")
+    $searchPaths = @('$(Agent.ToolsDirectory)\azcopy10', "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe", "C:\azcopy10\AzCopy.exe")
 
     foreach ($filter in $searchPaths) {
         $azCopy = Get-ChildItem -Path $filter -Recurse -ErrorAction SilentlyContinue | Select-Object -ExpandProperty FullName -First 1
diff --git a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
index 63a599d1431..98b65a4c6f8 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
@@ -6,6 +6,12 @@ steps:
 
 - template: release-SetReleaseTagAndContainerName.yml
 
+- pwsh: |
+    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
+    Install-AzCopy
+  displayName: Install AzCopy
+  retryCountOnTaskFailure: 2
+
 - pwsh: |
     Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
     $azcopy = Find-AzCopy
diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
index b6e53e99232..738718a2cdf 100644
--- a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+++ b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@@ -28,6 +28,12 @@ jobs:
     parameters:
       ReleaseTagVar: $(ReleaseTagVar)
 
+  - pwsh: |
+      Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
+      Install-AzCopy
+    displayName: Install AzCopy
+    retryCountOnTaskFailure: 2
+
   - pwsh: |
       Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
       $azcopy = Find-AzCopy

From 09fa48c7e37c24379e65ef39a60d2272b08b2a71 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 8 Nov 2022 15:46:45 -0800
Subject: [PATCH 611/645] Select the first of the download locations

---
 build.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index c57eab8aa12..e8d92e66480 100644
--- a/build.psm1
+++ b/build.psm1
@@ -3365,7 +3365,7 @@ function Install-AzCopy {
     }
 
     $destination = "$env:TEMP\azcopy10.zip"
-    $downloadLocation = (Invoke-WebRequest -Uri https://aka.ms/downloadazcopy-v10-windows -MaximumRedirection 0 -ErrorAction SilentlyContinue -SkipHttpErrorCheck).headers.location
+    $downloadLocation = (Invoke-WebRequest -Uri https://aka.ms/downloadazcopy-v10-windows -MaximumRedirection 0 -ErrorAction SilentlyContinue -SkipHttpErrorCheck).headers.location | Select-Object -First 1
 
     Invoke-WebRequest -Uri $downloadLocation -OutFile $destination -Verbose
     Expand-archive -Path $destination -Destinationpath '$(Agent.ToolsDirectory)\azcopy10'

From 5b217209273974e644662fff03328346c75f62ad Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 8 Nov 2022 15:52:56 -0800
Subject: [PATCH 612/645] Fix search in the new path

---
 build.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index e8d92e66480..115897f71ce 100644
--- a/build.psm1
+++ b/build.psm1
@@ -3372,7 +3372,7 @@ function Install-AzCopy {
 }
 
 function Find-AzCopy {
-    $searchPaths = @('$(Agent.ToolsDirectory)\azcopy10', "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe", "C:\azcopy10\AzCopy.exe")
+    $searchPaths = @('$(Agent.ToolsDirectory)\azcopy10\AzCopy.exe', "C:\Program Files (x86)\Microsoft SDKs\Azure\AzCopy\AzCopy.exe", "C:\azcopy10\AzCopy.exe")
 
     foreach ($filter in $searchPaths) {
         $azCopy = Get-ChildItem -Path $filter -Recurse -ErrorAction SilentlyContinue | Select-Object -ExpandProperty FullName -First 1

From 226ca5666750e5c03e73e79000944cf1a742442c Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 8 Nov 2022 16:12:52 -0800
Subject: [PATCH 613/645] Update the package folder of downloaded artifacts

---
 .../templates/release-CreateGitHubDraft.yml         | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
index 98b65a4c6f8..7e353baa487 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
@@ -19,13 +19,18 @@ steps:
 
     & $azcopy login --service-principal --application-id $(PowerShellReleaseSPN)
     & $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) $(System.ArtifactsDirectory) --recursive
+
+    $packagesPath = Get-ChildItem -Path $(System.ArtifactsDirectory)\*.deb -Recurse -File | Select-Object -First 1 -ExpandProperty DirectoryName
+    Write-Host "sending -- vso[task.setvariable variable=PackagesRoot]$packagesPath"
+    Write-Host "##vso[task.setvariable variable=PackagesRoot]$packagesPath"
+
   displayName: Download Azure Artifacts
   retryCountOnTaskFailure: 2
   env:
     AZCOPY_SPA_CLIENT_SECRET: $(PowerShellReleaseSPNSecret)
 
 - pwsh: |
-    Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty Name
+    Get-ChildItem $(System.ArtifactsDirectory)\* -recurse | Select-Object -ExpandProperty FullName
   displayName: Capture downloaded artifacts
 
 - pwsh: |
@@ -33,10 +38,10 @@ steps:
   displayName: Clone Internal-Tools repository
 
 - pwsh: |
-    $Path = "$(System.ArtifactsDirectory)"
+    $Path = "$(PackagesRoot)"
     $OutputPath = Join-Path $Path ‘hashes.sha256’
     $srcPaths = @($Path)
-    $packages  = Get-ChildItem -Path $srcPaths -Include * -Recurse
+    $packages  = Get-ChildItem -Path $srcPaths -Include * -Recurse -File
     $checksums = $packages |
         ForEach-Object {
             Write-Verbose -Verbose "Generating checksum file for $($_.FullName)"
@@ -84,5 +89,5 @@ steps:
 
     Write-Verbose -Verbose "Selected content: `n$clContent"
 
-    Publish-ReleaseDraft -Tag '$(ReleaseTag)' -Name '$(ReleaseTag) Release of PowerShell' -Description $clContent -User PowerShell -Repository PowerShell  -PackageFolder $(System.ArtifactsDirectory) -Token $(GitHubReleasePat)
+    Publish-ReleaseDraft -Tag '$(ReleaseTag)' -Name '$(ReleaseTag) Release of PowerShell' -Description $clContent -User PowerShell -Repository PowerShell  -PackageFolder $(PackagesRoot) -Token $(GitHubReleasePat)
   displayName: Publish Release Draft

From 71d127320cdbeffe7d141b94d8a20b580d401591 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 8 Nov 2022 16:22:34 -0800
Subject: [PATCH 614/645] Ensure version are considered as strings

---
 .../azureDevOps/templates/release-CreateGitHubDraft.yml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
index 7e353baa487..dc7cf126630 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-CreateGitHubDraft.yml
@@ -66,7 +66,7 @@ steps:
       "preview.md"
     }
     else {
-      $semanticVersion.Major + "." + $semanticVersion.Minor + ".md"
+      $semanticVersion.Major.ToString() + "." + $semanticVersion.Minor.ToString() + ".md"
     }
 
     $filePath = "$env:BUILD_SOURCESDIRECTORY/CHANGELOG/$fileName"

From 4a55f21c7a0706e0364166d8ae527a4096b9d61b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 9 Nov 2022 10:14:42 -0800
Subject: [PATCH 615/645] Fix package download in vpack job

---
 tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
index 738718a2cdf..3e58295ad8f 100644
--- a/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
+++ b/tools/releaseBuild/azureDevOps/templates/vpackReleaseJob.yml
@@ -41,9 +41,9 @@ jobs:
 
       & $azcopy login --service-principal --application-id $(PowerShellReleaseSPN)
 
-      Write-Host "running: $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) $(System.ArtifactsDirectory) --include-pattern PowerShell-$(Version)-win-${{ parameters.architecture }}.zip"
+      Write-Host "running: $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion)/PowerShell-$(Version)-win-${{ parameters.architecture }}.zip $(System.ArtifactsDirectory)"
 
-      & $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion) $(System.ArtifactsDirectory) --include-pattern PowerShell-$(Version)-win-${{ parameters.architecture }}.zip
+      & $azcopy cp https://$(StorageAccount).blob.core.windows.net/$(AzureVersion)/PowerShell-$(Version)-win-${{ parameters.architecture }}.zip $(System.ArtifactsDirectory)
     displayName: 'Download Azure Artifacts'
     retryCountOnTaskFailure: 2
     env:

From a307524eee05f141bd18b73a04c98e03e5f63b72 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 17 Nov 2022 11:36:33 -0800
Subject: [PATCH 616/645] Work around args parsing issue (#18607)

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 tools/packaging/packaging.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index d3484793a74..3fb471ce0d8 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -3521,7 +3521,7 @@ function New-MsiArgsArray {
 
     $buildArguments = @()
     foreach ($key in $Argument.Keys) {
-        $buildArguments += "-d$key=`"$($Argument.$key)`""
+        $buildArguments += "-d$key=$($Argument.$key)"
     }
 
     return $buildArguments

From 950de803bb928f488f6481b23fa5cbe5f4a0ecf3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 18 Nov 2022 14:12:00 -0800
Subject: [PATCH 617/645] Mark charset test as pending (#18609)

---
 .../Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
index 7a5ad26d545..76d425b16f1 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
@@ -2035,6 +2035,7 @@ Describe "Invoke-WebRequest tests" -Tags "Feature", "RequireAdminOnWindows" {
         }
 
         It "Charset Parsing" {
+            Set-ItResult -Pending -Because "We need a better way to test this and .NET has made bad regex's run faster"
             $dosUri = Get-WebListenerUrl -Test 'Dos' -query @{
                 dosType='charset'
                 dosLength='2850'

From a9308e8d3104b64b98a102e0096041ad42ab97c8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 18 Nov 2022 14:12:34 -0800
Subject: [PATCH 618/645] Fix native access violation (#18571)

---
 src/System.Management.Automation/security/wldpNativeMethods.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/System.Management.Automation/security/wldpNativeMethods.cs b/src/System.Management.Automation/security/wldpNativeMethods.cs
index d3c24173b9b..970abe541f6 100644
--- a/src/System.Management.Automation/security/wldpNativeMethods.cs
+++ b/src/System.Management.Automation/security/wldpNativeMethods.cs
@@ -696,6 +696,7 @@ internal static class WldpNativeMethods
             [DefaultDllImportSearchPathsAttribute(DllImportSearchPath.System32)]
             [DllImportAttribute("wldp.dll", EntryPoint = "WldpCanExecuteFile")]
             internal static extern int WldpCanExecuteFile(
+                [MarshalAs(UnmanagedType.LPStruct)]
                 Guid host,
                 WLDP_EXECUTION_EVALUATION_OPTIONS options,
                 IntPtr fileHandle,

From 61e1460a09836ec5971fbbbe8d57d2f6dd024614 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 21 Nov 2022 09:26:46 -0800
Subject: [PATCH 619/645] Backport CI fixed from #18508 (#18626)

---
 .vsts-ci/templates/verify-xunit.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci/templates/verify-xunit.yml b/.vsts-ci/templates/verify-xunit.yml
index d2799f53ae0..b43cb9339f9 100644
--- a/.vsts-ci/templates/verify-xunit.yml
+++ b/.vsts-ci/templates/verify-xunit.yml
@@ -19,12 +19,12 @@ jobs:
         xunit/**/*
       downloadPath: '$(System.ArtifactsDirectory)'
 
-  - powershell: |
+  - pwsh: |
       dir "$(System.ArtifactsDirectory)\*" -Recurse
     displayName: 'Capture artifacts directory'
     continueOnError: true
 
-  - powershell: |
+  - pwsh: |
       Import-Module .\tools\ci.psm1
       $xUnitTestResultsFile = "$(System.ArtifactsDirectory)\xunit\xUnitTestResults.xml"
 

From b895dacb7c5382c57e1f3a9ad7e1a634a3bbb635 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 21 Nov 2022 09:28:37 -0800
Subject: [PATCH 620/645] Don't install based on build-id for RPM (#18570)

Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
---
 tools/packaging/packaging.psm1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 3fb471ce0d8..00d7715b0c6 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -1337,6 +1337,7 @@ function Get-FpmArguments
         $Arguments += @("--rpm-dist", $Distribution)
         $Arguments += @("--rpm-os", "linux")
         $Arguments += @("--license", "MIT")
+        $Arguments += @("--rpm-rpmbuild-define", "_build_id_links none")
     } else {
         $Arguments += @("--license", "MIT License")
     }

From a6a33ae7085bee5d7e708036fbdc284538e786a3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 21 Nov 2022 10:00:36 -0800
Subject: [PATCH 621/645] Bump `System.Data.SqlClient` (#18573)

Bumps [System.Data.SqlClient](https://github.com/dotnet/corefx) from 4.8.4 to 4.8.5.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index bd26318a6b1..039402fd3a4 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -21,7 +21,7 @@
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="System.Web.Services.Description" Version="4.10.0" />
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.4" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
     <PackageReference Include="System.IO.Packaging" Version="7.0.0" />
     <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0" />

From 645249b8457696bdf21e17cf3b8029b22e314c1e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 21 Nov 2022 10:08:35 -0800
Subject: [PATCH 622/645] [release/v7.3.1] Fix `Switch-Process` to set
 `termios` appropriate for child process (#18572)

* add getting and setting termios

* chanage to use .NET exported function

* add comments

Co-authored-by: Steve Lee <slee@microsoft.com>
---
 .../engine/Modules/SwitchProcessCommand.cs                | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs b/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
index 1bad35bfd31..8ce2f08d841 100644
--- a/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
@@ -69,10 +69,12 @@ protected override void EndProcessing()
             // need null terminator at end
             execArgs[execArgs.Length - 1] = null;
 
+            // setup termios for a child process as .NET modifies termios dynamically for use with ReadKey()
+            ConfigureTerminalForChildProcess(true);
             int exitCode = Exec(command.Source, execArgs);
-
             if (exitCode < 0)
             {
+                ConfigureTerminalForChildProcess(false);
                 ThrowTerminatingError(
                     new ErrorRecord(
                         new Exception(
@@ -108,6 +110,10 @@ protected override void EndProcessing()
             CharSet = CharSet.Ansi,
             SetLastError = true)]
         private static extern int Exec(string path, string?[] args);
+
+        // leverage .NET runtime's native library which abstracts the need to handle different OS and architectures for termios api
+        [DllImport("libSystem.Native", EntryPoint = "SystemNative_ConfigureTerminalForChildProcess")]
+        private static extern void ConfigureTerminalForChildProcess([MarshalAs(UnmanagedType.Bool)] bool childUsesTerminal);
     }
 }
 

From fb46702bbcdaf3f5c92c143fe2b1f621e388a2df Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 21 Nov 2022 10:25:06 -0800
Subject: [PATCH 623/645] Fix issue when completing the first command in a
 script with an empty array expression (#18355) (#18630)

Co-authored-by: MartinGC94 <42123497+MartinGC94@users.noreply.github.com>
---
 .../engine/CommandCompletion/CompletionAnalysis.cs           | 5 ++++-
 test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1   | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index 53ca1f46f3a..1c47667b05f 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -1986,7 +1986,10 @@ private static List<CompletionResult> GetResultForIdentifier(CompletionContext c
                 // Handle completion for a path with variable, such as: $PSHOME\ty<tab>
                 if (completionContext.RelatedAsts.Count > 0 && completionContext.RelatedAsts[0] is ScriptBlockAst)
                 {
-                    Ast cursorAst = completionContext.RelatedAsts[0].FindAll(ast => ast.Extent.EndOffset <= tokenAtCursor.Extent.StartOffset, true).LastOrDefault();
+                    Ast cursorAst = completionContext.RelatedAsts[0].FindAll(
+                        ast => ast.Extent.EndOffset <= tokenAtCursor.Extent.StartOffset
+                            && ast.Extent is not EmptyScriptExtent,
+                        searchNestedScriptBlocks: true).LastOrDefault();
 
                     if (cursorAst is not null)
                     {
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index 2134d64530a..02a90fd65d2 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -759,6 +759,11 @@ ConstructorTestClass(int i, bool b)
         $res.CompletionMatches.CompletionText | Should -Contain "-Path"
     }
 
+    it 'Should complete command with an empty arrayexpression element' {
+        $res = TabExpansion2 -inputScript 'Get-ChildItem @()' -cursorColumn 1
+        $res.CompletionMatches[0].CompletionText | Should -Be "Get-ChildItem"
+    }
+
     Context "Script name completion" {
         BeforeAll {
             Setup -f 'install-powershell.ps1' -Content ""

From 15666cf5ba58063beed0a1b2e4ba792168f321c0 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 21 Nov 2022 14:52:51 -0800
Subject: [PATCH 624/645] [release/v7.3.1] Fix Switch-Process to copy the
 current env to the new process (#18632)

* Fix `Switch-Process` to copy the current env to the new process (#18452)

* Update test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1

Co-authored-by: Steve Lee <slee@microsoft.com>
---
 .../engine/Modules/SwitchProcessCommand.cs    | 20 ++++++++++++++++---
 .../Microsoft.PowerShell.Core/Exec.Tests.ps1  |  5 +++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs b/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
index 8ce2f08d841..31f3376d74d 100644
--- a/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Management.Automation;
 using System.Runtime.InteropServices;
@@ -69,9 +70,19 @@ protected override void EndProcessing()
             // need null terminator at end
             execArgs[execArgs.Length - 1] = null;
 
+            var env = Environment.GetEnvironmentVariables();
+            var envBlock = new string?[env.Count + 1];
+            int j = 0;
+            foreach (DictionaryEntry entry in env)
+            {
+                envBlock[j++] = entry.Key + "=" + entry.Value;
+            }
+
+            envBlock[envBlock.Length - 1] = null;
+
             // setup termios for a child process as .NET modifies termios dynamically for use with ReadKey()
             ConfigureTerminalForChildProcess(true);
-            int exitCode = Exec(command.Source, execArgs);
+            int exitCode = Exec(command.Source, execArgs, envBlock);
             if (exitCode < 0)
             {
                 ConfigureTerminalForChildProcess(false);
@@ -101,15 +112,18 @@ protected override void EndProcessing()
         /// The arguments to send through to the executable.
         /// Array must have its final element be null.
         /// </param>
+        /// <param name="env">
+        /// The environment variables to send through to the executable in the form of "key=value".
+        /// Array must have its final element be null.
         /// <returns>
         /// An exit code if exec failed, but if successful the calling process will be overwritten.
         /// </returns>
         [DllImport("libc",
-            EntryPoint = "execv",
+            EntryPoint = "execve",
             CallingConvention = CallingConvention.Cdecl,
             CharSet = CharSet.Ansi,
             SetLastError = true)]
-        private static extern int Exec(string path, string?[] args);
+        private static extern int Exec(string path, string?[] args, string?[] env);
 
         // leverage .NET runtime's native library which abstracts the need to handle different OS and architectures for termios api
         [DllImport("libSystem.Native", EntryPoint = "SystemNative_ConfigureTerminalForChildProcess")]
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
index 858a04fb4e8..1a1023f0ea4 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
@@ -48,6 +48,11 @@ Describe 'Switch-Process tests for Unix' -Tags 'CI' {
             ($p | Get-Process).Name -eq 'sleep'
         } -timeout 60000 -interval 100 | Should -BeTrue
     }
+
+    It 'The environment will be copied to the child process' {
+        $env = pwsh -noprofile -outputformat text -command { $env:TEST_FOO='my test = value'; Switch-Process bash -c 'echo $TEST_FOO' }
+        $env | Should -BeExactly 'my test = value'
+    }
 }
 
 Describe 'Switch-Process for Windows' -Tag 'CI' {

From f4a70cb67d929803fde06b4f3756d50cf2de9585 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Nov 2022 19:04:35 +0000
Subject: [PATCH 625/645] [release/v7.3.1] Change `exec` from alias to function
 to handle arbitrary args (#18644)

---
 .../engine/InitialSessionState.cs               | 17 +++++++++++++----
 .../Microsoft.PowerShell.Core/Exec.Tests.ps1    | 13 +++++++++----
 .../engine/Basic/DefaultCommands.Tests.ps1      |  1 -
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index e75ca018f8e..32969ecde28 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -4072,6 +4072,15 @@ internal static string GetClearHostFunctionText()
             }
         }
 
+#if UNIX
+        internal static string GetExecFunctionText()
+        {
+            return @"
+Switch-Process -WithCommand $args
+";
+        }
+#endif
+
         /// <summary>
         /// This is the default function to use for man/help. It uses
         /// splatting to pass in the parameters.
@@ -4677,10 +4686,6 @@ internal static SessionStateAliasEntry[] BuiltInAliases
                     new SessionStateAliasEntry("sls", "Select-String"),
                 };
 
-#if UNIX
-                builtInAliases.Add(new SessionStateAliasEntry("exec", "Switch-Process"));
-#endif
-
                 return builtInAliases.ToArray();
             }
         }
@@ -4709,6 +4714,10 @@ internal static SessionStateAliasEntry[] BuiltInAliases
             SessionStateFunctionEntry.GetDelayParsedFunctionEntry("help", GetHelpPagingFunctionText(), isProductCode: true, languageMode: systemLanguageMode),
             SessionStateFunctionEntry.GetDelayParsedFunctionEntry("prompt", DefaultPromptFunctionText, isProductCode: true, languageMode: systemLanguageMode),
 
+#if UNIX
+            SessionStateFunctionEntry.GetDelayParsedFunctionEntry("exec", GetExecFunctionText(), isProductCode: true, languageMode: systemLanguageMode),
+#endif
+
             // Functions that require full language mode and are trusted
             SessionStateFunctionEntry.GetDelayParsedFunctionEntry("Clear-Host", GetClearHostFunctionText(), isProductCode: true, languageMode: PSLanguageMode.FullLanguage),
             SessionStateFunctionEntry.GetDelayParsedFunctionEntry("TabExpansion2", s_tabExpansionFunctionText, isProductCode: true, languageMode: PSLanguageMode.FullLanguage),
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
index 1a1023f0ea4..ad89c847811 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
@@ -15,10 +15,10 @@ Describe 'Switch-Process tests for Unix' -Tags 'CI' {
         $global:PSDefaultParameterValues = $originalDefaultParameterValues
     }
 
-    It 'Exec alias should map to Switch-Process' {
-        $alias = Get-Command exec
-        $alias | Should -BeOfType [System.Management.Automation.AliasInfo]
-        $alias.Definition | Should -BeExactly 'Switch-Process'
+    It 'Exec function should map to Switch-Process' {
+        $func = Get-Command exec
+        $func | Should -BeOfType [System.Management.Automation.CommandInfo]
+        $func.Definition | Should -Not -BeNullOrEmpty
     }
 
     It 'Exec by itself does nothing' {
@@ -53,6 +53,11 @@ Describe 'Switch-Process tests for Unix' -Tags 'CI' {
         $env = pwsh -noprofile -outputformat text -command { $env:TEST_FOO='my test = value'; Switch-Process bash -c 'echo $TEST_FOO' }
         $env | Should -BeExactly 'my test = value'
     }
+
+    It 'The command can include a -w parameter' {
+        $out = pwsh -noprofile -outputformat text -command { exec /bin/echo 1 -w 2 }
+        $out | Should -BeExactly '1 -w 2'
+    }
 }
 
 Describe 'Switch-Process for Windows' -Tag 'CI' {
diff --git a/test/powershell/engine/Basic/DefaultCommands.Tests.ps1 b/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
index bdcd5af0000..f5fc66748a7 100644
--- a/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
+++ b/test/powershell/engine/Basic/DefaultCommands.Tests.ps1
@@ -58,7 +58,6 @@ Describe "Verify approved aliases list" -Tags "CI" {
 "Alias",        "epsn",                             "Export-PSSession",                 $($FullCLR                               ),     "",                     "",                     ""
 "Alias",        "erase",                            "Remove-Item",                      $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     ""
 "Alias",        "etsn",                             "Enter-PSSession",                  $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     ""
-"Alias",        "exec",                             "Switch-Process",                   $(                              $CoreUnix),     "",                     "",                     ""
 "Alias",        "exsn",                             "Exit-PSSession",                   $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     ""
 "Alias",        "fc",                               "Format-Custom",                    $($FullCLR -or $CoreWindows -or $CoreUnix),     "ReadOnly",             "",                     ""
 "Alias",        "fhx",                              "Format-Hex",                       $($FullCLR -or $CoreWindows -or $CoreUnix),     "",                     "",                     ""

From ef787cfa020f97e78793ab00b67162bd558acb74 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Nov 2022 19:30:40 +0000
Subject: [PATCH 626/645] Add `gcloud` and `sqlcmd` to list to use legacy
 argument passing (#18645)

---
 .../engine/NativeCommandProcessor.cs                          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index eab59af5add..ee16010a4f5 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -247,8 +247,10 @@ internal class NativeCommandProcessor : CommandProcessorBase
         {
             "cmd",
             "cscript",
-            "wscript",
             "find",
+            "gcloud",
+            "sqlcmd",
+            "wscript",
         };
 
         #region ctor/native command properties

From 32c0361d8eca7cc60f3b61b064760ac825934583 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Nov 2022 20:39:30 +0000
Subject: [PATCH 627/645] Remove `gcloud` because it's resolved to a `.ps1`
 script (#18646)

---
 .../engine/NativeCommandProcessor.cs                             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index ee16010a4f5..9a422eab713 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -248,7 +248,6 @@ internal class NativeCommandProcessor : CommandProcessorBase
             "cmd",
             "cscript",
             "find",
-            "gcloud",
             "sqlcmd",
             "wscript",
         };

From cf30cd3007cea5788b4803f48b2babd0c3f0c255 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Nov 2022 20:55:53 +0000
Subject: [PATCH 628/645] [release/v7.3.1] Apply expected file permissions to
 linux files after authenticode signing (#18647)

* Upload linux artifacts as tar.gz to preserve linux file permissions

* Fix conditions

* Fix yaml

* Fix paths for downloaded artifacts

* Rename while downloading

* Fix file names and paths

* Fix tar compress

* Add set-location before tar

* Create dirs before expanding

* Create dir before expanding

* Fix conditions

* Add logging

* Export file permission to json

* Fix for condition

* Apply file permissions before packaging

* Add logging

* Fix issues

* Add comments

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
---
 tools/packaging/packaging.psm1                | 127 +++++++++++++++++-
 .../templates/linux-authenticode-sign.yml     |  73 ++++++----
 .../azureDevOps/templates/linux-packaging.yml |  79 +++++++++--
 .../azureDevOps/templates/linux.yml           |  55 ++++++--
 .../azureDevOps/templates/signBuildFiles.yml  |  12 +-
 5 files changed, 292 insertions(+), 54 deletions(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 00d7715b0c6..28cb7bae632 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -669,7 +669,7 @@ function New-TarballPackage {
 
             try {
                 Push-Location -Path $Staging
-                tar $options $packagePath .
+                tar $options $packagePath *
             } finally {
                 Pop-Location
             }
@@ -4480,15 +4480,21 @@ function Invoke-AzDevOpsLinuxPackageCreation {
 
         switch ($BuildType) {
             'fxdependent' {
+                $filePermissionFile = "${env:SYSTEM_ARTIFACTSDIRECTORY}\${mainLinuxBuildFolder}-meta\linuxFilePermission.json"
+                Set-LinuxFilePermission -FilePath $filePermissionFile -RootPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${mainLinuxBuildFolder}"
                 Start-PSPackage -Type 'fxdependent' @releaseTagParam -LTS:$LTS
             }
             'alpine' {
+                $filePermissionFile = "${env:SYSTEM_ARTIFACTSDIRECTORY}\${mainLinuxBuildFolder}-meta\linuxFilePermission.json"
+                Set-LinuxFilePermission -FilePath $filePermissionFile -RootPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${mainLinuxBuildFolder}"
                 Start-PSPackage -Type 'tar-alpine' @releaseTagParam -LTS:$LTS
             }
             'rpm' {
                 Start-PSPackage -Type 'rpm' @releaseTagParam -LTS:$LTS
             }
             default {
+                $filePermissionFile = "${env:SYSTEM_ARTIFACTSDIRECTORY}\${mainLinuxBuildFolder}-meta\linuxFilePermission.json"
+                Set-LinuxFilePermission -FilePath $filePermissionFile -RootPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${mainLinuxBuildFolder}"
                 Start-PSPackage @releaseTagParam -LTS:$LTS -Type 'deb', 'tar'
             }
         }
@@ -4498,6 +4504,9 @@ function Invoke-AzDevOpsLinuxPackageCreation {
 
             Restore-PSOptions -PSOptionsPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${minSizeLinuxBuildFolder}-meta\psoptions.json"
 
+            $filePermissionFile = "${env:SYSTEM_ARTIFACTSDIRECTORY}\${minSizeLinuxBuildFolder}-meta\linuxFilePermission.json"
+            Set-LinuxFilePermission -FilePath $filePermissionFile -RootPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${minSizeLinuxBuildFolder}"
+
             Write-Verbose -Verbose "---- Min-Size ----"
             Write-Verbose -Verbose "options.Output: $($options.Output)"
             Write-Verbose -Verbose "options.Top $($options.Top)"
@@ -4507,14 +4516,20 @@ function Invoke-AzDevOpsLinuxPackageCreation {
             ## Create 'linux-arm' 'tar.gz' package.
             ## Note that 'linux-arm' can only be built on Ubuntu environment.
             Restore-PSOptions -PSOptionsPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${arm32LinuxBuildFolder}-meta\psoptions.json"
+            $filePermissionFile = "${env:SYSTEM_ARTIFACTSDIRECTORY}\${arm32LinuxBuildFolder}-meta\linuxFilePermission.json"
+            Set-LinuxFilePermission -FilePath $filePermissionFile -RootPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${arm32LinuxBuildFolder}"
             Start-PSPackage -Type tar-arm @releaseTagParam -LTS:$LTS
 
             ## Create 'linux-arm64' 'tar.gz' package.
             ## Note that 'linux-arm64' can only be built on Ubuntu environment.
             Restore-PSOptions -PSOptionsPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${arm64LinuxBuildFolder}-meta\psoptions.json"
+            $filePermissionFile = "${env:SYSTEM_ARTIFACTSDIRECTORY}\${arm64LinuxBuildFolder}-meta\linuxFilePermission.json"
+            Set-LinuxFilePermission -FilePath $filePermissionFile -RootPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${arm64LinuxBuildFolder}"
             Start-PSPackage -Type tar-arm64 @releaseTagParam -LTS:$LTS
         } elseif ($BuildType -eq 'rpm') {
             Restore-PSOptions -PSOptionsPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${amd64MarinerBuildFolder}-meta\psoptions.json"
+            $filePermissionFile = "${env:SYSTEM_ARTIFACTSDIRECTORY}\${amd64MarinerBuildFolder}-meta\linuxFilePermission.json"
+            Set-LinuxFilePermission -FilePath $filePermissionFile -RootPath "${env:SYSTEM_ARTIFACTSDIRECTORY}\${amd64MarinerBuildFolder}"
 
             Write-Verbose -Verbose "---- rpm-fxdependent ----"
             Write-Verbose -Verbose "options.Output: $($options.Output)"
@@ -4567,6 +4582,8 @@ function Invoke-AzDevOpsLinuxPackageBuild {
 
         $buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${mainLinuxBuildFolder}"
         Start-PSBuild @buildParams @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
+        Get-ChildItem -Path $buildFolder -Recurse -File | Export-LinuxFilePermission -FilePath "${buildFolder}-meta/linuxFilePermission.json" -RootPath ${buildFolder} -Force
+
         # Remove symbol files.
         Remove-Item "${buildFolder}\*.pdb" -Force
 
@@ -4587,6 +4604,7 @@ function Invoke-AzDevOpsLinuxPackageBuild {
             Start-PSBuild -Clean @buildParams @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
             # Remove symbol files, xml document files.
             Remove-Item "${buildFolder}\*.pdb", "${buildFolder}\*.xml" -Force
+            Get-ChildItem -Path $buildFolder -Recurse -File | Export-LinuxFilePermission -FilePath "${buildFolder}-meta/linuxFilePermission.json" -RootPath ${buildFolder} -Force
 
             ## Build 'linux-arm' and create 'tar.gz' package for it.
             ## Note that 'linux-arm' can only be built on Ubuntu environment.
@@ -4594,11 +4612,13 @@ function Invoke-AzDevOpsLinuxPackageBuild {
             Start-PSBuild -Configuration Release -Restore -Runtime linux-arm -PSModuleRestore @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
             # Remove symbol files.
             Remove-Item "${buildFolder}\*.pdb" -Force
+            Get-ChildItem -Path $buildFolder -Recurse -File | Export-LinuxFilePermission -FilePath "${buildFolder}-meta/linuxFilePermission.json" -RootPath ${buildFolder} -Force
 
             $buildFolder = "${env:SYSTEM_ARTIFACTSDIRECTORY}/${arm64LinuxBuildFolder}"
             Start-PSBuild -Configuration Release -Restore -Runtime linux-arm64 -PSModuleRestore @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
             # Remove symbol files.
             Remove-Item "${buildFolder}\*.pdb" -Force
+            Get-ChildItem -Path $buildFolder -Recurse -File | Export-LinuxFilePermission -FilePath "${buildFolder}-meta/linuxFilePermission.json" -RootPath ${buildFolder} -Force
         } elseif ($BuildType -eq 'rpm') {
             ## Build for Mariner
             $options = Get-PSOptions
@@ -4616,6 +4636,7 @@ function Invoke-AzDevOpsLinuxPackageBuild {
             Start-PSBuild -Clean @buildParams @releaseTagParam -Output $buildFolder -PSOptionsPath "${buildFolder}-meta/psoptions.json"
             # Remove symbol files, xml document files.
             Remove-Item "${buildFolder}\*.pdb", "${buildFolder}\*.xml" -Force
+            Get-ChildItem -Path $buildFolder -Recurse -File | Export-LinuxFilePermission -FilePath "${buildFolder}-meta/linuxFilePermission.json" -RootPath ${buildFolder} -Force
         }
     }
     catch {
@@ -4624,6 +4645,110 @@ function Invoke-AzDevOpsLinuxPackageBuild {
     }
 }
 
+<#
+    Apply the file permissions specified in the json file $FilePath to the files under $RootPath.
+    The format of the json file is like:
+
+    {
+        "System.Net.WebClient.dll": "744",
+        "Schemas/PSMaml/developer.xsd": "644",
+        "ref/System.Security.AccessControl.dll": "744",
+        "ref/System.IO.dll": "744",
+        "cs/Microsoft.CodeAnalysis.resources.dll": "744",
+        "Schemas/PSMaml/base.xsd": "644",
+        "Schemas/PSMaml/structureProcedure.xsd": "644",
+        "ref/System.Net.Security.dll": "744"
+    }
+#>
+function Set-LinuxFilePermission {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)] [string] $FilePath,
+        [Parameter(Mandatory)] [string] $RootPath
+    )
+
+    if (-not (Test-Path $FilePath)) {
+        throw "File does not exist: $FilePath"
+    }
+
+    if (-not (Test-Path $RootPath)) {
+        throw "File does not exist: $RootPath"
+    }
+
+    try {
+        Push-Location $RootPath
+        $filePermission = Get-Content $FilePath -Raw | ConvertFrom-Json -AsHashtable
+
+        Write-Verbose -Verbose -Message "Got file permission: $($filePermission.Count) for $FilePath"
+
+        $filePermission.GetEnumerator() | ForEach-Object {
+            $file = $_.Name
+            $permission = $_.Value
+            $fileFullName = Join-Path -Path $RootPath -ChildPath $file
+            Write-Verbose "Set permission $permission to $fileFullName" -Verbose
+            chmod $permission $fileFullName
+        }
+    }
+    finally {
+        Pop-Location
+    }
+}
+
+<#
+    Store the linux file permissions for all the files under root path $RootPath to the json file $FilePath.
+    The json file stores them as relative paths to the root.
+
+    The format of the json file is like:
+
+    {
+        "System.Net.WebClient.dll": "744",
+        "Schemas/PSMaml/developer.xsd": "644",
+        "ref/System.Security.AccessControl.dll": "744",
+        "ref/System.IO.dll": "744",
+        "cs/Microsoft.CodeAnalysis.resources.dll": "744",
+        "Schemas/PSMaml/base.xsd": "644",
+        "Schemas/PSMaml/structureProcedure.xsd": "644",
+        "ref/System.Net.Security.dll": "744"
+    }
+
+#>
+function Export-LinuxFilePermission {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)] [string] $FilePath,
+        [Parameter(Mandatory)] [string] $RootPath,
+        [Parameter(Mandatory, ValueFromPipeline = $true)] [System.IO.FileInfo[]] $InputObject,
+        [Parameter()] [switch] $Force
+    )
+
+    begin {
+        if (Test-Path $FilePath) {
+          if (-not $Force) {
+            throw "File '$FilePath' already exists."
+          }
+          else {
+            Remove-Item $FilePath -Force
+          }
+        }
+
+        $fileData = @{}
+    }
+
+    process {
+        foreach ($object in $InputObject) {
+            Write-Verbose "Processing $($object.FullName)"
+            # This gets the unix stat information for the file in the format that chmod expects, like '644'.
+            $filePerms = [convert]::ToString($object.unixstat.mode, 8).substring(3)
+            $relativePath = [System.IO.Path]::GetRelativePath($RootPath, $_.FullName)
+            $fileData.Add($relativePath, $filePerms)
+        }
+    }
+
+    end {
+        $fileData | ConvertTo-Json -Depth 10 | Out-File -FilePath $FilePath
+    }
+}
+
 enum PackageManifestResultStatus {
     Mismatch
     Match
diff --git a/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml b/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
index 39eeb7dd5fa..aa0d7ebcb8a 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
@@ -20,46 +20,82 @@ jobs:
 
   - task: DownloadPipelineArtifact@2
     inputs:
-      artifact: pwshLinuxBuild
-      path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuild
+      artifact: pwshLinuxBuild.tar.gz
+      path: $(Build.ArtifactStagingDirectory)/linuxTars
     displayName: Download deb build
 
   - task: DownloadPipelineArtifact@2
     inputs:
-      artifact: pwshLinuxBuildMinSize
-      path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize
+      artifact: pwshLinuxBuildMinSize.tar.gz
+      path: $(Build.ArtifactStagingDirectory)/linuxTars
     displayName: Download min-size build
 
   - task: DownloadPipelineArtifact@2
     inputs:
-      artifact: pwshLinuxBuildArm32
-      path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32
+      artifact: pwshLinuxBuildArm32.tar.gz
+      path: $(Build.ArtifactStagingDirectory)/linuxTars
     displayName: Download arm32 build
 
   - task: DownloadPipelineArtifact@2
     inputs:
-      artifact: pwshLinuxBuildArm64
-      path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64
+      artifact: pwshLinuxBuildArm64.tar.gz
+      path: $(Build.ArtifactStagingDirectory)/linuxTars
     displayName: Download arm64 build
 
   - task: DownloadPipelineArtifact@2
     inputs:
-      artifact: pwshMarinerBuildAmd64
-      path: $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64
+      artifact: pwshMarinerBuildAmd64.tar.gz
+      path: $(Build.ArtifactStagingDirectory)/linuxTars
     displayName: Download mariner build
 
   - task: DownloadPipelineArtifact@2
     inputs:
-      artifact: pwshLinuxBuildAlpine
-      path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildAlpine
+      artifact: pwshLinuxBuildAlpine.tar.gz
+      path: $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuildAlpine.tar.gz
     displayName: Download alpine build
 
   - task: DownloadPipelineArtifact@2
     inputs:
-      artifact: pwshLinuxBuildFxdependent
-      path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildFxdependent
+      artifact: pwshLinuxBuildFxdependent.tar.gz
+      path: $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuildFxdependent.tar.gz
     displayName: Download fxdependent build
 
+  - pwsh: |
+      Get-ChildItem -Path $(Build.ArtifactStagingDirectory)/linuxTars
+    displayName: Capture downloaded tars
+
+  - pwsh: |
+      Write-Verbose -Verbose -Message "Expanding $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuild.tar.gz to $(Build.ArtifactStagingDirectory)/pwshLinuxBuild"
+      New-Item -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuild -ItemType Directory
+      tar -xf $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuild.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshLinuxBuild
+      Write-Verbose -Verbose "File permisions after expanding"
+      Get-ChildItem -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuild/pwsh | Select-Object -Property 'unixmode', 'size', 'name'
+
+      Write-Verbose -Verbose -Message "Expanding $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuildMinSize.tar.gz to $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize"
+      New-Item -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize -ItemType Directory
+      tar -xf $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuildMinSize.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize
+
+      Write-Verbose -Verbose -Message "Expanding $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuildArm32.tar.gz to $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32"
+      New-Item -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32 -ItemType Directory
+      tar -xf $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuildArm32.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32
+
+      Write-Verbose -Verbose -Message "Expanding $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuildArm64.tar.gz to $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64"
+      New-Item -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64 -ItemType Directory
+      tar -xf $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuildArm64.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64
+
+      Write-Verbose -Verbose -Message "Expanding $(Build.ArtifactStagingDirectory)/linuxTars/pwshMarinerBuildAmd64.tar.gz to $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64"
+      New-Item -Path $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64 -ItemType Directory
+      tar -xf $(Build.ArtifactStagingDirectory)/linuxTars/pwshMarinerBuildAmd64.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64
+
+      Write-Verbose -Verbose -Message "Expanding $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuildAlpine.tar.gz/pwshLinuxBuild.tar.gz to $(Build.ArtifactStagingDirectory)/pwshLinuxBuildAlpine"
+      New-Item -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuildAlpine -ItemType Directory
+      tar -xf $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuildAlpine.tar.gz/pwshLinuxBuild.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshLinuxBuildAlpine
+
+      Write-Verbose -Verbose -Message "Expanding $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuildFxdependent.tar.gz/pwshLinuxBuild.tar.gz to $(Build.ArtifactStagingDirectory)/pwshLinuxBuildFxdependent"
+      New-Item -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuildFxdependent -ItemType Directory
+      tar -xf $(Build.ArtifactStagingDirectory)/linuxTars/pwshLinuxBuildFxdependent.tar.gz/pwshLinuxBuild.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshLinuxBuildFxdependent
+    displayName: Expand builds
+
   - template: SetVersionVariables.yml
     parameters:
       ReleaseTagVar: $(ReleaseTagVar)
@@ -116,12 +152,3 @@ jobs:
     parameters:
       binLocation: pwshLinuxBuildFxdependent
       buildPrefixName: 'PowerShell Linux Framework Dependent'
-
-  #- template: Sbom.yml@ComplianceRepo
-  #  parameters:
-  #    BuildDropPath: '$(System.ArtifactsDirectory)/$(BIN_LOCATION)'
-  #    Build_Repository_Uri: $(Github_Build_Repository_Uri)
-  #    displayName: ${{ parameters.buildName }} SBOM
-  #    PackageName: $(PACKAGE_NAME)
-  #    PackageVersion: $(Version)
-  #    sourceScanPath: '$(PowerShellRoot)/tools'
diff --git a/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml b/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
index f75ca3971a8..6837444b1be 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
@@ -26,50 +26,57 @@ jobs:
   - ${{ if or(eq(variables.build,'deb'), eq(variables.build,'rpm')) }} :
     - task: DownloadPipelineArtifact@2
       inputs:
-        artifact: pwshLinuxBuild-signed
-        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuild
+        artifact: authenticode-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuild-signed
+        pattern: '**/pwshLinuxBuild.tar.gz'
       displayName: Download deb build
 
   - ${{ if eq(variables.build,'deb') }} :
     - task: DownloadPipelineArtifact@2
       inputs:
-        artifact: pwshLinuxBuildMinSize-signed
-        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize
+        artifact: authenticode-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize-signed
+        pattern: '**/pwshLinuxBuildMinSize.tar.gz'
       displayName: Download min-size build
 
   - ${{ if eq(variables.build,'deb') }} :
     - task: DownloadPipelineArtifact@2
       inputs:
-        artifact: pwshLinuxBuildArm32-signed
-        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32
+        artifact: authenticode-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32-signed
+        pattern: '**/pwshLinuxBuildArm32.tar.gz'
       displayName: Download arm32 build
 
   - ${{ if eq(variables.build,'deb') }} :
     - task: DownloadPipelineArtifact@2
       inputs:
-        artifact: pwshLinuxBuildArm64-signed
-        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64
+        artifact: authenticode-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64-signed
+        pattern: '**/pwshLinuxBuildArm64.tar.gz'
       displayName: Download arm64 build
 
   - ${{ if eq(variables.build,'rpm') }} :
     - task: DownloadPipelineArtifact@2
       inputs:
-        artifact: pwshMarinerBuildAmd64-signed
-        path: $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64
+        artifact: authenticode-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64-signed
+        pattern: '**/pwshMarinerBuildAmd64.tar.gz'
       displayName: Download mariner build
 
   - ${{ if eq(variables.build,'alpine') }} :
     - task: DownloadPipelineArtifact@2
       inputs:
-        artifact: pwshLinuxBuildAlpine-signed
-        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuild
+        artifact: authenticode-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildAlpine-signed
+        pattern: '**/pwshLinuxBuildAlpine.tar.gz'
       displayName: Download alpine build
 
   - ${{ if eq(variables.build,'fxdependent') }} :
     - task: DownloadPipelineArtifact@2
       inputs:
-        artifact: pwshLinuxBuildFxdependent-signed
-        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuild
+        artifact: authenticode-signed
+        path: $(Build.ArtifactStagingDirectory)/pwshLinuxBuildFxdependent-signed
+        pattern: '**/pwshLinuxBuildFxdependent.tar.gz'
       displayName: Download fxdependent build
 
   - ${{ if or(eq(variables.build,'deb'), eq(variables.build,'rpm')) }} :
@@ -125,6 +132,50 @@ jobs:
       Get-ChildItem '$(Build.ArtifactStagingDirectory)' | Select-Object -Property 'unixmode', 'size', 'name'
     displayName: Capture downloads
 
+  - pwsh: |
+      if ('$(build)' -eq 'deb' -or '$(build)' -eq 'rpm') {
+        Write-Verbose -Verbose "Expanding $(Build.ArtifactStagingDirectory)/pwshLinuxBuild-signed/pwshLinuxBuild.tar.gz to $(Build.ArtifactStagingDirectory)/pwshLinuxBuild"
+        New-Item -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuild -ItemType Directory
+        tar -xf $(Build.ArtifactStagingDirectory)/pwshLinuxBuild-signed/pwshLinuxBuild.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshLinuxBuild
+      }
+
+      if ('$(build)' -eq 'deb') {
+        Write-Verbose -Verbose "Expanding $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize-signed/pwshLinuxBuildMinSize.tar.gz to $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize"
+        New-Item -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize -ItemType Directory
+        tar -xf $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize-signed/pwshLinuxBuildMinSize.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshLinuxBuildMinSize
+
+        Write-Verbose -Verbose "Expanding $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32-signed/pwshLinuxBuildArm32.tar.gz to $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32"
+        New-Item -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32 -ItemType Directory
+        tar -xf  $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32-signed/pwshLinuxBuildArm32.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm32
+
+        Write-Verbose -Verbose "Expanding $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64-signed/pwshLinuxBuildArm64.tar.gz to $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64"
+        New-Item -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64 -ItemType Directory
+        tar -xf  $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64-signed/pwshLinuxBuildArm64.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshLinuxBuildArm64
+      }
+
+      if ('$(build)' -eq 'rpm') {
+        Write-Verbose -Verbose "Expanding $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64-signed/pwshMarinerBuildAmd64.tar.gz to $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64"
+        New-Item -Path $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64 -ItemType Directory
+        tar -xf $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64-signed/pwshMarinerBuildAmd64.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshMarinerBuildAmd64
+      }
+
+      if ('$(build)' -eq 'alpine') {
+        Write-Verbose -Verbose "Expanding $(Build.ArtifactStagingDirectory)/pwshLinuxBuildAlpine-signed/pwshLinuxBuildAlpine.tar.gz to $(Build.ArtifactStagingDirectory)/pwshLinuxBuild"
+        New-Item -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuild -ItemType Directory
+        tar -xf $(Build.ArtifactStagingDirectory)/pwshLinuxBuildAlpine-signed/pwshLinuxBuildAlpine.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshLinuxBuild
+      }
+
+      if ('$(build)' -eq 'fxdependent') {
+        Write-Verbose -Verbose "Expanding $(Build.ArtifactStagingDirectory)/pwshLinuxBuildFxdependent-signed/pwshLinuxBuildFxdependent.tar.gz to $(Build.ArtifactStagingDirectory)/pwshLinuxBuild"
+        New-Item -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuild -ItemType Directory
+        tar -xf $(Build.ArtifactStagingDirectory)/pwshLinuxBuildFxdependent-signed/pwshLinuxBuildFxdependent.tar.gz -C $(Build.ArtifactStagingDirectory)/pwshLinuxBuild
+      }
+    displayName: Expand all signed tar.gz
+
+  - pwsh: |
+      Get-ChildItem '$(Build.ArtifactStagingDirectory)' | Select-Object -Property 'unixmode', 'size', 'name'
+    displayName: Capture expanded
+
   - checkout: self
     clean: true
 
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index ab551a16dd0..03358e2a5ec 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -71,6 +71,10 @@ jobs:
         Import-Module "$env:POWERSHELLROOT/tools/packaging"
 
         Invoke-AzDevOpsLinuxPackageBuild -ReleaseTag '$(ReleaseTagVar)' -BuildType '$(build)'
+
+        Write-Verbose -Verbose "File permisions after building"
+        Get-ChildItem -Path $(System.ArtifactsDirectory)/pwshLinuxBuild/pwsh | Select-Object -Property 'unixmode', 'size', 'name'
+
       } catch {
         Get-Error
         throw
@@ -128,11 +132,34 @@ jobs:
         PackageVersion: $(Version)
         sourceScanPath: '$(PowerShellRoot)/tools'
 
+  - pwsh: |
+      Set-Location '$(System.ArtifactsDirectory)/pwshLinuxBuild'
+      Write-Verbose -Verbose "File permisions before compressing"
+      Get-ChildItem -Path $(Build.ArtifactStagingDirectory)/pwshLinuxBuild/pwsh | Select-Object -Property 'unixmode', 'size', 'name'
+      tar -czvf $(System.ArtifactsDirectory)/pwshLinuxBuild.tar.gz *
+    displayName: Compress pwshLinuxBuild
+
+  - ${{ if eq(variables.build,'deb') }} :
+    - pwsh: |
+        Set-Location '$(System.ArtifactsDirectory)/pwshLinuxBuildMinSize'
+        tar -czvf $(System.ArtifactsDirectory)/pwshLinuxBuildMinSize.tar.gz *
+        Set-Location '$(System.ArtifactsDirectory)/pwshLinuxBuildArm32'
+        tar -czvf $(System.ArtifactsDirectory)/pwshLinuxBuildArm32.tar.gz *
+        Set-Location '$(System.ArtifactsDirectory)/pwshLinuxBuildArm64'
+        tar -czvf $(System.ArtifactsDirectory)/pwshLinuxBuildArm64.tar.gz *
+      displayName: Compress deb
+
+  - ${{ if eq(variables.build,'rpm') }} :
+    - pwsh: |
+        Set-Location '$(System.ArtifactsDirectory)/pwshMarinerBuildAmd64'
+        tar -czvf $(System.ArtifactsDirectory)/pwshMarinerBuildAmd64.tar.gz *
+      displayName: Compress pwshMarinerBuildAmd64
+
   - ${{ if eq(variables.build,'deb') }} :
     - task: PublishPipelineArtifact@1
       inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild'
-        artifactName: pwshLinuxBuild
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild.tar.gz'
+        artifactName: pwshLinuxBuild.tar.gz
 
   - ${{ if eq(variables.build,'deb') }} :
     - task: PublishPipelineArtifact@1
@@ -143,8 +170,8 @@ jobs:
   - ${{ if eq(variables.build,'deb') }} :
     - task: PublishPipelineArtifact@1
       inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildMinSize'
-        artifactName: pwshLinuxBuildMinSize
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildMinSize.tar.gz'
+        artifactName: pwshLinuxBuildMinSize.tar.gz
 
   - ${{ if eq(variables.build,'deb') }} :
     - task: PublishPipelineArtifact@1
@@ -155,8 +182,8 @@ jobs:
   - ${{ if eq(variables.build,'deb') }} :
     - task: PublishPipelineArtifact@1
       inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm32'
-        artifactName: pwshLinuxBuildArm32
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm32.tar.gz'
+        artifactName: pwshLinuxBuildArm32.tar.gz
 
   - ${{ if eq(variables.build,'deb') }} :
     - task: PublishPipelineArtifact@1
@@ -167,8 +194,8 @@ jobs:
   - ${{ if eq(variables.build,'deb') }} :
     - task: PublishPipelineArtifact@1
       inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm64'
-        artifactName: pwshLinuxBuildArm64
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuildArm64.tar.gz'
+        artifactName: pwshLinuxBuildArm64.tar.gz
 
   - ${{ if eq(variables.build,'deb') }} :
     - task: PublishPipelineArtifact@1
@@ -179,8 +206,8 @@ jobs:
   - ${{ if eq(variables.build,'rpm') }} :
     - task: PublishPipelineArtifact@1
       inputs:
-        path: '$(System.ArtifactsDirectory)/pwshMarinerBuildAmd64'
-        artifactName: pwshMarinerBuildAmd64
+        path: '$(System.ArtifactsDirectory)/pwshMarinerBuildAmd64.tar.gz'
+        artifactName: pwshMarinerBuildAmd64.tar.gz
 
   - ${{ if eq(variables.build,'rpm') }} :
     - task: PublishPipelineArtifact@1
@@ -191,8 +218,8 @@ jobs:
   - ${{ if eq(variables.build,'alpine') }} :
     - task: PublishPipelineArtifact@1
       inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild'
-        artifactName: pwshLinuxBuildAlpine
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild.tar.gz'
+        artifactName: pwshLinuxBuildAlpine.tar.gz
 
   - ${{ if eq(variables.build,'alpine') }} :
     - task: PublishPipelineArtifact@1
@@ -203,8 +230,8 @@ jobs:
   - ${{ if eq(variables.build,'fxdependent') }} :
     - task: PublishPipelineArtifact@1
       inputs:
-        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild'
-        artifactName: pwshLinuxBuildFxdependent
+        path: '$(System.ArtifactsDirectory)/pwshLinuxBuild.tar.gz'
+        artifactName: pwshLinuxBuildFxdependent.tar.gz
 
   - ${{ if eq(variables.build,'fxdependent') }} :
     - task: PublishPipelineArtifact@1
diff --git a/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml b/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml
index 8e4d86e3b51..f8a252da21c 100644
--- a/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml
+++ b/tools/releaseBuild/azureDevOps/templates/signBuildFiles.yml
@@ -174,6 +174,14 @@ steps:
 
 - pwsh: |
       $uploadFolder = '$(System.ArtifactsDirectory)/${{ parameters.binLocation }}'
-      $containerName = '${{ parameters.binLocation }}-signed'
-      Write-Host "##vso[artifact.upload containerfolder=$containerName;artifactname=$containerName]$uploadFolder"
+      $containerName = 'authenticode-signed'
+
+      Write-Verbose -Verbose "File permissions after signing"
+      Get-ChildItem $uploadFolder\pwsh | Select-Object -Property 'unixmode', 'size', 'name'
+
+      $uploadTarFilePath = '$(System.ArtifactsDirectory)/${{ parameters.binLocation }}.tar.gz'
+      Write-Verbose -Verbose -Message "Creating tar.gz - $uploadTarFilePath"
+      tar -czvf $uploadTarFilePath -C $uploadFolder *
+
+      Write-Host "##vso[artifact.upload containerfolder=$containerName;artifactname=$containerName]$uploadTarFilePath"
   displayName: ${{ parameters.buildPrefixName }} - Upload signed files to artifacts

From af8d716ac9bc85a8c35ca2af3afbc6bb88279519 Mon Sep 17 00:00:00 2001
From: Travis Plunk <tplunk@microsoft.com>
Date: Tue, 22 Nov 2022 02:14:11 +0000
Subject: [PATCH 629/645] Merged PR 23330: Update packages

Update dependent packages
---
 ...crosoft.PowerShell.Commands.Utility.csproj |   3 +-
 .../System.Management.Automation.csproj       |   6 +-
 tools/cgmanifest.json                         | 851 +++---------------
 3 files changed, 138 insertions(+), 722 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index ad1269ae241..1b6a915bbe5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Namotion.Reflection" Version="2.1.1" />
     <ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
     <PackageReference Include="Markdig.Signed" Version="0.30.4" />
     <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
@@ -32,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0-4.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
     <PackageReference Include="System.Threading.AccessControl" Version="7.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
     <PackageReference Include="NJsonSchema" Version="10.8.0" />
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 6198ff5a84c..7226b6ab488 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -13,6 +13,10 @@
   <ItemGroup>
     <!-- the following package(s) are from https://github.com/JamesNK/Newtonsoft.Json -->
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+   <!-- Newtonsoft.Json brings in an old version of CSharp
+      So, we are forcing a newer version.
+    -->
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <!-- the Application Insights package -->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
@@ -22,7 +26,7 @@
     <PackageReference Include="System.DirectoryServices" Version="7.0.0" />
     <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
     <PackageReference Include="System.Management" Version="7.0.0" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.3.22119.2" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0" />
     <PackageReference Include="System.Security.Permissions" Version="7.0.0" />
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index b69881cd658..fdae06f278c 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -25,7 +25,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Markdig.Signed",
-          "Version": "0.22.0"
+          "Version": "0.30.4"
         }
       },
       "DevelopmentDependency": false
@@ -45,7 +45,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Bcl.AsyncInterfaces",
-          "Version": "5.0.0"
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -65,7 +65,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.Common",
-          "Version": "4.3.0"
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -75,7 +75,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CodeAnalysis.CSharp",
-          "Version": "4.3.0"
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -95,7 +95,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.CSharp",
-          "Version": "4.3.0"
+          "Version": "4.7.0"
         }
       },
       "DevelopmentDependency": false
@@ -105,7 +105,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Extensions.ObjectPool",
-          "Version": "5.0.10"
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -140,36 +140,6 @@
       },
       "DevelopmentDependency": false
     },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "Microsoft.NETCore.Platforms",
-          "Version": "1.1.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "Microsoft.NETCore.Targets",
-          "Version": "1.1.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "Microsoft.NETCore.Windows.ApiSets",
-          "Version": "1.0.1"
-        }
-      },
-      "DevelopmentDependency": false
-    },
     {
       "Component": {
         "Type": "nuget",
@@ -185,7 +155,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.PowerShell.Native",
-          "Version": "7.2.0"
+          "Version": "7.3.0"
         }
       },
       "DevelopmentDependency": false
@@ -205,7 +175,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Win32.Registry.AccessControl",
-          "Version": "6.0.0"
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -215,7 +185,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Win32.Registry",
-          "Version": "4.7.0"
+          "Version": "5.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -225,7 +195,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Win32.SystemEvents",
-          "Version": "6.0.1"
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -235,7 +205,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Windows.Compatibility",
-          "Version": "6.0.0"
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -245,7 +215,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Namotion.Reflection",
-          "Version": "2.0.10"
+          "Version": "2.1.1"
         }
       },
       "DevelopmentDependency": false
@@ -265,67 +235,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "NJsonSchema",
-          "Version": "10.7.2"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "runtime.any.System.Collections",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "runtime.any.System.Globalization",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "runtime.any.System.IO",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "runtime.any.System.Reflection.Extensions",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "runtime.any.System.Reflection.Primitives",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "runtime.any.System.Reflection",
-          "Version": "4.3.0"
+          "Version": "10.8.0"
         }
       },
       "DevelopmentDependency": false
@@ -334,8 +244,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.any.System.Resources.ResourceManager",
-          "Version": "4.3.0"
+          "Name": "runtime.linux-arm.runtime.native.System.IO.Ports",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -344,8 +254,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.any.System.Runtime.Handles",
-          "Version": "4.3.0"
+          "Name": "runtime.linux-arm64.runtime.native.System.IO.Ports",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -354,8 +264,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.any.System.Runtime.InteropServices",
-          "Version": "4.3.0"
+          "Name": "runtime.linux-x64.runtime.native.System.IO.Ports",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -364,8 +274,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.any.System.Runtime",
-          "Version": "4.3.0"
+          "Name": "runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.7.0"
         }
       },
       "DevelopmentDependency": false
@@ -374,8 +284,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.any.System.Text.Encoding",
-          "Version": "4.3.0"
+          "Name": "runtime.native.System.IO.Ports",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -384,8 +294,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.any.System.Threading.Tasks",
-          "Version": "4.3.0"
+          "Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -394,8 +304,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -404,8 +314,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -414,8 +324,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -424,8 +334,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.linux-arm.runtime.native.System.IO.Ports",
-          "Version": "6.0.0"
+          "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
+          "Version": "4.4.0"
         }
       },
       "DevelopmentDependency": false
@@ -434,28 +344,28 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.linux-arm64.runtime.native.System.IO.Ports",
-          "Version": "6.0.0"
+          "Name": "StyleCop.Analyzers.Unstable",
+          "Version": "1.2.0.435"
         }
       },
-      "DevelopmentDependency": false
+      "DevelopmentDependency": true
     },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.linux-x64.runtime.native.System.IO.Ports",
-          "Version": "6.0.0"
+          "Name": "StyleCop.Analyzers",
+          "Version": "1.1.118"
         }
       },
-      "DevelopmentDependency": false
+      "DevelopmentDependency": true
     },
     {
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.7.0"
+          "Name": "System.CodeDom",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -464,7 +374,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.native.System.IO.Ports",
+          "Name": "System.Collections.Immutable",
           "Version": "6.0.0"
         }
       },
@@ -474,8 +384,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "System.ComponentModel.Composition.Registration",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -484,8 +394,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.native.System",
-          "Version": "4.3.0"
+          "Name": "System.ComponentModel.Composition",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -494,8 +404,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "System.Configuration.ConfigurationManager",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -504,8 +414,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "System.Data.Odbc",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -514,8 +424,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
-          "Version": "6.0.0"
+          "Name": "System.Data.OleDb",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -524,8 +434,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
-          "Version": "6.0.0"
+          "Name": "System.Data.SqlClient",
+          "Version": "4.8.5"
         }
       },
       "DevelopmentDependency": false
@@ -534,8 +444,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "System.Diagnostics.DiagnosticSource",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -544,8 +454,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "System.Diagnostics.EventLog",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -554,8 +464,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "System.Diagnostics.PerformanceCounter",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -564,8 +474,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "System.DirectoryServices.AccountManagement",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -574,8 +484,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-          "Version": "4.3.0"
+          "Name": "System.DirectoryServices.Protocols",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -584,8 +494,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.unix.System.Diagnostics.Debug",
-          "Version": "4.3.0"
+          "Name": "System.DirectoryServices",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -594,8 +504,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.unix.System.Private.Uri",
-          "Version": "4.3.0"
+          "Name": "System.Drawing.Common",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -604,8 +514,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.unix.System.Runtime.Extensions",
-          "Version": "4.3.0"
+          "Name": "System.Formats.Asn1",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -614,8 +524,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "System.IO.Packaging",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -624,8 +534,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-x64.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "System.IO.Ports",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -634,8 +544,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win-x86.runtime.native.System.Data.SqlClient.sni",
-          "Version": "4.4.0"
+          "Name": "System.Management",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -644,8 +554,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win.System.Diagnostics.Debug",
-          "Version": "4.3.0"
+          "Name": "System.Memory",
+          "Version": "4.5.5"
         }
       },
       "DevelopmentDependency": false
@@ -654,8 +564,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win.System.Runtime.Extensions",
-          "Version": "4.3.0"
+          "Name": "System.Net.Http.WinHttpHandler",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -664,8 +574,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win7-x64.Microsoft.NETCore.Windows.ApiSets",
-          "Version": "1.0.1"
+          "Name": "System.Numerics.Vectors",
+          "Version": "4.5.0"
         }
       },
       "DevelopmentDependency": false
@@ -674,8 +584,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win7-x86.Microsoft.NETCore.Windows.ApiSets",
-          "Version": "1.0.1"
+          "Name": "System.Private.ServiceModel",
+          "Version": "4.10.0"
         }
       },
       "DevelopmentDependency": false
@@ -684,8 +594,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "runtime.win7.System.Private.Uri",
-          "Version": "4.3.0"
+          "Name": "System.Reflection.Context",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -694,28 +604,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "StyleCop.Analyzers.Unstable",
-          "Version": "1.2.0.435"
-        }
-      },
-      "DevelopmentDependency": true
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "StyleCop.Analyzers",
-          "Version": "1.1.118"
-        }
-      },
-      "DevelopmentDependency": true
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.CodeDom",
-          "Version": "6.0.0"
+          "Name": "System.Reflection.DispatchProxy",
+          "Version": "4.7.1"
         }
       },
       "DevelopmentDependency": false
@@ -724,7 +614,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Collections.Immutable",
+          "Name": "System.Reflection.Metadata",
           "Version": "5.0.0"
         }
       },
@@ -734,8 +624,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Collections",
-          "Version": "4.3.0"
+          "Name": "System.Runtime.Caching",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -744,7 +634,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.ComponentModel.Composition.Registration",
+          "Name": "System.Runtime.CompilerServices.Unsafe",
           "Version": "6.0.0"
         }
       },
@@ -754,7 +644,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.ComponentModel.Composition",
+          "Name": "System.Security.AccessControl",
           "Version": "6.0.0"
         }
       },
@@ -764,18 +654,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Configuration.ConfigurationManager",
-          "Version": "6.0.1"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Data.Odbc",
-          "Version": "6.0.1"
+          "Name": "System.Security.Cryptography.Pkcs",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -784,8 +664,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Data.OleDb",
-          "Version": "6.0.0"
+          "Name": "System.Security.Cryptography.ProtectedData",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -794,8 +674,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Data.SqlClient",
-          "Version": "4.8.3"
+          "Name": "System.Security.Cryptography.Xml",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -804,8 +684,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Diagnostics.Debug",
-          "Version": "4.3.0"
+          "Name": "System.Security.Permissions",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -814,7 +694,7 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Diagnostics.DiagnosticSource",
+          "Name": "System.Security.Principal.Windows",
           "Version": "5.0.0"
         }
       },
@@ -824,28 +704,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Diagnostics.EventLog",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Diagnostics.PerformanceCounter",
-          "Version": "6.0.1"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.DirectoryServices.AccountManagement",
-          "Version": "6.0.0"
+          "Name": "System.ServiceModel.Duplex",
+          "Version": "4.10.0"
         }
       },
       "DevelopmentDependency": false
@@ -854,8 +714,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.DirectoryServices.Protocols",
-          "Version": "6.0.1"
+          "Name": "System.ServiceModel.Http",
+          "Version": "4.10.0"
         }
       },
       "DevelopmentDependency": false
@@ -864,8 +724,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.DirectoryServices",
-          "Version": "6.0.0"
+          "Name": "System.ServiceModel.NetTcp",
+          "Version": "4.10.0"
         }
       },
       "DevelopmentDependency": false
@@ -874,8 +734,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Drawing.Common",
-          "Version": "6.0.0"
+          "Name": "System.ServiceModel.Primitives",
+          "Version": "4.10.0"
         }
       },
       "DevelopmentDependency": false
@@ -884,8 +744,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Dynamic.Runtime",
-          "Version": "4.3.0"
+          "Name": "System.ServiceModel.Security",
+          "Version": "4.10.0"
         }
       },
       "DevelopmentDependency": false
@@ -894,8 +754,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Formats.Asn1",
-          "Version": "6.0.0"
+          "Name": "System.ServiceModel.Syndication",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -904,8 +764,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Globalization",
-          "Version": "4.3.0"
+          "Name": "System.ServiceProcess.ServiceController",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -914,8 +774,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.IO.Packaging",
-          "Version": "6.0.0"
+          "Name": "System.Speech",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -924,8 +784,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.IO.Ports",
-          "Version": "6.0.0"
+          "Name": "System.Text.Encoding.CodePages",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -934,8 +794,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.IO",
-          "Version": "4.3.0"
+          "Name": "System.Text.Encodings.Web",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -944,8 +804,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Linq.Expressions",
-          "Version": "4.3.0"
+          "Name": "System.Threading.AccessControl",
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
@@ -954,8 +814,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Linq",
-          "Version": "4.3.0"
+          "Name": "System.Threading.Tasks.Extensions",
+          "Version": "4.5.4"
         }
       },
       "DevelopmentDependency": false
@@ -964,458 +824,8 @@
       "Component": {
         "Type": "nuget",
         "Nuget": {
-          "Name": "System.Management",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Memory",
-          "Version": "4.5.4"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Net.Http.WinHttpHandler",
-          "Version": "6.0.1"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Numerics.Vectors",
-          "Version": "4.5.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.ObjectModel",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Private.ServiceModel",
-          "Version": "4.10.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Private.Uri",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Reflection.Context",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Reflection.DispatchProxy",
-          "Version": "4.7.1"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Reflection.Emit.ILGeneration",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Reflection.Emit.Lightweight",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Reflection.Emit",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Reflection.Extensions",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Reflection.Metadata",
-          "Version": "5.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Reflection.Primitives",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Reflection.TypeExtensions",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Reflection",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Resources.ResourceManager",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Runtime.Caching",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Runtime.CompilerServices.Unsafe",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Runtime.Extensions",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Runtime.Handles",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Runtime.InteropServices",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Runtime",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Security.AccessControl",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Security.Cryptography.Pkcs",
-          "Version": "6.0.1"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Security.Cryptography.ProtectedData",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Security.Cryptography.Xml",
-          "Version": "6.0.1"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Security.Permissions",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Security.Principal.Windows",
-          "Version": "5.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.ServiceModel.Duplex",
-          "Version": "4.10.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.ServiceModel.Http",
-          "Version": "4.10.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.ServiceModel.NetTcp",
-          "Version": "4.10.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.ServiceModel.Primitives",
-          "Version": "4.10.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.ServiceModel.Security",
-          "Version": "4.10.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.ServiceModel.Syndication",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.ServiceProcess.ServiceController",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Speech",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Text.Encoding.CodePages",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Text.Encoding",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Text.Encodings.Web",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Threading.AccessControl",
-          "Version": "6.0.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Threading.Tasks.Extensions",
-          "Version": "4.5.4"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Threading.Tasks",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Threading",
-          "Version": "4.3.0"
-        }
-      },
-      "DevelopmentDependency": false
-    },
-    {
-      "Component": {
-        "Type": "nuget",
-        "Nuget": {
-          "Name": "System.Web.Services.Description",
-          "Version": "4.9.0"
+          "Name": "System.Web.Services.Description",
+          "Version": "4.10.0"
         }
       },
       "DevelopmentDependency": false
@@ -1425,10 +835,11 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Windows.Extensions",
-          "Version": "6.0.0"
+          "Version": "7.0.0"
         }
       },
       "DevelopmentDependency": false
     }
-  ]
+  ],
+  "$schema": "https://json.schemastore.org/component-detection-manifest.json"
 }

From eb612c0be8e99c5d804e14c94f8973bbbc7d19c3 Mon Sep 17 00:00:00 2001
From: Travis Plunk <tplunk@microsoft.com>
Date: Tue, 22 Nov 2022 02:14:32 +0000
Subject: [PATCH 630/645] Merged PR 23331: Remove TabExpansion from remote
 session configuration

---
 .../common/WireDataFormat/EncodeAndDecode.cs  | 228 ------------------
 .../remoting/server/serverremotesession.cs    |  24 +-
 2 files changed, 3 insertions(+), 249 deletions(-)

diff --git a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs
index 2fc70413d1a..70693c4c3d9 100644
--- a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs
+++ b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs
@@ -125,234 +125,6 @@ internal static class RemoteDataNameStrings
         // to client to let client know if the negotiation succeeded.
         internal const string IsNegotiationSucceeded = "IsNegotiationSucceeded";
 
-        #region "PSv2 Tab Expansion Function"
-
-        internal const string PSv2TabExpansionFunction = "TabExpansion";
-
-        /// <summary>
-        /// This is the PSv2 function for tab expansion. It's only for legacy purpose - used in
-        /// an interactive remote session from a win7 machine to a win8 machine (or later).
-        /// </summary>
-        internal const string PSv2TabExpansionFunctionText = @"
-            param($line, $lastWord)
-            & {
-                function Write-Members ($sep='.')
-                {
-                    Invoke-Expression ('$_val=' + $_expression)
-
-                    $_method = [Management.Automation.PSMemberTypes] `
-                        'Method,CodeMethod,ScriptMethod,ParameterizedProperty'
-                    if ($sep -eq '.')
-                    {
-                        $params = @{view = 'extended','adapted','base'}
-                    }
-                    else
-                    {
-                        $params = @{static=$true}
-                    }
-
-                    foreach ($_m in ,$_val | Get-Member @params $_pat |
-                        Sort-Object membertype,name)
-                    {
-                        if ($_m.MemberType -band $_method)
-                        {
-                            # Return a method...
-                            $_base + $_expression + $sep + $_m.name + '('
-                        }
-                        else {
-                            # Return a property...
-                            $_base + $_expression + $sep + $_m.name
-                        }
-                    }
-                }
-
-                # If a command name contains any of these chars, it needs to be quoted
-                $_charsRequiringQuotes = ('`&@''#{}()$,;|<> ' + ""`t"").ToCharArray()
-
-                # If a variable name contains any of these characters it needs to be in braces
-                $_varsRequiringQuotes = ('-`&@''#{}()$,;|<> .\/' + ""`t"").ToCharArray()
-
-                switch -regex ($lastWord)
-                {
-                    # Handle property and method expansion rooted at variables...
-                    # e.g. $a.b.<tab>
-                    '(^.*)(\$(\w|:|\.)+)\.([*\w]*)$' {
-                        $_base = $matches[1]
-                        $_expression = $matches[2]
-                        $_pat = $matches[4] + '*'
-                        Write-Members
-                        break;
-                    }
-
-                    # Handle simple property and method expansion on static members...
-                    # e.g. [datetime]::n<tab>
-                    '(^.*)(\[(\w|\.|\+)+\])(\:\:|\.){0,1}([*\w]*)$' {
-                        $_base = $matches[1]
-                        $_expression = $matches[2]
-                        $_pat = $matches[5] + '*'
-                        Write-Members $(if (! $matches[4]) {'::'} else {$matches[4]})
-                        break;
-                    }
-
-                    # Handle complex property and method expansion on static members
-                    # where there are intermediate properties...
-                    # e.g. [datetime]::now.d<tab>
-                    '(^.*)(\[(\w|\.|\+)+\](\:\:|\.)(\w+\.)+)([*\w]*)$' {
-                        $_base = $matches[1]  # everything before the expression
-                        $_expression = $matches[2].TrimEnd('.') # expression less trailing '.'
-                        $_pat = $matches[6] + '*'  # the member to look for...
-                        Write-Members
-                        break;
-                    }
-
-                    # Handle variable name expansion...
-                    '(^.*\$)([*\w:]+)$' {
-                        $_prefix = $matches[1]
-                        $_varName = $matches[2]
-                        $_colonPos = $_varname.IndexOf(':')
-                        if ($_colonPos -eq -1)
-                        {
-                            $_varName = 'variable:' + $_varName
-                            $_provider = ''
-                        }
-                        else
-                        {
-                            $_provider = $_varname.Substring(0, $_colonPos+1)
-                        }
-
-                        foreach ($_v in Get-ChildItem ($_varName + '*') | sort Name)
-                        {
-                            $_nameFound = $_v.name
-                            $(if ($_nameFound.IndexOfAny($_varsRequiringQuotes) -eq -1) {'{0}{1}{2}'}
-                            else {'{0}{{{1}{2}}}'}) -f $_prefix, $_provider, $_nameFound
-                        }
-
-                        break;
-                    }
-
-                    # Do completion on parameters...
-                    '^-([*\w0-9]*)' {
-                        $_pat = $matches[1] + '*'
-
-                        # extract the command name from the string
-                        # first split the string into statements and pipeline elements
-                        # This doesn't handle strings however.
-                        $_command = [regex]::Split($line, '[|;=]')[-1]
-
-                        #  Extract the trailing unclosed block e.g. ls | foreach { cp
-                        if ($_command -match '\{([^\{\}]*)$')
-                        {
-                            $_command = $matches[1]
-                        }
-
-                        # Extract the longest unclosed parenthetical expression...
-                        if ($_command -match '\(([^()]*)$')
-                        {
-                            $_command = $matches[1]
-                        }
-
-                        # take the first space separated token of the remaining string
-                        # as the command to look up. Trim any leading or trailing spaces
-                        # so you don't get leading empty elements.
-                        $_command = $_command.TrimEnd('-')
-                        $_command,$_arguments = $_command.Trim().Split()
-
-                        # now get the info object for it, -ArgumentList will force aliases to be resolved
-                        # it also retrieves dynamic parameters
-                        try
-                        {
-                            $_command = @(Get-Command -type 'Alias,Cmdlet,Function,Filter,ExternalScript' `
-                                -Name $_command -ArgumentList $_arguments)[0]
-                        }
-                        catch
-                        {
-                            # see if the command is an alias. If so, resolve it to the real command
-                            if(Test-Path alias:\$_command)
-                            {
-                                $_command = @(Get-Command -Type Alias $_command)[0].Definition
-                            }
-
-                            # If we were unsuccessful retrieving the command, try again without the parameters
-                            $_command = @(Get-Command -type 'Cmdlet,Function,Filter,ExternalScript' `
-                                -Name $_command)[0]
-                        }
-
-                        # remove errors generated by the command not being found, and break
-                        if(-not $_command) { $error.RemoveAt(0); break; }
-
-                        # expand the parameter sets and emit the matching elements
-                        # need to use psbase.Keys in case 'keys' is one of the parameters
-                        # to the cmdlet
-                        foreach ($_n in $_command.Parameters.psbase.Keys)
-                        {
-                            if ($_n -like $_pat) { '-' + $_n }
-                        }
-
-                        break;
-                    }
-
-                    # Tab complete against history either #<pattern> or #<id>
-                    '^#(\w*)' {
-                        $_pattern = $matches[1]
-                        if ($_pattern -match '^[0-9]+$')
-                        {
-                            Get-History -ea SilentlyContinue -Id $_pattern | ForEach-Object { $_.CommandLine }
-                        }
-                        else
-                        {
-                            $_pattern = '*' + $_pattern + '*'
-                            Get-History -Count 32767 | Sort-Object -Descending Id| ForEach-Object { $_.CommandLine } | where { $_ -like $_pattern }
-                        }
-
-                        break;
-                    }
-
-                    # try to find a matching command...
-                    default {
-                        # parse the script...
-                        $_tokens = [System.Management.Automation.PSParser]::Tokenize($line,
-                            [ref] $null)
-
-                        if ($_tokens)
-                        {
-                            $_lastToken = $_tokens[$_tokens.count - 1]
-                            if ($_lastToken.Type -eq 'Command')
-                            {
-                                $_cmd = $_lastToken.Content
-
-                                # don't look for paths...
-                                if ($_cmd.IndexOfAny('/\:') -eq -1)
-                                {
-                                    # handle parsing errors - the last token string should be the last
-                                    # string in the line...
-                                    if ($lastword.Length -ge $_cmd.Length -and
-                                        $lastword.substring($lastword.length-$_cmd.length) -eq $_cmd)
-                                    {
-                                        $_pat = $_cmd + '*'
-                                        $_base = $lastword.substring(0, $lastword.length-$_cmd.length)
-
-                                        # get files in current directory first, then look for commands...
-                                        $( try {Resolve-Path -ea SilentlyContinue -Relative $_pat } catch {} ;
-                                           try { $ExecutionContext.InvokeCommand.GetCommandName($_pat, $true, $false) |
-                                               Sort-Object -Unique } catch {} ) |
-                                                   # If the command contains non-word characters (space, ) ] ; ) etc.)
-                                                   # then it needs to be quoted and prefixed with &
-                                                   ForEach-Object {
-                                                        if ($_.IndexOfAny($_charsRequiringQuotes) -eq -1) { $_ }
-                                                        elseif ($_.IndexOf('''') -ge 0) {'& ''{0}''' -f $_.Replace('''','''''') }
-                                                        else { '& ''{0}''' -f $_ }} |
-                                                   ForEach-Object {'{0}{1}' -f $_base,$_ }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        ";
-
-        #endregion "PSv2 Tab Expansion Function"
-
         #region Host Related Strings
 
         internal const string CallId = "ci";
diff --git a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
index 96aedc03ac3..7f0e5636a4e 100644
--- a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
+++ b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
@@ -802,32 +802,14 @@ private void HandleCreateRunspacePool(object sender, RemoteDataEventArgs createR
                     RemotingErrorIdStrings.PSSenderInfoDescription),
                 ScopedItemOptions.ReadOnly));
 
-            // check if the current scenario is Win7(client) to Win8(server). Add back the PSv2 version TabExpansion
-            // function if necessary.
+            // Get client PS version from PSSenderInfo.
             Version psClientVersion = null;
             if (_senderInfo.ApplicationArguments != null && _senderInfo.ApplicationArguments.ContainsKey("PSversionTable"))
             {
                 var value = PSObject.Base(_senderInfo.ApplicationArguments["PSversionTable"]) as PSPrimitiveDictionary;
-                if (value != null)
+                if (value != null && value.ContainsKey("PSVersion"))
                 {
-                    if (value.ContainsKey("WSManStackVersion"))
-                    {
-                        var wsmanStackVersion = PSObject.Base(value["WSManStackVersion"]) as Version;
-                        if (wsmanStackVersion != null && wsmanStackVersion.Major < 3)
-                        {
-                            // The client side is PSv2. This is the Win7 to Win8 scenario. We need to add the PSv2
-                            // TabExpansion function back in to keep the tab expansion functionable on the client side.
-                            rsSessionStateToUse.Commands.Add(
-                                new SessionStateFunctionEntry(
-                                    RemoteDataNameStrings.PSv2TabExpansionFunction,
-                                    RemoteDataNameStrings.PSv2TabExpansionFunctionText));
-                        }
-                    }
-
-                    if (value.ContainsKey("PSVersion"))
-                    {
-                        psClientVersion = PSObject.Base(value["PSVersion"]) as Version;
-                    }
+                    psClientVersion = PSObject.Base(value["PSVersion"]) as Version;
                 }
             }
 

From 555c1a6e79df670ee179a82dfdf2cf88f7b25110 Mon Sep 17 00:00:00 2001
From: Travis Plunk <tplunk@microsoft.com>
Date: Fri, 9 Dec 2022 19:21:58 +0000
Subject: [PATCH 631/645] Merged PR 23537: 7.3 change log

Add generated changelog for 7.3
---
 CHANGELOG/7.3.md | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/CHANGELOG/7.3.md b/CHANGELOG/7.3.md
index 66516873ae3..0b9c7699994 100644
--- a/CHANGELOG/7.3.md
+++ b/CHANGELOG/7.3.md
@@ -1,5 +1,45 @@
 # 7.3 Changelog
 
+## [7.3.1] - 2022-12-13
+
+### Engine Updates and Fixes
+
+- Remove TabExpansion for PSv2 from remote session configuration (Internal 23331)
+- Add `sqlcmd` to list to use legacy argument passing (#18645 #18646)
+- Change `exec` from alias to function to handle arbitrary args (#18644)
+- Fix `Switch-Process` to copy the current env to the new process (#18632)
+- Fix issue when completing the first command in a script with an empty array expression (#18355)
+- Fix `Switch-Process` to set `termios` appropriate for child process (#18572)
+- Fix native access violation (#18571)
+
+### Tests
+
+- Backport CI fixed from #18508 (#18626)
+- Mark charset test as pending (#18609)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+
+</summary>
+
+<ul>
+<li>Update packages (Internal 23330)</li>
+<li>Apply expected file permissions to linux files after authenticode signing (#18647)</li>
+<li>Bump <code>System.Data.SqlClient</code> (#18573)</li>
+<li>Don't install based on build-id for RPM (#18570)</li>
+<li>Work around args parsing issue (#18607)</li>
+<li>Fix package download in <code>vPack</code> job</li>
+</ul>
+
+</details>
+
+[7.3.1]: https://github.com/PowerShell/PowerShell/compare/v7.3.0...v7.3.1
+
 ## [7.3.0] - 2022-11-08
 
 ### General Cmdlet Updates and Fixes

From 826de5b0e0fe7eb299630bdf1db88084dd556a26 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 4 Jan 2023 10:02:04 -0800
Subject: [PATCH 632/645] [release/v7.3.2] Fix `Switch-Process` error to
 include the command that is not found (#18650)

---
 .../engine/Modules/SwitchProcessCommand.cs                 | 4 ++--
 .../Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1       | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs b/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
index 31f3376d74d..d660cee6ada 100644
--- a/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/SwitchProcessCommand.cs
@@ -47,12 +47,12 @@ protected override void EndProcessing()
                             string.Format(
                                 System.Globalization.CultureInfo.InvariantCulture,
                                 CommandBaseStrings.NativeCommandNotFound,
-                                command
+                                WithCommand[0]
                             )
                         ),
                         "CommandNotFound",
                         ErrorCategory.InvalidArgument,
-                        WithCommand
+                        WithCommand[0]
                     )
                 );
             }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
index ad89c847811..a39c5e941ba 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/Exec.Tests.ps1
@@ -58,6 +58,13 @@ Describe 'Switch-Process tests for Unix' -Tags 'CI' {
         $out = pwsh -noprofile -outputformat text -command { exec /bin/echo 1 -w 2 }
         $out | Should -BeExactly '1 -w 2'
     }
+
+    It 'Error is returned if target command is not found' {
+        $invalidCommand = 'doesNotExist'
+        $e = { Switch-Process $invalidCommand } | Should -Throw -ErrorId 'CommandNotFound,Microsoft.PowerShell.Commands.SwitchProcessCommand' -PassThru
+        $e.Exception.Message | Should -BeLike "*'$invalidCommand'*"
+        $e.TargetObject | Should -BeExactly $invalidCommand
+    }
 }
 
 Describe 'Switch-Process for Windows' -Tag 'CI' {

From a1453e25323f687b2a828db4fd3a37bccb830751 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 5 Jan 2023 11:00:27 -0800
Subject: [PATCH 633/645] Add bootstrap after SBOM task to re-install .NET
 (#18891)

---
 .vsts-ci/windows/templates/windows-packaging.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.vsts-ci/windows/templates/windows-packaging.yml b/.vsts-ci/windows/templates/windows-packaging.yml
index 832fe73af5e..90655ee6298 100644
--- a/.vsts-ci/windows/templates/windows-packaging.yml
+++ b/.vsts-ci/windows/templates/windows-packaging.yml
@@ -71,6 +71,14 @@ jobs:
       displayName: SBOM
       sourceScanPath: '$(repoPath)\tools'
 
+  # This is needed as SBOM task removed the installed .NET and installs .NET 3.1
+  - pwsh: |
+      Import-Module .\tools\ci.psm1
+      Invoke-CIInstall -SkipUser
+    displayName: Bootstrap
+    condition: succeeded()
+    workingDirectory: $(repoPath)
+
   - pwsh: |
       Import-Module .\tools\ci.psm1
       New-CodeCoverageAndTestPackage

From 02e506c84617e064002ffe2c02f9930985a7ffd3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 12:06:41 -0800
Subject: [PATCH 634/645] [release/v7.3.2] Fix `SuspiciousContentChecker.Match`
 to detect a pre-defined string when the text starts with it (#18916)

* Fix `SuspiciousContentChecker.Match` to detect a pre-defined string when the text starts with it

* Add more tests

* Add one more test

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
---
 .../engine/runtime/CompiledScriptBlock.cs     |  2 +-
 .../Api/SuspiciousContentChecker.Tests.ps1    | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 test/powershell/engine/Api/SuspiciousContentChecker.Tests.ps1

diff --git a/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs b/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
index 8d4e60ae0a2..9feeab94364 100644
--- a/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
+++ b/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
@@ -2033,7 +2033,7 @@ public static string Match(string text)
                         continue;
                     }
 
-                    for (int j = Math.Min(i, runningHash.Length) - 1; j > 0; j--)
+                    for (int j = Math.Min(i, runningHash.Length - 1); j > 0; j--)
                     {
                         // Say our input is: `Emit` (our shortest pattern, len 4).
                         // Towards the end just before matching, we will:
diff --git a/test/powershell/engine/Api/SuspiciousContentChecker.Tests.ps1 b/test/powershell/engine/Api/SuspiciousContentChecker.Tests.ps1
new file mode 100644
index 00000000000..8d532dac04e
--- /dev/null
+++ b/test/powershell/engine/Api/SuspiciousContentChecker.Tests.ps1
@@ -0,0 +1,35 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe 'SuspiciousContentChecker verification' -Tags "CI" {
+    BeforeAll {
+        $type = [psobject].Assembly.GetType('System.Management.Automation.ScriptBlock+SuspiciousContentChecker')
+
+        $testCases = @(
+            @{ id = 'Should Detect (1)'; text = "add-TyPe"; expected = "Add-Type" }
+            @{ id = 'Should Detect (2)'; text = "GetDelegateForFunctionPointer"; expected = "GetDelegateForFunctionPointer" }
+            @{ id = 'Should Detect (3)'; text = "ZeroFreeGlobalAllocUnicode"; expected = "ZeroFreeGlobalAllocUnicode" }
+            @{ id = 'Should Detect (4)'; text = "Hello world emit new"; expected = "Emit" }
+            @{ id = 'Should Detect (5)'; text = "xxxx yyyyMakeByRefTypecccc Type 'help' to get help"; expected = "MakeByRefType" }
+            @{ id = 'Should Detect (6)'; text = "emjt TypeHandlebegood"; expected = "TypeHandle" }
+            @{ id = 'Should Detect (7)'; text = "emit*&)(@~>-type"; expected = "Emit" }
+            @{ id = 'Should Detect (8)'; text = "*&)(@~>-typeemit"; expected = "Emit" }
+            @{ id = 'Should Detect (9)'; text = "Type`u{48}andle`u{2122}"; expected = "TypeHandle" }
+            @{ id = 'Should Detect (10)'; text = "`u{2122}Type`u{48}andle`u{2122}"; expected = "TypeHandle" }
+            @{ id = 'Should Detect (11)'; text = "`u{D83D}`u{DE00}Type`u{48}andle`u{D83D}`u{DE00}"; expected = "TypeHandle" } ## use surrogate pairs in the string.
+            @{ id = 'Should Detect (12)'; text = "xx`u{48}`u{48}xx()xxx--xx[]xx;'xpox?/xxemit"; expected = "Emit" } ## suspicious string starts at the index 29.
+
+            @{ id = 'Should NOT Detect (1)'; text = "PowerShell Preview Extension v2022.11.2"; expected = $null }
+            @{ id = 'Should NOT Detect (2)'; text = "add-typu"; expected = $null }
+            @{ id = 'Should NOT Detect (3)'; text = "GetDelegateForFunctionPointfr"; expected = $null }
+            @{ id = 'Should NOT Detect (4)'; text = "emjt TypeHandlfe"; expected = $null }
+            @{ id = 'Should NOT Detect (5)'; text = "Get*&)(@~>-Types"; expected = $null }
+        )
+    }
+
+    It "Smoke testing the suspicious content detection - <id>" -TestCases $testCases {
+        param($text, $expected)
+
+        $type::Match($text) | Should -BeExactly $expected
+    }
+}

From 4b9eae3c4c73f2e4244b3b8ce32e3632a8fe7b45 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 10 Jan 2023 14:17:47 -0800
Subject: [PATCH 635/645] Remove unnecessary reference to
 `System.Runtime.CompilerServices.Unsafe` (#18918)

Co-authored-by: Aditya Patwardhan <adityap@microsoft.com>
---
 .../System.Management.Automation.csproj                          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 7226b6ab488..bf0591f046b 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -26,7 +26,6 @@
     <PackageReference Include="System.DirectoryServices" Version="7.0.0" />
     <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
     <PackageReference Include="System.Management" Version="7.0.0" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.3.22119.2" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0" />
     <PackageReference Include="System.Security.Permissions" Version="7.0.0" />

From 2462a545bbd2d93328840c43f89b4596474d2b15 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 14:57:43 -0800
Subject: [PATCH 636/645] [release/v7.3.2] Fix `Start-Job` to check the
 existence of working directory using the PowerShell way (#18917)

* Fix `Start-Job` to check the existence of working directory using the PowerShell way

* Add a test

* Update

* Fix the test

* Not covering the check of whitespace string for -WorkingDirectory

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
---
 .../engine/remoting/commands/StartJob.cs      |  2 +-
 test/powershell/engine/Job/Jobs.Tests.ps1     | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/System.Management.Automation/engine/remoting/commands/StartJob.cs b/src/System.Management.Automation/engine/remoting/commands/StartJob.cs
index ff7b844d7fa..1436626e008 100644
--- a/src/System.Management.Automation/engine/remoting/commands/StartJob.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/StartJob.cs
@@ -601,7 +601,7 @@ protected override void BeginProcessing()
                 ThrowTerminatingError(errorRecord);
             }
 
-            if (WorkingDirectory != null && !Directory.Exists(WorkingDirectory))
+            if (WorkingDirectory != null && !InvokeProvider.Item.IsContainer(WorkingDirectory))
             {
                 string message = StringUtil.Format(RemotingErrorIdStrings.StartJobWorkingDirectoryNotFound, WorkingDirectory);
                 var errorRecord = new ErrorRecord(
diff --git a/test/powershell/engine/Job/Jobs.Tests.ps1 b/test/powershell/engine/Job/Jobs.Tests.ps1
index 61765b3f9bd..2e8b7aa7644 100644
--- a/test/powershell/engine/Job/Jobs.Tests.ps1
+++ b/test/powershell/engine/Job/Jobs.Tests.ps1
@@ -30,8 +30,8 @@ Describe 'Basic Job Tests' -Tags 'Feature' {
         BeforeAll {
             $invalidPathTestCases = @(
                 @{ path = "This is an invalid path"; case = "invalid path"; errorId = "DirectoryNotFoundException,Microsoft.PowerShell.Commands.StartJobCommand"}
-                @{ path = ""; case = "empty string"; errorId = "ParameterArgumentValidationError,Microsoft.PowerShell.Commands.StartJobCommand"}
-                @{ path = " "; case = "whitespace string (single space)"; errorId = "ParameterArgumentValidationError,Microsoft.PowerShell.Commands.StartJobCommand"}
+                ##@{ path = ""; case = "empty string"; errorId = "ParameterArgumentValidationError,Microsoft.PowerShell.Commands.StartJobCommand"}
+                ##@{ path = " "; case = "whitespace string (single space)"; errorId = "ParameterArgumentValidationError,Microsoft.PowerShell.Commands.StartJobCommand"}
             )
         }
 
@@ -86,6 +86,17 @@ Describe 'Basic Job Tests' -Tags 'Feature' {
             $jobOutput | Should -BeExactly $path.ToString()
         }
 
+        It 'Can specify the working directory with a PSPath' {
+            try {
+                Push-Location 'Temp:\'
+                $job = Start-Job -ScriptBlock { $PWD } -WorkingDirectory $pwd.Path | Wait-Job
+                $jobOutput = Receive-Job $job
+                $jobOutput | Should -BeExactly $pwd.Path
+            } finally {
+                Pop-Location
+            }
+        }
+
         It 'Can use the user specified working directory parameter with quote' -Skip:($IsWindows) {
             $path = Join-Path -Path $TestDrive -ChildPath "My ""Dir"
             $null = New-Item -ItemType Directory -Path "$path"
@@ -100,9 +111,9 @@ Describe 'Basic Job Tests' -Tags 'Feature' {
         }
 
         It 'Throws an error when the working directory parameter is <case>' -TestCases $invalidPathTestCases {
-            param($path, $case, $expectedErrorId)
+            param($path, $case, $errorId)
 
-            {Start-Job -ScriptBlock { 1 + 1 } -WorkingDirectory $path} | Should -Throw -ErrorId $expectedErrorId
+            {Start-Job -ScriptBlock { 1 + 1 } -WorkingDirectory $path} | Should -Throw -ErrorId $errorId
         }
 
         It 'Verifies that the current working directory is preserved' {

From ed0a788bde8a89ebf1ae175c1e1ea1b04c35d93d Mon Sep 17 00:00:00 2001
From: Travis Plunk <tplunk@microsoft.com>
Date: Wed, 11 Jan 2023 00:25:20 +0000
Subject: [PATCH 637/645] Merged PR 23818: Update dependencies for .NET release

Update dependencies for .NET release
---
 DotnetRuntimeMetadata.json                                  | 4 ++--
 assets/wix/files.wxs                                        | 6 +++---
 global.json                                                 | 2 +-
 .../Microsoft.PowerShell.Commands.Utility.csproj            | 2 +-
 .../Microsoft.PowerShell.SDK.csproj                         | 3 ++-
 .../System.Management.Automation.csproj                     | 4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 3e84f733c4d..0638b5aa502 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -4,10 +4,10 @@
     "quality": "daily",
     "qualityFallback": "preview",
     "packageVersionPattern": "7.0.0",
-    "sdkImageVersion": "7.0.100",
+    "sdkImageVersion": "7.0.102",
     "nextChannel": "7.0.1xx-rc2",
     "azureFeed": "",
-    "sdkImageOverride": "7.0.100-rtm.22521.12"
+    "sdkImageOverride": ""
   },
   "internalfeed": {
     "url": ""
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 88316f578c6..5d5b642d260 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -2778,8 +2778,8 @@
       <Component Id="cmp96588875574749E295496861FFC1DB58">
         <File Id="filF931B05A25224A188D08E09A9FDC3A58" KeyPath="yes" Source="$(var.ProductSourcePath)\PenImc_cor3.dll" />
       </Component>
-      <Component Id="cmp11BF5670AA094889995355E2413888C1">
-        <File Id="fil47F94DFC9B1F403997D9913B28B69807" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.51805.dll" />
+      <Component Id="cmpBF268557EF50438AB7374D5AAFD48780">
+        <File Id="filF5B0D5F1948E4854AF505B4A121B0867" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.222.60605.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -3669,7 +3669,7 @@
       <ComponentRef Id="cmp42A739F2AAC24D729DDBCAA096B8C55A" />
       <ComponentRef Id="cmp6986F8B66C514347A25E03DD3096B5AE" />
       <ComponentRef Id="cmp96588875574749E295496861FFC1DB58" />
-      <ComponentRef Id="cmp11BF5670AA094889995355E2413888C1" />
+      <ComponentRef Id="cmpBF268557EF50438AB7374D5AAFD48780" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 70e3dcc5080..9b920806bee 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100"
+    "version": "7.0.102"
   }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 1b6a915bbe5..21e870bd2f1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -34,7 +34,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
-    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0" />
+    <PackageReference Include="System.Threading.AccessControl" Version="7.0.1" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
     <PackageReference Include="NJsonSchema" Version="10.8.0" />
   </ItemGroup>
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 039402fd3a4..6683675208e 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -17,8 +17,9 @@
   <ItemGroup>
     <!-- This section is to force the version of non-direct dependencies -->
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.2" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />
     <PackageReference Include="System.Web.Services.Description" Version="4.10.0" />
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index bf0591f046b..c9855358ad0 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <!-- the following package(s) are from https://github.com/JamesNK/Newtonsoft.Json -->
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
    <!-- Newtonsoft.Json brings in an old version of CSharp
       So, we are forcing a newer version.
     -->
@@ -32,7 +32,7 @@
     <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
     <!-- 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.3.0" />
+    <PackageReference Include="Microsoft.PowerShell.Native" Version="7.3.2" />
     <!-- Signing APIs -->
     <PackageReference Include="Microsoft.Security.Extensions" Version="1.2.0" />
   </ItemGroup>

From c1b8d096b4c2519085a0741bc19417c6039288ee Mon Sep 17 00:00:00 2001
From: Travis Plunk <tplunk@microsoft.com>
Date: Wed, 11 Jan 2023 01:00:45 +0000
Subject: [PATCH 638/645] Merged PR 23820: Fix for JEA session leaking
 functions

Related work items: #152543
---
 .../engine/InitialSessionState.cs             |  83 +++++++++--
 .../engine/Modules/ModuleCmdletBase.cs        |   3 +
 .../engine/SessionStateScope.cs               | 134 +++++++++---------
 3 files changed, 147 insertions(+), 73 deletions(-)

diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index 32969ecde28..0c045818bcc 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -2981,13 +2981,20 @@ private RunspaceOpenModuleLoadException ProcessModulesToImport(
             HashSet<string> unresolvedCmdsToExpose)
         {
             RunspaceOpenModuleLoadException exceptionToReturn = null;
+            List<PSModuleInfo> processedModules = new List<PSModuleInfo>();
 
             foreach (object module in moduleList)
             {
                 string moduleName = module as string;
                 if (moduleName != null)
                 {
-                    exceptionToReturn = ProcessOneModule(initializedRunspace, moduleName, null, path, publicCommands);
+                    exceptionToReturn = ProcessOneModule(
+                        initializedRunspace: initializedRunspace,
+                        name: moduleName,
+                        moduleInfoToLoad: null,
+                        path: path,
+                        publicCommands: publicCommands,
+                        processedModules: processedModules);
                 }
                 else
                 {
@@ -2998,7 +3005,13 @@ private RunspaceOpenModuleLoadException ProcessModulesToImport(
                         {
                             // if only name is specified in the module spec, just try import the module
                             // ie., don't take the performance overhead of calling GetModule.
-                            exceptionToReturn = ProcessOneModule(initializedRunspace, moduleSpecification.Name, null, path, publicCommands);
+                            exceptionToReturn = ProcessOneModule(
+                                initializedRunspace: initializedRunspace,
+                                name: moduleSpecification.Name,
+                                moduleInfoToLoad: null,
+                                path: path,
+                                publicCommands: publicCommands,
+                                processedModules: processedModules);
                         }
                         else
                         {
@@ -3006,7 +3019,13 @@ private RunspaceOpenModuleLoadException ProcessModulesToImport(
 
                             if (moduleInfos != null && moduleInfos.Count > 0)
                             {
-                                exceptionToReturn = ProcessOneModule(initializedRunspace, moduleSpecification.Name, moduleInfos[0], path, publicCommands);
+                                exceptionToReturn = ProcessOneModule(
+                                    initializedRunspace: initializedRunspace,
+                                    name: moduleSpecification.Name,
+                                    moduleInfoToLoad: moduleInfos[0],
+                                    path: path,
+                                    publicCommands: publicCommands,
+                                    processedModules: processedModules);
                             }
                             else
                             {
@@ -3055,7 +3074,11 @@ private RunspaceOpenModuleLoadException ProcessModulesToImport(
                     string commandToMakeVisible = Utils.ParseCommandName(unresolvedCommand, out moduleName);
                     bool found = false;
 
-                    foreach (CommandInfo cmd in LookupCommands(commandToMakeVisible, moduleName, initializedRunspace.ExecutionContext))
+                    foreach (CommandInfo cmd in LookupCommands(
+                        commandPattern: commandToMakeVisible,
+                        moduleName: moduleName,
+                        context: initializedRunspace.ExecutionContext,
+                        processedModules: processedModules))
                     {
                         if (!found)
                         {
@@ -3106,11 +3129,13 @@ private RunspaceOpenModuleLoadException ProcessModulesToImport(
         /// <param name="commandPattern"></param>
         /// <param name="moduleName"></param>
         /// <param name="context"></param>
+        /// <param name="processedModules"></param>
         /// <returns></returns>
         private static IEnumerable<CommandInfo> LookupCommands(
             string commandPattern,
             string moduleName,
-            ExecutionContext context)
+            ExecutionContext context,
+            List<PSModuleInfo> processedModules)
         {
             bool isWildCardPattern = WildcardPattern.ContainsWildcardCharacters(commandPattern);
             var searchOptions = isWildCardPattern ?
@@ -3124,7 +3149,11 @@ private static IEnumerable<CommandInfo> LookupCommands(
             CommandOrigin cmdOrigin = CommandOrigin.Runspace;
             while (true)
             {
-                foreach (CommandInfo commandInfo in context.SessionState.InvokeCommand.GetCommands(commandPattern, CommandTypes.All, searchOptions, cmdOrigin))
+                foreach (CommandInfo commandInfo in context.SessionState.InvokeCommand.GetCommands(
+                    name: commandPattern,
+                    commandTypes: CommandTypes.All,
+                    options: searchOptions,
+                    commandOrigin: cmdOrigin))
                 {
                     // If module name is provided then use it to restrict returned results.
                     if (haveModuleName && !moduleName.Equals(commandInfo.ModuleName, StringComparison.OrdinalIgnoreCase))
@@ -3154,13 +3183,43 @@ private static IEnumerable<CommandInfo> LookupCommands(
                 // Next try internal search.
                 cmdOrigin = CommandOrigin.Internal;
             }
+
+            // If the command is associated with a module, try finding the command in the imported module list.
+            // The SessionState function table holds only one command name, and if two or more modules contain
+            // a command with the same name, only one of them will appear in the function table search above.
+            if (!found && haveModuleName)
+            {
+                var pattern = new WildcardPattern(commandPattern);
+
+                foreach (PSModuleInfo moduleInfo in processedModules)
+                {
+                    if (moduleInfo.Name.Equals(moduleName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        foreach (var cmd in moduleInfo.ExportedCommands.Values)
+                        {
+                            if (pattern.IsMatch(cmd.Name))
+                            {
+                                yield return cmd;
+                            }
+                        }
+
+                        break;
+                    }
+                }
+            }
         }
 
         /// <summary>
         /// If <paramref name="moduleInfoToLoad"/> is null, import module using <paramref name="name"/>. Otherwise,
         /// import module using <paramref name="moduleInfoToLoad"/>
         /// </summary>
-        private RunspaceOpenModuleLoadException ProcessOneModule(Runspace initializedRunspace, string name, PSModuleInfo moduleInfoToLoad, string path, HashSet<CommandInfo> publicCommands)
+        private RunspaceOpenModuleLoadException ProcessOneModule(
+            Runspace initializedRunspace,
+            string name,
+            PSModuleInfo moduleInfoToLoad,
+            string path,
+            HashSet<CommandInfo> publicCommands,
+            List<PSModuleInfo> processedModules)
         {
             using (PowerShell pse = PowerShell.Create())
             {
@@ -3197,6 +3256,11 @@ private RunspaceOpenModuleLoadException ProcessOneModule(Runspace initializedRun
                     c = new CmdletInfo("Out-Default", typeof(OutDefaultCommand), null, null, initializedRunspace.ExecutionContext);
                     pse.AddCommand(new Command(c));
                 }
+                else
+                {
+                    // For runspace init module processing, pass back the PSModuleInfo to the output pipeline.
+                    cmd.Parameters.Add("PassThru");
+                }
 
                 pse.Runspace = initializedRunspace;
                 // Module import should be run in FullLanguage mode since it is running in
@@ -3205,7 +3269,10 @@ private RunspaceOpenModuleLoadException ProcessOneModule(Runspace initializedRun
                 pse.Runspace.ExecutionContext.LanguageMode = PSLanguageMode.FullLanguage;
                 try
                 {
-                    pse.Invoke();
+                    // For runspace init module processing, collect the imported PSModuleInfo returned in the output pipeline.
+                    // In other cases, this collection will be empty.
+                    Collection<PSModuleInfo> moduleInfos = pse.Invoke<PSModuleInfo>();
+                    processedModules.AddRange(moduleInfos);
                 }
                 finally
                 {
diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index dc5f500f59b..48dd73a987b 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -7192,6 +7192,9 @@ private static void ImportFunctions(FunctionInfo func, SessionStateInternal targ
                     CommandOrigin.Internal,
                     targetSessionState.ExecutionContext);
 
+                // Note that the module 'func' and the function table 'functionInfo' instances are now linked
+                // together (see 'CopiedCommand' in CommandInfo class), so setting visibility on one also 
+                // sets it on the other.
                 SetCommandVisibility(isImportModulePrivate, functionInfo);
                 functionInfo.Module = sourceModule;
 
diff --git a/src/System.Management.Automation/engine/SessionStateScope.cs b/src/System.Management.Automation/engine/SessionStateScope.cs
index 57c4c6388ba..080aebb2b0a 100644
--- a/src/System.Management.Automation/engine/SessionStateScope.cs
+++ b/src/System.Management.Automation/engine/SessionStateScope.cs
@@ -1245,11 +1245,18 @@ internal FunctionInfo SetFunction(
                 name != null,
                 "The caller should verify the name");
 
-            var functionInfos = GetFunctions();
-            FunctionInfo existingValue;
+            Dictionary<string, FunctionInfo> functionInfos = GetFunctions();
             FunctionInfo result;
-            if (!functionInfos.TryGetValue(name, out existingValue))
+
+            // Functions are equal only if they have the same name and if they come from the same module (if any).
+            // If the function is not associated with a module then the info 'ModuleName' property is set to empty string.
+            // If the new function has the same name of an existing function, but different module names, then the
+            // existing table function is replaced with the new function.
+            if (!functionInfos.TryGetValue(name, out FunctionInfo existingValue) ||
+                (originalFunction != null &&
+                    !existingValue.ModuleName.Equals(originalFunction.ModuleName, StringComparison.OrdinalIgnoreCase)))
             {
+                // Add new function info to function table and return.
                 result = functionFactory(name, function, originalFunction, options, context, helpFile);
                 functionInfos[name] = result;
 
@@ -1257,81 +1264,78 @@ internal FunctionInfo SetFunction(
                 {
                     GetAllScopeFunctions()[name] = result;
                 }
-            }
-            else
-            {
-                // Make sure the function isn't constant or readonly
-
-                SessionState.ThrowIfNotVisible(origin, existingValue);
 
-                if (IsFunctionOptionSet(existingValue, ScopedItemOptions.Constant) ||
-                    (!force && IsFunctionOptionSet(existingValue, ScopedItemOptions.ReadOnly)))
-                {
-                    SessionStateUnauthorizedAccessException e =
-                        new SessionStateUnauthorizedAccessException(
-                                name,
-                                SessionStateCategory.Function,
-                                "FunctionNotWritable",
-                                SessionStateStrings.FunctionNotWritable);
+                return result;
+            }
 
-                    throw e;
-                }
+            // Update the existing function.
 
-                // Ensure we are not trying to set the function to constant as this can only be
-                // done at creation time.
+            // Make sure the function isn't constant or readonly.
+            SessionState.ThrowIfNotVisible(origin, existingValue);
 
-                if ((options & ScopedItemOptions.Constant) != 0)
-                {
-                    SessionStateUnauthorizedAccessException e =
-                        new SessionStateUnauthorizedAccessException(
-                                name,
-                                SessionStateCategory.Function,
-                                "FunctionCannotBeMadeConstant",
-                                SessionStateStrings.FunctionCannotBeMadeConstant);
+            if (IsFunctionOptionSet(existingValue, ScopedItemOptions.Constant) ||
+                (!force && IsFunctionOptionSet(existingValue, ScopedItemOptions.ReadOnly)))
+            {
+                SessionStateUnauthorizedAccessException e =
+                    new SessionStateUnauthorizedAccessException(
+                            name,
+                            SessionStateCategory.Function,
+                            "FunctionNotWritable",
+                            SessionStateStrings.FunctionNotWritable);
 
-                    throw e;
-                }
+                throw e;
+            }
 
-                // Ensure we are not trying to remove the AllScope option
+            // Ensure we are not trying to set the function to constant as this can only be
+            // done at creation time.
+            if ((options & ScopedItemOptions.Constant) != 0)
+            {
+                SessionStateUnauthorizedAccessException e =
+                    new SessionStateUnauthorizedAccessException(
+                            name,
+                            SessionStateCategory.Function,
+                            "FunctionCannotBeMadeConstant",
+                            SessionStateStrings.FunctionCannotBeMadeConstant);
 
-                if ((options & ScopedItemOptions.AllScope) == 0 &&
-                    IsFunctionOptionSet(existingValue, ScopedItemOptions.AllScope))
-                {
-                    SessionStateUnauthorizedAccessException e =
-                        new SessionStateUnauthorizedAccessException(
-                                name,
-                                SessionStateCategory.Function,
-                                "FunctionAllScopeOptionCannotBeRemoved",
-                                SessionStateStrings.FunctionAllScopeOptionCannotBeRemoved);
+                throw e;
+            }
 
-                    throw e;
-                }
+            // Ensure we are not trying to remove the AllScope option.
+            if ((options & ScopedItemOptions.AllScope) == 0 &&
+                IsFunctionOptionSet(existingValue, ScopedItemOptions.AllScope))
+            {
+                SessionStateUnauthorizedAccessException e =
+                    new SessionStateUnauthorizedAccessException(
+                            name,
+                            SessionStateCategory.Function,
+                            "FunctionAllScopeOptionCannotBeRemoved",
+                            SessionStateStrings.FunctionAllScopeOptionCannotBeRemoved);
 
-                FunctionInfo existingFunction = existingValue;
-                FunctionInfo newValue = null;
+                throw e;
+            }
 
-                // If the function type changes (i.e.: function to workflow or back)
-                // then we need to blast what was there
-                newValue = functionFactory(name, function, originalFunction, options, context, helpFile);
+            FunctionInfo existingFunction = existingValue;
 
-                bool changesFunctionType = existingFunction.GetType() != newValue.GetType();
+            // If the function type changes (i.e.: function to workflow or back)
+            // then we need to replace what was there.
+            FunctionInfo newValue = functionFactory(name, function, originalFunction, options, context, helpFile);
 
-                // Since the options are set after the script block, we have to
-                // forcefully apply the script block if the options will be
-                // set to not being ReadOnly
-                if (changesFunctionType ||
-                    ((existingFunction.Options & ScopedItemOptions.ReadOnly) != 0 && force))
-                {
-                    result = newValue;
-                    functionInfos[name] = newValue;
-                }
-                else
-                {
-                    bool applyForce = force || (options & ScopedItemOptions.ReadOnly) == 0;
+            bool changesFunctionType = existingFunction.GetType() != newValue.GetType();
 
-                    existingFunction.Update(newValue, applyForce, options, helpFile);
-                    result = existingFunction;
-                }
+            // Since the options are set after the script block, we have to
+            // forcefully apply the script block if the options will be
+            // set to not being ReadOnly.
+            if (changesFunctionType ||
+                ((existingFunction.Options & ScopedItemOptions.ReadOnly) != 0 && force))
+            {
+                result = newValue;
+                functionInfos[name] = newValue;
+            }
+            else
+            {
+                bool applyForce = force || (options & ScopedItemOptions.ReadOnly) == 0;
+                existingFunction.Update(newValue, applyForce, options, helpFile);
+                result = existingFunction;
             }
 
             return result;

From db6e07984cbd8d0b1e73b1bcf1ffd4215a5609da Mon Sep 17 00:00:00 2001
From: travis plunk <github@ez13.net>
Date: Wed, 18 Jan 2023 14:50:14 -0800
Subject: [PATCH 639/645] Allow system lock down test debug hook to work with
 new wldp API (fixes system lock down tests) (#18962)

---
 .../security/wldpNativeMethods.cs                             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/security/wldpNativeMethods.cs b/src/System.Management.Automation/security/wldpNativeMethods.cs
index 970abe541f6..28655c1afe8 100644
--- a/src/System.Management.Automation/security/wldpNativeMethods.cs
+++ b/src/System.Management.Automation/security/wldpNativeMethods.cs
@@ -109,8 +109,8 @@ public static SystemScriptFileEnforcement GetFilePolicyEnforcement(
         {
             SafeHandle fileHandle = fileStream.SafeFileHandle;
 
-            // First check latest WDAC APIs if available.
-            if (s_wldpCanExecuteAvailable)
+            // First check latest WDAC APIs if available.  Also revert to legacy APIs if debug hook is in effect.
+            if (s_wldpCanExecuteAvailable && !s_allowDebugOverridePolicy)
             {
                 try
                 {

From ee487440ff9b3fc180c2543d4a6adcfd55753e4d Mon Sep 17 00:00:00 2001
From: Travis Plunk <tplunk@microsoft.com>
Date: Mon, 23 Jan 2023 22:06:41 +0000
Subject: [PATCH 640/645] Merged PR 23924: Create change log for 7.3.2

---
 .spelling        |  5 +++++
 CHANGELOG/7.3.md | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/.spelling b/.spelling
index 48d711a2587..177f3d5489f 100644
--- a/.spelling
+++ b/.spelling
@@ -1232,6 +1232,11 @@ CommonCommandParameters.cs
 preview.6.22352.1
 v2.2.6
 ResultsComparer
+pre-defined
+System.Runtime.CompilerServices.Unsafe
+TabExpansion
+PSv2
+System.Data.SqlClient
  - CHANGELOG.md
 aavdberg
 asrosent
diff --git a/CHANGELOG/7.3.md b/CHANGELOG/7.3.md
index 0b9c7699994..e513c444d5a 100644
--- a/CHANGELOG/7.3.md
+++ b/CHANGELOG/7.3.md
@@ -1,5 +1,41 @@
 # 7.3 Changelog
 
+## [7.3.2] - 2023-01-24
+
+### Engine Updates and Fixes
+
+- Fix `SuspiciousContentChecker.Match` to detect a pre-defined string when the text starts with it (#18916)
+- Fix for JEA session leaking functions (Internal 23820)
+
+### General Cmdlet Updates and Fixes
+
+- Fix `Start-Job` to check the existence of working directory using the PowerShell way (#18917)
+- Fix `Switch-Process` error to include the command that is not found (#18650)
+
+### Tests
+
+- Allow system lock down test debug hook to work with new `WLDP` API (fixes system lock down tests) (#18962)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump to use .NET 7.0.2</p>
+
+</summary>
+
+<ul>
+<li>Update dependencies for .NET release (Internal 23818)</li>
+<li>Remove unnecessary reference to <code>System.Runtime.CompilerServices.Unsafe</code> (#18918)</li>
+<li>Add bootstrap after SBOM task to re-install .NET (#18891)</li>
+</ul>
+
+</details>
+
+[7.3.2]: https://github.com/PowerShell/PowerShell/compare/v7.3.1...v7.3.2
+
 ## [7.3.1] - 2022-12-13
 
 ### Engine Updates and Fixes

From d2cec425b4c526c4b6afd4c325178d9441edbb55 Mon Sep 17 00:00:00 2001
From: Patrick Meinecke <pmeinecke@microsoft.com>
Date: Thu, 16 Feb 2023 14:58:31 +0000
Subject: [PATCH 641/645] Merged PR 24338: Update cgmanifest for v7.3.3

---
 tools/cgmanifest.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index fdae06f278c..6d2f58cd615 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
   "Registrations": [
     {
       "Component": {
@@ -105,7 +106,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.Extensions.ObjectPool",
-          "Version": "7.0.0"
+          "Version": "7.0.3"
         }
       },
       "DevelopmentDependency": false
@@ -155,7 +156,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Microsoft.PowerShell.Native",
-          "Version": "7.3.0"
+          "Version": "7.3.2"
         }
       },
       "DevelopmentDependency": false
@@ -225,7 +226,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "Newtonsoft.Json",
-          "Version": "13.0.1"
+          "Version": "13.0.2"
         }
       },
       "DevelopmentDependency": false
@@ -445,7 +446,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Diagnostics.DiagnosticSource",
-          "Version": "7.0.0"
+          "Version": "7.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -495,7 +496,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.DirectoryServices",
-          "Version": "7.0.0"
+          "Version": "7.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -655,7 +656,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Cryptography.Pkcs",
-          "Version": "7.0.0"
+          "Version": "7.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -665,7 +666,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Cryptography.ProtectedData",
-          "Version": "7.0.0"
+          "Version": "7.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -675,7 +676,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Security.Cryptography.Xml",
-          "Version": "7.0.0"
+          "Version": "7.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -805,7 +806,7 @@
         "Type": "nuget",
         "Nuget": {
           "Name": "System.Threading.AccessControl",
-          "Version": "7.0.0"
+          "Version": "7.0.1"
         }
       },
       "DevelopmentDependency": false
@@ -840,6 +841,5 @@
       },
       "DevelopmentDependency": false
     }
-  ],
-  "$schema": "https://json.schemastore.org/component-detection-manifest.json"
+  ]
 }

From db10b2028ad9d28ec555012e0fa3db60f69cdfb6 Mon Sep 17 00:00:00 2001
From: Patrick Meinecke <pmeinecke@microsoft.com>
Date: Thu, 16 Feb 2023 17:25:56 +0000
Subject: [PATCH 642/645] Merged PR 24334: Update global.json to 7.0.200 for
 v7.3.3

---
 Analyzers.props                                            | 4 ++--
 assets/wix/files.wxs                                       | 6 +++---
 global.json                                                | 2 +-
 .../Microsoft.PowerShell.SDK.csproj                        | 3 ++-
 .../System.Management.Automation.csproj                    | 7 ++++---
 test/xUnit/xUnit.tests.csproj                              | 5 +++--
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Analyzers.props b/Analyzers.props
index 8360903606e..e21c552467a 100644
--- a/Analyzers.props
+++ b/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="7.0.0-preview1.22217.1" PrivateAssets="all" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1-preview1.23061.1" PrivateAssets="all" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 5d5b642d260..2a0bfe6afb7 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -2778,8 +2778,8 @@
       <Component Id="cmp96588875574749E295496861FFC1DB58">
         <File Id="filF931B05A25224A188D08E09A9FDC3A58" KeyPath="yes" Source="$(var.ProductSourcePath)\PenImc_cor3.dll" />
       </Component>
-      <Component Id="cmpBF268557EF50438AB7374D5AAFD48780">
-        <File Id="filF5B0D5F1948E4854AF505B4A121B0867" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.222.60605.dll" />
+      <Component Id="cmpB18002F10F5542E68D2D39F0A83D9843">
+        <File Id="fil2B7A86F782EB4ECBA14D51D5408882C5" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.323.6910.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -3669,7 +3669,7 @@
       <ComponentRef Id="cmp42A739F2AAC24D729DDBCAA096B8C55A" />
       <ComponentRef Id="cmp6986F8B66C514347A25E03DD3096B5AE" />
       <ComponentRef Id="cmp96588875574749E295496861FFC1DB58" />
-      <ComponentRef Id="cmpBF268557EF50438AB7374D5AAFD48780" />
+      <ComponentRef Id="cmpB18002F10F5542E68D2D39F0A83D9843" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
index 9b920806bee..4347eeb32e8 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.102"
+    "version": "7.0.200"
   }
 }
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 6683675208e..69084ba0828 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -17,8 +17,9 @@
   <ItemGroup>
     <!-- This section is to force the version of non-direct dependencies -->
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.2" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.3" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.1" />
     <PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />
     <PackageReference Include="System.Web.Services.Description" Version="4.10.0" />
     <!-- the following package(s) are from https://github.com/dotnet/fxdac -->
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index c9855358ad0..daf6daaca62 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -22,12 +22,13 @@
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
     <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
-    <PackageReference Include="System.DirectoryServices" Version="7.0.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.1" />
+    <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
     <!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
     <PackageReference Include="System.Management" Version="7.0.0" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.1" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.1" />
     <PackageReference Include="System.Security.Permissions" Version="7.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
     <!-- the following package(s) are from the powershell org -->
diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index 797f1bd52be..6817c372880 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -23,11 +23,12 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Validation" Version="2.4.22" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
-    <PackageReference Include="XunitXml.TestLogger" Version="3.0.70" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="XunitXml.TestLogger" Version="3.0.78" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
   </ItemGroup>
 
   <ItemGroup>

From ac3198f68d5c5e0af3b98cd378114919cb2df823 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 31 Jan 2023 12:58:15 -0800
Subject: [PATCH 643/645] Add tool to trigger license information gathering for
 NuGet modules (#18827)

---
 .spelling                                     |   2 +
 tools/clearlyDefined/ClearlyDefined.ps1       |  47 ++++++
 tools/clearlyDefined/readme.md                |  30 ++++
 .../src/ClearlyDefined/ClearlyDefined.psm1    | 137 ++++++++++++++++++
 4 files changed, 216 insertions(+)
 create mode 100644 tools/clearlyDefined/ClearlyDefined.ps1
 create mode 100644 tools/clearlyDefined/readme.md
 create mode 100644 tools/clearlyDefined/src/ClearlyDefined/ClearlyDefined.psm1

diff --git a/.spelling b/.spelling
index 177f3d5489f..f08124f5d67 100644
--- a/.spelling
+++ b/.spelling
@@ -1589,3 +1589,5 @@ centos-7
 Security.types.ps1xml
  - ADOPTERS.md
 MicrosoftPowerBIMgmt
+ - tools/clearlyDefined/readme.md
+ClearlyDefined
diff --git a/tools/clearlyDefined/ClearlyDefined.ps1 b/tools/clearlyDefined/ClearlyDefined.ps1
new file mode 100644
index 00000000000..ded0b229938
--- /dev/null
+++ b/tools/clearlyDefined/ClearlyDefined.ps1
@@ -0,0 +1,47 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+param(
+    [parameter(Mandatory = $true, ParameterSetName='Harvest')]
+    [switch]
+    $Harvest,
+    [parameter(Mandatory = $true, ParameterSetName='Test')]
+    [switch]
+    $Test,
+    [switch]
+    $ForceModuleReload
+)
+
+$extraParams = @{}
+if ($ForceModuleReload) {
+    $extraParams['Force'] = $true
+}
+
+Import-Module -Name "$PSScriptRoot/src/ClearlyDefined" @extraParams
+
+$cgManfest = Get-Content "$PSScriptRoot/../cgmanifest.json" | ConvertFrom-Json
+$fullCgList = $cgManfest.Registrations.Component |
+    ForEach-Object {
+        [Pscustomobject]@{
+            type = $_.Type
+            Name = $_.Nuget.Name
+            PackageVersion = $_.Nuget.Version
+        }
+    }
+
+$fullList = $fullCgList | Get-ClearlyDefinedData
+
+$needHarvest = $fullList | Where-Object { !$_.harvested }
+
+Write-Verbose "Full List count: $($fullList.Count)" -Verbose
+Write-Verbose "Need harvest: $($needHarvest.Count)" -Verbose
+
+if ($Harvest) {
+    $needHarvest | select-object -ExpandProperty coordinates | Start-ClearlyDefinedHarvest
+} elseif ($Test) {
+    if($needHarvest.Count -gt 0) {
+        $needHarvest | Format-List | Out-String -Width 9999 | Write-Verbose -Verbose
+        throw "There are $($needHarvest.Count) packages that need to be harvested"
+    } else {
+        Write-Verbose "All packages have been harvested" -Verbose
+    }
+}
diff --git a/tools/clearlyDefined/readme.md b/tools/clearlyDefined/readme.md
new file mode 100644
index 00000000000..839fc7019aa
--- /dev/null
+++ b/tools/clearlyDefined/readme.md
@@ -0,0 +1,30 @@
+# ClearlyDefined
+
+## Purpose
+
+This tool is intended to test if all the license data in [ClearlyDefined](https://clearlydefined.io) is present to generate the PowerShell license.
+If the data is not present, it can request that ClearlyDefined gather (called Harvest in their terminology) the data.
+
+## Use
+
+### Testing
+
+Run `./ClearlyDefined.ps1 -test`.
+
+If there is any missing data, the script should write verbose messages about the missing data and throw.
+If there is no missing data, the script should not throw.
+
+### Harvesting
+
+Run `./ClearlyDefined.ps1 -Harvest`.
+The script will trigger the harvest and output the result from ClearlyDefined.
+**Give ClearlyDefined 24 hours to harvest the data.**
+You can use the `-Test` switch without the `-Harvest` switch to test if Harvesting is done.
+
+## Caching
+
+If you run in the same PowerShell session, the script will be faster due to caching.
+
+The module will cache any results from ClearlyDefined that indicate the package is Harvested for 60 minutes.
+No caching is done for packages that are not yet harvested.
+To clear the cache, run with the `-ForceModuleReload` switch.
diff --git a/tools/clearlyDefined/src/ClearlyDefined/ClearlyDefined.psm1 b/tools/clearlyDefined/src/ClearlyDefined/ClearlyDefined.psm1
new file mode 100644
index 00000000000..2a9434c9cbe
--- /dev/null
+++ b/tools/clearlyDefined/src/ClearlyDefined/ClearlyDefined.psm1
@@ -0,0 +1,137 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Start the collection (known as harvest) of ClearlyDefined data for a package
+function Start-ClearlyDefinedHarvest {
+    [CmdletBinding()]
+    param(
+        [Parameter(ValueFromPipelineByPropertyName=$true)]
+        [Alias('Type')]
+        [validateset('nuget')]
+        [string]
+        $PackageType = 'nuget',
+
+        [parameter(mandatory = $true, ValueFromPipelineByPropertyName=$true)]
+        [Alias('Name')]
+        [string]
+        $PackageName,
+
+        [parameter(mandatory = $true, ValueFromPipelineByPropertyName=$true)]
+        [Alias('Version')]
+        [Alias('Revision')]
+        [string]
+        $PackageVersion
+    )
+
+    Process {
+        $coordinates = Get-ClearlyDefinedCoordinates @PSBoundParameters
+        $body = @{tool='package';coordinates=$coordinates} | convertto-json
+        Write-Verbose $body -Verbose
+        (Invoke-WebRequest -Method Post  -Uri 'https://api.clearlydefined.io/harvest' -Body $body -ContentType 'application/json').Content
+    }
+}
+
+function ConvertFrom-ClearlyDefinedCoordinates {
+    [CmdletBinding()]
+    param(
+        [parameter(mandatory = $true, ValueFromPipeline = $true)]
+        [string]
+        $Coordinates
+    )
+
+    Begin {}
+    Process {
+        $parts = $Coordinates.Split('/')
+        [PSCustomObject]@{
+            type = $parts[0]
+            provider = $parts[1]
+            namespace = $parts[2]
+            name = $parts[3]
+            revision = $parts[4]
+        }
+    }
+    End {}
+}
+
+# Get the coordinate string for a package
+Function Get-ClearlyDefinedCoordinates {
+    [CmdletBinding()]
+    param(
+        [validateset('nuget')]
+        [string]
+        $PackageType = 'nuget',
+        [parameter(mandatory = $true)]
+        [string]
+        $PackageName,
+        [parameter(mandatory = $true)]
+        [string]
+        $PackageVersion
+    )
+
+    return "$PackageType/$PackageType/-/$PackageName/$PackageVersion"
+}
+
+# Cache of ClearlyDefined data
+$cdCache = @{}
+
+# Get the ClearlyDefined data for a package
+Function Get-ClearlyDefinedData {
+    [CmdletBinding()]
+    param(
+        [Parameter(ValueFromPipelineByPropertyName=$true)]
+        [Alias('Type')]
+        [validateset('nuget')]
+        [string]
+        $PackageType = 'nuget',
+
+        [parameter(mandatory = $true, ValueFromPipelineByPropertyName=$true)]
+        [Alias('Name')]
+        [string]
+        $PackageName,
+
+        [parameter(mandatory = $true, ValueFromPipelineByPropertyName=$true)]
+        [Alias('Revision')]
+        [string]
+        $PackageVersion
+    )
+
+    Begin {
+        $cacheMinutes = 60
+        $cacheCutoff = (get-date).AddMinutes(-$cacheMinutes)
+        $coordinateList = @()
+    }
+
+    Process {
+        $coordinateList += Get-ClearlyDefinedCoordinates @PSBoundParameters
+    }
+
+    end {
+        $total = $coordinateList.Count
+        $completed = 0
+        foreach($coordinates in $coordinateList) {
+            Write-Progress -Activity "Getting ClearlyDefined data" -Status "Getting data for $coordinates" -PercentComplete (($completed / $total) * 100)
+            $containsKey = $cdCache.ContainsKey($coordinates)
+            if ($containsKey -and $cdCache[$coordinates].cachedTime -gt $cacheCutoff) {
+                Write-Verbose "Returning cached data for $coordinates"
+                Write-Output $cdCache[$coordinates]
+                continue
+            }
+
+            Invoke-RestMethod  -Uri "https://api.clearlydefined.io/definitions/$coordinates" | ForEach-Object {
+                [bool] $harvested = if ($_.licensed.declared) { $true } else { $false }
+                Add-Member -NotePropertyName cachedTime -NotePropertyValue (get-date) -InputObject $_ -PassThru | Add-Member -NotePropertyName harvested -NotePropertyValue $harvested -PassThru
+                if ($_.harvested) {
+                    Write-Verbose "Caching data for $coordinates"
+                    $cdCache[$coordinates] = $_
+                }
+            }
+            $completed++
+        }
+    }
+}
+
+Export-ModuleMember -Function @(
+    'Start-ClearlyDefinedHarvest'
+    'Get-ClearlyDefinedData'
+    'ConvertFrom-ClearlyDefinedCoordinates'
+)

From bb77a8dac8a256eee03480ef4763ba9152534295 Mon Sep 17 00:00:00 2001
From: Patrick Meinecke <pmeinecke@microsoft.com>
Date: Sat, 18 Feb 2023 21:24:42 +0000
Subject: [PATCH 644/645] Merged PR 24353: Update third party notices for
 v7.3.3

---
 ThirdPartyNotices.txt | 1717 +++++++++++++++++++++++++----------------
 1 file changed, 1072 insertions(+), 645 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index bc84f198b5b..1ba383a1999 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -17,145 +17,150 @@ required to debug changes to any libraries licensed under the GNU Lesser General
 
 ---------------------------------------------------------
 
-Microsoft.Extensions.ObjectPool 5.0.10 - Apache-2.0
+Markdig.Signed 0.30.4 - BSD-2-Clause
 
 
-(c) Microsoft Corporation
-Copyright (c) Andrew Arnott
-Copyright (c) 2019 David Fowler
-Copyright (c) 2016 Richard Morris
-Copyright (c) 2017 Yoshifumi Kawai
-Copyright (c) Microsoft Corporation
-Copyright (c) 2014-2018 Michael Daines
-Copyright (c) 2013-2017, Milosz Krajewski
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2019-2020 West Wind Technologies
-Copyright (c) 2010-2019 Google LLC. http://angular.io/license
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      
-
-      "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-      
-
-      "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-      
 
-      "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-      
-
-      "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-      
-
-      "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-      
-
-      "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-      
-
-      "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-      
-
-      "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-      
-
-      "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-      
+Copyright (c) <year> <owner> . All rights reserved.
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-   2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+   1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-   3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+   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.
 
-   4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+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 HOLDER 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.
 
-      (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+---------------------------------------------------------
 
-      (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+---------------------------------------------------------
 
-      (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+Microsoft.ApplicationInsights 2.21.0 - MIT
 
-      (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
 
-      You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
 
-   5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+MIT License
 
-   6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+Copyright (c) <year> <copyright holders>
 
-   7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this 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:
 
-   8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-   9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS
+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.
 
-APPENDIX: How to apply the Apache License to your work.
+---------------------------------------------------------
 
-To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+---------------------------------------------------------
 
-Copyright [yyyy] [name of copyright owner]
+Microsoft.Bcl.AsyncInterfaces 7.0.0 - MIT
 
-Licensed under the Apache License, Version 2.0 (the "License");
 
-you may not use this file except in compliance with the License.
+(c) Microsoft Corporation
+Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
+Copyright 2018 Daniel Lemire
+Copyright (c) .NET Foundation
+Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
+Copyright (c) 1998 Microsoft. To
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
+Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
+Portions (c) International Organization
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
+Copyright (c) .NET Foundation Contributors
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
-You may obtain a copy of the License at
+The MIT License (MIT)
 
-http://www.apache.org/licenses/LICENSE-2.0
+Copyright (c) .NET Foundation and Contributors
 
-Unless required by applicable law or agreed to in writing, software
+All rights reserved.
 
-distributed under the License is distributed on an "AS IS" BASIS,
+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:
 
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-See the License for the specific language governing permissions and
+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.
 
-limitations under the License.
 
 ---------------------------------------------------------
 
 ---------------------------------------------------------
 
-Markdig.Signed 0.22.0 - BSD-2-Clause
+Microsoft.CodeAnalysis.Common 4.4.0 - MIT
 
 
+(c) Microsoft Corporation
+Copyright (c) .NET Foundation and Contributors
 
-Copyright (c) <year> <owner> . All rights reserved.
+MIT License
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Copyright (c) <year> <copyright holders>
 
-   1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+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:
 
-   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 HOLDER 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.
 
 ---------------------------------------------------------
 
 ---------------------------------------------------------
 
-Microsoft.ApplicationInsights 2.21.0 - MIT
+Microsoft.CodeAnalysis.CSharp 4.4.0 - MIT
 
 
+(c) Microsoft Corporation
+Copyright (c) Microsoft Corporation
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) Microsoft Corporation. Alle Rechte
 
 MIT License
 
@@ -171,45 +176,29 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Microsoft.Bcl.AsyncInterfaces 5.0.0 - MIT
+Microsoft.CSharp 4.7.0 - MIT
 
 
 (c) Microsoft Corporation.
-Copyright (c) Andrew Arnott
-Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
-Copyright (c) 1998 Microsoft. To
 (c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2017 Yoshifumi Kawai
-Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2017 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
-Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
-Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -240,25 +229,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.CodeAnalysis.Common 4.3.0 - MIT
-
-
-
-MIT License
-
-Copyright (c) <year> <copyright holders>
-
-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.
-
----------------------------------------------------------
-
----------------------------------------------------------
-
-Microsoft.CodeAnalysis.CSharp 4.3.0 - MIT
+Microsoft.Extensions.ObjectPool 7.0.3 - MIT
 
 
 
@@ -334,10 +305,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Microsoft.PowerShell.Native 7.2.0 - MIT
+Microsoft.PowerShell.Native 7.3.2 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) by P.J. Plauger
 
 MIT License
@@ -372,29 +343,45 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Microsoft.Win32.Registry 4.7.0 - MIT
+Microsoft.Win32.Registry 5.0.0 - MIT
 
 
 (c) Microsoft Corporation.
+Copyright (c) Andrew Arnott
+Copyright 2018 Daniel Lemire
+Copyright 2012 the V8 project
 Copyright (c) .NET Foundation.
 Copyright (c) 2011, Google Inc.
+Copyright (c) 1998 Microsoft. To
 (c) 1997-2005 Sean Eron Anderson.
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
-Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 2012-2014, Yann Collet
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2018 Alexander Chermyanin
 Portions (c) International Organization
 Copyright (c) 2015 The Chromium Authors.
+Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
+Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -425,45 +412,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.Win32.Registry.AccessControl 6.0.0 - MIT
+Microsoft.Win32.Registry.AccessControl 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -495,9 +493,57 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.Win32.SystemEvents 6.0.1 - MIT
+Microsoft.Win32.SystemEvents 7.0.0 - MIT
 
 
+(c) Microsoft Corporation
+Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
+Copyright 2018 Daniel Lemire
+Copyright (c) .NET Foundation
+Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
+Copyright (c) 1998 Microsoft. To
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
+Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
+Portions (c) International Organization
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
+Copyright (c) .NET Foundation Contributors
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -528,45 +574,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Microsoft.Windows.Compatibility 6.0.0 - MIT
+Microsoft.Windows.Compatibility 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -598,7 +655,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-Namotion.Reflection 2.0.10 - MIT
+Namotion.Reflection 2.1.1 - MIT
 
 
 
@@ -616,7 +673,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-Newtonsoft.Json 13.0.1 - MIT
+Newtonsoft.Json 13.0.2 - MIT
 
 
 Copyright James Newton-King 2008
@@ -650,9 +707,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-NJsonSchema 10.7.2 - MIT
+NJsonSchema 10.8.0 - MIT
 
 
+Copyright Rico Suter, 2022
+Copyright (c) Rico Suter, 2022
+Copyright Rico Suter, 2022 4JSON Schema
 
 MIT License
 
@@ -668,45 +728,56 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-runtime.linux-arm.runtime.native.System.IO.Ports 6.0.0 - MIT
+runtime.linux-arm.runtime.native.System.IO.Ports 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -738,45 +809,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.linux-arm64.runtime.native.System.IO.Ports 6.0.0 - MIT
+runtime.linux-arm64.runtime.native.System.IO.Ports 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -808,45 +890,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.linux-x64.runtime.native.System.IO.Ports 6.0.0 - MIT
+runtime.linux-x64.runtime.native.System.IO.Ports 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -931,45 +1024,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.native.System.IO.Ports 6.0.0 - MIT
+runtime.native.System.IO.Ports 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -1001,45 +1105,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.osx-arm64.runtime.native.System.IO.Ports 6.0.0 - MIT
+runtime.osx-arm64.runtime.native.System.IO.Ports 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -1071,45 +1186,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-runtime.osx-x64.runtime.native.System.IO.Ports 6.0.0 - MIT
+runtime.osx-x64.runtime.native.System.IO.Ports 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -1141,45 +1267,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.CodeDom 6.0.0 - MIT
+System.CodeDom 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -1211,7 +1348,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Collections.Immutable 5.0.0 - MIT
+System.Collections.Immutable 6.0.0 - MIT
 
 
 (c) Microsoft Corporation.
@@ -1239,6 +1376,7 @@ Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
 Copyright (c) The Internet Society (2003).
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
@@ -1280,45 +1418,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ComponentModel.Composition 6.0.0 - MIT
+System.ComponentModel.Composition 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -1350,45 +1499,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ComponentModel.Composition.Registration 6.0.0 - MIT
+System.ComponentModel.Composition.Registration 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -1420,7 +1580,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Configuration.ConfigurationManager 6.0.1 - MIT
+System.Configuration.ConfigurationManager 7.0.0 - MIT
 
 
 (c) Microsoft Corporation
@@ -1437,11 +1597,14 @@ Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
-Copyright (c) 1991-2020 Unicode, Inc.
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
 Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
 Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
@@ -1452,16 +1615,19 @@ Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
 Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
 Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
@@ -1495,7 +1661,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Data.Odbc 6.0.1 - MIT
+System.Data.Odbc 7.0.0 - MIT
 
 
 (c) Microsoft Corporation
@@ -1512,11 +1678,14 @@ Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
-Copyright (c) 1991-2020 Unicode, Inc.
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
 Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
 Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
@@ -1527,16 +1696,19 @@ Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
 Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
 Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
@@ -1570,45 +1742,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Data.OleDb 6.0.0 - MIT
+System.Data.OleDb 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -1640,21 +1823,20 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Data.SqlClient 4.8.3 - MIT
+System.Data.SqlClient 4.8.5 - MIT
 
 
-2008 SQL Server 2012
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation.
+(c) Microsoft Corporation
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 2007 James Newton-King
 Copyright (c) 1991-2017 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright (c) 2015-2017, Wojciech Mula
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) .NET Foundation Contributors
@@ -1662,8 +1844,8 @@ Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
 
 The MIT License (MIT)
 
@@ -1694,45 +1876,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Diagnostics.DiagnosticSource 5.0.0 - MIT
+System.Diagnostics.DiagnosticSource 7.0.1 - MIT
 
 
-(c) Microsoft Corporation.
-Copyright (c) Andrew Arnott
-Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
-Copyright (c) 2011, Google Inc.
-Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
-Copyright (c) 2017 Yoshifumi Kawai
-Copyright (c) Microsoft Corporation
-Copyright (c) 2007 James Newton-King
-Copyright (c) 2012-2014, Yann Collet
-Copyright (c) 2013-2017, Alfred Klomp
-Copyright (c) 2015-2017, Wojciech Mula
-Copyright (c) 2005-2007, Nick Galbreath
-Copyright (c) 2018 Alexander Chermyanin
-Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
-Copyright (c) 2004-2006 Intel Corporation
-Copyright (c) 2013-2017, Milosz Krajewski
-Copyright (c) 2016-2017, Matthieu Darbois
-Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
-Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
-Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -1763,45 +1909,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Diagnostics.EventLog 6.0.0 - MIT
+System.Diagnostics.EventLog 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -1833,11 +1990,12 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Diagnostics.PerformanceCounter 6.0.1 - MIT
+System.Diagnostics.PerformanceCounter 7.0.0 - MIT
 
 
 (c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
 Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
@@ -1849,11 +2007,14 @@ Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
-Copyright (c) 1991-2020 Unicode, Inc.
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
 Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
 Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
@@ -1864,16 +2025,19 @@ Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
 Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
 Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
@@ -1907,45 +2071,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.DirectoryServices 6.0.0 - MIT
+System.DirectoryServices 7.0.1 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -1977,45 +2152,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.DirectoryServices.AccountManagement 6.0.0 - MIT
+System.DirectoryServices.AccountManagement 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -2047,11 +2233,12 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.DirectoryServices.Protocols 6.0.1 - MIT
+System.DirectoryServices.Protocols 7.0.0 - MIT
 
 
 (c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
 Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
@@ -2063,11 +2250,14 @@ Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
-Copyright (c) 1991-2020 Unicode, Inc.
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
 Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
 Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
@@ -2078,16 +2268,19 @@ Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
 Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
 Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
@@ -2121,45 +2314,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Drawing.Common 6.0.0 - MIT
+System.Drawing.Common 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -2191,45 +2395,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Formats.Asn1 6.0.0 - MIT
+System.Formats.Asn1 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -2261,45 +2476,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.IO.Packaging 6.0.0 - MIT
+System.IO.Packaging 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -2331,45 +2557,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.IO.Ports 6.0.0 - MIT
+System.IO.Ports 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -2401,45 +2638,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Management 6.0.0 - MIT
+System.Management 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -2471,23 +2719,24 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Memory 4.5.4 - MIT
+System.Memory 4.5.5 - MIT
 
 
-(c) Microsoft Corporation.
+(c) 2022 GitHub, Inc.
+(c) Microsoft Corporation
 Copyright (c) 2011, Google Inc.
-(c) 1997-2005 Sean Eron Anderson.
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1991-2017 Unicode, Inc.
+Copyright (c) 2015 The Chromium Authors
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) .NET Foundation Contributors
 Copyright (c) .NET Foundation and Contributors
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
 
 The MIT License (MIT)
 
@@ -2518,9 +2767,57 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Net.Http.WinHttpHandler 6.0.1 - MIT
+System.Net.Http.WinHttpHandler 7.0.0 - MIT
 
 
+(c) Microsoft Corporation
+Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
+Copyright 2018 Daniel Lemire
+Copyright (c) .NET Foundation
+Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
+Copyright (c) 1998 Microsoft. To
+Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
+Copyright (c) Microsoft Corporation
+Copyright (c) 2007 James Newton-King
+Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
+Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
+Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
+Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
+Portions (c) International Organization
+Copyright (c) 2004-2006 Intel Corporation
+Copyright (c) 2013-2017, Milosz Krajewski
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
+Copyright (c) .NET Foundation Contributors
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
+Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
+Copyright (c) 2019 Microsoft Corporation, Daan Leijen
+Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
+Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
+Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
+Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
 
@@ -2631,45 +2928,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Reflection.Context 6.0.0 - MIT
+System.Reflection.Context 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -2823,45 +3131,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Runtime.Caching 6.0.0 - MIT
+System.Runtime.Caching 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -3033,7 +3352,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.Pkcs 6.0.1 - MIT
+System.Security.Cryptography.Pkcs 7.0.1 - MIT
 
 
 (c) Microsoft Corporation
@@ -3050,11 +3369,14 @@ Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
-Copyright (c) 1991-2020 Unicode, Inc.
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
 Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
 Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
@@ -3065,16 +3387,19 @@ Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
 Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
 Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
@@ -3108,45 +3433,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.ProtectedData 6.0.0 - MIT
+System.Security.Cryptography.ProtectedData 7.0.1 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -3178,7 +3514,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Cryptography.Xml 6.0.1 - MIT
+System.Security.Cryptography.Xml 7.0.1 - MIT
 
 
 (c) Microsoft Corporation
@@ -3195,11 +3531,14 @@ Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
-Copyright (c) 1991-2020 Unicode, Inc.
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
 Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
 Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
 Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
@@ -3210,16 +3549,19 @@ Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
 Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
 Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
 Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
 Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
 Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
@@ -3253,45 +3595,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Security.Permissions 6.0.0 - MIT
+System.Security.Permissions 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -3557,45 +3910,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceModel.Syndication 6.0.0 - MIT
+System.ServiceModel.Syndication 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -3627,45 +3991,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.ServiceProcess.ServiceController 6.0.0 - MIT
+System.ServiceProcess.ServiceController 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -3697,45 +4072,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Speech 6.0.0 - MIT
+System.Speech 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -3767,45 +4153,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Text.Encoding.CodePages 6.0.0 - MIT
+System.Text.Encoding.CodePages 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -3837,45 +4234,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Text.Encodings.Web 6.0.0 - MIT
+System.Text.Encodings.Web 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -3907,45 +4315,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Threading.AccessControl 6.0.0 - MIT
+System.Threading.AccessControl 7.0.1 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)
@@ -4024,12 +4443,9 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Web.Services.Description 4.9.0 - MIT
+System.Web.Services.Description 4.10.0 - MIT
 
 
-(c) Microsoft Corporation.
-Copyright (c) .NET Foundation and Contributors
-Copyright (c) 2000-2014 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 The MIT License (MIT)
 
@@ -4060,45 +4476,56 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-System.Windows.Extensions 6.0.0 - MIT
+System.Windows.Extensions 7.0.0 - MIT
 
 
-(c) Microsoft Corporation.
+(c) Microsoft Corporation
 Copyright (c) Andrew Arnott
+Copyright 2019 LLVM Project
 Copyright 2018 Daniel Lemire
-Copyright 2012 the V8 project
-Copyright (c) .NET Foundation.
+Copyright (c) .NET Foundation
 Copyright (c) 2011, Google Inc.
+Copyright (c) 2020 Dan Shechter
+(c) 1997-2005 Sean Eron Anderson
 Copyright (c) 1998 Microsoft. To
-(c) 1997-2005 Sean Eron Anderson.
 Copyright (c) 2017 Yoshifumi Kawai
+Copyright (c) 2005-2020 Rich Felker
 Copyright (c) Microsoft Corporation
 Copyright (c) 2007 James Newton-King
 Copyright (c) 2012-2014, Yann Collet
+Copyright (c) 1991-2022 Unicode, Inc.
 Copyright (c) 2013-2017, Alfred Klomp
+Copyright 2012 the V8 project authors
+Copyright (c) 1999 Lucent Technologies
+Copyright (c) 2008-2016, Wojciech Mula
+Copyright (c) 2011-2020 Microsoft Corp
 Copyright (c) 2015-2017, Wojciech Mula
+Copyright (c) 2021 csFastFloat authors
 Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015 The Chromium Authors
 Copyright (c) 2018 Alexander Chermyanin
+Copyright (c) The Internet Society 1997
 Portions (c) International Organization
-Copyright (c) 2015 The Chromium Authors.
-Copyright (c) The Internet Society 1997.
 Copyright (c) 2004-2006 Intel Corporation
 Copyright (c) 2013-2017, Milosz Krajewski
 Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) The Internet Society (2003)
 Copyright (c) .NET Foundation Contributors
-Copyright (c) The Internet Society (2003).
+Copyright (c) 2020 Mara Bos <m-ou.se@m-ou.se>
 Copyright (c) .NET Foundation and Contributors
+Copyright (c) 2008-2020 Advanced Micro Devices, Inc.
 Copyright (c) 2019 Microsoft Corporation, Daan Leijen
 Copyright (c) 2011 Novell, Inc (http://www.novell.com)
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (c) 1995-2022 Jean-loup Gailly and Mark Adler
 Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
-Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
+Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors
 Copyright (c) 2014 Ryan Juckett http://www.ryanjuckett.com
 Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
-Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers THIS WORK IS PROVIDED AS
-Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California.
-Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass.
+Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang). Disclaimers
+Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip
+Copyright (c) 1980, 1986, 1993 The Regents of the University of California
+Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the University of California
+Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. & Digital Equipment Corporation, Maynard, Mass. To
 
 The MIT License (MIT)

From 699d2e817557722efb8060cf0427f4155bc8f2e4 Mon Sep 17 00:00:00 2001
From: Patrick Meinecke <pmeinecke@microsoft.com>
Date: Thu, 23 Feb 2023 23:48:09 +0000
Subject: [PATCH 645/645] Merged PR 24462: Update changelog for v7.3.3

---
 .spelling        |  1 +
 CHANGELOG/7.3.md | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/.spelling b/.spelling
index f08124f5d67..7c964a07675 100644
--- a/.spelling
+++ b/.spelling
@@ -1237,6 +1237,7 @@ System.Runtime.CompilerServices.Unsafe
 TabExpansion
 PSv2
 System.Data.SqlClient
+v7.3.3
  - CHANGELOG.md
 aavdberg
 asrosent
diff --git a/CHANGELOG/7.3.md b/CHANGELOG/7.3.md
index e513c444d5a..57c1e3b99f3 100644
--- a/CHANGELOG/7.3.md
+++ b/CHANGELOG/7.3.md
@@ -1,5 +1,28 @@
 # 7.3 Changelog
 
+## [7.3.3] - 2023-02-23
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Bump to use .NET 7.0.3</p>
+
+</summary>
+
+<ul>
+<li>Update third party notices for v7.3.3 (Internal 24353)</li>
+<li>Add tool to trigger license information gathering for NuGet modules (#18827)</li>
+<li>Update global.json to 7.0.200 for v7.3.3 (Internal 24334)</li>
+<li>Update cgmanifest for v7.3.3 (Internal 24338)</li>
+</ul>
+
+</details>
+
+[7.3.3]: https://github.com/PowerShell/PowerShell/compare/v7.3.2...v7.3.3
+
 ## [7.3.2] - 2023-01-24
 
 ### Engine Updates and Fixes